Changeset 1666 for trunk

Timestamp:

09/20/11 12:01:22 (8 months ago)

Author:

jharrop

Message:

Note about the need for color mapping.

File:

• trunk/docx4j/src/main/java/org/docx4j/model/properties/run/HighlightColor.java (modified) (5 diffs)

trunk/docx4j/src/main/java/org/docx4j/model/properties/run/HighlightColor.java

@@ -20 +20 @@
 package org.docx4j.model.properties.run;
 
-import org.docx4j.UnitsOfMeasurement;
 import org.docx4j.jaxb.Context;
-import org.docx4j.wml.CTShd;
 import org.docx4j.wml.Highlight;
 import org.docx4j.wml.RPr;
 import org.w3c.dom.Element;
-import org.w3c.dom.css.CSSPrimitiveValue;
 import org.w3c.dom.css.CSSValue;
 
@@ -34 +31 @@
         public final static String FO_NAME  = "background-color"; 
         
+        /*
+         * TODO: this class assumes that the
+         * colors specified in org.docx4j.wml.Highlight
+         * are valid CSS and XSL colors, and
+         * vice versa.
+         * 
+         * Someone needs to add handling/mappings for when
+         * this is not the case.
+         */
         
         public HighlightColor(Highlight shading) {
@@ -41 +47 @@
         public HighlightColor(CSSValue value) { 
                 
-                CTShd shd = Context.getWmlObjectFactory().createCTShd();
-
-                // PrimitiveType 25 -> RGBCOLOR
-                short ignored = 1;
-
-                CSSPrimitiveValue cssPrimitiveValue = (CSSPrimitiveValue)value;
-                float fRed = cssPrimitiveValue.getRGBColorValue().getRed().getFloatValue(ignored); 
-                float fGreen = cssPrimitiveValue.getRGBColorValue().getGreen().getFloatValue(ignored); 
-                float fBlue = cssPrimitiveValue.getRGBColorValue().getBlue().getFloatValue(ignored); 
-                
-                shd.setFill(UnitsOfMeasurement.rgbTripleToHex(fRed, fGreen, fBlue)  );
-
+                Highlight shd = Context.getWmlObjectFactory().createHighlight();                
+                shd.setVal(value.getCssText());
                 this.setObject( shd  );
         }
@@ -61 +57 @@
                 Highlight shd = ((Highlight)this.getObject());
                 
-                // TODO
-                // STShd styleVal = shd.getVal();  
-
-//              if (shd.getColor()!=null &&
-//                              !shd.getColor().equals("auto")) {
-//                      log.warn("TODO support w:shd/@w:color=" + shd.getColor() );
-//              }
-                
-                // We just support fill color right now
                 if (shd.getVal()!=null &&
-                !shd.getVal().equals("auto")) {
+                !shd.getVal().equals("none")) {
                         return composeCss(CSS_NAME, shd.getVal() );
                 } else {
                         return CSS_NULL;
                 }
-                
-//              if (shd.getFill()!=null &&
-//                              !shd.getFill().equals("auto")) {
-//                      return composeCss(CSS_NAME, "#" + shd.getFill() );
-//              } else {
-//                      return CSS_NULL;
-//              }
-                
         }
 
@@ -92 +71 @@
                 Highlight shd = ((Highlight)this.getObject());
                 
-                // TODO
-                // STShd styleVal = shd.getVal();  
-
-//              if (shd.getColor()!=null &&
-//                              !shd.getColor().equals("auto")) {
-//                      log.warn("TODO support w:shd/@w:color=" + shd.getColor() );
-//              }
-                
-                // We just support fill color right now
                 if (shd.getVal()!=null &&
-                                !shd.getVal().equals("auto")) {
+                                !shd.getVal().equals("none")) {
                         foElement.setAttribute(FO_NAME, shd.getVal() );
                 } 
                 
-//              if (shd.getFill()!=null &&
-//                              !shd.getFill().equals("auto")) {
-//                      foElement.setAttribute(FO_NAME, "#" + shd.getFill() );
-//              } 
         }