From 37ba6a47212ed1f79008d83fc1c088399d9bccbd Mon Sep 17 00:00:00 2001 From: Adrian Cumiskey Date: Mon, 21 Jul 2008 15:42:52 +0000 Subject: [PATCH] Renamed method canBeIncluded() to isIncludable(). git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@678453 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/render/afp/DataObjectCache.java | 2 +- src/java/org/apache/fop/render/afp/modca/AFPDataStream.java | 2 +- src/java/org/apache/fop/render/afp/modca/DataObjectFactory.java | 2 +- src/java/org/apache/fop/render/afp/modca/Registry.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/org/apache/fop/render/afp/DataObjectCache.java b/src/java/org/apache/fop/render/afp/DataObjectCache.java index 85b9f1893..ee684db6f 100644 --- a/src/java/org/apache/fop/render/afp/DataObjectCache.java +++ b/src/java/org/apache/fop/render/afp/DataObjectCache.java @@ -157,7 +157,7 @@ public final class DataObjectCache { public Record store(DataObjectInfo dataObjectInfo) { Record record = null; Registry.ObjectType objectType = dataObjectInfo.getObjectType(); - if (objectType == null || !objectType.canBeIncluded()) { + if (objectType == null || !objectType.isIncludable()) { AbstractNamedAFPObject dataObj = factory.createObject(dataObjectInfo); if (dataObj == null) { log.error("Failed to create object: " + dataObjectInfo); diff --git a/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java b/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java index f25dd1bfb..e9966af57 100644 --- a/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java +++ b/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java @@ -442,7 +442,7 @@ public class AFPDataStream extends AbstractResourceGroupContainer { // Can this data object use the include object (IOB) referencing // mechanism? - if (objectType.canBeIncluded()) { + if (objectType.isIncludable()) { // Create and return include DataObjectFactory factory = cache.getFactory(); diff --git a/src/java/org/apache/fop/render/afp/modca/DataObjectFactory.java b/src/java/org/apache/fop/render/afp/modca/DataObjectFactory.java index a5d156331..7915dbeb8 100644 --- a/src/java/org/apache/fop/render/afp/modca/DataObjectFactory.java +++ b/src/java/org/apache/fop/render/afp/modca/DataObjectFactory.java @@ -320,7 +320,7 @@ public class DataObjectFactory { ObjectType objectType = dataObjectInfo.getObjectType(); - if (objectType != null && objectType.canBeIncluded()) { + if (objectType != null && objectType.isIncludable()) { // Wrap newly created data object in a resource object // if it is to reside within a resource group at print-file or external level diff --git a/src/java/org/apache/fop/render/afp/modca/Registry.java b/src/java/org/apache/fop/render/afp/modca/Registry.java index 16f5fe87b..ca462c706 100644 --- a/src/java/org/apache/fop/render/afp/modca/Registry.java +++ b/src/java/org/apache/fop/render/afp/modca/Registry.java @@ -201,7 +201,7 @@ public final class Registry { * * @return true if this component can be included with an IOB structured field */ - public boolean canBeIncluded() { + public boolean isIncludable() { return this.includable; } -- 2.39.5