From: Marco Zanon Date: Mon, 27 Nov 2017 21:38:44 +0000 (+0000) Subject: Cleaned up the code. X-Git-Tag: SVN-to-Git~57 X-Git-Url: https://gitweb.marcozanon.com/?a=commitdiff_plain;h=d6480d4eb70d17ca2e917df46c5cf7ab71bc841e;p=Macaco Cleaned up the code. --- diff --git a/6.x/src/java/com/marcozanon/macaco/MInformation.java b/6.x/src/java/com/marcozanon/macaco/MInformation.java index 32a9516..88c0087 100644 --- a/6.x/src/java/com/marcozanon/macaco/MInformation.java +++ b/6.x/src/java/com/marcozanon/macaco/MInformation.java @@ -6,7 +6,6 @@ package com.marcozanon.macaco; -import com.marcozanon.macaco.text.MText; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/6.x/src/java/com/marcozanon/macaco/MObject.java b/6.x/src/java/com/marcozanon/macaco/MObject.java index ea72cac..2dd4784 100644 --- a/6.x/src/java/com/marcozanon/macaco/MObject.java +++ b/6.x/src/java/com/marcozanon/macaco/MObject.java @@ -10,10 +10,12 @@ public abstract class MObject { /* */ + @Override protected MObject clone() { throw new UnsupportedOperationException("Please provide manually by yourself."); } + @Override public String toString() { throw new UnsupportedOperationException("Please use appropriate methods (if any)."); } diff --git a/6.x/src/java/com/marcozanon/macaco/conversion/MDateConverter.java b/6.x/src/java/com/marcozanon/macaco/conversion/MDateConverter.java index 9ac0925..93d7ca0 100644 --- a/6.x/src/java/com/marcozanon/macaco/conversion/MDateConverter.java +++ b/6.x/src/java/com/marcozanon/macaco/conversion/MDateConverter.java @@ -13,7 +13,6 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Locale; import java.util.TimeZone; @@ -46,6 +45,7 @@ public class MDateConverter extends MObject { this.setTimeZone(timeZone); } + @Override public MDateConverter clone() { return new MDateConverter(this.getDateFormats(), this.getLocale(), this.getTimeZone()); } diff --git a/6.x/src/java/com/marcozanon/macaco/conversion/MLocalDateConverter.java b/6.x/src/java/com/marcozanon/macaco/conversion/MLocalDateConverter.java index 6eef1b2..a949a24 100644 --- a/6.x/src/java/com/marcozanon/macaco/conversion/MLocalDateConverter.java +++ b/6.x/src/java/com/marcozanon/macaco/conversion/MLocalDateConverter.java @@ -11,7 +11,6 @@ import com.marcozanon.macaco.text.MText; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Locale; @@ -36,6 +35,7 @@ public class MLocalDateConverter extends MObject { this.setLocale(locale); } + @Override public MLocalDateConverter clone() { return new MLocalDateConverter(this.getDateFormats(), this.getLocale()); } diff --git a/6.x/src/java/com/marcozanon/macaco/conversion/MLocalDateTimeConverter.java b/6.x/src/java/com/marcozanon/macaco/conversion/MLocalDateTimeConverter.java index 2d00e77..4542e4b 100644 --- a/6.x/src/java/com/marcozanon/macaco/conversion/MLocalDateTimeConverter.java +++ b/6.x/src/java/com/marcozanon/macaco/conversion/MLocalDateTimeConverter.java @@ -11,7 +11,6 @@ import com.marcozanon.macaco.text.MText; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Locale; @@ -36,6 +35,7 @@ public class MLocalDateTimeConverter extends MObject { this.setLocale(locale); } + @Override public MLocalDateTimeConverter clone() { return new MLocalDateTimeConverter(this.getDatetimeFormats(), this.getLocale()); } diff --git a/6.x/src/java/com/marcozanon/macaco/conversion/MNumberConverter.java b/6.x/src/java/com/marcozanon/macaco/conversion/MNumberConverter.java index a77a66c..63e3033 100644 --- a/6.x/src/java/com/marcozanon/macaco/conversion/MNumberConverter.java +++ b/6.x/src/java/com/marcozanon/macaco/conversion/MNumberConverter.java @@ -13,7 +13,6 @@ import java.math.RoundingMode; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.text.ParsePosition; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Locale; @@ -38,6 +37,7 @@ public class MNumberConverter extends MObject { this.setLocale(locale); } + @Override public MNumberConverter clone() { return new MNumberConverter(this.getNumberFormats(), this.getLocale()); } diff --git a/6.x/src/java/com/marcozanon/macaco/database/MDatabaseConnection.java b/6.x/src/java/com/marcozanon/macaco/database/MDatabaseConnection.java index 07f04c6..52a0b63 100644 --- a/6.x/src/java/com/marcozanon/macaco/database/MDatabaseConnection.java +++ b/6.x/src/java/com/marcozanon/macaco/database/MDatabaseConnection.java @@ -125,6 +125,7 @@ public class MDatabaseConnection extends MObject { } } + @Override protected void finalize() { try { this.close(); diff --git a/6.x/src/java/com/marcozanon/macaco/database/MDatabaseConnectionPool.java b/6.x/src/java/com/marcozanon/macaco/database/MDatabaseConnectionPool.java index 2ac0b38..c47da59 100644 --- a/6.x/src/java/com/marcozanon/macaco/database/MDatabaseConnectionPool.java +++ b/6.x/src/java/com/marcozanon/macaco/database/MDatabaseConnectionPool.java @@ -60,6 +60,7 @@ public class MDatabaseConnectionPool extends MObject { } } + @Override protected void finalize() { this.closeConnections(); } diff --git a/6.x/src/java/com/marcozanon/macaco/database/MSqlStatementResults.java b/6.x/src/java/com/marcozanon/macaco/database/MSqlStatementResults.java index e7c57fd..4ff7e8f 100644 --- a/6.x/src/java/com/marcozanon/macaco/database/MSqlStatementResults.java +++ b/6.x/src/java/com/marcozanon/macaco/database/MSqlStatementResults.java @@ -12,7 +12,6 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.LinkedList; @@ -96,6 +95,7 @@ public class MSqlStatementResults extends MObject { } } + @Override protected void finalize() { try { this.close(); diff --git a/6.x/src/java/com/marcozanon/macaco/json/MJsonArray.java b/6.x/src/java/com/marcozanon/macaco/json/MJsonArray.java index 72e7b44..53d5024 100644 --- a/6.x/src/java/com/marcozanon/macaco/json/MJsonArray.java +++ b/6.x/src/java/com/marcozanon/macaco/json/MJsonArray.java @@ -32,6 +32,7 @@ public class MJsonArray extends MJsonValue { this.parseString(x); } + @Override public MJsonArray clone() { MJsonArray tmpMJsonArray = null; try { @@ -192,6 +193,7 @@ public class MJsonArray extends MJsonValue { /* Formatter. */ + @Override public String getJsonValue() { StringBuilder s = new StringBuilder(""); s.append("["); diff --git a/6.x/src/java/com/marcozanon/macaco/json/MJsonBoolean.java b/6.x/src/java/com/marcozanon/macaco/json/MJsonBoolean.java index bdb84cc..8ff84a5 100644 --- a/6.x/src/java/com/marcozanon/macaco/json/MJsonBoolean.java +++ b/6.x/src/java/com/marcozanon/macaco/json/MJsonBoolean.java @@ -24,6 +24,7 @@ public class MJsonBoolean extends MJsonValue { this.parseString(x); } + @Override public MJsonBoolean clone() { MJsonBoolean tmpMJsonBoolean = null; try { @@ -77,6 +78,7 @@ public class MJsonBoolean extends MJsonValue { /* Formatter. */ + @Override public String getJsonValue() { return this.getValue().toString(); } diff --git a/6.x/src/java/com/marcozanon/macaco/json/MJsonNull.java b/6.x/src/java/com/marcozanon/macaco/json/MJsonNull.java index e52fb87..ceb9bc2 100644 --- a/6.x/src/java/com/marcozanon/macaco/json/MJsonNull.java +++ b/6.x/src/java/com/marcozanon/macaco/json/MJsonNull.java @@ -22,6 +22,7 @@ public class MJsonNull extends MJsonValue { this.parseString(x); } + @Override public MJsonNull clone() { MJsonNull tmpMJsonNull = null; try { @@ -57,6 +58,7 @@ public class MJsonNull extends MJsonValue { /* Formatter. */ + @Override public String getJsonValue() { return "null"; } diff --git a/6.x/src/java/com/marcozanon/macaco/json/MJsonNumber.java b/6.x/src/java/com/marcozanon/macaco/json/MJsonNumber.java index 06258f6..4aaa6cf 100644 --- a/6.x/src/java/com/marcozanon/macaco/json/MJsonNumber.java +++ b/6.x/src/java/com/marcozanon/macaco/json/MJsonNumber.java @@ -25,6 +25,7 @@ public class MJsonNumber extends MJsonValue { this.parseString(x); } + @Override public MJsonNumber clone() { MJsonNumber tmpMJsonNumber = null; try { @@ -97,6 +98,7 @@ public class MJsonNumber extends MJsonValue { /* Formatter. */ + @Override public String getJsonValue() { return this.getValue().toString(); } diff --git a/6.x/src/java/com/marcozanon/macaco/json/MJsonObject.java b/6.x/src/java/com/marcozanon/macaco/json/MJsonObject.java index 861c290..73ecce7 100644 --- a/6.x/src/java/com/marcozanon/macaco/json/MJsonObject.java +++ b/6.x/src/java/com/marcozanon/macaco/json/MJsonObject.java @@ -35,6 +35,7 @@ public class MJsonObject extends MJsonValue { this.parseString(x); } + @Override public MJsonObject clone() { MJsonObject tmpMJsonObject = null; try { @@ -242,6 +243,7 @@ public class MJsonObject extends MJsonValue { /* Formatter. */ + @Override public String getJsonValue() { StringBuilder s = new StringBuilder(""); s.append("{"); diff --git a/6.x/src/java/com/marcozanon/macaco/json/MJsonString.java b/6.x/src/java/com/marcozanon/macaco/json/MJsonString.java index 1fa61dd..2113449 100644 --- a/6.x/src/java/com/marcozanon/macaco/json/MJsonString.java +++ b/6.x/src/java/com/marcozanon/macaco/json/MJsonString.java @@ -31,6 +31,7 @@ public class MJsonString extends MJsonValue { this.parseString(x); } + @Override public MJsonString clone() { MJsonString tmpMJsonString = null; try { @@ -285,6 +286,7 @@ public class MJsonString extends MJsonValue { /* Formatter. */ + @Override public String getJsonValue() { return "\"" + MJsonString.getEscapedString(this.getValue(), this.getExtendedEscapeMode()) + "\""; } diff --git a/6.x/src/java/com/marcozanon/macaco/json/MJsonValue.java b/6.x/src/java/com/marcozanon/macaco/json/MJsonValue.java index 2bf4fcc..603eb78 100644 --- a/6.x/src/java/com/marcozanon/macaco/json/MJsonValue.java +++ b/6.x/src/java/com/marcozanon/macaco/json/MJsonValue.java @@ -12,6 +12,7 @@ public abstract class MJsonValue extends MObject { /* */ + @Override public abstract MJsonValue clone(); /* Helpers. */ diff --git a/6.x/src/java/com/marcozanon/macaco/logging/MLogDatabaseTable.java b/6.x/src/java/com/marcozanon/macaco/logging/MLogDatabaseTable.java index 30c68dc..0309b94 100644 --- a/6.x/src/java/com/marcozanon/macaco/logging/MLogDatabaseTable.java +++ b/6.x/src/java/com/marcozanon/macaco/logging/MLogDatabaseTable.java @@ -50,6 +50,7 @@ public class MLogDatabaseTable extends MLogTarget { this.logDatabaseField = logDatabaseField; } + @Override public void close() throws MLoggingException { } @@ -75,10 +76,12 @@ public class MLogDatabaseTable extends MLogTarget { /* Output. */ + @Override public void appendMessage(String message) throws MLoggingException { this.appendMessage(message, 0); } + @Override public void appendMessage(String message, int indentation) throws MLoggingException { if (null == message) { throw new IllegalArgumentException("Invalid 'message': null."); diff --git a/6.x/src/java/com/marcozanon/macaco/logging/MLogFilter.java b/6.x/src/java/com/marcozanon/macaco/logging/MLogFilter.java index af34cb5..de2e602 100644 --- a/6.x/src/java/com/marcozanon/macaco/logging/MLogFilter.java +++ b/6.x/src/java/com/marcozanon/macaco/logging/MLogFilter.java @@ -37,6 +37,7 @@ public class MLogFilter extends MObject { } } + @Override protected void finalize() { try { this.close(); diff --git a/6.x/src/java/com/marcozanon/macaco/logging/MLogPlainTextFile.java b/6.x/src/java/com/marcozanon/macaco/logging/MLogPlainTextFile.java index 20b4bb7..8b671c5 100644 --- a/6.x/src/java/com/marcozanon/macaco/logging/MLogPlainTextFile.java +++ b/6.x/src/java/com/marcozanon/macaco/logging/MLogPlainTextFile.java @@ -7,7 +7,6 @@ package com.marcozanon.macaco.logging; import com.marcozanon.macaco.MConstants; -import com.marcozanon.macaco.MInformation; import com.marcozanon.macaco.text.MText; import java.io.BufferedWriter; import java.io.FileNotFoundException; @@ -44,6 +43,7 @@ public class MLogPlainTextFile extends MLogTarget { } } + @Override public void close() throws MLoggingException { try { this.getBuffer().close(); @@ -67,10 +67,12 @@ public class MLogPlainTextFile extends MLogTarget { /* Output. */ + @Override public void appendMessage(String message) throws MLoggingException { this.appendMessage(message, 0); } + @Override public void appendMessage(String message, int indentation) throws MLoggingException { if (null == message) { throw new IllegalArgumentException("Invalid 'message': null."); diff --git a/6.x/src/java/com/marcozanon/macaco/logging/MLogTarget.java b/6.x/src/java/com/marcozanon/macaco/logging/MLogTarget.java index 4b32f4e..077c0ff 100644 --- a/6.x/src/java/com/marcozanon/macaco/logging/MLogTarget.java +++ b/6.x/src/java/com/marcozanon/macaco/logging/MLogTarget.java @@ -14,6 +14,7 @@ public abstract class MLogTarget extends MObject { public abstract void close() throws MLoggingException; + @Override protected void finalize() { try { this.close(); diff --git a/6.x/src/java/com/marcozanon/macaco/text/MText.java b/6.x/src/java/com/marcozanon/macaco/text/MText.java index 44fdb03..e300e89 100644 --- a/6.x/src/java/com/marcozanon/macaco/text/MText.java +++ b/6.x/src/java/com/marcozanon/macaco/text/MText.java @@ -7,7 +7,6 @@ package com.marcozanon.macaco.text; import com.marcozanon.macaco.MConstants; -import com.marcozanon.macaco.MInformation; import com.marcozanon.macaco.MObject; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -387,6 +386,7 @@ public class MText extends MObject { XMLReader reader = parser.getXMLReader(); reader.setEntityResolver(new EntityResolver() { + @Override public InputSource resolveEntity(String publicId, String systemId) { return new InputSource(new BufferedInputStream(this.getClass().getClassLoader().getResourceAsStream("dtd/xhtml1-transitional-macaco-edit.dtd"))); } @@ -394,6 +394,7 @@ public class MText extends MObject { }); reader.setContentHandler(new DefaultHandler() { + @Override public void startElement(String namespaceUri, String strippedName, String tagName, Attributes attributes) throws SAXException { if ("script".equalsIgnoreCase(tagName)) { throw new SAXException(String.format("Tag not allowed: %s.", tagName)); @@ -408,14 +409,17 @@ public class MText extends MObject { }); reader.setErrorHandler(new ErrorHandler() { + @Override public void error(SAXParseException exception) throws SAXException { throw new SAXException(exception); } + @Override public void fatalError(SAXParseException exception) throws SAXException { throw new SAXException(exception); } + @Override public void warning(SAXParseException exception) throws SAXException { throw new SAXException(exception); } diff --git a/6.x/src/java/com/marcozanon/macaco/text/MTranslator.java b/6.x/src/java/com/marcozanon/macaco/text/MTranslator.java index 5622752..72fc9cc 100644 --- a/6.x/src/java/com/marcozanon/macaco/text/MTranslator.java +++ b/6.x/src/java/com/marcozanon/macaco/text/MTranslator.java @@ -7,7 +7,6 @@ package com.marcozanon.macaco.text; import com.marcozanon.macaco.MConstants; -import com.marcozanon.macaco.MInformation; import com.marcozanon.macaco.MObject; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -48,6 +47,7 @@ public class MTranslator extends MObject { this.parseFile(file); } + @Override public MTranslator clone() { return new MTranslator(this.getBasicLocale(), this.getMessages()); }