litesoft

URLs

Explore

Commits

Diff Revisions 850 vs 851 for /trunk/Java/core/Server/src/org/litesoft/orsup/DB_ImportSupport.java

		@@ -456,8 +456,8 @@
456	456		}
457	457		SimpleDate zDesiredDate = to_SimpleDate( "Desired Date", pValue.substring( 0, zAt ) );
458	458		SimpleDate zDeltaDate = to_SimpleDate( "Delta Date", pValue.substring( zAt + DELTA_DATE_SEP.length() ) );
459		-	SimpleDate zToday = new SimpleDate( Dates.now() );
460		-	zDesiredDate.addDays( zDeltaDate.daysTill( zToday ) );
	459	+	SimpleDate zToday = SimpleDate.today();
	460	+	zDesiredDate = zDesiredDate.addDays( zDeltaDate.daysTill( zToday ) );
461	461		return zDesiredDate.toString();
462	462		}
463	463
		@@ -500,19 +500,19 @@
500	500		int iMonths = parseInt( "Month", zMonths );
501	501		int iDays = parseInt( "Day", zDays );
502	502
503		-	SimpleDate zDesiredDate = new SimpleDate( Dates.now() );
	503	+	SimpleDate zDesiredDate = SimpleDate.today();
504	504
505	505		if ( zAdd )
506	506		{
507		-	zDesiredDate.addYears( iYears );
508		-	zDesiredDate.addMonths( iMonths );
509		-	zDesiredDate.addDays( iDays );
	507	+	zDesiredDate = zDesiredDate.addYears( iYears );
	508	+	zDesiredDate = zDesiredDate.addMonths( iMonths );
	509	+	zDesiredDate = zDesiredDate.addDays( iDays );
510	510		}
511	511		else
512	512		{
513		-	zDesiredDate.minusYears( iYears );
514		-	zDesiredDate.minusMonths( iMonths );
515		-	zDesiredDate.minusDays( iDays );
	513	+	zDesiredDate = zDesiredDate.minusYears( iYears );
	514	+	zDesiredDate = zDesiredDate.minusMonths( iMonths );
	515	+	zDesiredDate = zDesiredDate.minusDays( iDays );
516	516		}
517	517
518	518		return zDesiredDate.toString();
		@@ -522,7 +522,7 @@
522	522		{
523	523		try
524	524		{
525		-	return TypeConverter.to_SimpleDate( DateFormatControl.DEFAULT_DATE_FORMAT, pString.trim() );
	525	+	return TypeConverter.to_SimpleDate( DateFormat.DEFAULT_YMD_FORMAT, pString.trim() );
526	526		}
527	527		catch ( RuntimeException e )
528	528		{

View View this file contents

History View the full history

Feeds

Commits for /trunk/Java/core/Server/src/org/litesoft/orsup/DB_ImportSupport.java