simplify abstract bean a bit

[jSite2.git] / src / net / pterodactylus / jsite / core / Request.java

diff --git a/src/net/pterodactylus/jsite/core/Request.java b/src/net/pterodactylus/jsite/core/Request.java
index 7b1bbe9..82df6f8 100644 (file)
--- a/src/net/pterodactylus/jsite/core/Request.java
+++ b/src/net/pterodactylus/jsite/core/Request.java
@@ -19,7 +19,6 @@
 
 package net.pterodactylus.jsite.core;
 
-
 import net.pterodactylus.util.beans.AbstractBean;
 
 /**
@@ -28,8 +27,7 @@ import net.pterodactylus.util.beans.AbstractBean;
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
  * @version $Id$
  */
-public class Request extends 
-AbstractBean {
+public class Request extends AbstractBean {
 
        /**
         * The type of a request.
@@ -162,9 +160,7 @@ AbstractBean {
        public void setType(Type type) {
                Type oldType = this.type;
                this.type = type;
-               if (!equal(oldType, type)) {
-                       firePropertyChange(PROPERTY_TYPE, oldType, type);
-               }
+               fireIfPropertyChanged(PROPERTY_TYPE, oldType, type);
        }
 
        /**
@@ -185,9 +181,7 @@ AbstractBean {
        public void setClientToken(String clientToken) {
                String oldClientToken = this.clientToken;
                this.clientToken = clientToken;
-               if (!equal(oldClientToken, clientToken)) {
-                       firePropertyChange(PROPERTY_CLIENT_TOKEN, oldClientToken, clientToken);
-               }
+               fireIfPropertyChanged(PROPERTY_CLIENT_TOKEN, oldClientToken, clientToken);
        }
 
        /**
@@ -210,9 +204,7 @@ AbstractBean {
        public void setTotalBlocks(int totalBlocks) {
                int oldTotalBlocks = this.totalBlocks;
                this.totalBlocks = totalBlocks;
-               if (oldTotalBlocks != totalBlocks) {
-                       firePropertyChange(PROPERTY_TOTAL_BLOCKS, oldTotalBlocks, totalBlocks);
-               }
+               fireIfPropertyChanged(PROPERTY_TOTAL_BLOCKS, oldTotalBlocks, totalBlocks);
        }
 
        /**
@@ -229,9 +221,7 @@ AbstractBean {
        public void setRequiredBlocks(int requiredBlocks) {
                int oldRequiredBlocks = this.requiredBlocks;
                this.requiredBlocks = requiredBlocks;
-               if (oldRequiredBlocks != requiredBlocks) {
-                       firePropertyChange(PROPERTY_REQUIRED_BLOCKS, oldRequiredBlocks, requiredBlocks);
-               }
+               fireIfPropertyChanged(PROPERTY_REQUIRED_BLOCKS, oldRequiredBlocks, requiredBlocks);
        }
 
        /**
@@ -248,9 +238,7 @@ AbstractBean {
        public void setSuccessfulBlocks(int successfulBlocks) {
                int oldSuccessfulBlocks = this.successfulBlocks;
                this.successfulBlocks = successfulBlocks;
-               if (oldSuccessfulBlocks != successfulBlocks) {
-                       firePropertyChange(PROPERTY_SUCCESSFUL_BLOCKS, oldSuccessfulBlocks, successfulBlocks);
-               }
+               fireIfPropertyChanged(PROPERTY_SUCCESSFUL_BLOCKS, oldSuccessfulBlocks, successfulBlocks);
        }
 
        /**
@@ -267,9 +255,7 @@ AbstractBean {
        public void setFailedBlocks(int failedBlocks) {
                int oldFailedBlocks = this.failedBlocks;
                this.failedBlocks = failedBlocks;
-               if (oldFailedBlocks != failedBlocks) {
-                       firePropertyChange(PROPERTY_FAILED_BLOCKS, oldFailedBlocks, failedBlocks);
-               }
+               fireIfPropertyChanged(PROPERTY_FAILED_BLOCKS, oldFailedBlocks, failedBlocks);
        }
 
        /**
@@ -286,9 +272,7 @@ AbstractBean {
        public void setFatallyFailedBlocks(int fatallyFailedBlocks) {
                int oldFatallyFailedBlocks = this.fatallyFailedBlocks;
                this.fatallyFailedBlocks = fatallyFailedBlocks;
-               if (oldFatallyFailedBlocks != fatallyFailedBlocks) {
-                       firePropertyChange(PROPERTY_FATALLY_FAILED_BLOCKS, oldFatallyFailedBlocks, fatallyFailedBlocks);
-               }
+               fireIfPropertyChanged(PROPERTY_FATALLY_FAILED_BLOCKS, oldFatallyFailedBlocks, fatallyFailedBlocks);
        }
 
        /**
@@ -305,9 +289,7 @@ AbstractBean {
        public void setTotalFinalized(boolean totalFinalized) {
                boolean oldTotalFinalized = this.totalFinalized;
                this.totalFinalized = totalFinalized;
-               if (oldTotalFinalized != totalFinalized) {
-                       firePropertyChange(PROPERTY_TOTAL_FINALIZED, oldTotalFinalized, totalFinalized);
-               }
+               fireIfPropertyChanged(PROPERTY_TOTAL_FINALIZED, oldTotalFinalized, totalFinalized);
        }
 
 }