From 5d619f94711f2bede01c7c54ed6c6de23c2a6484 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 18 Mar 2018 22:46:46 +0100 Subject: [PATCH] Continued: - removed StringUtils class as Apache Lang3 is around ... (ops) - removed CoreNumberUtils and Comparables as jcore-utils is now holding these utilities classes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../jcoreee/bean/faces/BaseFacesBean.java | 2 +- .../mxchange/jcoreee/utils/Comparables.java | 69 ------------ .../mxchange/jcoreee/utils/StringUtils.java | 100 ------------------ 3 files changed, 1 insertion(+), 170 deletions(-) delete mode 100644 src/org/mxchange/jcoreee/utils/Comparables.java delete mode 100644 src/org/mxchange/jcoreee/utils/StringUtils.java diff --git a/src/org/mxchange/jcoreee/bean/faces/BaseFacesBean.java b/src/org/mxchange/jcoreee/bean/faces/BaseFacesBean.java index 6101943..16dbefe 100644 --- a/src/org/mxchange/jcoreee/bean/faces/BaseFacesBean.java +++ b/src/org/mxchange/jcoreee/bean/faces/BaseFacesBean.java @@ -54,7 +54,7 @@ public abstract class BaseFacesBean implements Serializable { /** * Removes all bundles from web application. Typically you want to invoke - * this method in a ServletContextListener implemetation on the + * this method in a ServletContextListener implementation on the * contextDestroyed() method. */ public static void removeBundles () { diff --git a/src/org/mxchange/jcoreee/utils/Comparables.java b/src/org/mxchange/jcoreee/utils/Comparables.java deleted file mode 100644 index b5287f0..0000000 --- a/src/org/mxchange/jcoreee/utils/Comparables.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2018 Free Software Foundation - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.mxchange.jcoreee.utils; - -import java.io.Serializable; - -/** - * An utilities class for comparison of objects/entities - *

- * @author Roland Häder - */ -public class Comparables implements Serializable { - - /** - * Serial number - */ - private static final long serialVersionUID = 19_286_457_671_390L; - - /** - * Checks all comparison values if they are not zero and returns proper - * value. These comparators should come from an implementation of - * Comparable.compareTo(). - *

- * @param comparators An array of at least one comparator - *

- * @return Comparison value - */ - public static int checkAll (final int[] comparators) { - // Is array empty? - if (comparators.length == 0) { - // Should not happen - throw new IllegalArgumentException("comparators is empty."); //NOI18N - } - - // Loop through all - for (int i = 0; i < comparators.length; i++) { - // Is it smaller or bigger? - if (comparators[i] < 0) { - return -1; - } else if (comparators[i] > 0) { - return 1; - } - } - - // Assume euqality - return 0; - } - - /** - * Utility classes should not have instances - */ - private Comparables () { - } - -} diff --git a/src/org/mxchange/jcoreee/utils/StringUtils.java b/src/org/mxchange/jcoreee/utils/StringUtils.java deleted file mode 100644 index e69535a..0000000 --- a/src/org/mxchange/jcoreee/utils/StringUtils.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Copyright (C) 2018 Free Software Foundation - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.mxchange.jcoreee.utils; - -import java.io.Serializable; - -/** - * String utilities class - *

- * @author Roland Häder - */ -public class StringUtils implements Serializable { - - /** - * Serial number - */ - private static final long serialVersionUID = 30_894_676_712_650L; - - /** - * Compares both string with null-safety. This method is based on the - * example from - * https://codereview.stackexchange.com/questions/20191/comparing-two-strings-which-could-be-null-or-blank-in-a-comparator - *

- * @param str0 First string - * @param str1 Second string - *

- * @return Comparison value, 0 means equals, -1 means str0 smaller str2 and - * 2 means str0 bigger str2 - */ - @SuppressWarnings ("null") - public static int compareTo (final String str0, final String str1) { - // Check both strings for null and empty - boolean isStr0Empty = (str0 == null || str0.isEmpty()); - boolean isStr1Empty = (str1 == null || str1.isEmpty()); - - // Check conditions - if (isStr0Empty && isStr1Empty) { - return 0; - } else if (isStr0Empty) { - return -1; - } else if (isStr1Empty) { - return 1; - } - - // Compare both - return str0.compareTo(str1); - } - - /** - * Compares both string with null-safety, ignoring case-sensitivity. This - * method is based on the example from - * https://codereview.stackexchange.com/questions/20191/comparing-two-strings-which-could-be-null-or-blank-in-a-comparator - *

- * @param str0 First string - * @param str1 Second string - *

- * @return Comparison value, 0 means equals, -1 means str0 smaller str2 and - * 2 means str0 bigger str2 - */ - @SuppressWarnings ("null") - public static int compareToIgnoreCase (final String str0, final String str1) { - // Check both strings for null and empty - boolean isStr0Empty = (str0 == null || str0.isEmpty()); - boolean isStr1Empty = (str1 == null || str1.isEmpty()); - - // Check conditions - if (isStr0Empty && isStr1Empty) { - return 0; - } else if (isStr0Empty) { - return -1; - } else if (isStr1Empty) { - return 1; - } - - // Compare both - return str0.compareToIgnoreCase(str1); - } - - /** - * Utility classes don't have instances - */ - private StringUtils () { - // Empty constructor - } - -} -- 2.39.5