Ticket #1958: html.patch

src/main/java/org/sophie2/extra/func/html/HtmlTextImportManager.java

@@ -1 +1 @@
 package org.sophie2.extra.func.html;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.Reader;
+import java.io.InputStream;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.swing.JTextPane;
 import javax.swing.filechooser.FileFilter;
@@ -28 +32 @@
         /**
          * The file filter of the html resources.
          */
-        public static final FileFilter FILE_FILTER = 
-                new FileExtensionFilter("HTML (*.html, *.htm)", "html", "htm");
-        
+        public static final FileFilter FILE_FILTER = new FileExtensionFilter(
+                        "HTML (*.html, *.htm)", "html", "htm");
+
         /**
          * The import role of the <code>HtmlTextImportManager</code>.
          */
         public static final String IMPORT_ROLE = "import html text";
-        
+
         @Override
         public String getImportRole() {
                 return IMPORT_ROLE;
         }
-
-        @Override
+   private static final String splitBadTagStr = "<meta\\s*http-equiv" +
+                "=\\s*\"Content-Type\"\\s*content=\"text/html;";
+        private static final String splitEndTagStr = ">";
+   @Override
         public ImmHotText getResourceData(File resFile, ResourceH parentResource,
                         Object additionalData) {
-                if (resFile == null || !(resFile.getName().endsWith("html")
-                                || resFile.getName().endsWith("htm"))) {
+                FileInputStream infile = null;
+                if (resFile == null
+                                || !(resFile.getName().endsWith("html") || resFile.getName()
+                                                .endsWith("htm"))) {
                         return null;
                 }
                 
+                StringBuilder fileContent = new StringBuilder();
+                try {
+                        infile = new FileInputStream(resFile);
+                        byte[] bFileContent = new byte[infile.available()];
+                        int sizeRead = 0;
+                        while (sizeRead != -1) {
+                                try {
+                                        sizeRead = infile.read(bFileContent);
+                                        for (int i = 0; i < sizeRead; ++i) {
+                                                fileContent.append((char) bFileContent[i]);
+                                        }
+                                } catch (IOException e) {
+                                        throw new RuntimeException("Could not import HTML file", e);
+                                }
+                        }
+
+                } catch (FileNotFoundException e) {
+                        throw new RuntimeException("Could not import HTML file", e);
+                } catch (IOException e) {
+                        throw new RuntimeException("Could not import HTML file", e);
+                }
+                Pattern badTagPattern = Pattern.compile(splitBadTagStr,Pattern.CASE_INSENSITIVE);
+                Pattern endTagPattern = Pattern.compile(splitEndTagStr);
+                Matcher badTagMatcher = badTagPattern.matcher(fileContent);
+                Matcher endTagMatcher = endTagPattern.matcher(fileContent);
+                if(badTagMatcher.find()) {
+                        int start = badTagMatcher.start();
+                        int end = badTagMatcher.end();
+                        if(endTagMatcher.find(end)) {
+                        end = endTagMatcher.end();
+                        }
+                        fileContent.replace(start, end, "");
+                }
+                
                 HTMLEditorKit kit = new HTMLEditorKit();
                 HTMLDocument doc = (HTMLDocument) kit.createDefaultDocument();
-
                 JTextPane pane = new JTextPane();
                 pane.setEditorKit(kit);
                 pane.setDocument(doc);
                 View view = pane.getUI().getRootView(pane);
-
-                Reader reader = null;
-                String htmlPlain;
                 try {
-                        reader = new FileReader(resFile);
-                        kit.read(reader, doc, 0);
-                        reader.close();
+                        InputStream is = new ByteArrayInputStream(fileContent.toString().getBytes());
+                        kit.read(is, doc, 0);
+                        is.close();
 
-                        htmlPlain = doc.getText(0, doc.getLength());
                 } catch (BadLocationException e) {
                         throw new RuntimeException("Could not import HTML file", e);
                 } catch (IOException e) {
                         throw new RuntimeException("Could not import HTML file", e);
                 }
 
-                ImmHotText text = ImmHotText.createPlain(htmlPlain);
-
-                ApplyHtmlStylesUtility.applyStyles(text, view);
+      ImmHotText text = null;
                 
+                try {
+                        ApplyHtmlStylesUtility utility = new ApplyHtmlStylesUtility();
+                        text = utility.createStyled(view);
+                } catch (BadLocationException e) {
+                        throw new RuntimeException(e);
+                }
+                
                 return text;
+                
         }
 
 }

src/main/java/org/sophie2/extra/func/html/util/ApplyHtmlStylesUtility.java

@@ -1 +1 @@
 package org.sophie2.extra.func.html.util;
 
+import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.View;
 
+import org.sophie2.base.commons.structures.ImmDosTree;
+import org.sophie2.base.commons.structures.ImmTreeMap;
+import org.sophie2.base.commons.util.ImmColor;
+import org.sophie2.base.commons.util.ImmMap;
+import org.sophie2.base.commons.util.ImmMap.ImmEntry;
 import org.sophie2.base.model.text.HotAttr;
 import org.sophie2.base.model.text.smart.HotPos;
 import org.sophie2.base.model.text.smart.ImmHotText;
 import org.sophie2.base.model.text.smart.elements.CommonAttr;
 import org.sophie2.base.model.text.smart.position.HotInterval;
 import org.sophie2.base.model.text.smart.style.HotStyleDef;
+import org.sophie2.main.app.commons.element.ElementEntry;
 import org.sophie2.main.app.commons.util.AttributedPair;
-import org.sophie2.main.app.commons.util.TextManipulationUtility;
 
 /**
  * Helps adding the styles of the html document to the resulting HotText.
@@ -23 +30 @@
  * @author diana
  */
 public class ApplyHtmlStylesUtility {
-
+        private ImmMap<String, HotAttr<?>> htmlMap;
+        private ImmMap<String,Integer> hexMap;
         /**
+         * The default constructor;
+         */
+        public ApplyHtmlStylesUtility() {
+                this.htmlMap = new ImmTreeMap<String, HotAttr<?>>(
+                                new ImmDosTree<ImmEntry<String, HotAttr<?>>>());
+                this.htmlMap = this.htmlMap.put("font-size", CommonAttr.FONT_SIZE);
+                this.htmlMap = this.htmlMap.put("margin-left", CommonAttr.PARA_LEFT_INDENT);
+                this.htmlMap = this.htmlMap.put("margin-right", CommonAttr.PARA_RIGHT_INDENT);
+                this.htmlMap = this.htmlMap.put("margin-bottom", CommonAttr.PARA_SPACE_BELOW);
+                this.htmlMap = this.htmlMap.put("margin-top", CommonAttr.PARA_SPACE_ABOVE);
+                this.htmlMap = this.htmlMap.put("color", CommonAttr.FOREGROUND_COLOR);
+                //---------------
+                this.htmlMap = this.htmlMap.put("font-weight", CommonAttr.BOLD);
+                this.htmlMap = this.htmlMap.put("font-family", CommonAttr.FONT_FAMILY);
+                //--------------
+                this.hexMap = new ImmTreeMap<String,Integer>(
+                                new ImmDosTree<ImmEntry<String, Integer>>());
+                for(int i = 0;i<10;++i) {
+                        this.hexMap = this.hexMap.put(""+i, i);
+                }
+                this.hexMap = this.hexMap.put("A", 10);
+                this.hexMap = this.hexMap.put("B", 11);
+                this.hexMap = this.hexMap.put("C", 12);
+                this.hexMap = this.hexMap.put("D", 13);
+                this.hexMap = this.hexMap.put("E", 14);
+                this.hexMap = this.hexMap.put("F", 15);
+        }
+        
+        /**
          * Apply the styles for the html document.
          * 
-         * @param text
-         *            The HotText
          * @param view
-         *            The view with the html text.
+         *              The element with the html text.
+         * @return 
+         *                      The created styled text.
+         * 
+         * @throws BadLocationException
          */
-        public static void applyStyles(ImmHotText text, View view) {
+        public ImmHotText createStyled(View view) throws BadLocationException {
+
+                List<ElementEntry> entries = new ArrayList<ElementEntry>();
+                StringBuilder builder = new StringBuilder();
+
+                applyStyles(view, builder, entries);
+
+                ImmHotText newText = ImmHotText.createPlain(builder.toString());
+                HotPos curPos = newText.getBegin();
+
+                for (ElementEntry entry : entries) {
+                        int length = entry.getLength();
+                        HotInterval interval = new HotInterval(curPos, newText.advance(curPos, length));
+                        HotStyleDef def = HotStyleDef.getEmpty().derive(entry.getAttributes());
+                        newText = newText.applyStyle(interval, def);
+                        curPos = newText.advance(curPos, length);
+                }
+
+                return newText;
+        }
+        
+        
+        private void applyStyles( View view,StringBuilder builder,List<ElementEntry> entries) 
+        throws BadLocationException {
                 if (view.getViewCount() == 0) {
+                view.getDocument().getText(0, view.getDocument().getLength());
                         int begin = view.getElement().getStartOffset();
                         int end = view.getElement().getEndOffset();
-                        StringBuffer buffer = new StringBuffer();
-                        String stringToAppend = null;
-
-                        try {
-                                stringToAppend = view.getDocument().getText(begin, end - begin);
-                        } catch (BadLocationException e) {
-                                throw new RuntimeException(e);
-                        }
-
-                        if (stringToAppend != null) {
-                                buffer.append(stringToAppend);
-                                AttributeSet as = view.getAttributes();
-                                
-                                if (as != null) {
-                                        Enumeration<?> names = as.getAttributeNames();
-                                        Map<HotAttr<?>, Object> styleValues = new HashMap<HotAttr<?>, Object>();
-                                        while (names.hasMoreElements()) {
-                                                Object nm = names.nextElement();
-                                                AttributedPair<Object, Object> attr = 
-                                                        new AttributedPair<Object, Object>(nm,
-                                                                        as.getAttribute(nm));
-                                                
-                                                styleValues.put(CommonAttr.BOLD, true);
-                                                addCorrespondingValue(styleValues, attr);
-                                        }
-                                        HotStyleDef style = HotStyleDef.getEmpty().derive(styleValues);
-
-                                        TextManipulationUtility.addToEnd(text, buffer.toString());
-                                        HotPos textEnd = text.getEnd();
-                                        HotInterval interval = new HotInterval(text.advance(
-                                                        textEnd, - buffer.length()), textEnd);
-                                        text.applyStyle(interval, style);
-                                        buffer.replace(0, buffer.length(), "");
+                        String text = view.getDocument().getText(begin, end - begin);
+                        Map<HotAttr<?>, Object> styleValues = new HashMap<HotAttr<?>, Object>();
+                        AttributeSet set;
+                        
+                        for (set = view.getAttributes(); set != null; set = set.getResolveParent()) {
+                                Enumeration<?> names = set.getAttributeNames();
+                                while (names.hasMoreElements()) {
+                                        Object next = names.nextElement();
+                                        AttributedPair<Object, Object> attr = 
+                                                new AttributedPair<Object, Object>(next, set.getAttribute(next));
+                                        addCorrespondingValue(styleValues, attr);
+                                        
                                 }
                         }
+                        entries.add(new ElementEntry(text.length(), styleValues));
+                        builder.append(text);
                 }
                 for (int i = 0; i < view.getViewCount(); ++i) {
                         View child = view.getView(i);
-                        applyStyles(text, child);
+                         applyStyles(child,builder,entries);
                 }
         }
 
@@ -85 +129 @@
          * @param attr
          *          The attribute we are searching corresponding value for.
          */
-        public static void addCorrespondingValue(Map<HotAttr<?>, Object> styleValues,
+        public void addCorrespondingValue(Map<HotAttr<?>, Object> styleValues,
                         AttributedPair<Object, Object> attr) {
                 String key = attr.getKey().toString();
                 Object value = attr.getValue();
-                
-                if (key.equals("font-size")) {
+                Object res = null;
+                if ( "margin-left".equals(key) ||
+                                "margin-right".equals(key) || "margin-bottom".equals(key) ||
+                                "margin-top".equals(key)) {
+                        
                         try {
-                                int size = Integer.parseInt(value.toString());
-                                styleValues.put(CommonAttr.FONT_SIZE, 0f + size);
+                                res = Float.parseFloat(value.toString());
                         } catch (NumberFormatException e) {
                                 // Do nothing
                         }
-                } else if (key.equals("margin-left")) {
+                
+                } else if("font-size".equals(key)) {
                         try {
-                                float size = Float.parseFloat(value.toString());
-                                styleValues.put(CommonAttr.PARA_LEFT_INDENT, size);
+                                String val = value.toString();
+                                res = Float.parseFloat(val.substring(0,val.length()-2));
                         } catch (NumberFormatException e) {
                                 // Do nothing
+                                
                         }
-                } else if (key.equals("margin-right")) {
-                        try {
-                                float size = Float.parseFloat(value.toString());
-                                styleValues.put(CommonAttr.PARA_RIGHT_INDENT, size);
-                        } catch (NumberFormatException e) {
-                                // Do nothing
-                        }
-                } else if (key.equals("margin-bottom")) {
-                        try {
-                                float size = Float.parseFloat(value.toString());
-                                styleValues.put(CommonAttr.PARA_SPACE_BELOW, size);
-                        } catch (NumberFormatException e) {
-                                // Do nothing
-                        }
-                } else if (key.equals("margin-top")) {
-                        try {
-                                float size = Float.parseFloat(value.toString());
-                                styleValues.put(CommonAttr.PARA_SPACE_ABOVE, size);
-                        } catch (NumberFormatException e) {
-                                // Do nothing
-                        }
-                } else if (key.equals("color")) {
-                        // styleValues.put(CommonAttr.FOREGROUND_COLOR, (String) value);
+                }
+                else if (key.equals("color")) {
+                        res = getColor(value.toString());
                 } else if (key.equals("font-weight")) {
                         if (value.toString().equals("bold")) {
-                                styleValues.put(CommonAttr.BOLD, true);
+                                res = true;
                         }
-                } else if (key.equals("font-family")) {
-                        String family = value.toString();
-                        styleValues.put(CommonAttr.FONT_FAMILY, family);
-                } else if (key.equals("name")) {
-                        // TODO: add functionality
+                } else if ("font-family".equals(key)) {
+                        res = value.toString();
+                } 
+                
+                if (this.htmlMap.contains(key)) {
+                        if(res != null){
+                        styleValues.put(this.htmlMap.get(key), res);
+                        }
+                        
                 }
         }
+        
+        
+        private ImmColor getColor(String value) {
+                String r = value.substring(1,3);
+                String g = value.substring(3,5);
+                String b = value.substring(5,7);
+                return new ImmColor((float)(getComonentColor(r)/ 256.0),(float)(getComonentColor(g)/ 256.0),
+                                (float)(getComonentColor(b)/ 256.0));
+        }
+        
+        private int getComonentColor(String r) {
+                int res = 0;
+                for(int i = 0;i<r.length();++i) {
+                        char current = r.charAt(r.length() - i - 1);
+                        if(this.hexMap.contains(""+current)) {
+                        res += Math.pow(16,i)*this.hexMap.get(""+current);
+                        } else {
+                                return 0;
+                        }
+                }
+                return res;
+        }
+        
+        
 }