Remove #terminate method from base model classes

After removing all empty implementations of lifecycle methods (see
earlier commit), the #terminate method was no longer called anywhere
other than from CachedViewCB's #terminate method, which per its own
Javadoc is supposed to call #deactivate. Now it does just that.
This commit is contained in:
Chris Beams 2014-11-22 11:10:29 +01:00
parent 0f04bd58bc
commit c7e98df174
No known key found for this signature in database
GPG Key ID: 3D214F8F5BC5ED73
4 changed files with 1 additions and 14 deletions

View File

@ -98,7 +98,7 @@ public class CachedViewCB<T extends PresentationModel> extends ViewCB<T> {
super.terminate();
if (presentationModel != null)
presentationModel.terminate();
presentationModel.deactivate();
}
}

View File

@ -49,10 +49,4 @@ public class PresentationModel<T extends UIModel> {
if (model != null)
model.deactivate();
}
public void terminate() {
log.trace("Lifecycle: terminate " + this.getClass().getSimpleName());
if (model != null)
model.terminate();
}
}

View File

@ -34,8 +34,4 @@ public class UIModel {
public void deactivate() {
log.trace("Lifecycle: deactivate " + this.getClass().getSimpleName());
}
public void terminate() {
log.trace("Lifecycle: terminate " + this.getClass().getSimpleName());
}
}

View File

@ -79,9 +79,6 @@ public class ViewCB<T extends PresentationModel> implements Initializable {
*/
public void terminate() {
log.trace("Lifecycle: terminate " + this.getClass().getSimpleName());
if (presentationModel != null)
presentationModel.terminate();
}
/**