svn commit: r678453 - in /xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp: DataObjectCache.java modca/AFPDataStream.java modca/DataObjectFactory.java modca/Registry.j

[acumiskey]

Author: acumiskey
Date: Mon Jul 21 08:42:52 2008
New Revision: 678453

URL: http://svn.apache.org/viewvc?rev=678453&view=rev
Log:
Renamed method canBeIncluded() to isIncludable().

Modified:
    
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/DataObjectCache.java
    
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java
    
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/DataObjectFactory.java
    
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/Registry.java

Modified: 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/DataObjectCache.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/DataObjectCache.java?rev=678453&r1=678452&r2=678453&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/DataObjectCache.java
 (original)
+++ 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/DataObjectCache.java
 Mon Jul 21 08:42:52 2008
@@ -157,7 +157,7 @@
     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);

Modified: 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java?rev=678453&r1=678452&r2=678453&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java
 (original)
+++ 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java
 Mon Jul 21 08:42:52 2008
@@ -442,7 +442,7 @@
             
                 // 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();

Modified: 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/DataObjectFactory.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/DataObjectFactory.java?rev=678453&r1=678452&r2=678453&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/DataObjectFactory.java
 (original)
+++ 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/DataObjectFactory.java
 Mon Jul 21 08:42:52 2008
@@ -320,7 +320,7 @@
             
             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

Modified: 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/Registry.java
URL: 
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/Registry.java?rev=678453&r1=678452&r2=678453&view=diff
==============================================================================
--- 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/Registry.java
 (original)
+++ 
xmlgraphics/fop/branches/Temp_AFPGOCAResources/src/java/org/apache/fop/render/afp/modca/Registry.java
 Mon Jul 21 08:42:52 2008
@@ -201,7 +201,7 @@
          * 
          * @return true if this component can be included with an IOB 
structured field
          */
-        public boolean canBeIncluded() {
+        public boolean isIncludable() {
             return this.includable;
         }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]