7 files changed, 67 insertions, 26 deletions
diff --git a/src/java/org/apache/fop/fo/flow/MultiCase.java b/src/java/org/apache/fop/fo/flow/MultiCase.java
index 1283d6901..32b6803df 100644
--- a/src/java/org/apache/fop/fo/flow/MultiCase.java
+++ b/src/java/org/apache/fop/fo/flow/MultiCase.java
@@ -20,19 +20,25 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.ToBeImplementedElement;
+import org.apache.fop.fo.FObj;
 
 /**
- * Class modelling the fo:multi-case object. See Sec. 6.9.4 of the XSL-FO
- * Standard.
+ * Class modelling the fo:multi-case object.
  */
-public class MultiCase extends ToBeImplementedElement {
+public class MultiCase extends FObj {
+
+    static boolean notImplementedWarningGiven = false;
 
     /**
      * @param parent FONode that is the parent of this object
      */
     public MultiCase(FONode parent) {
         super(parent);
+
+        if (!notImplementedWarningGiven) {
+            getLogger().warn("fo:multi-case is not yet implemented.");
+            notImplementedWarningGiven = true;
+        }
     }
 
     /**
diff --git a/src/java/org/apache/fop/fo/flow/MultiProperties.java b/src/java/org/apache/fop/fo/flow/MultiProperties.java
index 3e95defb7..7463d4aa8 100644
--- a/src/java/org/apache/fop/fo/flow/MultiProperties.java
+++ b/src/java/org/apache/fop/fo/flow/MultiProperties.java
@@ -28,8 +28,7 @@ import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
 
 /**
- * Class modelling the fo:multi-properties object. See Sec. 6.9.6 of the XSL-FO
- * Standard.
+ * Class modelling the fo:multi-properties object.
  */
 public class MultiProperties extends FObj {
 
diff --git a/src/java/org/apache/fop/fo/flow/MultiPropertySet.java b/src/java/org/apache/fop/fo/flow/MultiPropertySet.java
index 17dcaf543..51ac3b58f 100644
--- a/src/java/org/apache/fop/fo/flow/MultiPropertySet.java
+++ b/src/java/org/apache/fop/fo/flow/MultiPropertySet.java
@@ -25,19 +25,25 @@ import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.ToBeImplementedElement;
+import org.apache.fop.fo.FObj;
 
 /**
- * Class modelling the fo:multi-property-set object. See Sec. 6.9.7 of the
- * XSL-FO Standard.
+ * Class modelling the fo:multi-property-set object.
  */
-public class MultiPropertySet extends ToBeImplementedElement {
+public class MultiPropertySet extends FObj {
+
+    static boolean notImplementedWarningGiven = false;
 
     /**
      * @param parent FONode that is the parent of this object
      */
     public MultiPropertySet(FONode parent) {
         super(parent);
+
+        if (!notImplementedWarningGiven) {
+            getLogger().warn("fo:multi-property-set is not yet implemented.");
+            notImplementedWarningGiven = true;
+        }
     }
 
     /**
diff --git a/src/java/org/apache/fop/fo/flow/MultiSwitch.java b/src/java/org/apache/fop/fo/flow/MultiSwitch.java
index 3cf02c821..99c392f27 100644
--- a/src/java/org/apache/fop/fo/flow/MultiSwitch.java
+++ b/src/java/org/apache/fop/fo/flow/MultiSwitch.java
@@ -20,21 +20,30 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.ToBeImplementedElement;
+import org.apache.fop.fo.FObj;
 
 /**
- * Class modelling the fo:multi-switch object. See Sec. 6.9.3 of the XSL-FO
- * Standard.
+ * Class modelling the fo:multi-switch object.
  */
-public class MultiSwitch extends ToBeImplementedElement {
+public class MultiSwitch extends FObj {
+
+    static boolean notImplementedWarningGiven = false;
 
     /**
      * @param parent FONode that is the parent of this object
      */
     public MultiSwitch(FONode parent) {
         super(parent);
+
+        if (!notImplementedWarningGiven) {
+            getLogger().warn("fo:multi-switch is not yet implemented.");
+            notImplementedWarningGiven = true;
+        }
     }
 
+    /**
+     * @see org.apache.fop.fo.FObj#getName()
+     */
     public String getName() {
         return "fo:multi-switch";
     }
diff --git a/src/java/org/apache/fop/fo/flow/MultiToggle.java b/src/java/org/apache/fop/fo/flow/MultiToggle.java
index 60e42d1b3..a4a58e018 100644
--- a/src/java/org/apache/fop/fo/flow/MultiToggle.java
+++ b/src/java/org/apache/fop/fo/flow/MultiToggle.java
@@ -20,19 +20,25 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.ToBeImplementedElement;
+import org.apache.fop.fo.FObj;
 
 /**
- * Class modelling the fo:multi-toggle property. See Sec. 6.9.5 of the XSL-FO
- * Standard.
+ * Class modelling the fo:multi-toggle property.
  */
-public class MultiToggle extends ToBeImplementedElement {
+public class MultiToggle extends FObj {
+
+    static boolean notImplementedWarningGiven = false;
 
     /**
      * @param parent FONode that is the parent of this object
      */
     public MultiToggle(FONode parent) {
         super(parent);
+
+        if (!notImplementedWarningGiven) {
+            getLogger().warn("fo:multi-toggle is not yet implemented.");
+            notImplementedWarningGiven = true;
+        }
     }
 
     /**
diff --git a/src/java/org/apache/fop/fo/flow/TableAndCaption.java b/src/java/org/apache/fop/fo/flow/TableAndCaption.java
index cd79627f9..df01c19c0 100644
--- a/src/java/org/apache/fop/fo/flow/TableAndCaption.java
+++ b/src/java/org/apache/fop/fo/flow/TableAndCaption.java
@@ -20,19 +20,25 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.ToBeImplementedElement;
+import org.apache.fop.fo.FObj;
 
 /**
- * Class modelling the fo:table-and-caption property. See Sec. 6.7.2 of the
- * XSL-FO Standard.
+ * Class modelling the fo:table-and-caption property.
  */
-public class TableAndCaption extends ToBeImplementedElement {
+public class TableAndCaption extends FObj {
+
+    static boolean notImplementedWarningGiven = false;
 
     /**
      * @param parent FONode that is the parent of this object
      */
     public TableAndCaption(FONode parent) {
         super(parent);
+
+        if (!notImplementedWarningGiven) {
+            getLogger().warn("fo:table-and-caption is not yet implemented.");
+            notImplementedWarningGiven = true;
+        }
     }
 
     /**
diff --git a/src/java/org/apache/fop/fo/flow/TableCaption.java b/src/java/org/apache/fop/fo/flow/TableCaption.java
index 3bf29323c..8fcbb776d 100644
--- a/src/java/org/apache/fop/fo/flow/TableCaption.java
+++ b/src/java/org/apache/fop/fo/flow/TableCaption.java
@@ -20,21 +20,30 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.ToBeImplementedElement;
+import org.apache.fop.fo.FObj;
 
 /**
- * Class modelling the fo:table-caption object. See Sec. 6.7.5 of the XSL-FO
- * Standard.
+ * Class modelling the fo:table-caption object.
  */
-public class TableCaption extends ToBeImplementedElement {
+public class TableCaption extends FObj {
+
+    static boolean notImplementedWarningGiven = false;
 
     /**
      * @param parent FONode that is the parent of this object
      */
     public TableCaption(FONode parent) {
         super(parent);
+
+        if (!notImplementedWarningGiven) {
+            getLogger().warn("fo:table-caption is not yet implemented.");
+            notImplementedWarningGiven = true;
+        }
     }
 
+    /**
+     * @see org.apache.fop.fo.FObj#getName()
+     */
     public String getName() {
         return "fo:table-caption";
     }