From: Marco Zanon Date: Sun, 16 Nov 2014 14:47:24 +0000 (+0000) Subject: Released version 3.2. X-Git-Tag: 3.2 X-Git-Url: https://gitweb.marcozanon.com/?a=commitdiff_plain;h=53dff5528501ca15c0a5f7d3ea6152d8165689d1;p=Macaco Released version 3.2. --- diff --git a/LICENSE b/LICENSE index e201d78..baa52db 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ Macaco -Copyright (c) 2009-2013 Marco Zanon . +Copyright (c) 2009-2014 Marco Zanon . Released under MIT license: diff --git a/src/java/com/marcozanon/macaco/MException.java b/src/java/com/marcozanon/macaco/MException.java index 55fcdaa..539688c 100644 --- a/src/java/com/marcozanon/macaco/MException.java +++ b/src/java/com/marcozanon/macaco/MException.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/MInformation.java b/src/java/com/marcozanon/macaco/MInformation.java index ee2b2d2..47b0109 100644 --- a/src/java/com/marcozanon/macaco/MInformation.java +++ b/src/java/com/marcozanon/macaco/MInformation.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ @@ -12,7 +12,7 @@ import java.io.StringWriter; public class MInformation extends MObject { - public static final String MACACO_VERSION = "3.x"; + public static final String MACACO_VERSION = "3.2"; public static final String TEXT_ENCODING = "UTF-8"; diff --git a/src/java/com/marcozanon/macaco/MObject.java b/src/java/com/marcozanon/macaco/MObject.java index b8e8d3d..66e3e49 100644 --- a/src/java/com/marcozanon/macaco/MObject.java +++ b/src/java/com/marcozanon/macaco/MObject.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/conversion/MConversionException.java b/src/java/com/marcozanon/macaco/conversion/MConversionException.java index 90cf355..9bc1073 100644 --- a/src/java/com/marcozanon/macaco/conversion/MConversionException.java +++ b/src/java/com/marcozanon/macaco/conversion/MConversionException.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/conversion/MDateConverter.java b/src/java/com/marcozanon/macaco/conversion/MDateConverter.java index d8334dc..46514ef 100644 --- a/src/java/com/marcozanon/macaco/conversion/MDateConverter.java +++ b/src/java/com/marcozanon/macaco/conversion/MDateConverter.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/conversion/MFormatConversionException.java b/src/java/com/marcozanon/macaco/conversion/MFormatConversionException.java index 879eb61..8f3f841 100644 --- a/src/java/com/marcozanon/macaco/conversion/MFormatConversionException.java +++ b/src/java/com/marcozanon/macaco/conversion/MFormatConversionException.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/conversion/MNumberConverter.java b/src/java/com/marcozanon/macaco/conversion/MNumberConverter.java index 42d12a1..1e200aa 100644 --- a/src/java/com/marcozanon/macaco/conversion/MNumberConverter.java +++ b/src/java/com/marcozanon/macaco/conversion/MNumberConverter.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/json/MInvalidValueJsonException.java b/src/java/com/marcozanon/macaco/json/MInvalidValueJsonException.java index 6048512..73628c3 100644 --- a/src/java/com/marcozanon/macaco/json/MInvalidValueJsonException.java +++ b/src/java/com/marcozanon/macaco/json/MInvalidValueJsonException.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/json/MJsonArray.java b/src/java/com/marcozanon/macaco/json/MJsonArray.java index 3ba2f5f..03dd8e4 100644 --- a/src/java/com/marcozanon/macaco/json/MJsonArray.java +++ b/src/java/com/marcozanon/macaco/json/MJsonArray.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/json/MJsonBoolean.java b/src/java/com/marcozanon/macaco/json/MJsonBoolean.java index 5eb9f8a..fcb83c8 100644 --- a/src/java/com/marcozanon/macaco/json/MJsonBoolean.java +++ b/src/java/com/marcozanon/macaco/json/MJsonBoolean.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/json/MJsonException.java b/src/java/com/marcozanon/macaco/json/MJsonException.java index 6e6a01d..e99a958 100644 --- a/src/java/com/marcozanon/macaco/json/MJsonException.java +++ b/src/java/com/marcozanon/macaco/json/MJsonException.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/json/MJsonNull.java b/src/java/com/marcozanon/macaco/json/MJsonNull.java index a21ad15..a199f32 100644 --- a/src/java/com/marcozanon/macaco/json/MJsonNull.java +++ b/src/java/com/marcozanon/macaco/json/MJsonNull.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/json/MJsonNumber.java b/src/java/com/marcozanon/macaco/json/MJsonNumber.java index 4044919..fd873d2 100644 --- a/src/java/com/marcozanon/macaco/json/MJsonNumber.java +++ b/src/java/com/marcozanon/macaco/json/MJsonNumber.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/json/MJsonObject.java b/src/java/com/marcozanon/macaco/json/MJsonObject.java index f1a157b..4d6cc76 100644 --- a/src/java/com/marcozanon/macaco/json/MJsonObject.java +++ b/src/java/com/marcozanon/macaco/json/MJsonObject.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/json/MJsonString.java b/src/java/com/marcozanon/macaco/json/MJsonString.java index 10c0720..0c5e222 100644 --- a/src/java/com/marcozanon/macaco/json/MJsonString.java +++ b/src/java/com/marcozanon/macaco/json/MJsonString.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/json/MJsonValue.java b/src/java/com/marcozanon/macaco/json/MJsonValue.java index 6d57d1d..7d2a9da 100644 --- a/src/java/com/marcozanon/macaco/json/MJsonValue.java +++ b/src/java/com/marcozanon/macaco/json/MJsonValue.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/logging/MLogDatabaseTable.java b/src/java/com/marcozanon/macaco/logging/MLogDatabaseTable.java index d65be12..2c15867 100644 --- a/src/java/com/marcozanon/macaco/logging/MLogDatabaseTable.java +++ b/src/java/com/marcozanon/macaco/logging/MLogDatabaseTable.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/logging/MLogFilter.java b/src/java/com/marcozanon/macaco/logging/MLogFilter.java index ee98b3a..2c50d20 100644 --- a/src/java/com/marcozanon/macaco/logging/MLogFilter.java +++ b/src/java/com/marcozanon/macaco/logging/MLogFilter.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ @@ -21,6 +21,9 @@ public class MLogFilter extends MObject { protected LinkedList logTargets = new LinkedList(); + protected boolean pausedState = false; + protected LinkedList logMessageQueue = new LinkedList(); + /* */ public MLogFilter(MLogFilter.Threshold threshold) { @@ -75,6 +78,18 @@ public class MLogFilter extends MObject { /* Output */ + public void setPausedState(boolean pausedState) throws MLoggingException { + this.pausedState = pausedState; + // + if (!this.getPausedState()) { + this.flushMessages(); + } + } + + public boolean getPausedState() { + return this.pausedState; + } + public void appendMessage(MLogFilter.Threshold level, String message) throws MLoggingException { this.appendMessage(level, message, 0); } @@ -87,8 +102,23 @@ public class MLogFilter extends MObject { if (level.ordinal() > this.getThreshold().ordinal()) { return; } - for (MLogTarget t: this.getLogTargetsReference()) { - t.appendMessage(message, indentation); + // + this.logMessageQueue.add(new MLogMessage(message, indentation)); + // + if (!this.getPausedState()) { + this.flushMessages(); + } + } + + protected void flushMessages() throws MLoggingException { + while (0 < this.logMessageQueue.size()) { + MLogMessage logMessage = this.logMessageQueue.remove(); + String message = logMessage.getMessage(); + int indentation = logMessage.getIndentation(); + // + for (MLogTarget logTarget: this.getLogTargetsReference()) { + logTarget.appendMessage(message, indentation); + } } } diff --git a/src/java/com/marcozanon/macaco/logging/MLogMessage.java b/src/java/com/marcozanon/macaco/logging/MLogMessage.java new file mode 100644 index 0000000..fc08644 --- /dev/null +++ b/src/java/com/marcozanon/macaco/logging/MLogMessage.java @@ -0,0 +1,40 @@ +/** + * Macaco + * Copyright (c) 2009-2014 Marco Zanon . + * Released under MIT license (see LICENSE for details). + */ + +package com.marcozanon.macaco.logging; + +import com.marcozanon.macaco.MObject; + +public class MLogMessage extends MObject { + + protected String message = null; + protected int indentation = 0; + + /* */ + + public MLogMessage(String message, int indentation) { + if (null == message) { + throw new IllegalArgumentException("Invalid 'message': null."); + } + if (0 > indentation) { + throw new IllegalArgumentException(String.format("Invalid 'indentation': %s: cannot be negative.", indentation)); + } + // + this.message = message; + this.indentation = indentation; + } + + /* Values */ + + public String getMessage() { + return this.message; + } + + public int getIndentation() { + return this.indentation; + } + +} diff --git a/src/java/com/marcozanon/macaco/logging/MLogPlainTextFile.java b/src/java/com/marcozanon/macaco/logging/MLogPlainTextFile.java index 5884ee3..d7af2c1 100644 --- a/src/java/com/marcozanon/macaco/logging/MLogPlainTextFile.java +++ b/src/java/com/marcozanon/macaco/logging/MLogPlainTextFile.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/logging/MLogTarget.java b/src/java/com/marcozanon/macaco/logging/MLogTarget.java index 62ec12f..824b6b8 100644 --- a/src/java/com/marcozanon/macaco/logging/MLogTarget.java +++ b/src/java/com/marcozanon/macaco/logging/MLogTarget.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/logging/MLoggingException.java b/src/java/com/marcozanon/macaco/logging/MLoggingException.java index eb5cb30..732afa4 100644 --- a/src/java/com/marcozanon/macaco/logging/MLoggingException.java +++ b/src/java/com/marcozanon/macaco/logging/MLoggingException.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/sql/MConnectionSqlException.java b/src/java/com/marcozanon/macaco/sql/MConnectionSqlException.java index 0130bb6..1875bed 100644 --- a/src/java/com/marcozanon/macaco/sql/MConnectionSqlException.java +++ b/src/java/com/marcozanon/macaco/sql/MConnectionSqlException.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/sql/MSqlConnection.java b/src/java/com/marcozanon/macaco/sql/MSqlConnection.java index b2a99fe..650e002 100644 --- a/src/java/com/marcozanon/macaco/sql/MSqlConnection.java +++ b/src/java/com/marcozanon/macaco/sql/MSqlConnection.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/sql/MSqlConnectionGenerator.java b/src/java/com/marcozanon/macaco/sql/MSqlConnectionGenerator.java index 2ad909a..5ba67b2 100644 --- a/src/java/com/marcozanon/macaco/sql/MSqlConnectionGenerator.java +++ b/src/java/com/marcozanon/macaco/sql/MSqlConnectionGenerator.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/sql/MSqlException.java b/src/java/com/marcozanon/macaco/sql/MSqlException.java index 3da97a7..bee0919 100644 --- a/src/java/com/marcozanon/macaco/sql/MSqlException.java +++ b/src/java/com/marcozanon/macaco/sql/MSqlException.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/sql/MSqlStatementResults.java b/src/java/com/marcozanon/macaco/sql/MSqlStatementResults.java index 95b05ca..aa184e1 100644 --- a/src/java/com/marcozanon/macaco/sql/MSqlStatementResults.java +++ b/src/java/com/marcozanon/macaco/sql/MSqlStatementResults.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/sql/MSqlTable.java b/src/java/com/marcozanon/macaco/sql/MSqlTable.java index bf7ad51..f656633 100644 --- a/src/java/com/marcozanon/macaco/sql/MSqlTable.java +++ b/src/java/com/marcozanon/macaco/sql/MSqlTable.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/sql/MStatementSqlException.java b/src/java/com/marcozanon/macaco/sql/MStatementSqlException.java index 2ed7701..7b5b985 100644 --- a/src/java/com/marcozanon/macaco/sql/MStatementSqlException.java +++ b/src/java/com/marcozanon/macaco/sql/MStatementSqlException.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/sql/MTransactionSqlException.java b/src/java/com/marcozanon/macaco/sql/MTransactionSqlException.java index c453e69..00b736f 100644 --- a/src/java/com/marcozanon/macaco/sql/MTransactionSqlException.java +++ b/src/java/com/marcozanon/macaco/sql/MTransactionSqlException.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/text/MText.java b/src/java/com/marcozanon/macaco/text/MText.java index 203834b..aa6487f 100644 --- a/src/java/com/marcozanon/macaco/text/MText.java +++ b/src/java/com/marcozanon/macaco/text/MText.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2013 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/text/MTextException.java b/src/java/com/marcozanon/macaco/text/MTextException.java index ed4b652..c752605 100644 --- a/src/java/com/marcozanon/macaco/text/MTextException.java +++ b/src/java/com/marcozanon/macaco/text/MTextException.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2012 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/text/MTranslationException.java b/src/java/com/marcozanon/macaco/text/MTranslationException.java index 67128dc..3380554 100644 --- a/src/java/com/marcozanon/macaco/text/MTranslationException.java +++ b/src/java/com/marcozanon/macaco/text/MTranslationException.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2012 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/text/MTranslationFileParsingTextException.java b/src/java/com/marcozanon/macaco/text/MTranslationFileParsingTextException.java index a3001ba..faeb2c3 100644 --- a/src/java/com/marcozanon/macaco/text/MTranslationFileParsingTextException.java +++ b/src/java/com/marcozanon/macaco/text/MTranslationFileParsingTextException.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2012 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/text/MTranslationValueNotFoundTextException.java b/src/java/com/marcozanon/macaco/text/MTranslationValueNotFoundTextException.java index 0cc5991..5935bb0 100644 --- a/src/java/com/marcozanon/macaco/text/MTranslationValueNotFoundTextException.java +++ b/src/java/com/marcozanon/macaco/text/MTranslationValueNotFoundTextException.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2012 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/text/MTranslator.java b/src/java/com/marcozanon/macaco/text/MTranslator.java index 2e58ff3..339e838 100644 --- a/src/java/com/marcozanon/macaco/text/MTranslator.java +++ b/src/java/com/marcozanon/macaco/text/MTranslator.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2012 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */ diff --git a/src/java/com/marcozanon/macaco/text/MXhtmlUnsafeStringTextException.java b/src/java/com/marcozanon/macaco/text/MXhtmlUnsafeStringTextException.java index 830d3a0..32ad032 100644 --- a/src/java/com/marcozanon/macaco/text/MXhtmlUnsafeStringTextException.java +++ b/src/java/com/marcozanon/macaco/text/MXhtmlUnsafeStringTextException.java @@ -1,6 +1,6 @@ /** * Macaco - * Copyright (c) 2009-2012 Marco Zanon . + * Copyright (c) 2009-2014 Marco Zanon . * Released under MIT license (see LICENSE for details). */