From 90bf573b7d2dfd74ffb4db57857f6ceedd3c96f8 Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Sun, 13 Sep 2020 02:30:53 +0200 Subject: [PATCH] Fixed building. Improved global configuration. --- .settings/org.eclipse.jdt.ui.prefs | 21 ++++++++++++++++++ build-appjar.xml | 4 ++-- build.num | 2 +- log4j.properties | 2 +- resources/conf/log4j-default.properties | 2 +- .../devinsy/statoolinfos/core/CrawlCache.java | 8 +++++-- .../statoolinfos/core/PathPropertySet.java | 12 ++++------ .../statoolinfos/core/PathPropertyUtils.java | 22 ++++++++++++------- .../statoolinfos/core/StatoolInfos.java | 19 ++++++++++++++-- .../statoolinfos/core/StatoolInfosUtils.java | 1 + src/utils/BuildInformation.java | 2 +- 11 files changed, 69 insertions(+), 26 deletions(-) diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs index b79f8cb..64a7f25 100644 --- a/.settings/org.eclipse.jdt.ui.prefs +++ b/.settings/org.eclipse.jdt.ui.prefs @@ -89,28 +89,39 @@ sp_cleanup.always_use_blocks=true sp_cleanup.always_use_parentheses_in_expressions=false sp_cleanup.always_use_this_for_non_static_field_access=true sp_cleanup.always_use_this_for_non_static_method_access=false +sp_cleanup.convert_functional_interfaces=false sp_cleanup.convert_to_enhanced_for_loop=false +sp_cleanup.convert_to_enhanced_for_loop_if_loop_var_used=false sp_cleanup.correct_indentation=true sp_cleanup.format_source_code=true sp_cleanup.format_source_code_changes_only=false +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.lazy_logical_operator=false sp_cleanup.make_local_variable_final=false sp_cleanup.make_parameters_final=true sp_cleanup.make_private_fields_final=false sp_cleanup.make_type_abstract_if_missing_method=false sp_cleanup.make_variable_declarations_final=true +sp_cleanup.merge_conditional_blocks=false sp_cleanup.never_use_blocks=false sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.number_suffix=false sp_cleanup.on_save_use_additional_actions=true sp_cleanup.organize_imports=true +sp_cleanup.push_down_negation=false sp_cleanup.qualify_static_field_accesses_with_declaring_class=false sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true sp_cleanup.qualify_static_member_accesses_with_declaring_class=false sp_cleanup.qualify_static_method_accesses_with_declaring_class=false sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_redundant_modifiers=false +sp_cleanup.remove_redundant_semicolons=false +sp_cleanup.remove_redundant_type_arguments=false sp_cleanup.remove_trailing_whitespaces=false sp_cleanup.remove_trailing_whitespaces_all=true sp_cleanup.remove_trailing_whitespaces_ignore_empty=false +sp_cleanup.remove_unnecessary_array_creation=false sp_cleanup.remove_unnecessary_casts=true sp_cleanup.remove_unnecessary_nls_tags=true sp_cleanup.remove_unused_imports=true @@ -119,12 +130,22 @@ sp_cleanup.remove_unused_private_fields=true sp_cleanup.remove_unused_private_members=false sp_cleanup.remove_unused_private_methods=true sp_cleanup.remove_unused_private_types=true +sp_cleanup.simplify_lambda_expression_and_method_ref=false sp_cleanup.sort_members=true sp_cleanup.sort_members_all=false +sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_autoboxing=false sp_cleanup.use_blocks=true sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_directly_map_method=false +sp_cleanup.use_lambda=false sp_cleanup.use_parentheses_in_expressions=false sp_cleanup.use_this_for_non_static_field_access=true sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=false sp_cleanup.use_this_for_non_static_method_access=false sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true +sp_cleanup.use_unboxing=false +sp_cleanup.use_var=false +sp_jautodoc.cleanup.add_header=false +sp_jautodoc.cleanup.javadoc=false +sp_jautodoc.cleanup.replace_header=false diff --git a/build-appjar.xml b/build-appjar.xml index 9bcf0a2..8d52e4f 100644 --- a/build-appjar.xml +++ b/build-appjar.xml @@ -83,7 +83,7 @@ - + @@ -111,7 +111,7 @@ - + diff --git a/build.num b/build.num index 3201934..734a7c2 100644 --- a/build.num +++ b/build.num @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Wed Mar 25 02:52:42 CET 2020 +#Sun Sep 13 02:27:38 CEST 2020 build.number=0 diff --git a/log4j.properties b/log4j.properties index 68a334f..56336f4 100644 --- a/log4j.properties +++ b/log4j.properties @@ -3,7 +3,7 @@ # priority setting: DEBUG < INFO < WARN < ERROR log4j.rootLogger = DEBUG, console -log4j.logger.org.april.tatoolinfos = INFO +log4j.logger.fr.devinsy.tatoolinfos = INFO log4j.logger.fr.devinsy.xidyn = WARN #-- diff --git a/resources/conf/log4j-default.properties b/resources/conf/log4j-default.properties index 1a427e7..74041e7 100644 --- a/resources/conf/log4j-default.properties +++ b/resources/conf/log4j-default.properties @@ -3,7 +3,7 @@ # priority setting: DEBUG < INFO < WARN < ERROR log4j.rootLogger = INFO, stdout, LogWriter -log4j.logger.org.april.statoolinfos = INFO +log4j.logger.fr.devinsy.statoolinfos = INFO log4j.logger.fr.devinsy.xidyn = INFO #-- diff --git a/src/fr/devinsy/statoolinfos/core/CrawlCache.java b/src/fr/devinsy/statoolinfos/core/CrawlCache.java index adddbcf..fa03d90 100644 --- a/src/fr/devinsy/statoolinfos/core/CrawlCache.java +++ b/src/fr/devinsy/statoolinfos/core/CrawlCache.java @@ -37,9 +37,10 @@ public class CrawlCache /** * Instantiates a new crawl cache. * - * @param cacheDirectory - * the cache directory + * @param directory + * the directory * @throws StatoolInfosException + * the statool infos exception */ public CrawlCache(final File directory) throws StatoolInfosException { @@ -103,6 +104,7 @@ public class CrawlCache * the url * @return the path property list * @throws IOException + * Signals that an I/O exception has occurred. */ public PathPropertyList load(final String url) throws IOException { @@ -123,7 +125,9 @@ public class CrawlCache * the url * @param properties * the properties + * @return the file * @throws IOException + * Signals that an I/O exception has occurred. */ public File store(final String url, final PathPropertyList properties) throws IOException { diff --git a/src/fr/devinsy/statoolinfos/core/PathPropertySet.java b/src/fr/devinsy/statoolinfos/core/PathPropertySet.java index 5ff455e..40aad58 100644 --- a/src/fr/devinsy/statoolinfos/core/PathPropertySet.java +++ b/src/fr/devinsy/statoolinfos/core/PathPropertySet.java @@ -36,10 +36,7 @@ public class PathPropertySet private Hashtable data; /** - * Instantiates a new path properties. - * - * @throws StatoolInfosException - * the statool infos exception + * Instantiates a new path property set. */ public PathPropertySet() { @@ -47,12 +44,10 @@ public class PathPropertySet } /** - * Instantiates a new path properties. + * Instantiates a new path property set. * * @param initialCapacity * the initial capacity - * @throws StatoolInfosException - * the statool infos exception */ public PathPropertySet(final int initialCapacity) { @@ -178,10 +173,11 @@ public class PathPropertySet } /** - * Delete path. + * Removes the path. * * @param path * the path + * @return the string */ public String removePath(final String path) { diff --git a/src/fr/devinsy/statoolinfos/core/PathPropertyUtils.java b/src/fr/devinsy/statoolinfos/core/PathPropertyUtils.java index aef6380..8f24fd2 100644 --- a/src/fr/devinsy/statoolinfos/core/PathPropertyUtils.java +++ b/src/fr/devinsy/statoolinfos/core/PathPropertyUtils.java @@ -62,7 +62,7 @@ public class PathPropertyUtils } else { - result = line.matches("^[^#].*[^\s].*=.*$"); + result = line.matches("^[^#].*[^\\s].*=.*$"); } // @@ -72,10 +72,11 @@ public class PathPropertyUtils /** * Load. * - * @param source - * the source - * @return the path properties + * @param file + * the file + * @return the path property list * @throws IOException + * Signals that an I/O exception has occurred. */ public static PathPropertyList load(final File file) throws IOException { @@ -141,9 +142,13 @@ public class PathPropertyUtils } /** + * Read. + * * @param in - * @return + * the in + * @return the path property list * @throws IOException + * Signals that an I/O exception has occurred. */ public static PathPropertyList read(final BufferedReader in) throws IOException { @@ -171,10 +176,10 @@ public class PathPropertyUtils } /** - * Load. + * Read. * - * @param url - * the url + * @param source + * the source * @return the path property list * @throws IOException * Signals that an I/O exception has occurred. @@ -320,6 +325,7 @@ public class PathPropertyUtils * @param source * the source * @throws IOException + * Signals that an I/O exception has occurred. */ public static void write(final PrintWriter out, final PathPropertyList source) throws IOException { diff --git a/src/fr/devinsy/statoolinfos/core/StatoolInfos.java b/src/fr/devinsy/statoolinfos/core/StatoolInfos.java index 88f1580..63b7581 100644 --- a/src/fr/devinsy/statoolinfos/core/StatoolInfos.java +++ b/src/fr/devinsy/statoolinfos/core/StatoolInfos.java @@ -37,9 +37,12 @@ public class StatoolInfos /** * Builds the. * - * @param inputs - * the inputs + * @param input + * the input + * @throws StatoolInfosException + * the statool infos exception * @throws IOException + * Signals that an I/O exception has occurred. */ public static void build(final File input) throws StatoolInfosException, IOException { @@ -91,6 +94,10 @@ public class StatoolInfos * * @param input * the input + * @throws StatoolInfosException + * the statool infos exception + * @throws IOException + * Signals that an I/O exception has occurred. */ public static void clear(final File input) throws StatoolInfosException, IOException { @@ -146,6 +153,10 @@ public class StatoolInfos * * @param input * the input + * @throws StatoolInfosException + * the statool infos exception + * @throws IOException + * Signals that an I/O exception has occurred. */ public static void crawl(final File input) throws StatoolInfosException, IOException { @@ -202,6 +213,10 @@ public class StatoolInfos * * @param input * the input + * @throws StatoolInfosException + * the statool infos exception + * @throws IOException + * Signals that an I/O exception has occurred. */ public static void htmlize(final File input) throws StatoolInfosException, IOException { diff --git a/src/fr/devinsy/statoolinfos/core/StatoolInfosUtils.java b/src/fr/devinsy/statoolinfos/core/StatoolInfosUtils.java index 6c49644..96951e4 100644 --- a/src/fr/devinsy/statoolinfos/core/StatoolInfosUtils.java +++ b/src/fr/devinsy/statoolinfos/core/StatoolInfosUtils.java @@ -60,6 +60,7 @@ public class StatoolInfosUtils * @param target * the target * @throws IOException + * Signals that an I/O exception has occurred. */ public static void generateCatLogo(final String seed, final File target) throws IOException { diff --git a/src/utils/BuildInformation.java b/src/utils/BuildInformation.java index 55c70ab..ade245d 100644 --- a/src/utils/BuildInformation.java +++ b/src/utils/BuildInformation.java @@ -38,7 +38,7 @@ public class BuildInformation private static final Logger logger = LoggerFactory.getLogger(BuildInformation.class); - private static String BUILD_INFORMATION_FILE = "/org/april/statoolinfos/build_information.properties"; + private static String BUILD_INFORMATION_FILE = "/fr/devinsy/statoolinfos/build_information.properties"; private String productName; private String majorRevision;