From: Marco Zanon <info@marcozanon.com>
Date: Thu, 25 Jul 2019 20:38:06 +0000 (+0000)
Subject: Added new string methods.
X-Git-Tag: 7.0.0~4
X-Git-Url: https://gitweb.marcozanon.com/?a=commitdiff_plain;h=05cc9e1318d017d085783b33364f83ce42efb49c;p=Macaco

Added new string methods.
---

diff --git a/src/java/com/marcozanon/macaco/database/MDatabaseConnection.java b/src/java/com/marcozanon/macaco/database/MDatabaseConnection.java
index 09df47f..4ce8bcc 100644
--- a/src/java/com/marcozanon/macaco/database/MDatabaseConnection.java
+++ b/src/java/com/marcozanon/macaco/database/MDatabaseConnection.java
@@ -186,6 +186,7 @@ public class MDatabaseConnection extends MObject {
         if (MDatabaseConnection.TransactionStatus.CLOSED != this.getTransactionStatus()) {
             throw new MSqlTransactionException("Nested transactions not allowed.");
         }
+        //
         try {
             // Check the connection.
             this.check();
@@ -207,6 +208,7 @@ public class MDatabaseConnection extends MObject {
         if (MDatabaseConnection.TransactionStatus.CLOSED == this.getTransactionStatus()) {
             throw new MSqlTransactionException("Transaction not started.");
         }
+        //
         try {
 /*
             // Check the connection.
diff --git a/src/java/com/marcozanon/macaco/text/MText.java b/src/java/com/marcozanon/macaco/text/MText.java
index 1fef4ea..0af3ebb 100644
--- a/src/java/com/marcozanon/macaco/text/MText.java
+++ b/src/java/com/marcozanon/macaco/text/MText.java
@@ -12,6 +12,7 @@ import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.util.StringJoiner;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
@@ -69,6 +70,43 @@ public class MText extends MObject {
         return y.toString();
     }
 
+    public static String removeLine(String x, int lineNumber) {
+        if (null == x) {
+            throw new IllegalArgumentException("Invalid 'x': null.");
+        }
+        //
+        String[] xLines = x.split(System.getProperty("line.separator"));
+        //
+        if ((0 > lineNumber) || (xLines.length - 1 < lineNumber)) {
+            throw new IllegalArgumentException(String.format("Invalid 'lineNumber': %s.", lineNumber));
+        }
+        //
+        StringJoiner stringJoiner = new StringJoiner(System.getProperty("line.separator"));
+        for (int l = 0; xLines.length > l; l++) {
+            if (l == lineNumber) {
+                continue;
+            }
+            //
+            stringJoiner.add(xLines[l]);
+        }
+        //
+        return stringJoiner.toString();
+    }
+
+    public static String removeFirstLine(String x) {
+        return MText.removeLine(x, 0);
+    }
+
+    public static String removeLastLine(String x) {
+        if (null == x) {
+            throw new IllegalArgumentException("Invalid 'x': null.");
+        }
+        //
+        String[] xLines = x.split(System.getProperty("line.separator"));
+        //
+        return MText.removeLine(x, xLines.length - 1);
+    }
+
     /* Javascript escape. */
 
     public static String getJavascriptEscapedString(String x) {