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

diff --git a/src/java/org/apache/fop/render/afp/DataObjectCache.java b/src/java/org/apache/fop/render/afp/DataObjectCache.java
index 85b9f1893a061a843b1725d419a699a5359964b0..ee684db6f1960a7c5f4a7858b215139f065e0f63 100644 (file)
--- 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 f25dd1bfb00f65441d6f6f835b3e172b7e6bf386..e9966af572ffba212da145d2e61de25398e80ebe 100644 (file)
--- 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 a5d15633180e3a19cab7342f255ec068f1e90551..7915dbeb8f168314cb8c7d72f7a28b652d07a442 100644 (file)
--- 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 16f5fe87b801d08f3b3aede1274422d50f7c05ae..ca462c706aee0abc62b9b9d91797d7a83be8764f 100644 (file)
--- 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;
         }