Thread: [Objectlabkit-svn] SF.net SVN: objectlabkit:[335] trunk/utils/src/main/java/net/objectlab/kit/ util

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 335
          http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=335&view=rev
Author:   benoitx
Date:     2010-03-30 22:18:44 +0000 (Tue, 30 Mar 2010)

Log Message:
-----------
A few more methods

Modified Paths:
--------------
    trunk/utils/src/main/java/net/objectlab/kit/util/Average.java
    trunk/utils/src/main/java/net/objectlab/kit/util/StringUtil.java
    trunk/utils/src/main/java/net/objectlab/kit/util/WeightedAverage.java

Added Paths:
-----------
    trunk/utils/src/main/java/net/objectlab/kit/util/Total.java

Removed Paths:
-------------
    trunk/utils/src/main/java/net/objectlab/kit/util/Sum.java

Modified: trunk/utils/src/main/java/net/objectlab/kit/util/Average.java
===================================================================

--- trunk/utils/src/main/java/net/objectlab/kit/util/Average.java	2010-03-30 11:06:50 UTC (rev 334)
+++ trunk/utils/src/main/java/net/objectlab/kit/util/Average.java	2010-03-30 22:18:44 UTC (rev 335)
@@ -41,19 +41,19 @@
  */
 public final class Average implements Serializable {
     private static final long serialVersionUID = 4630559777899225672L;
-    private Sum sum = new Sum();
+    private Total sum = new Total();
     private int count = 0;
 
     public Average() {
     }
 
     public Average(final BigDecimal start) {
-        sum = new Sum(start);
+        sum = new Total(start);
     }
 
     public Average(final int scale) {
         final BigDecimal bd = new BigDecimal(0);
-        sum = new Sum(bd.setScale(scale));
+        sum = new Total(bd.setScale(scale));
     }
 
     public void add(final BigDecimal val) {

Modified: trunk/utils/src/main/java/net/objectlab/kit/util/StringUtil.java
===================================================================
--- trunk/utils/src/main/java/net/objectlab/kit/util/StringUtil.java	2010-03-30 11:06:50 UTC (rev 334)
+++ trunk/utils/src/main/java/net/objectlab/kit/util/StringUtil.java	2010-03-30 22:18:44 UTC (rev 335)
@@ -517,4 +517,38 @@
         }
         return EMPTY;
     }
+
+    /**
+    *
+    * @param strings
+    * @return true if any are empty
+    */
+   public static boolean anyEmpty(final String... strings) {
+       if (strings != null) {
+           for (final String object : strings) {
+               if (StringUtils.isEmpty(object)) {
+                   return true;
+               }
+           }
+           return strings.length == 0 ? true : false;
+       }
+       return true;
+   }
+
+  
+   /**
+    * Does equalsIgnoreCase call but if the value is '*', immediately returns true.
+    */
+   public static boolean equalsIgnoreCaseOrValueIsWildcard(final String value, final String toCheck) {
+       if (value == null && toCheck == null) {
+           return true;
+       }
+       if (value != null && StringUtil.WILDCARD.equals(value)) {
+           return true;
+       }
+       if (value != null && toCheck != null) {
+           return value.equalsIgnoreCase(toCheck);
+       }
+       return false;
+   }
 }

Deleted: trunk/utils/src/main/java/net/objectlab/kit/util/Sum.java
===================================================================
--- trunk/utils/src/main/java/net/objectlab/kit/util/Sum.java	2010-03-30 11:06:50 UTC (rev 334)
+++ trunk/utils/src/main/java/net/objectlab/kit/util/Sum.java	2010-03-30 22:18:44 UTC (rev 335)
@@ -1,156 +0,0 @@
-/*
- * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
- * 
- * Based in London, we are world leaders in the design and development 
- * of bespoke applications for the securities financing markets.
- * 
- * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
- *           ___  _     _           _   _          _
- *          / _ \| |__ (_) ___  ___| |_| |    __ _| |__
- *         | | | | '_ \| |/ _ \/ __| __| |   / _` | '_ \
- *         | |_| | |_) | |  __/ (__| |_| |__| (_| | |_) |
- *          \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
- *                   |__/
- *
- *                     www.ObjectLab.co.uk
- *
- * $Id: AbstractDateCalculator.java 309 2010-03-23 21:01:49Z marchy $
- * 
- * Copyright 2006 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package net.objectlab.kit.util;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * Mutable class representing a sum of BigDecimals.
- * @author Benoit Xhenseval
- *
- */
-public class Sum implements Serializable {
-    private static final long serialVersionUID = -8583271171731930344L;
-    private BigDecimal value = BigDecimal.ZERO;
-    private int count = 0;
-
-    public Sum() {
-        this(BigDecimal.ZERO, 2);
-    }
-
-    public Sum(final BigDecimal start) {
-        if (start != null) {
-            value = start;
-        }
-    }
-
-    public Sum(final BigDecimal start, final int scale) {
-        if (start != null) {
-            value = start.setScale(scale, BigDecimal.ROUND_HALF_UP);
-        }
-    }
-
-    public Sum(final Sum start) {
-        if (start != null) {
-            value = start.getTotal();
-        }
-    }
-
-    public BigDecimal getTotal() {
-        return value;
-    }
-
-    public void setTotal(final BigDecimal total) {
-        if (total != null) {
-            this.value = total;
-        }
-    }
-
-    /**
-     * @return the current Sum with new total.
-     */
-    public Sum add(final BigDecimal... value) {
-        this.value = BigDecimalUtil.add(this.value, value);
-        count += value.length;
-        return this;
-    }
-
-    public Sum subtract(final BigDecimal... value) {
-        this.value = BigDecimalUtil.subtract(this.value, value);
-        count += value.length;
-        return this;
-    }
-
-    public Sum add(final Integer value) {
-        this.value = BigDecimalUtil.add(this.value, new BigDecimal(value));
-        count++;
-        return this;
-    }
-
-    /**
-     * @return the current Sum with new total.
-     */
-    public Sum add(final Sum value) {
-        if (value != null) {
-            this.value = BigDecimalUtil.add(this.value, value.getTotal());
-            count++;
-        }
-        return this;
-    }
-
-    /**
-     * @return the current Sum with new total.
-     */
-    public Sum minus(final BigDecimal... value) {
-        this.value = BigDecimalUtil.subtract(this.value, value);
-        count += value.length;
-        return this;
-    }
-
-    /**
-     * @return the current Sum with new total.
-     */
-    public Sum minus(final Sum value) {
-        if (value != null) {
-            this.value = BigDecimalUtil.subtract(this.value, value.getTotal());
-            count++;
-        }
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return value.toString();
-    }
-
-    public boolean isZero() {
-        return BigDecimalUtil.isZero(value);
-    }
-
-    public boolean isNotZero() {
-        return !isZero();
-    }
-
-    public boolean isNegative() {
-        return BigDecimalUtil.isNegative(value);
-    }
-
-    public boolean isZeroOrLess() {
-        return BigDecimalUtil.isZeroOrLess(value);
-    }
-
-    public int getCount() {
-        return count;
-    }
-}

Added: trunk/utils/src/main/java/net/objectlab/kit/util/Total.java
===================================================================
--- trunk/utils/src/main/java/net/objectlab/kit/util/Total.java	                        (rev 0)
+++ trunk/utils/src/main/java/net/objectlab/kit/util/Total.java	2010-03-30 22:18:44 UTC (rev 335)
@@ -0,0 +1,156 @@
+/*
+ * ObjectLab, http://www.objectlab.co.uk/open is sponsoring the ObjectLab Kit.
+ * 
+ * Based in London, we are world leaders in the design and development 
+ * of bespoke applications for the securities financing markets.
+ * 
+ * <a href="http://www.objectlab.co.uk/open">Click here to learn more</a>
+ *           ___  _     _           _   _          _
+ *          / _ \| |__ (_) ___  ___| |_| |    __ _| |__
+ *         | | | | '_ \| |/ _ \/ __| __| |   / _` | '_ \
+ *         | |_| | |_) | |  __/ (__| |_| |__| (_| | |_) |
+ *          \___/|_.__// |\___|\___|\__|_____\__,_|_.__/
+ *                   |__/
+ *
+ *                     www.ObjectLab.co.uk
+ *
+ * $Id: AbstractDateCalculator.java 309 2010-03-23 21:01:49Z marchy $
+ * 
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package net.objectlab.kit.util;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * Mutable class representing a sum of BigDecimals.
+ * @author Benoit Xhenseval
+ *
+ */
+public class Total implements Serializable {
+    private static final long serialVersionUID = -8583271171731930344L;
+    private BigDecimal value = BigDecimal.ZERO;
+    private int count = 0;
+
+    public Total() {
+        this(BigDecimal.ZERO, 2);
+    }
+
+    public Total(final BigDecimal start) {
+        if (start != null) {
+            value = start.setScale(2);
+        }
+    }
+
+    public Total(final BigDecimal start, final int scale) {
+        if (start != null) {
+            value = start.setScale(scale, BigDecimal.ROUND_HALF_UP);
+        }
+    }
+
+    public Total(final Total start) {
+        if (start != null) {
+            value = start.getTotal();
+        }
+    }
+
+    public BigDecimal getTotal() {
+        return value;
+    }
+
+    public void setTotal(final BigDecimal total) {
+        if (total != null) {
+            this.value = total;
+        }
+    }
+
+    /**
+     * @return the current Sum with new total.
+     */
+    public Total add(final BigDecimal... value) {
+        this.value = BigDecimalUtil.add(this.value, value);
+        count += value.length;
+        return this;
+    }
+
+    public Total subtract(final BigDecimal... value) {
+        this.value = BigDecimalUtil.subtract(this.value, value);
+        count += value.length;
+        return this;
+    }
+
+    public Total add(final Integer value) {
+        this.value = BigDecimalUtil.add(this.value, new BigDecimal(value));
+        count++;
+        return this;
+    }
+
+    /**
+     * @return the current Sum with new total.
+     */
+    public Total add(final Total value) {
+        if (value != null) {
+            this.value = BigDecimalUtil.add(this.value, value.getTotal());
+            count++;
+        }
+        return this;
+    }
+
+    /**
+     * @return the current Sum with new total.
+     */
+    public Total minus(final BigDecimal... value) {
+        this.value = BigDecimalUtil.subtract(this.value, value);
+        count += value.length;
+        return this;
+    }
+
+    /**
+     * @return the current Sum with new total.
+     */
+    public Total minus(final Total value) {
+        if (value != null) {
+            this.value = BigDecimalUtil.subtract(this.value, value.getTotal());
+            count++;
+        }
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return value.toString();
+    }
+
+    public boolean isZero() {
+        return BigDecimalUtil.isZero(value);
+    }
+
+    public boolean isNotZero() {
+        return !isZero();
+    }
+
+    public boolean isNegative() {
+        return BigDecimalUtil.isNegative(value);
+    }
+
+    public boolean isZeroOrLess() {
+        return BigDecimalUtil.isZeroOrLess(value);
+    }
+
+    public int getCount() {
+        return count;
+    }
+}

Modified: trunk/utils/src/main/java/net/objectlab/kit/util/WeightedAverage.java
===================================================================
--- trunk/utils/src/main/java/net/objectlab/kit/util/WeightedAverage.java	2010-03-30 11:06:50 UTC (rev 334)
+++ trunk/utils/src/main/java/net/objectlab/kit/util/WeightedAverage.java	2010-03-30 22:18:44 UTC (rev 335)
@@ -41,8 +41,8 @@
  */
 public class WeightedAverage implements Serializable {
     private static final long serialVersionUID = 4687472725716492770L;
-    private final Sum total = new Sum();
-    private final Sum totalExpanded = new Sum();
+    private final Total total = new Total();
+    private final Total totalExpanded = new Total();
     private int count = 0;
 
     public BigDecimal getTotal() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Objectlabkit-svn] SF.net SVN: objectlabkit:[335] trunk/utils/src/main/java/net/objectlab/kit/ util

We MOVED to GITHUB!

objectlabkit-svn