Switched to long licence

Some general checkstyle fixing


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

1 files changed, 54 insertions, 11 deletions

diff --git a/src/org/apache/fop/fo/flow/ExternalGraphic.java b/src/org/apache/fop/fo/flow/ExternalGraphic.java
index 07a0bc783..1d105b342 100644
--- a/src/org/apache/fop/fo/flow/ExternalGraphic.java
+++ b/src/org/apache/fop/fo/flow/ExternalGraphic.java
@@ -1,10 +1,53 @@
 /*
  * $Id$
- * Copyright (C) 2001-2002 The Apache Software Foundation. All rights reserved.
- * For details on use and redistribution please refer to the
- * LICENSE file included with these sources.
- */
-
+ * ============================================================================
+ *                    The Apache Software License, Version 1.1
+ * ============================================================================
+ * 
+ * Copyright (C) 1999-2003 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/>.
+ */ 
 package org.apache.fop.fo.flow;
 
 // FOP
@@ -124,20 +167,20 @@ public class ExternalGraphic extends FObj {
         // assume lr-tb for now
         Length ipd = properties.get("inline-progression-dimension.optimum").getLength();
         if (!ipd.isAuto()) {
-            viewWidth = ipd.mvalue();
+            viewWidth = ipd.getValue();
         } else {
             ipd = properties.get("width").getLength();
             if (!ipd.isAuto()) {
-                viewWidth = ipd.mvalue();
+                viewWidth = ipd.getValue();
             }
         }
         Length bpd = properties.get("block-progression-dimension.optimum").getLength();
         if (!bpd.isAuto()) {
-            viewHeight = bpd.mvalue();
+            viewHeight = bpd.getValue();
         } else {
             bpd = properties.get("height").getLength();
             if (!bpd.isAuto()) {
-                viewHeight = bpd.mvalue();
+                viewHeight = bpd.getValue();
             }
         }
 
@@ -153,7 +196,7 @@ public class ExternalGraphic extends FObj {
                     cheight = viewHeight;
                 }
             } else {*/
-            cheight = ch.mvalue();
+            cheight = ch.getValue();
         }
         Length cw = properties.get("content-width").getLength();
         if (!cw.isAuto()) {
@@ -162,7 +205,7 @@ public class ExternalGraphic extends FObj {
                     cwidth = viewWidth;
                 }
             } else {*/
-            cwidth = cw.mvalue();
+            cwidth = cw.getValue();
         }
 
         int scaling = properties.get("scaling").getEnum();