Removed three unused classes in the traits package.

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

diff --git a/src/java/org/apache/fop/traits/BlockProps.java b/src/java/org/apache/fop/traits/BlockProps.java
deleted file mode 100644 (file)
index 370a979..0000000
--- a/src/java/org/apache/fop/traits/BlockProps.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-
-package org.apache.fop.traits;
-
-import org.apache.fop.datatypes.Length;
-
-/**
- * Store all block-level layout properties on an FO.
- * Public "structure" allows direct member access.
- */
-public class BlockProps {
-
-    public Length firstIndent; // text-indent
-    public int lastIndent; // last-line-indent
-    public int textAlign;
-    public int textAlignLast;
-    public int lineStackType; // line-stacking-strategy (enum)
-
-}

diff --git a/src/java/org/apache/fop/traits/InlineProps.java b/src/java/org/apache/fop/traits/InlineProps.java
deleted file mode 100644 (file)
index 06ca255..0000000
--- a/src/java/org/apache/fop/traits/InlineProps.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-
-package org.apache.fop.traits;
-
-/**
- * Store all inline "margin" related properties
- * Public "structure" allows direct member access.
- */
-public class InlineProps {
-
-    public int marginTop;
-    public int marginBottom;
-    public int marginLeft;
-    public int marginRight;
-    public SpaceVal spaceStart;
-    public SpaceVal spaceEnd;
-
-}

diff --git a/src/java/org/apache/fop/traits/LayoutProps.java b/src/java/org/apache/fop/traits/LayoutProps.java
deleted file mode 100644 (file)
index eff218b..0000000
--- a/src/java/org/apache/fop/traits/LayoutProps.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-
-package org.apache.fop.traits;
-
-import org.apache.fop.datatypes.KeepValue;
-import org.apache.fop.fo.Constants;
-
-/**
- * Store properties affecting layout: break-before, break-after, keeps, span.
- * for a block level FO.
- * Public "structure" allows direct member access.
- */
-public class LayoutProps {
-
-    public int breakBefore; // enum constant BreakBefore.xxx
-    public int breakAfter; // enum constant BreakAfter.xxx
-    public KeepValue keepWithPrevious;  /*LF*/
-    public KeepValue keepWithNext;      /*LF*/
-    public KeepValue keepTogether;      /*LF*/
-    public int orphans;                 /*LF*/
-    public int widows;                  /*LF*/
-    public int blockProgressionUnit;    /*LF*/
-    public int lineStackingStrategy;    /*LF*/
-    public boolean bIsSpan;
-    public SpaceVal spaceBefore;
-    public SpaceVal spaceAfter;
-
-    private static final int[] BREAK_PRIORITIES =
-        new int[]{ Constants.EN_AUTO, Constants.EN_COLUMN, Constants.EN_PAGE };
-
-
-    public LayoutProps() {
-        breakBefore = breakAfter = Constants.EN_AUTO;
-        bIsSpan = false;
-    }
-
-    //     public static int higherBreak(int brkParent, int brkChild) {
-    // if (brkParent == brkChild) return brkChild;
-    // for (int i=0; i < s_breakPriorities.length; i++) {
-    //     int bp = s_breakPriorities[i];
-    //     if (bp == brkParent) return brkChild;
-    //     else if (bp == brkChild) return brkParent;
-    // }
-    // return brkChild;
-    //     }
-
-    public void combineWithParent(LayoutProps parentLP) {
-        if (parentLP.breakBefore != breakBefore) {
-            for (int i = 0; i < BREAK_PRIORITIES.length; i++) {
-                int bp = BREAK_PRIORITIES[i];
-                if (bp == breakBefore) {
-                    breakBefore = parentLP.breakBefore;
-                    break;
-                } else if (bp == parentLP.breakBefore) {
-                    break;
-                }
-            }
-        }
-        // Parent span always overrides child span
-        bIsSpan = parentLP.bIsSpan;
-    }
-
-    public String toString() {
-        return "LayoutProps:\n" +
-        "breakBefore = " + breakBefore + "; breakAfter = " + breakAfter + "\n" +
-        "spaceBefore = " + ((spaceBefore != null) ? spaceBefore.toString() : "null") + "\n" +
-        "spaceAfter = " + ((spaceAfter != null) ? spaceAfter.toString() : "null") + "\n" +
-        "bIsSpan = " + bIsSpan + "\n";
-    }
-}
-