Changeset 5349


Ignore:
Timestamp:
06/12/14 07:48:42 (10 years ago)
Author:
Oliver Schonefeld
Message:
  • allow handler to throw CMDIValidatorException to abort processing
  • minor code formating
Location:
CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidationPlugin.java

    r5204 r5349  
    99            throws CMDIValidatorException;
    1010
    11 }
     11} // class CMDIValidationPlugin

  • CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidationPluginFactory.java

    r5204 r5349  
    99            throws CMDIValidatorInitException;
    1010
    11 }
     11} // class CMDIValidationPluginFactory

  • CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidatorJob.java

    r5311 r5349  
    1616
    1717    public CMDIValidatorJob(TFile root, FileFilter filter,
    18             CMDIValidatorJobHandler handler) {
     18            CMDIValidatorJobHandler handler) throws CMDIValidatorException {
    1919        if (root == null) {
    2020            throw new NullPointerException("root = null");
    … …  
    3333
    3434
    35     public CMDIValidatorJob(TFile root, CMDIValidatorJobHandler handler) {
     35    public CMDIValidatorJob(TFile root, CMDIValidatorJobHandler handler)
     36            throws CMDIValidatorException {
    3637        this(root, null, handler);
    3738    }
    … …  
    9697
    9798    private void signalDone() {
    98         handler.onJobFinished(canceled);
     99        try {
     100            handler.onJobFinished(canceled);
     101        } catch (CMDIValidatorException e) {
     102        }
    99103        if (canceled) {
    100104            this.notifyAll();

  • CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidatorJobHandler.java

    r5052 r5349  
    33
    44public interface CMDIValidatorJobHandler {
    5     public void onJobStarted();
     5
     6    public void onJobStarted()
     7            throws CMDIValidatorException;
    68
    79
    8     public void onJobFinished(boolean wasCanceled);
     10    public void onJobFinished(boolean wasCanceled)
     11            throws CMDIValidatorException;
    912
    1013
    11     public void onValidationSuccess(CMDIValidatorResult result);
     14    public void onValidationSuccess(CMDIValidatorResult result)
     15            throws CMDIValidatorException;
    1216
    1317
    14     public void onValidationFailure(CMDIValidatorResult result);
     18    public void onValidationFailure(CMDIValidatorResult result)
     19            throws CMDIValidatorException;
    1520
    1621} // interface CMDIValidatorJobHandler

  • CMDIValidator/trunk/cmdi-validator-core/src/main/java/eu/clarin/cmdi/validator/CMDIValidatorJobHandlerAdapter.java

    r5052 r5349  
    55
    66    @Override
    7     public void onJobStarted() {
     7    public void onJobStarted() throws CMDIValidatorException {
    88    }
    99
    1010
    1111    @Override
    12     public void onJobFinished(boolean wasCanceled) {
    13     }
    14 
    15        
    16     @Override
    17     public void onValidationSuccess(CMDIValidatorResult result) {
     12    public void onJobFinished(boolean wasCanceled)
     13            throws CMDIValidatorException {
    1814    }
    1915
    2016
    2117    @Override
    22     public void onValidationFailure(CMDIValidatorResult result) {
     18    public void onValidationSuccess(CMDIValidatorResult result)
     19            throws CMDIValidatorException {
     20    }
     21
     22
     23    @Override
     24    public void onValidationFailure(CMDIValidatorResult result)
     25            throws CMDIValidatorException {
    2326    }
    2427
Note: See TracChangeset for help on using the changeset viewer.