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/09/26 23:08:58 UTC
svn commit: r1627886 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox: contentstream/
contentstream/operator/state/ pdmodel/ pdmodel/graphics/pattern/
pdmodel/graphics/state/
Author: jahewson
Date: Fri Sep 26 21:08:58 2014
New Revision: 1627886
URL: http://svn.apache.org/r1627886
Log:
PDFBOX-2390: Corrected class name
Added:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExternalGraphicsState.java
- copied, changed from r1627869, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExtendedGraphicsState.java
Removed:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExtendedGraphicsState.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetGraphicsStateParameters.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDShadingPattern.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDGraphicsState.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java?rev=1627886&r1=1627885&r2=1627886&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFStreamEngine.java Fri Sep 26 21:08:58 2014
@@ -43,7 +43,7 @@ import org.apache.pdfbox.pdmodel.common.
import org.apache.pdfbox.pdmodel.font.PDFont;
import org.apache.pdfbox.pdmodel.font.PDFontFactory;
import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
-import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
+import org.apache.pdfbox.pdmodel.graphics.state.PDExternalGraphicsState;
import org.apache.pdfbox.pdmodel.graphics.state.PDGraphicsState;
import org.apache.pdfbox.pdmodel.graphics.PDXObject;
import org.apache.pdfbox.pdmodel.graphics.state.PDTextState;
@@ -562,7 +562,7 @@ public class PDFStreamEngine
/**
* @return Returns the graphicsStates.
*/
- public Map<String, PDExtendedGraphicsState> getGraphicsStates()
+ public Map<String, PDExternalGraphicsState> getGraphicsStates()
{
return streamResourcesStack.peek().getGraphicsStates();
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetGraphicsStateParameters.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetGraphicsStateParameters.java?rev=1627886&r1=1627885&r2=1627886&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetGraphicsStateParameters.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/state/SetGraphicsStateParameters.java Fri Sep 26 21:08:58 2014
@@ -20,7 +20,7 @@ import java.util.List;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
+import org.apache.pdfbox.pdmodel.graphics.state.PDExternalGraphicsState;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorProcessor;
@@ -38,7 +38,7 @@ public class SetGraphicsStateParameters
{
// set parameters from graphics state parameter dictionary
COSName graphicsName = (COSName)arguments.get( 0 );
- PDExtendedGraphicsState gs = context.getGraphicsStates().get( graphicsName.getName() );
+ PDExternalGraphicsState gs = context.getGraphicsStates().get( graphicsName.getName() );
gs.copyIntoGraphicsState( context.getGraphicsState() );
}
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=1627886&r1=1627885&r2=1627886&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 Fri Sep 26 21:08:58 2014
@@ -31,7 +31,7 @@ import org.apache.pdfbox.pdmodel.common.
import org.apache.pdfbox.pdmodel.common.COSObjectable;
import org.apache.pdfbox.pdmodel.font.PDFont;
import org.apache.pdfbox.pdmodel.font.PDFontFactory;
-import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
+import org.apache.pdfbox.pdmodel.graphics.state.PDExternalGraphicsState;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
import org.apache.pdfbox.pdmodel.graphics.pattern.PDAbstractPattern;
import org.apache.pdfbox.pdmodel.graphics.shading.PDShading;
@@ -53,7 +53,7 @@ public class PDResources implements COSO
private Map<String, PDXObject> xobjects = null;
private Map<PDXObject, String> xobjectMappings = null;
private HashMap<String, PDImageXObject> images = null;
- private Map<String, PDExtendedGraphicsState> graphicsStates = null;
+ private Map<String, PDExternalGraphicsState> graphicsStates = null;
private Map<String, PDAbstractPattern> patterns = null;
private Map<String, PDShading> shadings = null;
@@ -338,18 +338,18 @@ public class PDResources implements COSO
*
* @return The map of extended graphic state objects.
*/
- public Map<String, PDExtendedGraphicsState> getGraphicsStates()
+ public Map<String, PDExternalGraphicsState> getGraphicsStates()
{
if (graphicsStates == null)
{
COSDictionary states = (COSDictionary) resources.getDictionaryObject(COSName.EXT_G_STATE);
if (states != null)
{
- graphicsStates = new HashMap<String, PDExtendedGraphicsState>();
+ graphicsStates = new HashMap<String, PDExternalGraphicsState>();
for (COSName name : states.keySet())
{
COSDictionary dictionary = (COSDictionary) states.getDictionaryObject(name);
- graphicsStates.put(name.getName(), new PDExtendedGraphicsState(dictionary));
+ graphicsStates.put(name.getName(), new PDExternalGraphicsState(dictionary));
}
}
}
@@ -361,7 +361,7 @@ public class PDResources implements COSO
*
* @param states The new map of states.
*/
- public void setGraphicsStates(Map<String, PDExtendedGraphicsState> states)
+ public void setGraphicsStates(Map<String, PDExternalGraphicsState> states)
{
graphicsStates = states;
if (states != null)
@@ -371,7 +371,7 @@ public class PDResources implements COSO
while (iter.hasNext())
{
String name = (String) iter.next();
- PDExtendedGraphicsState state = states.get(name);
+ PDExternalGraphicsState state = states.get(name);
dic.setItem(COSName.getPDFName(name), state.getCOSObject());
}
resources.setItem(COSName.EXT_G_STATE, dic);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDShadingPattern.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDShadingPattern.java?rev=1627886&r1=1627885&r2=1627886&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDShadingPattern.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDShadingPattern.java Fri Sep 26 21:08:58 2014
@@ -24,7 +24,7 @@ import org.apache.pdfbox.cos.COSDictiona
import org.apache.pdfbox.cos.COSFloat;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSNumber;
-import org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState;
+import org.apache.pdfbox.pdmodel.graphics.state.PDExternalGraphicsState;
import org.apache.pdfbox.pdmodel.graphics.shading.PDShading;
import org.apache.pdfbox.util.Matrix;
@@ -34,7 +34,7 @@ import org.apache.pdfbox.util.Matrix;
*/
public class PDShadingPattern extends PDAbstractPattern
{
- private PDExtendedGraphicsState extendedGraphicsState;
+ private PDExternalGraphicsState extendedGraphicsState;
private PDShading shading;
private COSArray matrix = null;
@@ -107,14 +107,14 @@ public class PDShadingPattern extends PD
* This will get the extended graphics state for this pattern.
* @return The extended graphics state for this pattern.
*/
- public PDExtendedGraphicsState getExtendedGraphicsState()
+ public PDExternalGraphicsState getExtendedGraphicsState()
{
if (extendedGraphicsState == null)
{
COSDictionary dictionary = (COSDictionary)getCOSDictionary().getDictionaryObject( COSName.EXT_G_STATE );
if( dictionary != null )
{
- extendedGraphicsState = new PDExtendedGraphicsState( dictionary );
+ extendedGraphicsState = new PDExternalGraphicsState( dictionary );
}
}
return extendedGraphicsState;
@@ -124,7 +124,7 @@ public class PDShadingPattern extends PD
* This will set the extended graphics state for this pattern.
* @param extendedGraphicsState The new extended graphics state for this pattern.
*/
- public void setExtendedGraphicsState( PDExtendedGraphicsState extendedGraphicsState )
+ public void setExtendedGraphicsState( PDExternalGraphicsState extendedGraphicsState )
{
this.extendedGraphicsState = extendedGraphicsState;
if (extendedGraphicsState != null)
Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExternalGraphicsState.java (from r1627869, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExtendedGraphicsState.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExternalGraphicsState.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExternalGraphicsState.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExtendedGraphicsState.java&r1=1627869&r2=1627886&rev=1627886&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExtendedGraphicsState.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDExternalGraphicsState.java Fri Sep 26 21:08:58 2014
@@ -30,13 +30,11 @@ import org.apache.pdfbox.pdmodel.graphic
import org.apache.pdfbox.pdmodel.graphics.blend.BlendMode;
/**
- * This class represents the graphics state dictionary that is stored in the PDF document.
- * The PDGraphicsStateValue holds the current runtime values as a stream is being executed.
+ * An external graphics state dictionary.
*
- * @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
- * @version $Revision: 1.5 $
+ * @author Ben Litchfield
*/
-public class PDExtendedGraphicsState implements COSObjectable
+public class PDExternalGraphicsState implements COSObjectable
{
/**
* Rendering intent constants, see PDF Reference 1.5 Section 4.5.4 Rendering Intents.
@@ -61,7 +59,7 @@ public class PDExtendedGraphicsState imp
/**
* Default constructor, creates blank graphics state.
*/
- public PDExtendedGraphicsState()
+ public PDExternalGraphicsState()
{
graphicsState = new COSDictionary();
graphicsState.setItem( COSName.TYPE, COSName.EXT_G_STATE );
@@ -72,7 +70,7 @@ public class PDExtendedGraphicsState imp
*
* @param dictionary The existing graphics state.
*/
- public PDExtendedGraphicsState( COSDictionary dictionary )
+ public PDExternalGraphicsState(COSDictionary dictionary)
{
graphicsState = dictionary;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDGraphicsState.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDGraphicsState.java?rev=1627886&r1=1627885&r2=1627886&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDGraphicsState.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDGraphicsState.java Fri Sep 26 21:08:58 2014
@@ -430,7 +430,7 @@ public class PDGraphicsState implements
/**
* This will get the rendering intent.
*
- * @see org.apache.pdfbox.pdmodel.graphics.state.PDExtendedGraphicsState
+ * @see PDExternalGraphicsState
*
* @return The rendering intent
*/