svn commit: r1571948 - in /pdfbox/trunk/pdfbox/src: main/java/org/apache/pdfbox/pdmodel/ main/java/org/apache/pdfbox/pdmodel/markedcontent/ main/java/org/apache/pdfbox/util/ test/java/org/apache/pdfbox/pdmodel/graphics/optional_content/ test/java/org/a...

[ja...@apache.org]

Author: jahewson
Date: Wed Feb 26 07:48:55 2014
New Revision: 1571948

URL: http://svn.apache.org/r1571948
Log:
Moved PDPropertyList into same package as PDResources

Added:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPropertyList.java
      - copied, changed from r1571939, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/markedcontent/PDPropertyList.java
Removed:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/markedcontent/
Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/LayerUtility.java
    pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/optional_content/TestOptionalContentGroups.java
    pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java

Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPropertyList.java (from r1571939, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/markedcontent/PDPropertyList.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPropertyList.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPropertyList.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/markedcontent/PDPropertyList.java&r1=1571939&r2=1571948&rev=1571948&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/markedcontent/PDPropertyList.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDPropertyList.java Wed Feb 26 07:48:55 2014
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pdfbox.pdmodel.markedcontent;
+package org.apache.pdfbox.pdmodel;
 
 import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSDictionary;

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java?rev=1571948&r1=1571947&r2=1571948&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java Wed Feb 26 07:48:55 2014
@@ -36,7 +36,6 @@ import org.apache.pdfbox.pdmodel.graphic
 import org.apache.pdfbox.pdmodel.graphics.shading.PDShading;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.apache.pdfbox.pdmodel.graphics.PDXObject;
-import org.apache.pdfbox.pdmodel.markedcontent.PDPropertyList;
 
 /**
  * This represents a set of resources available at the page/pages/stream level.

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/LayerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/LayerUtility.java?rev=1571948&r1=1571947&r2=1571948&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/LayerUtility.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/LayerUtility.java Wed Feb 26 07:48:55 2014
@@ -39,7 +39,7 @@ import org.apache.pdfbox.pdmodel.edit.PD
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.pdmodel.graphics.optional_content.PDOptionalContentGroup;
 import org.apache.pdfbox.pdmodel.graphics.optional_content.PDOptionalContentProperties;
-import org.apache.pdfbox.pdmodel.markedcontent.PDPropertyList;
+import org.apache.pdfbox.pdmodel.PDPropertyList;
 
 /**
  * This class allows to import pages as Form XObjects into a PDF file and use them to create

Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/optional_content/TestOptionalContentGroups.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/optional_content/TestOptionalContentGroups.java?rev=1571948&r1=1571947&r2=1571948&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/optional_content/TestOptionalContentGroups.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/graphics/optional_content/TestOptionalContentGroups.java Wed Feb 26 07:48:55 2014
@@ -33,7 +33,7 @@ import org.apache.pdfbox.pdmodel.edit.PD
 import org.apache.pdfbox.pdmodel.font.PDFont;
 import org.apache.pdfbox.pdmodel.font.PDType1Font;
 import org.apache.pdfbox.pdmodel.graphics.optional_content.PDOptionalContentProperties.BaseState;
-import org.apache.pdfbox.pdmodel.markedcontent.PDPropertyList;
+import org.apache.pdfbox.pdmodel.PDPropertyList;
 
 /**
  * Tests optional content group functionality (also called layers).

Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java?rev=1571948&r1=1571947&r2=1571948&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java Wed Feb 26 07:48:55 2014
@@ -36,7 +36,7 @@ import org.apache.pdfbox.pdmodel.font.PD
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.pdmodel.graphics.optional_content.PDOptionalContentGroup;
 import org.apache.pdfbox.pdmodel.graphics.optional_content.PDOptionalContentProperties;
-import org.apache.pdfbox.pdmodel.markedcontent.PDPropertyList;
+import org.apache.pdfbox.pdmodel.PDPropertyList;
 
 /**
  * Tests the {@link LayerUtility} class.