Revision 8714 trunk/libraries/libIverUtiles/src/com/iver/utiles/swing/threads/TaskMonitorTimerListener.java

View differences:

TaskMonitorTimerListener.java
45 45
*
46 46
* $Id$
47 47
* $Log$
48
* Revision 1.3  2006-11-06 07:29:59  jaume
48
* Revision 1.4  2006-11-13 20:46:37  azabala
49
* *** empty log message ***
50
*
51
* Revision 1.3  2006/11/06 07:29:59  jaume
49 52
* organize imports
50 53
*
51 54
* Revision 1.2  2006/03/14 19:24:07  azabala
......
90 93
		String statusNote = task.getNote();
91 94
        progressMonitor.setCurrentStep(currentStep);
92 95
        progressMonitor.setNote(statusNote);
93
        if (progressMonitor.isCanceled() || task.isFinished()) {
94
            progressMonitor.close();
95
            task.cancel();
96
            timer.stop();
96
        if(progressMonitor.isCanceled()){
97
        	 progressMonitor.close();
98
             task.cancel();
99
             timer.stop();
97 100
        }
101
        if (task.isFinished()) {
102
           progressMonitor.close();
103
           timer.stop();
104
        }
98 105
	}
99 106

  
100 107
}

Also available in: Unified diff