Revision b953bc70
Added by Andreas Müller over 2 years ago
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/StatusComboBoxDataProvider.java | ||
|---|---|---|
| 39 | 39 |
/** |
| 40 | 40 |
* @author k.luther |
| 41 | 41 |
* @since 05.12.2018 |
| 42 |
* |
|
| 43 | 42 |
*/ |
| 44 | 43 |
public class StatusComboBoxDataProvider implements IComboBoxDataProvider {
|
| 45 | 44 |
|
| ... | ... | |
| 70 | 69 |
// } |
| 71 | 70 |
// } |
| 72 | 71 |
return getValues(pref); |
| 73 |
|
|
| 74 | 72 |
} |
| 75 | 73 |
|
| 76 |
|
|
| 77 | 74 |
public static List<?> getValues(CdmPreference pref){
|
| 78 | 75 |
List<StatusHelper> inputAll = new ArrayList<>(); |
| 79 | 76 |
PresenceAbsenceTerm noneTerm = PresenceAbsenceTerm.NewInstance(); |
| ... | ... | |
| 108 | 105 |
} |
| 109 | 106 |
|
| 110 | 107 |
if (order.equals(TermOrder.IdInVoc)){
|
| 111 |
comp = new TermIdInVocabularyComparator<DefinedTermBase>();
|
|
| 108 |
comp = new TermIdInVocabularyComparator<>(); |
|
| 112 | 109 |
}else if(order.equals(TermOrder.Label)){
|
| 113 |
comp = new TermLanguageComparator<DefinedTermBase>(Language.DEFAULT(), Language.DEFAULT());
|
|
| 110 |
comp = new TermLanguageComparator<>(Language.DEFAULT(), Language.DEFAULT()); |
|
| 114 | 111 |
}else if(order.equals(TermOrder.Symbol1)){
|
| 115 |
comp = new TermSymbol1Comparator<DefinedTermBase>();
|
|
| 112 |
comp = new TermSymbol1Comparator<>(); |
|
| 116 | 113 |
}else if(order.equals(TermOrder.Symbol2)){
|
| 117 |
comp = new TermSymbol2Comparator<DefinedTermBase>();
|
|
| 114 |
comp = new TermSymbol2Comparator<>(); |
|
| 118 | 115 |
} |
| 119 | 116 |
Collections.sort(inputList, comp); |
| 120 | 117 |
// Collections.sort(inputList, Collections.reverseOrder()); |
| eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/SetSecundumForSubtreeOperation.java | ||
|---|---|---|
| 22 | 22 |
import org.eclipse.e4.ui.workbench.modeling.EPartService; |
| 23 | 23 |
import org.eclipse.swt.widgets.Display; |
| 24 | 24 |
|
| 25 |
import eu.etaxonomy.cdm.api.service.ITaxonNodeService; |
|
| 26 | 25 |
import eu.etaxonomy.cdm.api.service.UpdateResult; |
| 27 | 26 |
import eu.etaxonomy.cdm.api.service.config.SecundumForSubtreeConfigurator; |
| 28 | 27 |
import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor; |
| 29 | 28 |
import eu.etaxonomy.taxeditor.editor.EditorUtil; |
| 29 |
import eu.etaxonomy.taxeditor.model.AbstractUtility; |
|
| 30 | 30 |
import eu.etaxonomy.taxeditor.navigation.l10n.Messages; |
| 31 | 31 |
import eu.etaxonomy.taxeditor.operation.IPostMoniteredOperationEnabled; |
| 32 | 32 |
|
| ... | ... | |
| 94 | 94 |
|
| 95 | 95 |
|
| 96 | 96 |
public void runMoniteredOperation() {
|
| 97 |
ITaxonNodeService nodeService; |
|
| 98 | 97 |
final UUID uuid = longRunningTaskService.monitLongRunningTask(config); |
| 99 | 98 |
Display.getDefault().asyncExec(new Runnable() {
|
| 100 | 99 |
@Override |
| 101 | 100 |
public void run() {
|
| 102 |
EditorUtil.executeMoniteredOperation("Set Secundum Reference for Subtree: ",
|
|
| 101 |
AbstractUtility.executeMoniteredOperation("Set Secundum Reference for Subtree: ",
|
|
| 103 | 102 |
uuid, |
| 104 | 103 |
1000, |
| 105 | 104 |
false, |
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/ProgressMonitorClientManager.java | ||
|---|---|---|
| 119 | 119 |
}else if (result == null){
|
| 120 | 120 |
result = new UpdateResult(); |
| 121 | 121 |
} |
| 122 |
|
|
| 123 | 122 |
} |
| 124 | 123 |
// start the client monitor |
| 125 | 124 |
monitor.beginTask(remotingMonitor.getTaskName(), remotingMonitor.getTotalWork()); |
Also available in: Unified diff
cleanup