You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by pr...@apache.org on 2002/03/28 10:31:45 UTC
cvs commit: jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/turbine/actions EvtDoJrlFBTestAction.java EvtDoJrlTestAction.java EvtDoTestAction.java NoAlarmTestAction.java SaveEventTestAction.java
prickett 02/03/28 01:31:45
Modified: periodicity/src/java/org/apache/commons/periodicity/turbine/actions
EvtDoJrlFBTestAction.java EvtDoJrlTestAction.java
EvtDoTestAction.java NoAlarmTestAction.java
SaveEventTestAction.java
Log:
Fixed it so that "" or empty strings are interpreted as null values
by the Actions that process the event information.
Revision Changes Path
1.2 +11 -8 jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/turbine/actions/EvtDoJrlFBTestAction.java
Index: EvtDoJrlFBTestAction.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/turbine/actions/EvtDoJrlFBTestAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EvtDoJrlFBTestAction.java 28 Mar 2002 08:49:14 -0000 1.1
+++ EvtDoJrlFBTestAction.java 28 Mar 2002 09:31:45 -0000 1.2
@@ -106,30 +106,34 @@
{
String rawOrganizer = request.getParameter(
TestTemplateParams.ORGANIZER_PARAM);
- if(rawOrganizer != null)
+ if(rawOrganizer != null && !rawOrganizer.equals(""))
{
Organizer organizer = new Organizer(rawOrganizer);
String rawOrganizerName = request.getParameter(
TestTemplateParams.ORGANIZER_NAME_PARAM);
- if(rawOrganizerName != null)
+ if(rawOrganizerName != null &&
+ !rawOrganizerName.equals(""))
{
organizer.setCommonName(rawOrganizerName);
}
String rawOrganizerDirectory = request.getParameter(
TestTemplateParams.ORGANIZER_DIRECTORY_PARAM);
- if(rawOrganizerDirectory != null)
+ if(rawOrganizerDirectory != null &&
+ !rawOrganizerDirectory.equals(""))
{
organizer.setDirectoryParameter(rawOrganizerDirectory);
}
String rawOrganizerSentby = request.getParameter(
TestTemplateParams.ORGANIZER_SENTBY_PARAM);
- if(rawOrganizerSentby != null)
+ if(rawOrganizerSentby != null &&
+ !rawOrganizerSentby.equals(""))
{
organizer.setSentByParameter(rawOrganizerSentby);
}
String rawOrganizerLang = request.getParameter(
TestTemplateParams.ORGANIZER_LANG_PARAM);
- if(rawOrganizerLang != null)
+ if(rawOrganizerLang != null &&
+ !rawOrganizerLang.equals(""))
{
organizer.setLanguageParameter(rawOrganizerLang);
}
@@ -141,7 +145,7 @@
}
String rawUid = request.getParameter(
TestTemplateParams.UID_PARAM);
- if(rawUid != null)
+ if(rawUid != null && !rawUid.equals(""))
{
UID uid = new UID(rawUid);
event.setUIDProp(uid);
@@ -152,7 +156,7 @@
}
String rawUrl = request.getParameter(
TestTemplateParams.URL_PARAM);
- if(rawUrl != null)
+ if(rawUrl != null && !rawUrl.equals(""))
{
URLProp url = new URLProp(rawUrl);
event.setURLProp(url);
@@ -165,4 +169,3 @@
}
}
}
-
1.2 +17 -12 jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/turbine/actions/EvtDoJrlTestAction.java
Index: EvtDoJrlTestAction.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/turbine/actions/EvtDoJrlTestAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EvtDoJrlTestAction.java 28 Mar 2002 08:49:14 -0000 1.1
+++ EvtDoJrlTestAction.java 28 Mar 2002 09:31:45 -0000 1.2
@@ -110,7 +110,7 @@
{
String rawClassify = request.getParameter(
TestTemplateParams.CLASSIFICATION_PARAM);
- if(rawClassify != null)
+ if(rawClassify != null && !rawClassify.equals(""))
{
ClassProp classify = new ClassProp(rawClassify);
event.setClassification(classify);
@@ -121,18 +121,18 @@
}
String rawDesc = request.getParameter(
TestTemplateParams.DESCRIPTION_PARAM);
- if(rawDesc != null)
+ if(rawDesc != null && !rawDesc.equals(""))
{
Description descProp = new Description(rawDesc);
String rawDescAltrep = request.getParameter(
TestTemplateParams.DESC_ALTREP_PARAM);
- if(rawDescAltrep != null)
+ if(rawDescAltrep != null && !rawDescAltrep.equals(""))
{
descProp.setAltRep(rawDescAltrep);
}
String rawDescLang = request.getParameter(
TestTemplateParams.DESC_LANG_PARAM);
- if(rawDescLang != null)
+ if(rawDescLang != null && !rawDescLang.equals(""))
{
descProp.setLanguageParameter(rawDescLang);
}
@@ -153,7 +153,10 @@
String rawMinute = request.getParameter(
TestTemplateParams.RECURID_MINUTE_PARAM);
if(rawMonth != null && rawDate != null && rawYear != null &&
- rawHour != null && rawMinute != null)
+ rawHour != null && rawMinute != null &&
+ !rawMonth.equals("") && !rawDate.equals("") &&
+ !rawYear.equals("") && !rawHour.equals("") &&
+ !rawMinute.equals(""))
{
Integer month = Integer.valueOf(rawMonth);
Integer date = Integer.valueOf(rawDate);
@@ -176,13 +179,13 @@
recurid.setDateTime(recuriddt);
String rawRange = request.getParameter(
TestTemplateParams.RECURID_RANGE_PARAM);
- if(rawRange != null)
+ if(rawRange != null && !rawRange.equals(""))
{
recurid.setRangeParameter(rawRange);
}
String rawTzid = request.getParameter(
TestTemplateParams.RECURID_TZID_PARAM);
- if(rawTzid != null)
+ if(rawTzid != null && !rawTzid.equals(""))
{
recurid.setTimeZoneID(rawTzid);
}
@@ -199,7 +202,7 @@
}
String rawSeq = request.getParameter(
TestTemplateParams.SEQUENCE_PARAM);
- if(rawSeq != null)
+ if(rawSeq != null && !rawSeq.equals(""))
{
Integer sequence = Integer.valueOf(rawSeq);
if(sequence != null)
@@ -218,7 +221,7 @@
}
String rawStatus = request.getParameter(
TestTemplateParams.STATUS_PARAM);
- if(rawStatus != null)
+ if(rawStatus != null && !rawStatus.equals(""))
{
Status status = new Status(rawStatus);
event.setStatusProp(status);
@@ -229,18 +232,20 @@
}
String rawSummary = request.getParameter(
TestTemplateParams.SUMMARY_PARAM);
- if(rawSummary != null)
+ if(rawSummary != null && !rawSummary.equals(""))
{
Summary summary = new Summary(rawSummary);
String rawSummaryAltrep = request.getParameter(
TestTemplateParams.SUMMARY_ALTREP_PARAM);
- if(rawSummaryAltrep != null)
+ if(rawSummaryAltrep != null &&
+ !rawSummaryAltrep.equals(""))
{
summary.setAltRep(rawSummaryAltrep);
}
String rawSummaryLang = request.getParameter(
TestTemplateParams.SUMMARY_LANG_PARAM);
- if(rawSummaryLang != null)
+ if(rawSummaryLang != null &&
+ !rawSummaryLang.equals(""))
{
summary.setLanguageParameter(rawSummaryLang);
}
1.2 +8 -5 jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/turbine/actions/EvtDoTestAction.java
Index: EvtDoTestAction.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/turbine/actions/EvtDoTestAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EvtDoTestAction.java 28 Mar 2002 08:49:14 -0000 1.1
+++ EvtDoTestAction.java 28 Mar 2002 09:31:45 -0000 1.2
@@ -109,7 +109,8 @@
TestTemplateParams.LATITUDE_PARAM);
String rawLongitude = request.getParameter(
TestTemplateParams.LONGITUDE_PARAM);
- if(rawLatitude != null && rawLongitude != null)
+ if(rawLatitude != null && rawLongitude != null &&
+ !rawLatitude.equals("") && !rawLongitude.equals(""))
{
Float latitude = Float.valueOf(rawLatitude);
Float longitude = Float.valueOf(rawLongitude);
@@ -130,18 +131,20 @@
}
String rawLocation = request.getParameter(
TestTemplateParams.LOCATION_PARAM);
- if(rawLocation != null)
+ if(rawLocation != null && !rawLocation.equals(""))
{
Location location = new Location(rawLocation);
String rawLocationAltrep = request.getParameter(
TestTemplateParams.LOCATION_ALTREP_PARAM);
- if(rawLocationAltrep != null)
+ if(rawLocationAltrep != null &&
+ !rawLocationAltrep.equals(""))
{
location.setAltRep(rawLocationAltrep);
}
String rawLocationLang = request.getParameter(
TestTemplateParams.LOCATION_LANG_PARAM);
- if(rawLocationLang != null)
+ if(rawLocationLang != null &&
+ !rawLocationLang.equals(""))
{
location.setLanguageParameter(rawLocationLang);
}
@@ -153,7 +156,7 @@
}
String rawPriority = request.getParameter(
TestTemplateParams.PRIORITY_PARAM);
- if(rawPriority != null)
+ if(rawPriority != null && !rawPriority.equals(""))
{
Integer priority = Integer.valueOf(rawPriority);
if(priority != null)
1.2 +5 -2 jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/turbine/actions/NoAlarmTestAction.java
Index: NoAlarmTestAction.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/turbine/actions/NoAlarmTestAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NoAlarmTestAction.java 28 Mar 2002 08:49:14 -0000 1.1
+++ NoAlarmTestAction.java 28 Mar 2002 09:31:45 -0000 1.2
@@ -114,7 +114,10 @@
String rawMinute = request.getParameter(
TestTemplateParams.DTSTART_MINUTE_PARAM);
if(rawMonth != null && rawDate != null && rawYear != null &&
- rawHour != null && rawMinute != null)
+ rawHour != null && rawMinute != null &&
+ !rawMonth.equals("") && !rawDate.equals("") &&
+ !rawYear.equals("") && !rawHour.equals("") &&
+ !rawMinute.equals(""))
{
Integer month = Integer.valueOf(rawMonth);
Integer date = Integer.valueOf(rawDate);
@@ -137,7 +140,7 @@
start.setDateTime(startTime);
String rawTzid = request.getParameter(
TestTemplateParams.DTSTART_TZID_PARAM);
- if(rawTzid != null)
+ if(rawTzid != null && !rawTzid.equals(""))
{
start.setTimeZoneID(rawTzid);
}
1.2 +7 -3 jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/turbine/actions/SaveEventTestAction.java
Index: SaveEventTestAction.java
===================================================================
RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/turbine/actions/SaveEventTestAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SaveEventTestAction.java 28 Mar 2002 08:49:14 -0000 1.1
+++ SaveEventTestAction.java 28 Mar 2002 09:31:45 -0000 1.2
@@ -115,7 +115,10 @@
String rawMinute = request.getParameter(
TestTemplateParams.END_MINUTE_PARAM);
if(rawDate != null && rawMonth != null && rawYear != null &&
- rawHour != null && rawMinute != null)
+ rawHour != null && rawMinute != null &&
+ !rawDate.equals("") && !rawMonth.equals("") &&
+ !rawYear.equals("") && !rawHour.equals("") &&
+ !rawMinute.equals(""))
{
Integer date = Integer.valueOf(rawDate);
Integer month = Integer.valueOf(rawMonth);
@@ -131,7 +134,8 @@
endDate.set(GregorianCalendar.MONTH,
month.intValue() - 1);
endDate.set(GregorianCalendar.YEAR, year.intValue());
- endDate.set(GregorianCalendar.HOUR, hour.intValue());
+ endDate.set(GregorianCalendar.HOUR_OF_DAY,
+ hour.intValue());
endDate.set(GregorianCalendar.MINUTE,
minute.intValue());
endTimeProp.setDateTime(endDate);
@@ -148,7 +152,7 @@
}
String rawTransparency = request.getParameter(
TestTemplateParams.TRANSPARENCY_PARAM);
- if(rawTransparency != null)
+ if(rawTransparency != null && !rawTransparency.equals(""))
{
Transparency transparent = new Transparency();
transparent.setValue(rawTransparency);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>