You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2014/02/26 01:09:37 UTC
svn commit: r1571874 - in /pdfbox/trunk:
pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/
tools/src/main/java/org/apache/pdfbox/tools/
tools/src/main/java/org/apache/pdfbox/tools/gui/
Author: jahewson
Date: Wed Feb 26 00:09:37 2014
New Revision: 1571874
URL: http://svn.apache.org/r1571874
Log:
Moved more Swing PDFReader classes to pdf-tools
Added:
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/ArrayEntry.java
- copied, changed from r1571869, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/ArrayEntry.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/MapEntry.java
- copied, changed from r1571869, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/MapEntry.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFPagePanel.java
- copied, changed from r1571869, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PDFPagePanel.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFTreeCellRenderer.java
- copied, changed from r1571869, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PDFTreeCellRenderer.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFTreeModel.java
- copied, changed from r1571869, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PDFTreeModel.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PageWrapper.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/ReaderBottomPanel.java
- copied, changed from r1571869, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/ReaderBottomPanel.java
Removed:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/ArrayEntry.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/MapEntry.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PDFPagePanel.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PDFTreeCellRenderer.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PDFTreeModel.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/ReaderBottomPanel.java
Modified:
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFDebugger.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFReader.java
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFDebugger.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFDebugger.java?rev=1571874&r1=1571873&r2=1571874&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFDebugger.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFDebugger.java Wed Feb 26 00:09:37 2014
@@ -18,10 +18,10 @@ package org.apache.pdfbox.tools;
import org.apache.pdfbox.exceptions.InvalidPasswordException;
-import org.apache.pdfbox.pdfviewer.PDFTreeModel;
-import org.apache.pdfbox.pdfviewer.PDFTreeCellRenderer;
-import org.apache.pdfbox.pdfviewer.ArrayEntry;
-import org.apache.pdfbox.pdfviewer.MapEntry;
+import org.apache.pdfbox.tools.gui.PDFTreeModel;
+import org.apache.pdfbox.tools.gui.PDFTreeCellRenderer;
+import org.apache.pdfbox.tools.gui.ArrayEntry;
+import org.apache.pdfbox.tools.gui.MapEntry;
import org.apache.pdfbox.pdmodel.PDDocument;
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFReader.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFReader.java?rev=1571874&r1=1571873&r2=1571874&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFReader.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFReader.java Wed Feb 26 00:09:37 2014
@@ -37,8 +37,9 @@ import javax.swing.KeyStroke;
import javax.swing.border.LineBorder;
import org.apache.pdfbox.exceptions.InvalidPasswordException;
-import org.apache.pdfbox.pdfviewer.PDFPagePanel;
-import org.apache.pdfbox.pdfviewer.ReaderBottomPanel;
+import org.apache.pdfbox.tools.gui.PDFPagePanel;
+import org.apache.pdfbox.tools.gui.PageWrapper;
+import org.apache.pdfbox.tools.gui.ReaderBottomPanel;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDPageable;
@@ -412,70 +413,4 @@ public class PDFReader extends JFrame
+ " -nonSeq Enables the new non-sequential parser\n"
+ " <input-file> The PDF document to be loaded\n");
}
-
- /**
- * A class to handle some prettyness around a single PDF page.
- * @author Ben Litchfield
- */
- private static class PageWrapper implements MouseMotionListener
- {
- private JPanel pageWrapper = new JPanel();
- private PDFPagePanel pagePanel = null;
- private PDFReader reader = null;
-
- private static final int SPACE_AROUND_DOCUMENT = 20;
-
- /**
- * Constructor.
- * @param aReader The reader application that holds this page.
- * @throws IOException If there is an error creating the page drawing objects.
- */
- public PageWrapper(PDFReader aReader) throws IOException
- {
- reader = aReader;
- pagePanel = new PDFPagePanel();
- pageWrapper.setLayout(null);
- pageWrapper.add(pagePanel);
- pagePanel.setLocation(SPACE_AROUND_DOCUMENT, SPACE_AROUND_DOCUMENT);
- pageWrapper.setBorder(LineBorder.createBlackLineBorder());
- pagePanel.addMouseMotionListener(this);
- }
-
- /**
- * This will display the PDF page in this component.
- * @param page The PDF page to display.
- */
- public void displayPage(PDPage page)
- {
- pagePanel.setPage(page);
- pagePanel.setPreferredSize(pagePanel.getSize());
- Dimension d = pagePanel.getSize();
- d.width+=(SPACE_AROUND_DOCUMENT*2);
- d.height+=(SPACE_AROUND_DOCUMENT*2);
-
- pageWrapper.setPreferredSize(d);
- pageWrapper.validate();
- }
-
- /**
- * This will get the JPanel that can be displayed.
- * @return The panel with the displayed PDF page.
- */
- public JPanel getPanel()
- {
- return pageWrapper;
- }
-
- @Override
- public void mouseDragged(MouseEvent e)
- {
- //do nothing when mouse moves.
- }
-
- @Override
- public void mouseMoved(MouseEvent e)
- {
- reader.getBottomStatusPanel().getStatusLabel().setText(e.getX() + "," + e.getY());
- }
- }
}
Copied: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/ArrayEntry.java (from r1571869, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/ArrayEntry.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/ArrayEntry.java?p2=pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/ArrayEntry.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/ArrayEntry.java&r1=1571869&r2=1571874&rev=1571874&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/ArrayEntry.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/ArrayEntry.java Wed Feb 26 00:09:37 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.pdfviewer;
+package org.apache.pdfbox.tools.gui;
/**
* This is a simple class that will contain an index and a value.
Copied: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/MapEntry.java (from r1571869, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/MapEntry.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/MapEntry.java?p2=pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/MapEntry.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/MapEntry.java&r1=1571869&r2=1571874&rev=1571874&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/MapEntry.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/MapEntry.java Wed Feb 26 00:09:37 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.pdfviewer;
+package org.apache.pdfbox.tools.gui;
import org.apache.pdfbox.cos.COSName;
Copied: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFPagePanel.java (from r1571869, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PDFPagePanel.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFPagePanel.java?p2=pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFPagePanel.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PDFPagePanel.java&r1=1571869&r2=1571874&rev=1571874&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PDFPagePanel.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFPagePanel.java Wed Feb 26 00:09:37 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.pdfviewer;
+package org.apache.pdfbox.tools.gui;
import java.awt.Dimension;
import java.awt.Graphics;
@@ -24,6 +24,7 @@ import java.io.IOException;
import javax.swing.JPanel;
+import org.apache.pdfbox.pdfviewer.PageDrawer;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.common.PDRectangle;
Copied: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFTreeCellRenderer.java (from r1571869, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PDFTreeCellRenderer.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFTreeCellRenderer.java?p2=pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFTreeCellRenderer.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PDFTreeCellRenderer.java&r1=1571869&r2=1571874&rev=1571874&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PDFTreeCellRenderer.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFTreeCellRenderer.java Wed Feb 26 00:09:37 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.pdfviewer;
+package org.apache.pdfbox.tools.gui;
import java.awt.Component;
@@ -59,7 +59,7 @@ public class PDFTreeCellRenderer extends
private Object convertToTreeObject( Object nodeValue )
{
- if( nodeValue instanceof MapEntry )
+ if( nodeValue instanceof MapEntry)
{
MapEntry entry = (MapEntry)nodeValue;
COSName key = (COSName)entry.getKey();
@@ -82,7 +82,7 @@ public class PDFTreeCellRenderer extends
{
nodeValue = ((COSName)nodeValue).getName();
}
- else if( nodeValue instanceof ArrayEntry )
+ else if( nodeValue instanceof ArrayEntry)
{
ArrayEntry entry = (ArrayEntry)nodeValue;
nodeValue = "[" + entry.getIndex() + "]" + convertToTreeObject( entry.getValue() );
Copied: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFTreeModel.java (from r1571869, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PDFTreeModel.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFTreeModel.java?p2=pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFTreeModel.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PDFTreeModel.java&r1=1571869&r2=1571874&rev=1571874&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PDFTreeModel.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFTreeModel.java Wed Feb 26 00:09:37 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.pdfviewer;
+package org.apache.pdfbox.tools.gui;
/**
* A tree model that uses a cos document.
Added: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PageWrapper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PageWrapper.java?rev=1571874&view=auto
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PageWrapper.java (added)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PageWrapper.java Wed Feb 26 00:09:37 2014
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.pdfbox.tools.gui;
+
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.tools.PDFReader;
+
+import javax.swing.JPanel;
+import javax.swing.border.LineBorder;
+import java.awt.Dimension;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
+import java.io.IOException;
+
+
+/**
+ * A class to handle some prettyness around a single PDF page.
+ * @author Ben Litchfield
+ */
+public class PageWrapper implements MouseMotionListener
+{
+ private JPanel pageWrapper = new JPanel();
+ private PDFPagePanel pagePanel = null;
+ private PDFReader reader = null;
+
+ private static final int SPACE_AROUND_DOCUMENT = 20;
+
+ /**
+ * Constructor.
+ * @param aReader The reader application that holds this page.
+ * @throws IOException If there is an error creating the page drawing objects.
+ */
+ public PageWrapper(PDFReader aReader) throws IOException
+ {
+ reader = aReader;
+ pagePanel = new PDFPagePanel();
+ pageWrapper.setLayout(null);
+ pageWrapper.add(pagePanel);
+ pagePanel.setLocation(SPACE_AROUND_DOCUMENT, SPACE_AROUND_DOCUMENT);
+ pageWrapper.setBorder(LineBorder.createBlackLineBorder());
+ pagePanel.addMouseMotionListener(this);
+ }
+
+ /**
+ * This will display the PDF page in this component.
+ * @param page The PDF page to display.
+ */
+ public void displayPage(PDPage page)
+ {
+ pagePanel.setPage(page);
+ pagePanel.setPreferredSize(pagePanel.getSize());
+ Dimension d = pagePanel.getSize();
+ d.width+=(SPACE_AROUND_DOCUMENT*2);
+ d.height+=(SPACE_AROUND_DOCUMENT*2);
+
+ pageWrapper.setPreferredSize(d);
+ pageWrapper.validate();
+ }
+
+ /**
+ * This will get the JPanel that can be displayed.
+ * @return The panel with the displayed PDF page.
+ */
+ public JPanel getPanel()
+ {
+ return pageWrapper;
+ }
+
+ @Override
+ public void mouseDragged(MouseEvent e)
+ {
+ //do nothing when mouse moves.
+ }
+
+ @Override
+ public void mouseMoved(MouseEvent e)
+ {
+ reader.getBottomStatusPanel().getStatusLabel().setText(e.getX() + "," + e.getY());
+ }
+}
\ No newline at end of file
Copied: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/ReaderBottomPanel.java (from r1571869, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/ReaderBottomPanel.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/ReaderBottomPanel.java?p2=pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/ReaderBottomPanel.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/ReaderBottomPanel.java&r1=1571869&r2=1571874&rev=1571874&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/ReaderBottomPanel.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/ReaderBottomPanel.java Wed Feb 26 00:09:37 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.pdfviewer;
+package org.apache.pdfbox.tools.gui;
import java.awt.Dimension;