Project

General

Profile

« Previous | Next » 

Revision 44ddcdb3

Added by Katja Luther over 2 years ago

ref #9772: check for changes before start aggregation

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/handler/AggregationHandler.java
26 26
import org.eclipse.jface.viewers.IStructuredSelection;
27 27
import org.eclipse.jface.window.Window;
28 28
import org.eclipse.jface.wizard.WizardDialog;
29
import org.eclipse.nebula.widgets.nattable.data.IRowDataProvider;
29 30

  
30 31
import eu.etaxonomy.cdm.api.application.CdmApplicationState;
31 32
import eu.etaxonomy.cdm.api.service.UpdateResult;
......
46 47
import eu.etaxonomy.taxeditor.model.MessagingUtils;
47 48
import eu.etaxonomy.taxeditor.operation.IFeedbackGenerator;
48 49
import eu.etaxonomy.taxeditor.store.CdmStore;
50
import eu.etaxonomy.taxeditor.store.StoreUtil;
49 51
import eu.etaxonomy.taxeditor.ui.dialog.configurator.StructuredAggregationConfigurationWizard;
50 52

  
51 53
/**
......
58 60

  
59 61
        // dependent on the selection the specimens are filtered
60 62
        CharacterMatrixPart matrixPart = (CharacterMatrixPart) activePart.getObject();
61

  
63
       
62 64
        CharacterMatrix matrix = matrixPart.getMatrix();
65
        if(StoreUtil.promptCheckIsDirty(matrixPart)){
66
            return;
67
        }
63 68

  
69
        
64 70
        //ranks
65 71
        UUID minRankUuid = matrix.getDescriptiveDataSet().getMinRank() != null? matrix.getDescriptiveDataSet().getMinRank().getUuid(): null;
66 72
        UUID maxRankUuid = matrix.getDescriptiveDataSet().getMaxRank() != null? matrix.getDescriptiveDataSet().getMaxRank().getUuid(): null;
......
137 143
                    }
138 144

  
139 145
                    DescriptiveDataSet dataSet = (DescriptiveDataSet) result.getCdmEntity();
140
                    dataSet = matrix.getCdmEntitySession().load(dataSet, true);
146
                    
141 147
                    // update local dataset
148
                    
142 149
                    matrix.loadDescriptions(false, true);
150
                   
151
//                    matrix.setSelectedObject(sel);
143 152
                }
144 153
            } catch (InterruptedException e) {
145 154
                return;

Also available in: Unified diff