litesoft

Explore

Commits

Diff Revisions 853 vs 854 for /trunk/Java/core/Anywhere/src/org/litesoft/core/util/TypeConverter.java

		@@ -244,24 +244,24 @@
244	244		return Double.parseDouble( s ); // Will blow up...
245	245		}
246	246
247		-	public static SimpleMoney to_SimpleMoney( SimpleCurrency pSC, Object pObject )
	247	+	public static Money to_Money( Currency pSC, Object pObject )
248	248		{
249		-	Objects.assertNotNull( "SimpleCurrency", pSC );
	249	+	Objects.assertNotNull( "Currency", pSC );
250	250		if ( null == pObject )
251	251		{
252	252		return null;
253	253		}
254		-	if ( pObject instanceof SimpleMoney )
	254	+	if ( pObject instanceof Money )
255	255		{
256		-	SimpleMoney zMoney = (SimpleMoney) pObject;
257		-	SimpleCurrency zNewSC = zMoney.getCurrency();
	256	+	Money zMoney = (Money) pObject;
	257	+	Currency zNewSC = zMoney.getCurrency();
258	258		if ( zNewSC.equals( pSC ) )
259	259		{
260	260		return zMoney;
261	261		}
262	262		throw new IllegalArgumentException( "Currency convertion ('" + zNewSC + "'->'" + pSC + "') is not supported" );
263	263		}
264		-	return SimpleMoney.fromString( pSC, pObject.toString() );
	264	+	return Money.fromString( pSC, pObject.toString() );
265	265		}
266	266
267	267		public static SimpleFixedPointLong to_SimpleFixedPointLong( int pDecimalPlaces, //