Mark,
I have committed the patch without any problems :)
Paul Spencer
Paul Spencer wrote:
> Mark,
> I will test and apply the patch today.
>
> Thank you,
> Paul Spencer
>
> Nutter, Mark wrote:
>
>> I just tried compiling Jetspeed (fresh update from CVS) under Java
>> 1.4, and
>> got a bunch of warnings in BaseProfileLocator.java about using
>> "assert" as
>> an identifier (since it's now a keyword in 1.4). Below is a patch that
>> renames the assert() method to assertNotNull(), which satisfies java
>> 1.4 and
>> also makes the method name a bit more explicit about what is actually
>> being
>> asserted. A trivial mod, but I wanted a simple test case to see if
>> I've got
>> the mechanics of submitting patches correctly.
>>
>> Please let me know if there's anything I should do differently in the
>> future. Thanks.
>>
>> Mark
>>
>>
>> <<patch.txt>>
>>
>> This e-mail and any attachments are confidential. If you are not the
>> intended recipient, please notify us immediately by reply e-mail and then
>> delete this message from your system. Do not copy this e-mail or any
>> attachment, use the contents for any purposes, or disclose the
>> contents to
>> any other person: to do so could be a breach of confidence.
>>
>>
>> ------------------------------------------------------------------------
>>
>> Index: src/java/org/apache/jetspeed/om/profile/BaseProfileLocator.java
>> ===================================================================
>> RCS file:
>>
>/home/cvspublic/jakarta-jetspeed/src/java/org/apache/jetspeed/om/profile/BaseProfileLocator.java,v
>
>>
>> retrieving revision 1.5
>> diff -u -r1.5 BaseProfileLocator.java
>> --- src/java/org/apache/jetspeed/om/profile/BaseProfileLocator.java
>> 6 Dec 2001 05:07:15 -0000 1.5
>> +++ src/java/org/apache/jetspeed/om/profile/BaseProfileLocator.java
>> 11 Feb 2002 20:27:16 -0000
>> @@ -351,7 +351,7 @@
>> return false;
>> }
>> // check if both are non-nulls
>> - if (assert(this.user) && assert(user))
>> + if (assertNotNull(this.user) && assertNotNull(user))
>> {
>> return stringEquals(this.user.getUserName(),
>> user.getUserName());
>> }
>> @@ -371,7 +371,7 @@
>> return false;
>> }
>> // check if both are non-nulls
>> - if (assert(this.group) && assert(group))
>> + if (assertNotNull(this.group) && assertNotNull(group))
>> {
>> return stringEquals( this.group.getName(), group.getName());
>> }
>> @@ -391,7 +391,7 @@
>> return false;
>> }
>> // check if both are non-nulls
>> - if (assert(this.role) && assert(role))
>> + if (assertNotNull(this.role) && assertNotNull(role))
>> {
>> return stringEquals(this.role.getName(), role.getName());
>> }
>> @@ -436,7 +436,7 @@
>> }
>>
>> /**
>> - * Assert the two String objects and then check the equality.
>> + * AssertNotNull the two String objects and then check the equality.
>> */
>> private boolean stringEquals(String str1, String str2)
>> {
>> @@ -444,7 +444,7 @@
>> {
>> return false;
>> }
>> - if (assert(str1) && assert(str2))
>> + if (assertNotNull(str1) && assertNotNull(str2))
>> {
>> return str1.equals(str2);
>> }
>> @@ -453,9 +453,9 @@
>> }
>>
>> /**
>> - * Assert the given object.
>> + * AssertNotNull the given object.
>> */
>> - private boolean assert(Object object)
>> + private boolean assertNotNull(Object object)
>> {
>> return object != null;
>> }
>> @@ -465,7 +465,7 @@
>> */
>> private boolean exclusiveOr(Object obj1, Object obj2)
>> {
>> - return (assert(obj1) && !assert(obj2))
>> - || (!assert(obj1) && assert(obj2));
>> + return (assertNotNull(obj1) && !assertNotNull(obj2))
>> + || (!assertNotNull(obj1) && assertNotNull(obj2));
>> }
>> }
>>
>>
>>
>>
>> ------------------------------------------------------------------------
>>
>> --
>> To unsubscribe, e-mail:
>> <mailto:[EMAIL PROTECTED]>
>> For additional commands, e-mail:
>> <mailto:[EMAIL PROTECTED]>
>>
>
>
>
> --
> To unsubscribe, e-mail:
> <mailto:[EMAIL PROTECTED]>
> For additional commands, e-mail:
> <mailto:[EMAIL PROTECTED]>
>
>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
