Changeset 776


Ignore:
Timestamp:
04/06/09 15:52:16 (3 years ago)
Author:
jharrop
Message:

Renamed package out.xmlPackage to out.FlatOpcXml?
Renamed XmlPackageCreator? to FlatOpcXmlCreator?

Location:
trunk/docx4j/src/main/java/org/docx4j
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/docx4j/src/main/java/org/docx4j/convert/in/FlatOpcXmlImporter.java

    r771 r776  
    484484                // Ok, now spit it out again 
    485485                         
    486                 org.docx4j.convert.out.xmlPackage.XmlPackageCreator outWorker  
    487                         = new org.docx4j.convert.out.xmlPackage.XmlPackageCreator(wordMLPackage); 
     486                org.docx4j.convert.out.flatOpcXml.FlatOpcXmlCreator outWorker  
     487                        = new org.docx4j.convert.out.flatOpcXml.FlatOpcXmlCreator(wordMLPackage); 
    488488                 
    489489                org.docx4j.xmlPackage.Package result = outWorker.get(); 

  • trunk/docx4j/src/main/java/org/docx4j/convert/out/html/AbstractHtmlExporter.java

    r756 r776  
    2525import org.docx4j.convert.out.ConvertUtils; 
    2626import org.docx4j.convert.out.Output; 
    27 import org.docx4j.convert.out.xmlPackage.XmlPackageCreator; 
     27import org.docx4j.convert.out.flatOpcXml.FlatOpcXmlCreator; 
    2828import org.docx4j.fonts.Mapper; 
    2929import org.docx4j.fonts.BestMatchingMapper; 

  • trunk/docx4j/src/main/java/org/docx4j/convert/out/html/HtmlExporter.java

    r753 r776  
    2424import org.docx4j.XmlUtils; 
    2525import org.docx4j.convert.out.Output; 
    26 import org.docx4j.convert.out.xmlPackage.XmlPackageCreator; 
     26import org.docx4j.convert.out.flatOpcXml.FlatOpcXmlCreator; 
    2727import org.docx4j.fonts.Mapper; 
    2828import org.docx4j.fonts.BestMatchingMapper; 
    … …  
    151151         *  
    152152         */      
    153                 XmlPackageCreator worker = new XmlPackageCreator(wmlPackage); 
     153                FlatOpcXmlCreator worker = new FlatOpcXmlCreator(wmlPackage); 
    154154                org.docx4j.xmlPackage.Package pkg = worker.get(); 
    155155 

  • trunk/docx4j/src/main/java/org/docx4j/convert/out/html/HtmlExporterNG.java

    r767 r776  
    3030import org.docx4j.XmlUtils; 
    3131import org.docx4j.convert.out.Output; 
    32 import org.docx4j.convert.out.xmlPackage.XmlPackageCreator; 
     32import org.docx4j.convert.out.flatOpcXml.FlatOpcXmlCreator; 
    3333import org.docx4j.fonts.Mapper; 
    3434import org.docx4j.fonts.BestMatchingMapper; 

  • trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/WordprocessingMLPackage.java

    r771 r776  
    3939import org.apache.log4j.Logger; 
    4040import org.docx4j.XmlUtils; 
    41 import org.docx4j.convert.out.xmlPackage.XmlPackageCreator; 
     41import org.docx4j.convert.out.flatOpcXml.FlatOpcXmlCreator; 
    4242import org.docx4j.fonts.BestMatchingMapper; 
    4343import org.docx4j.fonts.IdentityPlusMapper; 
    … …  
    209209        // Prepare in the input document 
    210210         
    211                 XmlPackageCreator worker = new XmlPackageCreator(this); 
     211                FlatOpcXmlCreator worker = new FlatOpcXmlCreator(this); 
    212212                org.docx4j.xmlPackage.Package pkg = worker.get(); 
    213213         

  • trunk/docx4j/src/main/java/org/docx4j/samples/AddImage.java

    r604 r776  
    5151                 
    5252                 
    53                 //File file = new File("/home/dev/lanl/testing/fig1.pdf" ); 
    54                 File file = new File("C:\\Documents and Settings\\Jason Harrop\\My Documents\\LANL\\fig1.pdf" ); 
     53                File file = new File("/home/dev/lanl/testing/fig1.pdf" ); 
     54                //File file = new File("C:\\Documents and Settings\\Jason Harrop\\My Documents\\LANL\\fig1.pdf" ); 
    5555                 
    5656                // Our utility method wants that as a byte array 
    … …  
    8787                // Now add our p to the document 
    8888                wordMLPackage.getMainDocumentPart().addObject(p); 
     89 
     90        org.docx4j.wml.P p2 = newImage( wordMLPackage, bytes,  
     91                        filenameHint, altText,  
     92                        id1, id2, 3000 ); 
    8993         
     94                // Now add our p to the document 
     95                wordMLPackage.getMainDocumentPart().addObject(p2); 
     96 
     97        org.docx4j.wml.P p3 = newImage( wordMLPackage, bytes,  
     98                        filenameHint, altText,  
     99                        id1, id2, 6000 ); 
     100         
     101                // Now add our p to the document 
     102                wordMLPackage.getMainDocumentPart().addObject(p3); 
     103                 
     104                 
    90105                // Now save it  
    91106                wordMLPackage.save(new java.io.File(System.getProperty("user.dir") + "/result.docx") ); 
    … …  
    94109                                 
    95110        } 
    96          
     111 
    97112        public static org.docx4j.wml.P newImage( WordprocessingMLPackage wordMLPackage, 
    98113                        byte[] bytes, 
    … …  
    117132                 
    118133        }        
     134         
     135        public static org.docx4j.wml.P newImage( WordprocessingMLPackage wordMLPackage, 
     136                        byte[] bytes, 
     137                        String filenameHint, String altText,  
     138                        int id1, int id2, long cx) throws Exception { 
     139                 
     140        BinaryPartAbstractImage imagePart = BinaryPartAbstractImage.createImagePart(wordMLPackage, bytes); 
     141                 
     142        Inline inline = imagePart.createImageInline( filenameHint, altText,  
     143                        id1, id2, cx); 
     144         
     145        // Now add the inline in w:p/w:r/w:drawing 
     146                org.docx4j.wml.ObjectFactory factory = new org.docx4j.wml.ObjectFactory(); 
     147                org.docx4j.wml.P  p = factory.createP(); 
     148                org.docx4j.wml.R  run = factory.createR();               
     149                p.getParagraphContent().add(run);         
     150                org.docx4j.wml.Drawing drawing = factory.createDrawing();                
     151                run.getRunContent().add(drawing);                
     152                drawing.getAnchorOrInline().add(inline); 
     153                 
     154                return p; 
     155                 
     156        }        
    119157} 

  • trunk/docx4j/src/main/java/org/docx4j/samples/CreateHtml.java

    r761 r776  
    5959                                                new javax.xml.transform.stream.StreamSource(new FileInputStream(inputfilepath)))).getValue();  
    6060 
    61                                 org.docx4j.convert.in.XmlPackageImporter xmlPackage = new org.docx4j.convert.in.XmlPackageImporter( wmlPackageEl);  
     61                                org.docx4j.convert.in.FlatOpcXmlImporter xmlPackage = new org.docx4j.convert.in.FlatOpcXmlImporter( wmlPackageEl);  
    6262 
    6363                                wordMLPackage = (WordprocessingMLPackage)xmlPackage.get();  

  • trunk/docx4j/src/main/java/org/docx4j/samples/ExportInPackageFormat.java

    r771 r776  
    2828import javax.xml.bind.Marshaller; 
    2929 
    30 import org.docx4j.convert.out.xmlPackage.XmlPackageCreator; 
     30import org.docx4j.convert.out.flatOpcXml.FlatOpcXmlCreator; 
    3131import org.docx4j.jaxb.Context; 
    3232import org.docx4j.openpackaging.packages.WordprocessingMLPackage; 
    … …  
    5656                 
    5757                // Create a org.docx4j.wml.Package object 
    58                 XmlPackageCreator worker = new XmlPackageCreator(wmlPackage); 
     58                FlatOpcXmlCreator worker = new FlatOpcXmlCreator(wmlPackage); 
    5959                org.docx4j.xmlPackage.Package pkg = worker.get(); 
    6060         

  • trunk/docx4j/src/main/java/org/docx4j/samples/Filter.java

    r771 r776  
    2828import javax.xml.bind.Marshaller; 
    2929 
    30 import org.docx4j.convert.out.xmlPackage.XmlPackageCreator; 
     30import org.docx4j.convert.out.flatOpcXml.FlatOpcXmlCreator; 
    3131import org.docx4j.jaxb.Context; 
    3232import org.docx4j.openpackaging.packages.WordprocessingMLPackage; 
    … …  
    6161                 
    6262                // Create a org.docx4j.wml.Package object 
    63                 XmlPackageCreator worker = new XmlPackageCreator(wmlPackage); 
     63                FlatOpcXmlCreator worker = new FlatOpcXmlCreator(wmlPackage); 
    6464                org.docx4j.xmlPackage.Package pkg = worker.get(); 
    6565         

  • trunk/docx4j/src/main/java/org/docx4j/samples/ImportForeignPart.java

    r771 r776  
    3434 
    3535import org.docx4j.JcrNodeMapper.NodeMapper; 
    36 import org.docx4j.convert.out.xmlPackage.XmlPackageCreator; 
     36import org.docx4j.convert.out.flatOpcXml.FlatOpcXmlCreator; 
    3737import org.docx4j.dml.Inline; 
    3838import org.docx4j.docProps.extended.Properties; 
Note: See TracChangeset for help on using the changeset viewer.