Project

General

Profile

« Previous | Next » 

Revision 68df9072

Added by Andreas Müller about 9 years ago

merge trunk into taxeditor-validation3 trunk

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/validation/ValidationDaemon.java
8 8
import org.eclipse.core.runtime.Status;
9 9
import org.eclipse.core.runtime.jobs.Job;
10 10

  
11
import eu.etaxonomy.cdm.api.service.IEntityConstraintViolationService;
12
import eu.etaxonomy.cdm.api.service.IEntityValidationResultService;
13
import eu.etaxonomy.cdm.model.validation.EntityValidationResult;
11
import eu.etaxonomy.cdm.api.service.IEntityValidationService;
12
import eu.etaxonomy.cdm.model.validation.EntityValidation;
14 13
import eu.etaxonomy.taxeditor.model.MessagingUtils;
15 14
import eu.etaxonomy.taxeditor.store.CdmStore;
16 15

  
17 16
/**
18 17
 * A job that repeatedly checks the error tables and refreshes the problem
19 18
 * markers created from them.
20
 * 
19
 *
21 20
 * @author ayco_holleman
22
 * 
21
 *
23 22
 */
24 23
public class ValidationDaemon extends Job {
25

  
26 24
	@SuppressWarnings("unused")
27 25
	private static final Logger logger = Logger.getLogger(ValidationDaemon.class);
28 26

  
29
	private final IEntityValidationResultService validationResultService;
30
	
31
	@SuppressWarnings("unused")
32
	/* Not currently needed but present for future use if/when required */
33
	private final IEntityConstraintViolationService constraintViolationService;
27
	private final IEntityValidationService entityValidationService;
34 28

  
29
	// Might want to make this configurable:
30
	private int SLEEP_TIME = 5000;
31
	
35 32
	private boolean cancelRequested = false;
36 33

  
34

  
35

  
37 36
	public ValidationDaemon(){
38
		super("Initializing validation module");
39
//		StoreUtil.info("Initializing validation module");
40
		MessagingUtils.info("Initializing validation module");
41
		constraintViolationService = CdmStore.getService(IEntityConstraintViolationService.class);
42
		validationResultService = CdmStore.getService(IEntityValidationResultService.class);
37
		super("Running validation daemon");
38
		entityValidationService = CdmStore.getService(IEntityValidationService.class);
43 39
	}
44 40

  
45
	
41

  
46 42
	@Override
47 43
	protected void canceling(){
48 44
		cancelRequested = true;
......
62 58
	@Override
63 59
	protected IStatus run(IProgressMonitor monitor){
64 60
		MarkerManager markerManager;
65
		List<EntityValidationResult> results;
61
		List<EntityValidation> results;
66 62
		try {
67 63
			while (!cancelRequested) {
68
				results = validationResultService.getValidationResults();
64
				results = entityValidationService.getValidationResults();
69 65
				markerManager = new MarkerManager(results);
70 66
				markerManager.deleteObsoleteMarkers();
71 67
				markerManager.createMarkers();
72
				// Might want to make this configurable:
73
				Thread.sleep(5000);
68
				Thread.sleep(SLEEP_TIME);
74 69
			}
75
//			StoreUtil.info("Validation module stopped");
76 70
			MessagingUtils.info("Validation module stopped");
77 71
			return Status.OK_STATUS;
78 72
		}
79 73
		catch (Throwable t) {
80
//			StoreUtil.info("Validation module terminated unexpectedly: " + t.getMessage());
81 74
			MessagingUtils.info("Validation module terminated unexpectedly: " + t.getMessage());
82 75
			return Status.CANCEL_STATUS;
83 76
		}

Also available in: Unified diff