Cleanup.
This commit is contained in:
parent
8f408d1f46
commit
8e8e530181
10 changed files with 84 additions and 60 deletions
100
.gitignore
vendored
100
.gitignore
vendored
|
@ -2,53 +2,85 @@
|
||||||
!.vscode/launch.json
|
!.vscode/launch.json
|
||||||
!.vscode/settings.json
|
!.vscode/settings.json
|
||||||
!.vscode/tasks.json
|
!.vscode/tasks.json
|
||||||
|
!gradle-wrapper.jar
|
||||||
|
!properties/*
|
||||||
.classpath
|
.classpath
|
||||||
.DS_Store
|
.DS_Store
|
||||||
.gradle
|
.gradle
|
||||||
.history
|
.history
|
||||||
|
.idea_modules/
|
||||||
|
.idea/**/contentModel.xml
|
||||||
|
.idea/**/dataSources.ids
|
||||||
|
.idea/**/dataSources.local.xml
|
||||||
|
.idea/**/dataSources/
|
||||||
|
.idea/**/dbnavigator.xml
|
||||||
|
.idea/**/dictionaries
|
||||||
|
.idea/**/dynamic.xml
|
||||||
|
.idea/**/gradle.xml
|
||||||
|
.idea/**/libraries
|
||||||
|
.idea/**/mongoSettings.xml
|
||||||
|
.idea/**/shelf
|
||||||
|
.idea/**/sqlDataSources.xml
|
||||||
|
.idea/**/tasks.xml
|
||||||
|
.idea/**/uiDesigner.xml
|
||||||
|
.idea/**/usage.statistics.xml
|
||||||
|
.idea/**/workspace.xml
|
||||||
|
.idea/caches/build_file_checksums.ser
|
||||||
|
.idea/httpRequests
|
||||||
|
.idea/replstate.xml
|
||||||
.kobalt
|
.kobalt
|
||||||
|
.mtj.tmp/
|
||||||
|
.mvn/timing.properties
|
||||||
|
.mvn/wrapper/maven-wrapper.jar
|
||||||
.nb-gradle
|
.nb-gradle
|
||||||
.project
|
.project
|
||||||
|
.scannerwork
|
||||||
.settings
|
.settings
|
||||||
.vscode/*
|
.vscode/*
|
||||||
|
*.class
|
||||||
*.code-workspace
|
*.code-workspace
|
||||||
|
*.ctxt
|
||||||
|
*.ear
|
||||||
*.iws
|
*.iws
|
||||||
|
*.jar
|
||||||
|
*.log
|
||||||
|
*.nar
|
||||||
|
*.rar
|
||||||
*.sublime-*
|
*.sublime-*
|
||||||
**/.idea/**/dataSources.ids
|
*.tar.gz
|
||||||
**/.idea/**/dataSources.local.xml
|
*.war
|
||||||
**/.idea/**/dataSources/
|
*.zip
|
||||||
**/.idea/**/dbnavigator.xml
|
atlassian-ide-plugin.xml
|
||||||
**/.idea/**/dictionaries
|
bin/
|
||||||
**/.idea/**/dynamic.xml
|
build/
|
||||||
**/.idea/**/gradle.xml
|
cmake-build-*/
|
||||||
**/.idea/**/libraries
|
com_crashlytics_export_strings.xml
|
||||||
**/.idea/**/shelf
|
crashlytics-build.properties
|
||||||
**/.idea/**/sqlDataSources.xml
|
crashlytics.properties
|
||||||
**/.idea/**/tasks.xml
|
dependency-reduced-pom.xml
|
||||||
**/.idea/**/uiDesigner.xml
|
deploy/
|
||||||
**/.idea/**/usage.statistics.xml
|
dist/
|
||||||
**/.idea/**/workspace.xml
|
|
||||||
**/*.class
|
|
||||||
/bin
|
|
||||||
/build
|
|
||||||
/deploy
|
|
||||||
/dist
|
|
||||||
/fetcher.properties
|
|
||||||
/gen
|
|
||||||
/gradle.properties
|
|
||||||
/local.properties
|
|
||||||
/log4j2.xml
|
|
||||||
/logs
|
|
||||||
/mobibot.properties
|
|
||||||
/out
|
|
||||||
/proguard-project.txt
|
|
||||||
/project.properties
|
|
||||||
/target
|
|
||||||
/test-output
|
|
||||||
/weather.log
|
|
||||||
CVS
|
|
||||||
debug.log
|
|
||||||
ehthumbs.db
|
ehthumbs.db
|
||||||
|
fabric.properties
|
||||||
|
gen/
|
||||||
|
gradle.properties
|
||||||
|
hs_err_pid*
|
||||||
kobaltBuild
|
kobaltBuild
|
||||||
kobaltw*-test
|
kobaltw*-test
|
||||||
|
lib/kotlin*
|
||||||
|
libs/
|
||||||
|
local.properties
|
||||||
|
log4j2.xml
|
||||||
|
logs/
|
||||||
|
mobibot.properties
|
||||||
|
out/
|
||||||
|
pom.xml.next
|
||||||
|
pom.xml.releaseBackup
|
||||||
|
pom.xml.tag
|
||||||
|
pom.xml.versionsBackup
|
||||||
|
proguard-project.txt
|
||||||
|
project.properties
|
||||||
|
release.properties
|
||||||
|
target/
|
||||||
|
test-output
|
||||||
Thumbs.db
|
Thumbs.db
|
||||||
|
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,5 +1,5 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
|
@ -3,12 +3,12 @@
|
||||||
<component name="CheckStyle-IDEA">
|
<component name="CheckStyle-IDEA">
|
||||||
<option name="configuration">
|
<option name="configuration">
|
||||||
<map>
|
<map>
|
||||||
<entry key="active-configuration" value="LOCAL_FILE:$PROJECT_DIR$/config/checkstyle/checkstyle.xml:Erik's Checks" />
|
<entry key="active-configuration" value="LOCAL_FILE:K:/java/mobibot/config/checkstyle/checkstyle.xml:Erik's Checks" />
|
||||||
<entry key="checkstyle-version" value="8.19" />
|
<entry key="checkstyle-version" value="8.19" />
|
||||||
<entry key="copy-libs" value="true" />
|
<entry key="copy-libs" value="true" />
|
||||||
<entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
|
<entry key="location-0" value="BUNDLED:(bundled):Sun Checks" />
|
||||||
<entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
|
<entry key="location-1" value="BUNDLED:(bundled):Google Checks" />
|
||||||
<entry key="location-2" value="LOCAL_FILE:$PROJECT_DIR$/config/checkstyle/checkstyle.xml:Erik's Checks" />
|
<entry key="location-2" value="LOCAL_FILE:K:/java/mobibot/config/checkstyle/checkstyle.xml:Erik's Checks" />
|
||||||
<entry key="scan-before-checkin" value="false" />
|
<entry key="scan-before-checkin" value="false" />
|
||||||
<entry key="scanscope" value="JavaOnlyWithTests" />
|
<entry key="scanscope" value="JavaOnlyWithTests" />
|
||||||
<entry key="suppress-errors" value="false" />
|
<entry key="suppress-errors" value="false" />
|
||||||
|
@ -53,13 +53,13 @@
|
||||||
<property name="caretWidth" class="java.lang.Integer" />
|
<property name="caretWidth" class="java.lang.Integer" />
|
||||||
</properties>
|
</properties>
|
||||||
</component>
|
</component>
|
||||||
<component name="CopyrightManager">
|
<component name="CopyrightManager" default="Copyright">
|
||||||
<copyright>
|
<copyright>
|
||||||
<option name="notice" value="&#36;file.fileName Copyright (c) 2004-&#36;today.year, Erik C. Thauvin (erik@thauvin.net) All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of this project nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." />
|
<option name="notice" value="&#36;file.fileName Copyright (c) 2004-&#36;today.year, Erik C. Thauvin (erik@thauvin.net) All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. Neither the name of this project nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." />
|
||||||
<option name="myName" value="Copyright" />
|
<option name="myName" value="Copyright" />
|
||||||
</copyright>
|
</copyright>
|
||||||
<module2copyright>
|
<module2copyright>
|
||||||
<element module="Source" copyright="Copyright" />
|
<element module="Copryight" copyright="Copyright" />
|
||||||
</module2copyright>
|
</module2copyright>
|
||||||
<LanguageOptions name="JAVA">
|
<LanguageOptions name="JAVA">
|
||||||
<option name="addBlankAfter" value="false" />
|
<option name="addBlankAfter" value="false" />
|
||||||
|
|
|
@ -14,21 +14,13 @@ import java.time.*;
|
||||||
public final class ReleaseInfo {
|
public final class ReleaseInfo {
|
||||||
public final static String PROJECT = "mobibot";
|
public final static String PROJECT = "mobibot";
|
||||||
public final static LocalDateTime BUILDDATE =
|
public final static LocalDateTime BUILDDATE =
|
||||||
LocalDateTime.ofInstant(Instant.ofEpochMilli(1554881826135L), ZoneId.systemDefault());
|
LocalDateTime.ofInstant(Instant.ofEpochMilli(1555731762870L), ZoneId.systemDefault());
|
||||||
public final static int MAJOR = 0;
|
public final static int MAJOR = 0;
|
||||||
public final static int MINOR = 7;
|
public final static int MINOR = 7;
|
||||||
public final static int PATCH = 3;
|
public final static int PATCH = 3;
|
||||||
public final static String PRERELEASE = "beta";
|
public final static String PRERELEASE = "beta";
|
||||||
public final static String BUILDMETA = "261";
|
public final static String BUILDMETA = "303";
|
||||||
|
public final static String VERSION = "0.7.3-beta+303";
|
||||||
/**
|
|
||||||
* The full semantic version string.
|
|
||||||
*/
|
|
||||||
public final static String VERSION = Integer.toString(MAJOR) + '.'
|
|
||||||
+ Integer.toString(MINOR) + '.'
|
|
||||||
+ Integer.toString(PATCH)
|
|
||||||
+ ((!PRERELEASE.isEmpty()) ? "-" + PRERELEASE : "")
|
|
||||||
+ ((!BUILDMETA.isEmpty()) ? "+" + BUILDMETA : "");
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Disables the default constructor.
|
* Disables the default constructor.
|
||||||
|
|
|
@ -44,7 +44,7 @@ import java.util.regex.Pattern;
|
||||||
* @created 2019-04-07
|
* @created 2019-04-07
|
||||||
* @since 1.0
|
* @since 1.0
|
||||||
*/
|
*/
|
||||||
class ModuleException extends Exception {
|
public class ModuleException extends Exception {
|
||||||
private static final long serialVersionUID = -3036774290621088107L;
|
private static final long serialVersionUID = -3036774290621088107L;
|
||||||
private final String debugMessage;
|
private final String debugMessage;
|
||||||
private final Pattern urlPattern = Pattern.compile("(https?://\\S+)(\\?\\S+)");
|
private final Pattern urlPattern = Pattern.compile("(https?://\\S+)(\\?\\S+)");
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* PrivateMessage.java
|
* NoticeMessage.java
|
||||||
*
|
*
|
||||||
* Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
|
* Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
@ -53,7 +53,7 @@ public class NoticeMessage extends Message {
|
||||||
/**
|
/**
|
||||||
* Create a new notice.
|
* Create a new notice.
|
||||||
*
|
*
|
||||||
* @param message The ntoice's message.
|
* @param message The notice's message.
|
||||||
* @param color The color.
|
* @param color The color.
|
||||||
*/
|
*/
|
||||||
public NoticeMessage(final String message, final String color) {
|
public NoticeMessage(final String message, final String color) {
|
||||||
|
|
|
@ -50,11 +50,11 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||||
* @since 1.0
|
* @since 1.0
|
||||||
*/
|
*/
|
||||||
public class UtilsTest {
|
public class UtilsTest {
|
||||||
static final String ASCII =
|
private static final String ASCII =
|
||||||
" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
|
" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
|
||||||
|
|
||||||
final Calendar cal = Calendar.getInstance();
|
private final Calendar cal = Calendar.getInstance();
|
||||||
final LocalDateTime localDateTime =
|
private final LocalDateTime localDateTime =
|
||||||
LocalDateTime.of(1952, 2, 17, 12, 30, 0);
|
LocalDateTime.of(1952, 2, 17, 12, 30, 0);
|
||||||
|
|
||||||
@BeforeClass
|
@BeforeClass
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* CurrencyConvertTest.java
|
* CurrencyConverterTest.java
|
||||||
*
|
*
|
||||||
* Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
|
* Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* properties.java
|
* LocalProperties.java
|
||||||
*
|
*
|
||||||
* Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
|
* Copyright (c) 2004-2019, Erik C. Thauvin (erik@thauvin.net)
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#Generated by the Semver Plugin for Gradle
|
#Generated by the Semver Plugin for Gradle
|
||||||
#Wed Apr 10 00:37:04 PDT 2019
|
#Fri Apr 19 20:42:41 PDT 2019
|
||||||
version.buildmeta=261
|
version.buildmeta=303
|
||||||
version.major=0
|
version.major=0
|
||||||
version.minor=7
|
version.minor=7
|
||||||
version.patch=3
|
version.patch=3
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue