Changeset 1050 for trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages

Timestamp:

01/19/10 01:37:32 (2 years ago)

Author:

jharrop

Message:

Renamed Package -> OpcPackage?;
Additional pptx parts.

Location:

trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages

Files:

• OpcPackage.java (moved) (moved from trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/Package.java) (5 diffs)
• WordprocessingMLPackage.java (modified) (2 diffs)

trunk/docx4j/src/main/java/org/docx4j/openpackaging/packages/OpcPackage.java

@@ -58 +58 @@
  * @author Jason Harrop
  */
-public class Package extends Base {
-
-        private static Logger log = Logger.getLogger(Package.class);
+public class OpcPackage extends Base {
+
+        private static Logger log = Logger.getLogger(OpcPackage.class);
 
         /**
@@ -108 +108 @@
          * 
          */
-        public Package() {
+        public OpcPackage() {
                 try {
                         partName = new PartName("/", false);
@@ -125 +125 @@
          *            The content type manager to use 
          */
-        public Package(ContentTypeManager contentTypeManager) {
+        public OpcPackage(ContentTypeManager contentTypeManager) {
                 try {
                         partName = new PartName("/", false);
@@ -136 +136 @@
         }
         
-        public Package getPackage() {
+        public OpcPackage getPackage() {
                 return this;
         }
@@ -156 +156 @@
          *            The docx file 
          */     
-        public static Package load(java.io.File docxFile) throws Docx4JException {
+        public static OpcPackage load(java.io.File docxFile) throws Docx4JException {
                 
                 if (docxFile.getName().endsWith(".xml")) {

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

@@ -77 +77 @@
  *
  */
-public class WordprocessingMLPackage extends Package {
+public class WordprocessingMLPackage extends OpcPackage {
         
         // What is a Word document these days?
@@ -161 +161 @@
         public static WordprocessingMLPackage load(java.io.File docxFile) throws Docx4JException {
                 
-                return (WordprocessingMLPackage)Package.load(docxFile);
+                return (WordprocessingMLPackage)OpcPackage.load(docxFile);
         }