Project

General

Profile

« Previous | Next » 

Revision c1bf973e

Added by pplitzner over 4 years ago

ref #8539 Update local data set after adding specimen

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrix.java
153 153
    @Inject
154 154
    private EMenuService menuService;
155 155

  
156
    private DescriptiveDataSet descriptiveDataSet;
157

  
158 156
    private NatTable natTable;
159 157

  
160 158
    private Map<Integer, Feature> indexToFeatureMap = new HashMap<>();
......
260 258
        GridDataFactory.fillDefaults().grab(true, true).applyTo(natTable);
261 259

  
262 260
        //update label to current data set
263
        toolbar.getWsLabel().setText(descriptiveDataSet.getLabel());
261
        toolbar.getWsLabel().setText(getDescriptiveDataSet().getLabel());
264 262
        toolbar.getWsLabel().setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
265 263
        toolbar.getWsLabel().getParent().layout();
266 264

  
......
291 289
        return features;
292 290
    }
293 291

  
294
    public void initDescriptiveDataSet(DescriptiveDataSet descriptiveDataSet){
295
        this.descriptiveDataSet = descriptiveDataSet;
292
    public void initDescriptiveDataSet(){
296 293
        //get features/columns stored in descriptive data set
297
        TermTree<Feature> tree = descriptiveDataSet.getDescriptiveSystem();
294
        TermTree<Feature> tree = getDescriptiveDataSet().getDescriptiveSystem();
298 295
        features = initFeatureList(tree.getRoot());
299 296

  
300 297
        //init state data for categorical features
......
319 316
    private void createLayers(boolean treeView) {
320 317
        SortedList<Object> sortedList = new SortedList<>(descriptions, new MatrixRowComparator());
321 318
        // wrap the SortedList with the TreeList
322
        TreeList<Object> treeList = new TreeList(sortedList, new DescriptionTreeFormat(descriptiveDataSet), TreeList.NODES_START_EXPANDED);
319
        TreeList<Object> treeList = new TreeList(sortedList, new DescriptionTreeFormat(getDescriptiveDataSet()), TreeList.NODES_START_EXPANDED);
323 320
        /**
324 321
         * data provider
325 322
         */
......
393 390

  
394 391
        // assemble the column groups
395 392
        LinkedList<ColumnGroupWrapper> columnGroups = new LinkedList<>();
396
        List<TermNode<Feature>> rootChildren = descriptiveDataSet.getDescriptiveSystem().getRootChildren();
393
        List<TermNode<Feature>> rootChildren = getDescriptiveDataSet().getDescriptiveSystem().getRootChildren();
397 394
        buildHeader(rootChildren, columnGroups);
398 395

  
399 396
        bodyLayer = new MatrixBodyLayerStack(eventLayer, columnGroups);
......
755 752
    }
756 753

  
757 754
    public DescriptiveDataSet getDescriptiveDataSet() {
758
        return descriptiveDataSet;
755
        return part.getDescriptiveDataSet();
756
    }
757

  
758
    public void setDescriptiveDataSet(DescriptiveDataSet dataSet) {
759
        part.setDescriptiveDataSet(dataSet);
759 760
    }
760 761

  
761 762
    public Collection<SpecimenNodeWrapper> getSpecimenCache() {
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java
251 251
                                        .stream().map(ex->ex.toString())
252 252
                                        .collect(Collectors.joining("\n"))));
253 253
                    }
254
                    DescriptiveDataSet dataset = (DescriptiveDataSet) result.getCdmEntity();
255
                    // update local dataset
256
                    matrix.setDescriptiveDataSet(dataset);
254 257
                    matrix.loadDescriptions(descriptiveDataSetUuid);
255 258
                }
256 259
            } catch (InterruptedException e) {
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixPart.java
137 137
                MessagingUtils.informationDialog(Messages.CharacterMatrixPart_COULD_NOT_OPEN, Messages.CharacterMatrixPart_COULD_NOT_OPEN_MESSAGE);
138 138
                return;
139 139
            }
140
            matrix.initDescriptiveDataSet(descriptiveDataSet);
140
            matrix.initDescriptiveDataSet();
141 141
            matrix.createTable(treeView, true);
142 142
            thisPart.setLabel(descriptiveDataSet.getLabel());
143 143
            matrix.loadDescriptions(descriptiveDataSetUuid);
......
156 156
        return descriptiveDataSet;
157 157
    }
158 158

  
159
    public void setDescriptiveDataSet(DescriptiveDataSet dataSet) {
160
        this.descriptiveDataSet = dataSet;
161
    }
162

  
159 163
    public NatTable getNatTable() {
160 164
        return matrix.getNatTable();
161 165
    }

Also available in: Unified diff