diff --git a/.classpath b/.classpath
index 1efd79adfb..4d0c300ec7 100644
--- a/.classpath
+++ b/.classpath
@@ -1,81 +1,80 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/JasperReports/build.xml b/JasperReports/build.xml
index 43cc79c4e4..f989b6fce7 100644
--- a/JasperReports/build.xml
+++ b/JasperReports/build.xml
@@ -69,7 +69,6 @@
-
@@ -147,9 +146,6 @@
-
-
-
diff --git a/base/src/org/compiere/print/layout/BarcodeElement.java b/base/src/org/compiere/print/layout/BarcodeElement.java
index c856fb4b5d..2685a91632 100644
--- a/base/src/org/compiere/print/layout/BarcodeElement.java
+++ b/base/src/org/compiere/print/layout/BarcodeElement.java
@@ -16,19 +16,26 @@
*****************************************************************************/
package org.compiere.print.layout;
-import java.awt.*;
-import java.awt.geom.*;
-import java.util.*;
-import org.compiere.print.*;
+import java.awt.Graphics2D;
+import java.awt.geom.Point2D;
+import java.util.Properties;
-import net.sourceforge.barbecue.*;
-import net.sourceforge.barbecue.linear.code128.*;
+import net.sourceforge.barbecue.Barcode;
+import net.sourceforge.barbecue.BarcodeFactory;
+import net.sourceforge.barbecue.linear.ean.UCCEAN128Barcode;
+import net.sourceforge.barbecue.output.OutputException;
+
+import org.compiere.print.MPrintFont;
+import org.compiere.print.MPrintFormatItem;
/**
* Barcode Print Element
*
* @author Jorg Janke
* @version $Id: BarcodeElement.java,v 1.2 2006/07/30 00:53:02 jjanke Exp $
+ *
+ * @author Teo Sarca, SC ARHIPAC SERVICE SRL
+ * FR [ 1803359 ] Migrate to barbecue 1.1
*/
public class BarcodeElement extends PrintElement
{
@@ -209,7 +216,10 @@ public class BarcodeElement extends PrintElement
x += (p_maxWidth - p_width) / 2;
int y = (int)location.y;
- m_barcode.draw(g2D, x, y);
+ try {
+ m_barcode.draw(g2D, x, y);
+ } catch (OutputException e) {
+ }
} // paint
/**
diff --git a/base/src/org/compiere/print/layout/TableElement.java b/base/src/org/compiere/print/layout/TableElement.java
index ba2edc5718..06a48b33a7 100644
--- a/base/src/org/compiere/print/layout/TableElement.java
+++ b/base/src/org/compiere/print/layout/TableElement.java
@@ -16,17 +16,36 @@
*****************************************************************************/
package org.compiere.print.layout;
-import java.awt.*;
-import java.awt.font.*;
-import java.awt.geom.*;
-import java.text.*;
-import java.util.*;
-import java.util.logging.*;
-import java.util.regex.*;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Graphics2D;
+import java.awt.Image;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.font.FontRenderContext;
+import java.awt.font.LineBreakMeasurer;
+import java.awt.font.TextAttribute;
+import java.awt.font.TextLayout;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
+import java.text.AttributedCharacterIterator;
+import java.text.AttributedString;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.regex.Pattern;
-import org.compiere.model.*;
-import org.compiere.print.*;
-import org.compiere.util.*;
+import net.sourceforge.barbecue.output.OutputException;
+
+import org.compiere.model.MQuery;
+import org.compiere.print.MPrintFormatItem;
+import org.compiere.print.MPrintTableFormat;
+import org.compiere.util.KeyNamePair;
+import org.compiere.util.NamePair;
+import org.compiere.util.Util;
+import org.compiere.util.ValueNamePair;
/**
* Table Print Element.
@@ -47,6 +66,9 @@ import org.compiere.util.*;
*
* @author Jorg Janke
* @version $Id: TableElement.java,v 1.2 2006/07/30 00:53:02 jjanke Exp $
+ *
+ * @author Teo Sarca, SC ARHIPAC SERVICE SRL
+ * FR [ 1803359 ] Migrate to barbecue 1.1
*/
public class TableElement extends PrintElement
{
@@ -1371,7 +1393,10 @@ public class TableElement extends PrintElement
}
else if (printItems[index] instanceof BarcodeElement)
{
- ((BarcodeElement)printItems[index]).getBarcode().draw(g2D, curX, (int)penY);
+ try {
+ ((BarcodeElement)printItems[index]).getBarcode().draw(g2D, curX, (int)penY);
+ } catch (OutputException e) {
+ }
}
else if (printItems[index] instanceof Boolean)
{
diff --git a/tools/build.xml b/tools/build.xml
index cdc9359360..b6967d536e 100644
--- a/tools/build.xml
+++ b/tools/build.xml
@@ -207,7 +207,7 @@
-
+
@@ -283,7 +283,7 @@
-
+