cleanup / abuse system fix / prepping for a release

[mir.git] / source / mircoders / pdf / PDFGenerator.java

diff --git a/source/mircoders/pdf/PDFGenerator.java b/source/mircoders/pdf/PDFGenerator.java
index 049f8b3..ebfe984 100755 (executable)
--- a/source/mircoders/pdf/PDFGenerator.java
+++ b/source/mircoders/pdf/PDFGenerator.java
@@ -29,27 +29,42 @@
  */
 package mircoders.pdf;
 
-import com.lowagie.text.*;
-import com.lowagie.text.pdf.*;
 import gnu.regexp.RE;
 import gnu.regexp.REException;
 import gnu.regexp.REMatch;
 import gnu.regexp.REMatchEnumeration;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 import mir.config.MirPropertiesConfiguration;
 import mir.entity.EntityBrowser;
 import mir.log.LoggerWrapper;
 import mir.misc.StringUtil;
-import mir.util.DateTimeFunctions;
+import mir.util.DateTimeRoutines;
+import mir.util.HTMLRoutines;
 import mircoders.entity.EntityContent;
 import mircoders.entity.EntityImages;
 import mircoders.storage.DatabaseImages;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import com.lowagie.text.BadElementException;
+import com.lowagie.text.Document;
+import com.lowagie.text.DocumentException;
+import com.lowagie.text.Element;
+import com.lowagie.text.Font;
+import com.lowagie.text.Image;
+import com.lowagie.text.PageSize;
+import com.lowagie.text.Paragraph;
+import com.lowagie.text.Phrase;
+import com.lowagie.text.pdf.BaseFont;
+import com.lowagie.text.pdf.ColumnText;
+import com.lowagie.text.pdf.PdfContentByte;
+import com.lowagie.text.pdf.PdfTemplate;
+import com.lowagie.text.pdf.PdfWriter;
 
 public class PDFGenerator{
 
@@ -116,11 +131,11 @@ public class PDFGenerator{
       footerText = configuration.getString("PDF.Footer.String");
       footerFontSize   = Integer.parseInt(configuration.getString("PDF.Footer.FontSize"));
       footerFontFamily = getFontByName(configuration.getString("PDF.Footer.FontFamily"));
-      footerHeight = Integer.parseInt(configuration.getString("PDF.Footer.Height"));;
+      footerHeight = Integer.parseInt(configuration.getString("PDF.Footer.Height"));
 
       metaFontSize   = Integer.parseInt(configuration.getString("PDF.Meta.FontSize"));
       metaFontFamily = getFontByName(configuration.getString("PDF.Meta.FontFamily"));
-      metaHeight = Integer.parseInt(configuration.getString("PDF.Meta.Height"));;
+      metaHeight = Integer.parseInt(configuration.getString("PDF.Meta.Height"));
 
       descriptionFontSize   = Integer.parseInt(configuration.getString("PDF.Description.FontSize"));
       descriptionLineHeight = Integer.parseInt(configuration.getString("PDF.Description.LineHeight"));
@@ -600,8 +615,7 @@ public class PDFGenerator{
   private boolean enoughY(int heightOfBlockToAdd){
     if ((currentYPosition - heightOfBlockToAdd - footerHeight) < bottomEdge )
       return false;
-    else
-      return true;
+               return true;
   }
 
 
@@ -630,7 +644,7 @@ public class PDFGenerator{
     String isHTML  = entityContent.getFieldValue("is_html");
     String theTitle = entityContent.getFieldValue("title");
     String theCreator = entityContent.getFieldValue("creator");
-    String theDate = DateTimeFunctions.advancedDateFormat(
+    String theDate = DateTimeRoutines.advancedDateFormat(
         configuration.getString("RDF.Meta.DateFormat"),
         StringUtil.convertMirInternalDateToDate(entityContent.getFieldValue("webdb_create")),
         configuration.getString("Mir.DefaultTimezone"));
@@ -712,8 +726,8 @@ public class PDFGenerator{
   theContent= noTags.substituteAll(theContent," ");
   theDescription= noTags.substituteAll(theDescription," ");
 
-  theContent=mir.util.Translate.decode(theContent);
-  theDescription=mir.util.Translate.decode(theDescription);
+  theContent = HTMLRoutines.resolveHTMLEntites(theContent);
+  theDescription = HTMLRoutines.resolveHTMLEntites(theDescription);
 
   RE re1 = new RE("\r?\n\r?\n");
   String theDescription1 = re1.substituteAll(theDescription,"BREAKHERE");