Formatted code according to code standards.

Changed license to use short license.


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

1 files changed, 35 insertions, 74 deletions

diff --git a/src/org/apache/fop/fo/EnumProperty.java b/src/org/apache/fop/fo/EnumProperty.java
index 41a519491..a5804420e 100644
--- a/src/org/apache/fop/fo/EnumProperty.java
+++ b/src/org/apache/fop/fo/EnumProperty.java
@@ -1,53 +1,10 @@
-/*-- $Id$ -- 
-
- ============================================================================
-                   The Apache Software License, Version 1.1
- ============================================================================
- 
-    Copyright (C) 1999 The Apache Software Foundation. All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without modifica-
- tion, are permitted provided that the following conditions are met:
- 
- 1. Redistributions of  source code must  retain the above copyright  notice,
-    this list of conditions and the following disclaimer.
- 
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
- 
- 3. The end-user documentation included with the redistribution, if any, must
-    include  the following  acknowledgment:  "This product includes  software
-    developed  by the  Apache Software Foundation  (http://www.apache.org/)."
-    Alternately, this  acknowledgment may  appear in the software itself,  if
-    and wherever such third-party acknowledgments normally appear.
- 
- 4. The names "FOP" and  "Apache Software Foundation"  must not be used to
-    endorse  or promote  products derived  from this  software without  prior
-    written permission. For written permission, please contact
-    apache@apache.org.
- 
- 5. Products  derived from this software may not  be called "Apache", nor may
-    "Apache" appear  in their name,  without prior written permission  of the
-    Apache Software Foundation.
- 
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
- APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
- DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
- ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
- (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- This software  consists of voluntary contributions made  by many individuals
- on  behalf of the Apache Software  Foundation and was  originally created by
- James Tauber <jtauber@jtauber.com>. For more  information on the Apache 
- Software Foundation, please see <http://www.apache.org/>.
- 
+/*
+ * $Id$
+ * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
+ * For details on use and redistribution please refer to the
+ * LICENSE file included with these sources.
  */
+
 package org.apache.fop.fo;
 
 import org.apache.fop.apps.FOPException;
@@ -55,47 +12,51 @@ import org.apache.fop.messaging.MessageHandler;
 
 public class EnumProperty extends Property {
 
-  public static class Maker extends Property.Maker {
+    public static class Maker extends Property.Maker {
 
-    protected Maker(String propName) {
-      super(propName);
-    }
+        protected Maker(String propName) {
+            super(propName);
+        }
 
 
-    /**
-     * Called by subclass if no match found.
-     */
-    public Property checkEnumValues(String value) {
-	MessageHandler.errorln("WARNING: Unknown enumerated value for property '" +
-			       getPropName() + "': " + value);
-	return null;
-    }
+        /**
+         * Called by subclass if no match found.
+         */
+        public Property checkEnumValues(String value) {
+            MessageHandler.errorln("WARNING: Unknown enumerated value for property '"
+                                   + getPropName() + "': " + value);
+            return null;
+        }
 
-    protected Property findConstant(String value) {
-      return null;
-    }
+        protected Property findConstant(String value) {
+            return null;
+        }
+
+        public Property convertProperty(Property p,
+                                        PropertyList propertyList,
+                                        FObj fo) throws FOPException {
+            if (p instanceof EnumProperty)
+                return p;
+            else
+                return null;
+        }
 
-    public Property convertProperty(Property p,
-	PropertyList propertyList, FObj fo) throws FOPException {
-      if (p instanceof EnumProperty) return p;
-      else return null;
     }
-  }
 
     private int value;
 
     public EnumProperty(int explicitValue) {
-	this.value = explicitValue;
+        this.value = explicitValue;
     }
 
     public int getEnum() {
-	return this.value;
+        return this.value;
     }
 
     public Object getObject() {
-	// FIXME: return String value: property must reference maker
-	// return maker.getEnumValue(this.value);
-	return new Integer(this.value);
+        // FIXME: return String value: property must reference maker
+        // return maker.getEnumValue(this.value);
+        return new Integer(this.value);
     }
 
 }