You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@roller.apache.org by Markus Fuchs <Ma...@Sun.COM> on 2007/01/15 13:07:58 UTC
Fix for typos in roller code
Hi,
I ran FindBugs, see http://findbugs.sourceforge.net/ against
roller-business.jar and found some obvious typos which I fixed in the
attached jar. Please check it out.
Thanks,
-- markus.
Index: src/org/apache/roller/pojos/UserData.java
===================================================================
--- src/org/apache/roller/pojos/UserData.java (Revision 496271)
+++ src/org/apache/roller/pojos/UserData.java (Arbeitskopie)
@@ -85,7 +85,7 @@
this.dateCreated = (Date)dateCreated.clone();
this.locale = locale;
this.timeZone = timeZone;
- this.enabled = enabled;
+ this.enabled = isEnabled;
}
public UserData( UserData otherData ) {
Index: src/org/apache/roller/pojos/RollerConfigData.java
===================================================================
--- src/org/apache/roller/pojos/RollerConfigData.java (Revision 496250)
+++ src/org/apache/roller/pojos/RollerConfigData.java (Arbeitskopie)
@@ -757,7 +757,7 @@
public boolean equals(Object pOther)
{
- if (pOther instanceof WebsiteData)
+ if (pOther instanceof RollerConfigData)
{
RollerConfigData lTest = (RollerConfigData) pOther;
boolean lEquals = true;
Index: src/org/apache/roller/business/ThemeManagerImpl.java
===================================================================
--- src/org/apache/roller/business/ThemeManagerImpl.java
(Revision 496250)
+++ src/org/apache/roller/business/ThemeManagerImpl.java
(Arbeitskopie)
@@ -239,7 +239,7 @@
String themespath = RollerConfig.getProperty("themes.dir");
if(themespath.endsWith(File.separator)) {
- themespath.substring(0, themespath.length() - 1);
+ themespath = themespath.substring(0, themespath.length() - 1);
}
// first, get a list of the themes available
Index: src/org/apache/roller/business/utils/ConsistencyCheck.java
===================================================================
--- src/org/apache/roller/business/utils/ConsistencyCheck.java
(Revision 496250)
+++ src/org/apache/roller/business/utils/ConsistencyCheck.java
(Arbeitskopie)
@@ -213,7 +213,7 @@
ResultSet websiteRs = websiteSt.executeQuery(
"select websiteid from weblogentry where id="+entryid);
websiteRs.first();
- String websiteid = websiteRs.getString(0);
+ String websiteid = websiteRs.getString(1);
String rootid = getRootCategoryId(con, websiteid);
Statement st = con.createStatement();
bash-3.00$ cat ~/typos.diff
Index: src/org/apache/roller/pojos/UserData.java
===================================================================
--- src/org/apache/roller/pojos/UserData.java (Revision 496271)
+++ src/org/apache/roller/pojos/UserData.java (Arbeitskopie)
@@ -85,7 +85,7 @@
this.dateCreated = (Date)dateCreated.clone();
this.locale = locale;
this.timeZone = timeZone;
- this.enabled = enabled;
+ this.enabled = isEnabled;
}
public UserData( UserData otherData ) {
Index: src/org/apache/roller/pojos/RollerConfigData.java
===================================================================
--- src/org/apache/roller/pojos/RollerConfigData.java (Revision 496250)
+++ src/org/apache/roller/pojos/RollerConfigData.java (Arbeitskopie)
@@ -757,7 +757,7 @@
public boolean equals(Object pOther)
{
- if (pOther instanceof WebsiteData)
+ if (pOther instanceof RollerConfigData)
{
RollerConfigData lTest = (RollerConfigData) pOther;
boolean lEquals = true;
Index: src/org/apache/roller/business/ThemeManagerImpl.java
===================================================================
--- src/org/apache/roller/business/ThemeManagerImpl.java
(Revision 496250)
+++ src/org/apache/roller/business/ThemeManagerImpl.java
(Arbeitskopie)
@@ -239,7 +239,7 @@
String themespath = RollerConfig.getProperty("themes.dir");
if(themespath.endsWith(File.separator)) {
- themespath.substring(0, themespath.length() - 1);
+ themespath = themespath.substring(0, themespath.length() - 1);
}
// first, get a list of the themes available
Index: src/org/apache/roller/business/utils/ConsistencyCheck.java
===================================================================
--- src/org/apache/roller/business/utils/ConsistencyCheck.java
(Revision 496250)
+++ src/org/apache/roller/business/utils/ConsistencyCheck.java
(Arbeitskopie)
@@ -213,7 +213,7 @@
ResultSet websiteRs = websiteSt.executeQuery(
"select websiteid from weblogentry where id="+entryid);
websiteRs.first();
- String websiteid = websiteRs.getString(0);
+ String websiteid = websiteRs.getString(1);
String rootid = getRootCategoryId(con, websiteid);
Statement st = con.createStatement();
Re: Fix for typos in roller code
Posted by Dave <sn...@gmail.com>.
On 1/22/07, Markus Fuchs <Ma...@sun.com> wrote:
> Did anybody have the time to look at this? I ran the JUnit tests
> successfully with these changes.
Yes. Craig took care of that. Thanks for the fixes.
http://svn.apache.org/viewvc?view=rev&revision=496903
- Dave
Re: Fix for typos in roller code
Posted by Markus Fuchs <Ma...@Sun.COM>.
I am interested and signed up. Thanks!
-- markus.
Craig L Russell wrote:
> Hi Markus,
>
> If you're interested, you can subscribe to
> roller-commits-subscribe@incubator.apache.org and you will get about
> 4.5 emails per day, including your own contributions. ;-)
>
> Craig
>
> On Jan 23, 2007, at 9:42 AM, Markus Fuchs wrote:
>
>> Hi Craig,
>>
>> Thanks for checking in. I just expected a reply to my email, once it
>> went in...
>>
>> -- markus.
>>
>> Craig L Russell wrote:
>>
>>> Hi Markus,
>>>
>>> Have you checked out the code since you submitted this patch?
>>>
>>> I checked in your changes last week with revision 496903. I guess
>>> svn is not set up to send mail to the roller-dev alias.
>>>
>>> Regards,
>>>
>>> Craig
>>>
>>> On Jan 22, 2007, at 4:08 PM, Markus Fuchs wrote:
>>>
>>>> Hi,
>>>>
>>>> Did anybody have the time to look at this? I ran the JUnit tests
>>>> successfully with these changes.
>>>>
>>>> Thanks,
>>>>
>>>> -- markus.
>>>>
>>>> Markus Fuchs wrote:
>>>>
>>>>> Hi,
>>>>>
>>>>> I ran FindBugs, see http://findbugs.sourceforge.net/ against
>>>>> roller-business.jar and found some obvious typos which I fixed in
>>>>> the attached jar. Please check it out.
>>>>>
>>>>> Thanks,
>>>>>
>>>>> -- markus.
>>>>>
>>>>> Index: src/org/apache/roller/pojos/UserData.java
>>>>> ===================================================================
>>>>> --- src/org/apache/roller/pojos/UserData.java (Revision 496271)
>>>>> +++ src/org/apache/roller/pojos/UserData.java (Arbeitskopie)
>>>>> @@ -85,7 +85,7 @@
>>>>> this.dateCreated = (Date)dateCreated.clone();
>>>>> this.locale = locale;
>>>>> this.timeZone = timeZone;
>>>>> - this.enabled = enabled;
>>>>> + this.enabled = isEnabled;
>>>>> }
>>>>>
>>>>> public UserData( UserData otherData ) {
>>>>> Index: src/org/apache/roller/pojos/RollerConfigData.java
>>>>> ===================================================================
>>>>> --- src/org/apache/roller/pojos/RollerConfigData.java (Revision
>>>>> 496250)
>>>>> +++ src/org/apache/roller/pojos/RollerConfigData.java
>>>>> (Arbeitskopie)
>>>>> @@ -757,7 +757,7 @@
>>>>>
>>>>> public boolean equals(Object pOther)
>>>>> {
>>>>> - if (pOther instanceof WebsiteData)
>>>>> + if (pOther instanceof RollerConfigData)
>>>>> {
>>>>> RollerConfigData lTest = (RollerConfigData) pOther;
>>>>> boolean lEquals = true;
>>>>> Index: src/org/apache/roller/business/ThemeManagerImpl.java
>>>>> ===================================================================
>>>>> --- src/org/apache/roller/business/ThemeManagerImpl.java
>>>>> (Revision 496250)
>>>>> +++ src/org/apache/roller/business/ThemeManagerImpl.java
>>>>> (Arbeitskopie)
>>>>> @@ -239,7 +239,7 @@
>>>>>
>>>>> String themespath = RollerConfig.getProperty("themes.dir");
>>>>> if(themespath.endsWith(File.separator)) {
>>>>> - themespath.substring(0, themespath.length() - 1);
>>>>> + themespath = themespath.substring(0,
>>>>> themespath.length () - 1);
>>>>> }
>>>>>
>>>>> // first, get a list of the themes available
>>>>> Index: src/org/apache/roller/business/utils/ConsistencyCheck.java
>>>>> ===================================================================
>>>>> --- src/org/apache/roller/business/utils/ConsistencyCheck.java
>>>>> (Revision 496250)
>>>>> +++ src/org/apache/roller/business/utils/ConsistencyCheck.java
>>>>> (Arbeitskopie)
>>>>> @@ -213,7 +213,7 @@
>>>>> ResultSet websiteRs = websiteSt.executeQuery(
>>>>> "select websiteid from weblogentry where
>>>>> id="+entryid);
>>>>> websiteRs.first();
>>>>> - String websiteid = websiteRs.getString(0);
>>>>> + String websiteid = websiteRs.getString(1);
>>>>>
>>>>> String rootid = getRootCategoryId(con, websiteid);
>>>>> Statement st = con.createStatement();
>>>>> bash-3.00$ cat ~/typos.diff
>>>>> Index: src/org/apache/roller/pojos/UserData.java
>>>>> ===================================================================
>>>>> --- src/org/apache/roller/pojos/UserData.java (Revision 496271)
>>>>> +++ src/org/apache/roller/pojos/UserData.java (Arbeitskopie)
>>>>> @@ -85,7 +85,7 @@
>>>>> this.dateCreated = (Date)dateCreated.clone();
>>>>> this.locale = locale;
>>>>> this.timeZone = timeZone;
>>>>> - this.enabled = enabled;
>>>>> + this.enabled = isEnabled;
>>>>> }
>>>>>
>>>>> public UserData( UserData otherData ) {
>>>>> Index: src/org/apache/roller/pojos/RollerConfigData.java
>>>>> ===================================================================
>>>>> --- src/org/apache/roller/pojos/RollerConfigData.java (Revision
>>>>> 496250)
>>>>> +++ src/org/apache/roller/pojos/RollerConfigData.java
>>>>> (Arbeitskopie)
>>>>> @@ -757,7 +757,7 @@
>>>>>
>>>>> public boolean equals(Object pOther)
>>>>> {
>>>>> - if (pOther instanceof WebsiteData)
>>>>> + if (pOther instanceof RollerConfigData)
>>>>> {
>>>>> RollerConfigData lTest = (RollerConfigData) pOther;
>>>>> boolean lEquals = true;
>>>>> Index: src/org/apache/roller/business/ThemeManagerImpl.java
>>>>> ===================================================================
>>>>> --- src/org/apache/roller/business/ThemeManagerImpl.java
>>>>> (Revision 496250)
>>>>> +++ src/org/apache/roller/business/ThemeManagerImpl.java
>>>>> (Arbeitskopie)
>>>>> @@ -239,7 +239,7 @@
>>>>>
>>>>> String themespath = RollerConfig.getProperty("themes.dir");
>>>>> if(themespath.endsWith(File.separator)) {
>>>>> - themespath.substring(0, themespath.length() - 1);
>>>>> + themespath = themespath.substring(0,
>>>>> themespath.length () - 1);
>>>>> }
>>>>>
>>>>> // first, get a list of the themes available
>>>>> Index: src/org/apache/roller/business/utils/ConsistencyCheck.java
>>>>> ===================================================================
>>>>> --- src/org/apache/roller/business/utils/ConsistencyCheck.java
>>>>> (Revision 496250)
>>>>> +++ src/org/apache/roller/business/utils/ConsistencyCheck.java
>>>>> (Arbeitskopie)
>>>>> @@ -213,7 +213,7 @@
>>>>> ResultSet websiteRs = websiteSt.executeQuery(
>>>>> "select websiteid from weblogentry where
>>>>> id="+entryid);
>>>>> websiteRs.first();
>>>>> - String websiteid = websiteRs.getString(0);
>>>>> + String websiteid = websiteRs.getString(1);
>>>>>
>>>>> String rootid = getRootCategoryId(con, websiteid);
>>>>> Statement st = con.createStatement();
>>>>
>>>>
>>>
>>> Craig Russell
>>> Architect, Sun Java Enterprise System http://java.sun.com/products/jdo
>>> 408 276-5638 mailto:Craig.Russell@sun.com
>>> P.S. A good JDO? O, Gasp!
>>>
>
> Craig Russell
> Architect, Sun Java Enterprise System http://java.sun.com/products/jdo
> 408 276-5638 mailto:Craig.Russell@sun.com
> P.S. A good JDO? O, Gasp!
>
Re: Fix for typos in roller code
Posted by Craig L Russell <Cr...@Sun.COM>.
Hi Markus,
If you're interested, you can subscribe to roller-commits-
subscribe@incubator.apache.org and you will get about 4.5 emails per
day, including your own contributions. ;-)
Craig
On Jan 23, 2007, at 9:42 AM, Markus Fuchs wrote:
> Hi Craig,
>
> Thanks for checking in. I just expected a reply to my email, once
> it went in...
>
> -- markus.
>
> Craig L Russell wrote:
>
>> Hi Markus,
>>
>> Have you checked out the code since you submitted this patch?
>>
>> I checked in your changes last week with revision 496903. I guess
>> svn is not set up to send mail to the roller-dev alias.
>>
>> Regards,
>>
>> Craig
>>
>> On Jan 22, 2007, at 4:08 PM, Markus Fuchs wrote:
>>
>>> Hi,
>>>
>>> Did anybody have the time to look at this? I ran the JUnit tests
>>> successfully with these changes.
>>>
>>> Thanks,
>>>
>>> -- markus.
>>>
>>> Markus Fuchs wrote:
>>>
>>>> Hi,
>>>>
>>>> I ran FindBugs, see http://findbugs.sourceforge.net/ against
>>>> roller-business.jar and found some obvious typos which I fixed
>>>> in the attached jar. Please check it out.
>>>>
>>>> Thanks,
>>>>
>>>> -- markus.
>>>>
>>>> Index: src/org/apache/roller/pojos/UserData.java
>>>> ===================================================================
>>>> --- src/org/apache/roller/pojos/UserData.java (Revision 496271)
>>>> +++ src/org/apache/roller/pojos/UserData.java (Arbeitskopie)
>>>> @@ -85,7 +85,7 @@
>>>> this.dateCreated = (Date)dateCreated.clone();
>>>> this.locale = locale;
>>>> this.timeZone = timeZone;
>>>> - this.enabled = enabled;
>>>> + this.enabled = isEnabled;
>>>> }
>>>>
>>>> public UserData( UserData otherData ) {
>>>> Index: src/org/apache/roller/pojos/RollerConfigData.java
>>>> ===================================================================
>>>> --- src/org/apache/roller/pojos/RollerConfigData.java
>>>> (Revision 496250)
>>>> +++ src/org/apache/roller/pojos/RollerConfigData.java
>>>> (Arbeitskopie)
>>>> @@ -757,7 +757,7 @@
>>>>
>>>> public boolean equals(Object pOther)
>>>> {
>>>> - if (pOther instanceof WebsiteData)
>>>> + if (pOther instanceof RollerConfigData)
>>>> {
>>>> RollerConfigData lTest = (RollerConfigData) pOther;
>>>> boolean lEquals = true;
>>>> Index: src/org/apache/roller/business/ThemeManagerImpl.java
>>>> ===================================================================
>>>> --- src/org/apache/roller/business/ThemeManagerImpl.java
>>>> (Revision 496250)
>>>> +++ src/org/apache/roller/business/ThemeManagerImpl.java
>>>> (Arbeitskopie)
>>>> @@ -239,7 +239,7 @@
>>>>
>>>> String themespath = RollerConfig.getProperty
>>>> ("themes.dir");
>>>> if(themespath.endsWith(File.separator)) {
>>>> - themespath.substring(0, themespath.length() - 1);
>>>> + themespath = themespath.substring(0,
>>>> themespath.length () - 1);
>>>> }
>>>>
>>>> // first, get a list of the themes available
>>>> Index: src/org/apache/roller/business/utils/ConsistencyCheck.java
>>>> ===================================================================
>>>> --- src/org/apache/roller/business/utils/ConsistencyCheck.java
>>>> (Revision 496250)
>>>> +++ src/org/apache/roller/business/utils/ConsistencyCheck.java
>>>> (Arbeitskopie)
>>>> @@ -213,7 +213,7 @@
>>>> ResultSet websiteRs = websiteSt.executeQuery(
>>>> "select websiteid from weblogentry where
>>>> id="+entryid);
>>>> websiteRs.first();
>>>> - String websiteid = websiteRs.getString(0);
>>>> + String websiteid = websiteRs.getString(1);
>>>>
>>>> String rootid = getRootCategoryId(con, websiteid);
>>>> Statement st = con.createStatement();
>>>> bash-3.00$ cat ~/typos.diff
>>>> Index: src/org/apache/roller/pojos/UserData.java
>>>> ===================================================================
>>>> --- src/org/apache/roller/pojos/UserData.java (Revision 496271)
>>>> +++ src/org/apache/roller/pojos/UserData.java (Arbeitskopie)
>>>> @@ -85,7 +85,7 @@
>>>> this.dateCreated = (Date)dateCreated.clone();
>>>> this.locale = locale;
>>>> this.timeZone = timeZone;
>>>> - this.enabled = enabled;
>>>> + this.enabled = isEnabled;
>>>> }
>>>>
>>>> public UserData( UserData otherData ) {
>>>> Index: src/org/apache/roller/pojos/RollerConfigData.java
>>>> ===================================================================
>>>> --- src/org/apache/roller/pojos/RollerConfigData.java
>>>> (Revision 496250)
>>>> +++ src/org/apache/roller/pojos/RollerConfigData.java
>>>> (Arbeitskopie)
>>>> @@ -757,7 +757,7 @@
>>>>
>>>> public boolean equals(Object pOther)
>>>> {
>>>> - if (pOther instanceof WebsiteData)
>>>> + if (pOther instanceof RollerConfigData)
>>>> {
>>>> RollerConfigData lTest = (RollerConfigData) pOther;
>>>> boolean lEquals = true;
>>>> Index: src/org/apache/roller/business/ThemeManagerImpl.java
>>>> ===================================================================
>>>> --- src/org/apache/roller/business/ThemeManagerImpl.java
>>>> (Revision 496250)
>>>> +++ src/org/apache/roller/business/ThemeManagerImpl.java
>>>> (Arbeitskopie)
>>>> @@ -239,7 +239,7 @@
>>>>
>>>> String themespath = RollerConfig.getProperty
>>>> ("themes.dir");
>>>> if(themespath.endsWith(File.separator)) {
>>>> - themespath.substring(0, themespath.length() - 1);
>>>> + themespath = themespath.substring(0,
>>>> themespath.length () - 1);
>>>> }
>>>>
>>>> // first, get a list of the themes available
>>>> Index: src/org/apache/roller/business/utils/ConsistencyCheck.java
>>>> ===================================================================
>>>> --- src/org/apache/roller/business/utils/ConsistencyCheck.java
>>>> (Revision 496250)
>>>> +++ src/org/apache/roller/business/utils/ConsistencyCheck.java
>>>> (Arbeitskopie)
>>>> @@ -213,7 +213,7 @@
>>>> ResultSet websiteRs = websiteSt.executeQuery(
>>>> "select websiteid from weblogentry where
>>>> id="+entryid);
>>>> websiteRs.first();
>>>> - String websiteid = websiteRs.getString(0);
>>>> + String websiteid = websiteRs.getString(1);
>>>>
>>>> String rootid = getRootCategoryId(con, websiteid);
>>>> Statement st = con.createStatement();
>>>
>>>
>>
>> Craig Russell
>> Architect, Sun Java Enterprise System http://java.sun.com/products/
>> jdo
>> 408 276-5638 mailto:Craig.Russell@sun.com
>> P.S. A good JDO? O, Gasp!
>>
Craig Russell
Architect, Sun Java Enterprise System http://java.sun.com/products/jdo
408 276-5638 mailto:Craig.Russell@sun.com
P.S. A good JDO? O, Gasp!
Re: Fix for typos in roller code
Posted by Markus Fuchs <Ma...@Sun.COM>.
Hi Craig,
Thanks for checking in. I just expected a reply to my email, once it
went in...
-- markus.
Craig L Russell wrote:
> Hi Markus,
>
> Have you checked out the code since you submitted this patch?
>
> I checked in your changes last week with revision 496903. I guess svn
> is not set up to send mail to the roller-dev alias.
>
> Regards,
>
> Craig
>
> On Jan 22, 2007, at 4:08 PM, Markus Fuchs wrote:
>
>> Hi,
>>
>> Did anybody have the time to look at this? I ran the JUnit tests
>> successfully with these changes.
>>
>> Thanks,
>>
>> -- markus.
>>
>> Markus Fuchs wrote:
>>
>>> Hi,
>>>
>>> I ran FindBugs, see http://findbugs.sourceforge.net/ against
>>> roller-business.jar and found some obvious typos which I fixed in
>>> the attached jar. Please check it out.
>>>
>>> Thanks,
>>>
>>> -- markus.
>>>
>>> Index: src/org/apache/roller/pojos/UserData.java
>>> ===================================================================
>>> --- src/org/apache/roller/pojos/UserData.java (Revision 496271)
>>> +++ src/org/apache/roller/pojos/UserData.java (Arbeitskopie)
>>> @@ -85,7 +85,7 @@
>>> this.dateCreated = (Date)dateCreated.clone();
>>> this.locale = locale;
>>> this.timeZone = timeZone;
>>> - this.enabled = enabled;
>>> + this.enabled = isEnabled;
>>> }
>>>
>>> public UserData( UserData otherData ) {
>>> Index: src/org/apache/roller/pojos/RollerConfigData.java
>>> ===================================================================
>>> --- src/org/apache/roller/pojos/RollerConfigData.java (Revision
>>> 496250)
>>> +++ src/org/apache/roller/pojos/RollerConfigData.java (Arbeitskopie)
>>> @@ -757,7 +757,7 @@
>>>
>>> public boolean equals(Object pOther)
>>> {
>>> - if (pOther instanceof WebsiteData)
>>> + if (pOther instanceof RollerConfigData)
>>> {
>>> RollerConfigData lTest = (RollerConfigData) pOther;
>>> boolean lEquals = true;
>>> Index: src/org/apache/roller/business/ThemeManagerImpl.java
>>> ===================================================================
>>> --- src/org/apache/roller/business/ThemeManagerImpl.java
>>> (Revision 496250)
>>> +++ src/org/apache/roller/business/ThemeManagerImpl.java
>>> (Arbeitskopie)
>>> @@ -239,7 +239,7 @@
>>>
>>> String themespath = RollerConfig.getProperty("themes.dir");
>>> if(themespath.endsWith(File.separator)) {
>>> - themespath.substring(0, themespath.length() - 1);
>>> + themespath = themespath.substring(0, themespath.length
>>> () - 1);
>>> }
>>>
>>> // first, get a list of the themes available
>>> Index: src/org/apache/roller/business/utils/ConsistencyCheck.java
>>> ===================================================================
>>> --- src/org/apache/roller/business/utils/ConsistencyCheck.java
>>> (Revision 496250)
>>> +++ src/org/apache/roller/business/utils/ConsistencyCheck.java
>>> (Arbeitskopie)
>>> @@ -213,7 +213,7 @@
>>> ResultSet websiteRs = websiteSt.executeQuery(
>>> "select websiteid from weblogentry where
>>> id="+entryid);
>>> websiteRs.first();
>>> - String websiteid = websiteRs.getString(0);
>>> + String websiteid = websiteRs.getString(1);
>>>
>>> String rootid = getRootCategoryId(con, websiteid);
>>> Statement st = con.createStatement();
>>> bash-3.00$ cat ~/typos.diff
>>> Index: src/org/apache/roller/pojos/UserData.java
>>> ===================================================================
>>> --- src/org/apache/roller/pojos/UserData.java (Revision 496271)
>>> +++ src/org/apache/roller/pojos/UserData.java (Arbeitskopie)
>>> @@ -85,7 +85,7 @@
>>> this.dateCreated = (Date)dateCreated.clone();
>>> this.locale = locale;
>>> this.timeZone = timeZone;
>>> - this.enabled = enabled;
>>> + this.enabled = isEnabled;
>>> }
>>>
>>> public UserData( UserData otherData ) {
>>> Index: src/org/apache/roller/pojos/RollerConfigData.java
>>> ===================================================================
>>> --- src/org/apache/roller/pojos/RollerConfigData.java (Revision
>>> 496250)
>>> +++ src/org/apache/roller/pojos/RollerConfigData.java (Arbeitskopie)
>>> @@ -757,7 +757,7 @@
>>>
>>> public boolean equals(Object pOther)
>>> {
>>> - if (pOther instanceof WebsiteData)
>>> + if (pOther instanceof RollerConfigData)
>>> {
>>> RollerConfigData lTest = (RollerConfigData) pOther;
>>> boolean lEquals = true;
>>> Index: src/org/apache/roller/business/ThemeManagerImpl.java
>>> ===================================================================
>>> --- src/org/apache/roller/business/ThemeManagerImpl.java
>>> (Revision 496250)
>>> +++ src/org/apache/roller/business/ThemeManagerImpl.java
>>> (Arbeitskopie)
>>> @@ -239,7 +239,7 @@
>>>
>>> String themespath = RollerConfig.getProperty("themes.dir");
>>> if(themespath.endsWith(File.separator)) {
>>> - themespath.substring(0, themespath.length() - 1);
>>> + themespath = themespath.substring(0, themespath.length
>>> () - 1);
>>> }
>>>
>>> // first, get a list of the themes available
>>> Index: src/org/apache/roller/business/utils/ConsistencyCheck.java
>>> ===================================================================
>>> --- src/org/apache/roller/business/utils/ConsistencyCheck.java
>>> (Revision 496250)
>>> +++ src/org/apache/roller/business/utils/ConsistencyCheck.java
>>> (Arbeitskopie)
>>> @@ -213,7 +213,7 @@
>>> ResultSet websiteRs = websiteSt.executeQuery(
>>> "select websiteid from weblogentry where
>>> id="+entryid);
>>> websiteRs.first();
>>> - String websiteid = websiteRs.getString(0);
>>> + String websiteid = websiteRs.getString(1);
>>>
>>> String rootid = getRootCategoryId(con, websiteid);
>>> Statement st = con.createStatement();
>>
>>
>
> Craig Russell
> Architect, Sun Java Enterprise System http://java.sun.com/products/jdo
> 408 276-5638 mailto:Craig.Russell@sun.com
> P.S. A good JDO? O, Gasp!
>
Re: Fix for typos in roller code
Posted by Craig L Russell <Cr...@Sun.COM>.
Hi Markus,
Have you checked out the code since you submitted this patch?
I checked in your changes last week with revision 496903. I guess svn
is not set up to send mail to the roller-dev alias.
Regards,
Craig
On Jan 22, 2007, at 4:08 PM, Markus Fuchs wrote:
> Hi,
>
> Did anybody have the time to look at this? I ran the JUnit tests
> successfully with these changes.
>
> Thanks,
>
> -- markus.
>
> Markus Fuchs wrote:
>
>> Hi,
>>
>> I ran FindBugs, see http://findbugs.sourceforge.net/ against
>> roller-business.jar and found some obvious typos which I fixed in
>> the attached jar. Please check it out.
>>
>> Thanks,
>>
>> -- markus.
>>
>> Index: src/org/apache/roller/pojos/UserData.java
>> ===================================================================
>> --- src/org/apache/roller/pojos/UserData.java (Revision 496271)
>> +++ src/org/apache/roller/pojos/UserData.java (Arbeitskopie)
>> @@ -85,7 +85,7 @@
>> this.dateCreated = (Date)dateCreated.clone();
>> this.locale = locale;
>> this.timeZone = timeZone;
>> - this.enabled = enabled;
>> + this.enabled = isEnabled;
>> }
>>
>> public UserData( UserData otherData ) {
>> Index: src/org/apache/roller/pojos/RollerConfigData.java
>> ===================================================================
>> --- src/org/apache/roller/pojos/RollerConfigData.java (Revision
>> 496250)
>> +++ src/org/apache/roller/pojos/RollerConfigData.java
>> (Arbeitskopie)
>> @@ -757,7 +757,7 @@
>>
>> public boolean equals(Object pOther)
>> {
>> - if (pOther instanceof WebsiteData)
>> + if (pOther instanceof RollerConfigData)
>> {
>> RollerConfigData lTest = (RollerConfigData) pOther;
>> boolean lEquals = true;
>> Index: src/org/apache/roller/business/ThemeManagerImpl.java
>> ===================================================================
>> --- src/org/apache/roller/business/ThemeManagerImpl.java
>> (Revision 496250)
>> +++ src/org/apache/roller/business/ThemeManagerImpl.java
>> (Arbeitskopie)
>> @@ -239,7 +239,7 @@
>>
>> String themespath = RollerConfig.getProperty("themes.dir");
>> if(themespath.endsWith(File.separator)) {
>> - themespath.substring(0, themespath.length() - 1);
>> + themespath = themespath.substring(0, themespath.length
>> () - 1);
>> }
>>
>> // first, get a list of the themes available
>> Index: src/org/apache/roller/business/utils/ConsistencyCheck.java
>> ===================================================================
>> --- src/org/apache/roller/business/utils/ConsistencyCheck.java
>> (Revision 496250)
>> +++ src/org/apache/roller/business/utils/ConsistencyCheck.java
>> (Arbeitskopie)
>> @@ -213,7 +213,7 @@
>> ResultSet websiteRs = websiteSt.executeQuery(
>> "select websiteid from weblogentry where
>> id="+entryid);
>> websiteRs.first();
>> - String websiteid = websiteRs.getString(0);
>> + String websiteid = websiteRs.getString(1);
>>
>> String rootid = getRootCategoryId(con, websiteid);
>> Statement st = con.createStatement();
>> bash-3.00$ cat ~/typos.diff
>> Index: src/org/apache/roller/pojos/UserData.java
>> ===================================================================
>> --- src/org/apache/roller/pojos/UserData.java (Revision 496271)
>> +++ src/org/apache/roller/pojos/UserData.java (Arbeitskopie)
>> @@ -85,7 +85,7 @@
>> this.dateCreated = (Date)dateCreated.clone();
>> this.locale = locale;
>> this.timeZone = timeZone;
>> - this.enabled = enabled;
>> + this.enabled = isEnabled;
>> }
>>
>> public UserData( UserData otherData ) {
>> Index: src/org/apache/roller/pojos/RollerConfigData.java
>> ===================================================================
>> --- src/org/apache/roller/pojos/RollerConfigData.java (Revision
>> 496250)
>> +++ src/org/apache/roller/pojos/RollerConfigData.java
>> (Arbeitskopie)
>> @@ -757,7 +757,7 @@
>>
>> public boolean equals(Object pOther)
>> {
>> - if (pOther instanceof WebsiteData)
>> + if (pOther instanceof RollerConfigData)
>> {
>> RollerConfigData lTest = (RollerConfigData) pOther;
>> boolean lEquals = true;
>> Index: src/org/apache/roller/business/ThemeManagerImpl.java
>> ===================================================================
>> --- src/org/apache/roller/business/ThemeManagerImpl.java
>> (Revision 496250)
>> +++ src/org/apache/roller/business/ThemeManagerImpl.java
>> (Arbeitskopie)
>> @@ -239,7 +239,7 @@
>>
>> String themespath = RollerConfig.getProperty("themes.dir");
>> if(themespath.endsWith(File.separator)) {
>> - themespath.substring(0, themespath.length() - 1);
>> + themespath = themespath.substring(0, themespath.length
>> () - 1);
>> }
>>
>> // first, get a list of the themes available
>> Index: src/org/apache/roller/business/utils/ConsistencyCheck.java
>> ===================================================================
>> --- src/org/apache/roller/business/utils/ConsistencyCheck.java
>> (Revision 496250)
>> +++ src/org/apache/roller/business/utils/ConsistencyCheck.java
>> (Arbeitskopie)
>> @@ -213,7 +213,7 @@
>> ResultSet websiteRs = websiteSt.executeQuery(
>> "select websiteid from weblogentry where
>> id="+entryid);
>> websiteRs.first();
>> - String websiteid = websiteRs.getString(0);
>> + String websiteid = websiteRs.getString(1);
>>
>> String rootid = getRootCategoryId(con, websiteid);
>> Statement st = con.createStatement();
>
Craig Russell
Architect, Sun Java Enterprise System http://java.sun.com/products/jdo
408 276-5638 mailto:Craig.Russell@sun.com
P.S. A good JDO? O, Gasp!
Re: Fix for typos in roller code
Posted by Markus Fuchs <Ma...@Sun.COM>.
Hi,
Did anybody have the time to look at this? I ran the JUnit tests
successfully with these changes.
Thanks,
-- markus.
Markus Fuchs wrote:
> Hi,
>
> I ran FindBugs, see http://findbugs.sourceforge.net/ against
> roller-business.jar and found some obvious typos which I fixed in the
> attached jar. Please check it out.
>
> Thanks,
>
> -- markus.
>
> Index: src/org/apache/roller/pojos/UserData.java
> ===================================================================
> --- src/org/apache/roller/pojos/UserData.java (Revision 496271)
> +++ src/org/apache/roller/pojos/UserData.java (Arbeitskopie)
> @@ -85,7 +85,7 @@
> this.dateCreated = (Date)dateCreated.clone();
> this.locale = locale;
> this.timeZone = timeZone;
> - this.enabled = enabled;
> + this.enabled = isEnabled;
> }
>
> public UserData( UserData otherData ) {
> Index: src/org/apache/roller/pojos/RollerConfigData.java
> ===================================================================
> --- src/org/apache/roller/pojos/RollerConfigData.java (Revision 496250)
> +++ src/org/apache/roller/pojos/RollerConfigData.java (Arbeitskopie)
> @@ -757,7 +757,7 @@
>
> public boolean equals(Object pOther)
> {
> - if (pOther instanceof WebsiteData)
> + if (pOther instanceof RollerConfigData)
> {
> RollerConfigData lTest = (RollerConfigData) pOther;
> boolean lEquals = true;
> Index: src/org/apache/roller/business/ThemeManagerImpl.java
> ===================================================================
> --- src/org/apache/roller/business/ThemeManagerImpl.java
> (Revision 496250)
> +++ src/org/apache/roller/business/ThemeManagerImpl.java
> (Arbeitskopie)
> @@ -239,7 +239,7 @@
>
> String themespath = RollerConfig.getProperty("themes.dir");
> if(themespath.endsWith(File.separator)) {
> - themespath.substring(0, themespath.length() - 1);
> + themespath = themespath.substring(0, themespath.length()
> - 1);
> }
>
> // first, get a list of the themes available
> Index: src/org/apache/roller/business/utils/ConsistencyCheck.java
> ===================================================================
> --- src/org/apache/roller/business/utils/ConsistencyCheck.java
> (Revision 496250)
> +++ src/org/apache/roller/business/utils/ConsistencyCheck.java
> (Arbeitskopie)
> @@ -213,7 +213,7 @@
> ResultSet websiteRs = websiteSt.executeQuery(
> "select websiteid from weblogentry where id="+entryid);
> websiteRs.first();
> - String websiteid = websiteRs.getString(0);
> + String websiteid = websiteRs.getString(1);
>
> String rootid = getRootCategoryId(con, websiteid);
> Statement st = con.createStatement();
> bash-3.00$ cat ~/typos.diff
> Index: src/org/apache/roller/pojos/UserData.java
> ===================================================================
> --- src/org/apache/roller/pojos/UserData.java (Revision 496271)
> +++ src/org/apache/roller/pojos/UserData.java (Arbeitskopie)
> @@ -85,7 +85,7 @@
> this.dateCreated = (Date)dateCreated.clone();
> this.locale = locale;
> this.timeZone = timeZone;
> - this.enabled = enabled;
> + this.enabled = isEnabled;
> }
>
> public UserData( UserData otherData ) {
> Index: src/org/apache/roller/pojos/RollerConfigData.java
> ===================================================================
> --- src/org/apache/roller/pojos/RollerConfigData.java (Revision 496250)
> +++ src/org/apache/roller/pojos/RollerConfigData.java (Arbeitskopie)
> @@ -757,7 +757,7 @@
>
> public boolean equals(Object pOther)
> {
> - if (pOther instanceof WebsiteData)
> + if (pOther instanceof RollerConfigData)
> {
> RollerConfigData lTest = (RollerConfigData) pOther;
> boolean lEquals = true;
> Index: src/org/apache/roller/business/ThemeManagerImpl.java
> ===================================================================
> --- src/org/apache/roller/business/ThemeManagerImpl.java
> (Revision 496250)
> +++ src/org/apache/roller/business/ThemeManagerImpl.java
> (Arbeitskopie)
> @@ -239,7 +239,7 @@
>
> String themespath = RollerConfig.getProperty("themes.dir");
> if(themespath.endsWith(File.separator)) {
> - themespath.substring(0, themespath.length() - 1);
> + themespath = themespath.substring(0, themespath.length()
> - 1);
> }
>
> // first, get a list of the themes available
> Index: src/org/apache/roller/business/utils/ConsistencyCheck.java
> ===================================================================
> --- src/org/apache/roller/business/utils/ConsistencyCheck.java
> (Revision 496250)
> +++ src/org/apache/roller/business/utils/ConsistencyCheck.java
> (Arbeitskopie)
> @@ -213,7 +213,7 @@
> ResultSet websiteRs = websiteSt.executeQuery(
> "select websiteid from weblogentry where id="+entryid);
> websiteRs.first();
> - String websiteid = websiteRs.getString(0);
> + String websiteid = websiteRs.getString(1);
>
> String rootid = getRootCategoryId(con, websiteid);
> Statement st = con.createStatement();