svn commit: r1657733 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox: pdmodel/interactive/form/ service/

[ja...@apache.org]

Author: jahewson
Date: Fri Feb  6 01:16:35 2015
New Revision: 1657733

URL: http://svn.apache.org/r1657733
Log:
PDFBOX-2580: Move PDAppearanceString and helpers back into the pdmodel.interactive.form package

Added:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGenerator.java
      - copied, changed from r1657665, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/service/interactive/form/AppearanceGenerator.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/DefaultAppearanceHandler.java
      - copied, changed from r1657665, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/service/interactive/form/DefaultAppearanceHandler.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAppearanceString.java
      - copied, changed from r1657665, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/service/interactive/form/PDAppearanceString.java
Removed:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/service/
Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java

Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGenerator.java (from r1657665, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/service/interactive/form/AppearanceGenerator.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGenerator.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGenerator.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/service/interactive/form/AppearanceGenerator.java&r1=1657665&r2=1657733&rev=1657733&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/service/interactive/form/AppearanceGenerator.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGenerator.java Fri Feb  6 01:16:35 2015
@@ -14,26 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pdfbox.service.interactive.form;
+package org.apache.pdfbox.pdmodel.interactive.form;
 
 import java.io.IOException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.pdfbox.pdmodel.common.PDTextStream;
-import org.apache.pdfbox.pdmodel.interactive.form.PDField;
-import org.apache.pdfbox.pdmodel.interactive.form.PDVariableText;
 
 /**
  * (Re-) Generate the appearance for a field.
  * 
  * The fields appearance defines the 'look' the field has when it's rendered for display or printing.
- * 
  */
-
-public final class AppearanceGenerator
+class AppearanceGenerator
 {
-
     private static final Log LOG = LogFactory.getLog(AppearanceGenerator.class);
 
     private AppearanceGenerator()

Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/DefaultAppearanceHandler.java (from r1657665, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/service/interactive/form/DefaultAppearanceHandler.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/DefaultAppearanceHandler.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/DefaultAppearanceHandler.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/service/interactive/form/DefaultAppearanceHandler.java&r1=1657665&r2=1657733&rev=1657733&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/service/interactive/form/DefaultAppearanceHandler.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/DefaultAppearanceHandler.java Fri Feb  6 01:16:35 2015
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pdfbox.service.interactive.form;
+package org.apache.pdfbox.pdmodel.interactive.form;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -39,15 +39,14 @@ import org.apache.pdfbox.pdfparser.PDFSt
  * 
  * <p>
  * <strong>Currently only the Tf operator is abstracted through this class!</strong>
- * </p> 
- * 
+ * </p>
  */
 class DefaultAppearanceHandler
 {
     /**
      * The tokens making up the content of the default appearance string.
      */
-    List<Object> appearanceTokens;
+    private List<Object> appearanceTokens;
     
     DefaultAppearanceHandler(String defaultApperanceString) throws IOException
     {

Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAppearanceString.java (from r1657665, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/service/interactive/form/PDAppearanceString.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAppearanceString.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAppearanceString.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/service/interactive/form/PDAppearanceString.java&r1=1657665&r2=1657733&rev=1657733&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/service/interactive/form/PDAppearanceString.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAppearanceString.java Fri Feb  6 01:16:35 2015
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pdfbox.service.interactive.form;
+package org.apache.pdfbox.pdmodel.interactive.form;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -43,10 +43,6 @@ import org.apache.pdfbox.pdmodel.interac
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceEntry;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceStream;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget;
-import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
-import org.apache.pdfbox.pdmodel.interactive.form.PDField;
-import org.apache.pdfbox.pdmodel.interactive.form.PDTextField;
-import org.apache.pdfbox.pdmodel.interactive.form.PDVariableText;
 import org.apache.pdfbox.contentstream.operator.Operator;
 
 /**

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java?rev=1657733&r1=1657732&r2=1657733&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDField.java Fri Feb  6 01:16:35 2015
@@ -22,7 +22,6 @@ import org.apache.pdfbox.cos.COSDictiona
 import org.apache.pdfbox.cos.COSInteger;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.interactive.action.PDFormFieldAdditionalActions;
-import org.apache.pdfbox.service.interactive.form.AppearanceGenerator;
 
 /**
  * A field in an interactive form.