From: <pen...@pe...> - 2009-11-08 17:37:21
|
Author: mimil Date: 2009-11-08 11:37:13 -0600 (Sun, 08 Nov 2009) New Revision: 10517 Added: libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/NumberSequence.java Removed: libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/sequence/NumberSequence.java Modified: libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/function/math/SumFunction.java libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/DefaultTypeRegistry.java libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/TypeRegistry.java libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/sequence/AnyNumberSequence.java libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/sequence/DefaultNumberSequence.java Log: PRD-2240: move of NumberSequence to its parent package Modified: libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/function/math/SumFunction.java =================================================================== --- libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/function/math/SumFunction.java 2009-11-07 10:30:58 UTC (rev 10516) +++ libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/function/math/SumFunction.java 2009-11-08 17:37:13 UTC (rev 10517) @@ -26,7 +26,7 @@ import org.pentaho.reporting.libraries.formula.typing.Type; import org.pentaho.reporting.libraries.formula.typing.TypeRegistry; import org.pentaho.reporting.libraries.formula.typing.coretypes.NumberType; -import org.pentaho.reporting.libraries.formula.typing.sequence.NumberSequence; +import org.pentaho.reporting.libraries.formula.typing.NumberSequence; import org.pentaho.reporting.libraries.formula.util.NumberUtil; import java.math.BigDecimal; Modified: libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/DefaultTypeRegistry.java =================================================================== --- libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/DefaultTypeRegistry.java 2009-11-07 10:30:58 UTC (rev 10516) +++ libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/DefaultTypeRegistry.java 2009-11-08 17:37:13 UTC (rev 10517) @@ -54,7 +54,7 @@ import org.pentaho.reporting.libraries.formula.typing.sequence.AnyNumberSequence; import org.pentaho.reporting.libraries.formula.typing.sequence.AnySequence; import org.pentaho.reporting.libraries.formula.typing.sequence.DefaultNumberSequence; -import org.pentaho.reporting.libraries.formula.typing.sequence.NumberSequence; +import org.pentaho.reporting.libraries.formula.typing.NumberSequence; import org.pentaho.reporting.libraries.formula.util.DateUtil; import org.pentaho.reporting.libraries.formula.util.HSSFDateUtil; import org.pentaho.reporting.libraries.formula.util.NumberUtil; Copied: libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/NumberSequence.java (from rev 10516, libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/sequence/NumberSequence.java) =================================================================== --- libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/NumberSequence.java (rev 0) +++ libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/NumberSequence.java 2009-11-08 17:37:13 UTC (rev 10517) @@ -0,0 +1,31 @@ +/* + * This program is free software; you can redistribute it and/or modify it under the + * terms of the GNU Lesser General Public License, version 2.1 as published by the Free Software + * Foundation. + * + * You should have received a copy of the GNU Lesser General Public License along with this + * program; if not, you can obtain a copy at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html + * or from the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU Lesser General Public License for more details. + * + * Copyright (c) 2009 Pentaho Corporation. All rights reserved. + */ + +package org.pentaho.reporting.libraries.formula.typing; + +import org.pentaho.reporting.libraries.formula.typing.Sequence; +import org.pentaho.reporting.libraries.formula.EvaluationException; + +/** + * Todo: Document Me + * + * @author Thomas Morgner + */ +public interface NumberSequence extends Sequence +{ + Number nextNumber() throws EvaluationException; +} Modified: libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/TypeRegistry.java =================================================================== --- libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/TypeRegistry.java 2009-11-07 10:30:58 UTC (rev 10516) +++ libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/TypeRegistry.java 2009-11-08 17:37:13 UTC (rev 10517) @@ -20,7 +20,7 @@ import java.util.Date; import org.pentaho.reporting.libraries.formula.lvalues.TypeValuePair; -import org.pentaho.reporting.libraries.formula.typing.sequence.NumberSequence; +import org.pentaho.reporting.libraries.formula.typing.NumberSequence; import org.pentaho.reporting.libraries.formula.EvaluationException; /** Modified: libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/sequence/AnyNumberSequence.java =================================================================== --- libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/sequence/AnyNumberSequence.java 2009-11-07 10:30:58 UTC (rev 10516) +++ libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/sequence/AnyNumberSequence.java 2009-11-08 17:37:13 UTC (rev 10517) @@ -22,9 +22,9 @@ import org.pentaho.reporting.libraries.formula.EvaluationException; import org.pentaho.reporting.libraries.formula.FormulaContext; import org.pentaho.reporting.libraries.formula.lvalues.LValue; -import org.pentaho.reporting.libraries.formula.lvalues.TypeValuePair; import org.pentaho.reporting.libraries.formula.typing.ArrayCallback; import org.pentaho.reporting.libraries.formula.typing.Type; +import org.pentaho.reporting.libraries.formula.typing.NumberSequence; /** * A sequence that treats text-values as valid numbers that always evaluate to zero. Logical values Modified: libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/sequence/DefaultNumberSequence.java =================================================================== --- libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/sequence/DefaultNumberSequence.java 2009-11-07 10:30:58 UTC (rev 10516) +++ libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/sequence/DefaultNumberSequence.java 2009-11-08 17:37:13 UTC (rev 10517) @@ -20,9 +20,9 @@ import org.pentaho.reporting.libraries.formula.EvaluationException; import org.pentaho.reporting.libraries.formula.FormulaContext; import org.pentaho.reporting.libraries.formula.lvalues.LValue; -import org.pentaho.reporting.libraries.formula.lvalues.TypeValuePair; import org.pentaho.reporting.libraries.formula.typing.ArrayCallback; import org.pentaho.reporting.libraries.formula.typing.Type; +import org.pentaho.reporting.libraries.formula.typing.NumberSequence; /** * @author Cedric Pronzato Deleted: libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/sequence/NumberSequence.java =================================================================== --- libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/sequence/NumberSequence.java 2009-11-07 10:30:58 UTC (rev 10516) +++ libraries/libformula/trunk/source/org/pentaho/reporting/libraries/formula/typing/sequence/NumberSequence.java 2009-11-08 17:37:13 UTC (rev 10517) @@ -1,31 +0,0 @@ -/* - * This program is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License, version 2.1 as published by the Free Software - * Foundation. - * - * You should have received a copy of the GNU Lesser General Public License along with this - * program; if not, you can obtain a copy at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html - * or from the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU Lesser General Public License for more details. - * - * Copyright (c) 2009 Pentaho Corporation. All rights reserved. - */ - -package org.pentaho.reporting.libraries.formula.typing.sequence; - -import org.pentaho.reporting.libraries.formula.typing.Sequence; -import org.pentaho.reporting.libraries.formula.EvaluationException; - -/** - * Todo: Document Me - * - * @author Thomas Morgner - */ -public interface NumberSequence extends Sequence -{ - Number nextNumber() throws EvaluationException; -} |