Removed obsolete BestFit and Alternative classes, and fox:fitting-strategy property

Patch by Seifeddine Dridi


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_WhitespaceManagement@1543891 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 2 insertions, 18 deletions

diff --git a/src/java/org/apache/fop/fo/flow/MultiCase.java b/src/java/org/apache/fop/fo/flow/MultiCase.java
index 053e0d6f2..09a854c3e 100644
--- a/src/java/org/apache/fop/fo/flow/MultiCase.java
+++ b/src/java/org/apache/fop/fo/flow/MultiCase.java
@@ -44,8 +44,6 @@ public class MultiCase extends FObj {
     //     private CommonAccessibility commonAccessibility;
     // End of property values
 
-    private static boolean notImplementedWarningGiven = false;
-
     /**
      * Base constructor
      *
@@ -53,12 +51,6 @@ public class MultiCase extends FObj {
      */
     public MultiCase(FONode parent) {
         super(parent);
-
-        if (!notImplementedWarningGiven) {
-            getFOValidationEventProducer().unimplementedFeature(this, getName(),
-                    getName(), getLocator());
-            notImplementedWarningGiven = true;
-        }
     }
 
     @Override
@@ -134,7 +126,7 @@ public class MultiCase extends FObj {
         return caseTitle;
     }
 
-    public boolean isActuated() {
+    public boolean hasToggle() {
         return multiCaseHandler != null;
     }
 
diff --git a/src/java/org/apache/fop/fo/flow/MultiSwitch.java b/src/java/org/apache/fop/fo/flow/MultiSwitch.java
index 0c1bb2cde..4197b8675 100644
--- a/src/java/org/apache/fop/fo/flow/MultiSwitch.java
+++ b/src/java/org/apache/fop/fo/flow/MultiSwitch.java
@@ -38,7 +38,6 @@ public class MultiSwitch extends FObj {
     //     private CommonAccessibility commonAccessibility;
     // End of property values
 
-    private static boolean notImplementedWarningGiven;
     private FONode currentlyVisibleMultiCase;
     private String autoToggle;
     private String fittingStrategy;
@@ -50,12 +49,6 @@ public class MultiSwitch extends FObj {
      */
     public MultiSwitch(FONode parent) {
         super(parent);
-
-        if (!notImplementedWarningGiven) {
-            getFOValidationEventProducer().unimplementedFeature(this, getName(),
-                    getName(), getLocator());
-            notImplementedWarningGiven = true;
-        }
     }
 
     /** {@inheritDoc} */
@@ -63,7 +56,6 @@ public class MultiSwitch extends FObj {
     public void bind(PropertyList pList) throws FOPException {
         super.bind(pList);
         autoToggle = pList.get(PR_X_AUTO_TOGGLE).getString();
-        fittingStrategy = pList.get(PR_X_FITTING_STRATEGY).getString();
         // autoRestore = pList.get(PR_AUTO_RESTORE);
     }
 
@@ -85,7 +77,7 @@ public class MultiSwitch extends FObj {
             FONodeIterator nodeIter = getChildNodes();
             while (nodeIter.hasNext()) {
                 MultiCase multiCase = (MultiCase) nodeIter.next();
-                if (multiCase.isActuated()) {
+                if (multiCase.hasToggle()) {
                     multiCase.getHandler().filter(this);
                 }
             }