From d4b9295e704003aff0496ec89cf185e8ab85b70c Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Tue, 28 Jul 2015 20:52:33 -0500 Subject: [PATCH] IDEMPIERE-1440:line description alignment wrong on document printing / apply same patch from hieplq in other Pattern.compile --- .../src/org/compiere/print/layout/LocationElement.java | 4 ++-- .../src/org/compiere/print/layout/StringElement.java | 6 +++--- .../src/org/compiere/print/layout/TableElement.java | 4 ++-- .../src/org/adempiere/db/oracle/config/ConfigOracle.java | 3 ++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/print/layout/LocationElement.java b/org.adempiere.base/src/org/compiere/print/layout/LocationElement.java index 94130b191a..875ae4ae34 100644 --- a/org.adempiere.base/src/org/compiere/print/layout/LocationElement.java +++ b/org.adempiere.base/src/org/compiere/print/layout/LocationElement.java @@ -76,7 +76,7 @@ public class LocationElement extends GridElement else if (ml.isAddressLinesReverse()) { setData(index++, 0, ml.getCountry(true, language), font, color); - String[] lines = Pattern.compile("$", Pattern.MULTILINE).split(ml.getCityRegionPostal()); + String[] lines = Pattern.compile("\n", Pattern.MULTILINE).split(ml.getCityRegionPostal()); for (int i = 0; i < lines.length; i++) setData(index++, 0, lines[i], font, color); if (ml.getAddress4() != null && ml.getAddress4().length() > 0) @@ -98,7 +98,7 @@ public class LocationElement extends GridElement setData(index++, 0, ml.getAddress3(), font, color); if (ml.getAddress4() != null && ml.getAddress4().length() > 0) setData(index++, 0, ml.getAddress4(), font, color); - String[] lines = Pattern.compile("$", Pattern.MULTILINE).split(ml.getCityRegionPostal()); + String[] lines = Pattern.compile("\n", Pattern.MULTILINE).split(ml.getCityRegionPostal()); for (int i = 0; i < lines.length; i++) setData(index++, 0, lines[i], font, color); setData(index++, 0, ml.getCountry(true, language), font, color); diff --git a/org.adempiere.base/src/org/compiere/print/layout/StringElement.java b/org.adempiere.base/src/org/compiere/print/layout/StringElement.java index 6935799597..445d6a5f88 100644 --- a/org.adempiere.base/src/org/compiere/print/layout/StringElement.java +++ b/org.adempiere.base/src/org/compiere/print/layout/StringElement.java @@ -80,7 +80,7 @@ public class StringElement extends PrintElement } } m_ID = ID; - String[] lines = Pattern.compile("$", Pattern.MULTILINE).split(inText); + String[] lines = Pattern.compile("\n", Pattern.MULTILINE).split(inText); m_string_paper = new AttributedString[lines.length]; m_string_view = new AttributedString[lines.length]; for (int i = 0; i < lines.length; i++) @@ -155,7 +155,7 @@ public class StringElement extends PrintElement endOffset = labelSuffix.length(); } m_ID = ID; - String[] lines = Pattern.compile("$", Pattern.MULTILINE).split(text); + String[] lines = Pattern.compile("\n", Pattern.MULTILINE).split(text); m_string_paper = new AttributedString[lines.length]; m_string_view = new AttributedString[lines.length]; for (int i = 0; i < lines.length; i++) @@ -230,7 +230,7 @@ public class StringElement extends PrintElement return; String inText = Msg.parseTranslation(ctx, m_originalString); // log.fine( "StringElement.translate", inText); - String[] lines = Pattern.compile("$", Pattern.MULTILINE).split(inText); + String[] lines = Pattern.compile("\n", Pattern.MULTILINE).split(inText); m_string_paper = new AttributedString[lines.length]; for (int i = 0; i < lines.length; i++) { diff --git a/org.adempiere.base/src/org/compiere/print/layout/TableElement.java b/org.adempiere.base/src/org/compiere/print/layout/TableElement.java index 3eb11ad110..cd1a26b2ba 100644 --- a/org.adempiere.base/src/org/compiere/print/layout/TableElement.java +++ b/org.adempiere.base/src/org/compiere/print/layout/TableElement.java @@ -431,7 +431,7 @@ public class TableElement extends PrintElement } else { - String[] lines = Pattern.compile("$", Pattern.MULTILINE).split(string); + String[] lines = Pattern.compile("\n", Pattern.MULTILINE).split(string); for (int lineNo = 0; lineNo < lines.length; lineNo++) { AttributedString aString = new AttributedString(lines[lineNo]); @@ -503,7 +503,7 @@ public class TableElement extends PrintElement { float height = 0; // - String[] lines = Pattern.compile("$", Pattern.MULTILINE).split(string); + String[] lines = Pattern.compile("\n", Pattern.MULTILINE).split(string); for (int lineNo = 0; lineNo < lines.length; lineNo++) { AttributedString aString = new AttributedString(lines[lineNo]); diff --git a/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java b/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java index 66a2422903..8f0ae3a057 100644 --- a/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java +++ b/org.compiere.db.oracle.provider/src/org/adempiere/db/oracle/config/ConfigOracle.java @@ -247,7 +247,8 @@ public class ConfigOracle implements IDatabaseConfig return null; ArrayList list = new ArrayList(); - Pattern pattern = Pattern.compile("$", Pattern.MULTILINE); + Pattern pattern = Pattern.compile("\n", Pattern.MULTILINE); + System.out.println(tnsnames); String[] lines = pattern.split(tnsnames); for (int i = 0; i < lines.length; i++) {