Fix for typos in roller code

[Markus Fuchs]

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
===================================================================

@@ -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
===================================================================

@@ -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
===================================================================

@@ -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
===================================================================

@@ -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();

--- src/org/apache/roller/business/ThemeManagerImpl.java (Revision 496250) +++ src/org/apache/roller/business/ThemeManagerImpl.java (Arbeitskopie) --- src/org/apache/roller/business/utils/ConsistencyCheck.java (Revision 496250) +++ src/org/apache/roller/business/utils/ConsistencyCheck.java (Arbeitskopie) --- src/org/apache/roller/business/ThemeManagerImpl.java (Revision 496250) +++ src/org/apache/roller/business/ThemeManagerImpl.java (Arbeitskopie) --- src/org/apache/roller/business/utils/ConsistencyCheck.java (Revision 496250) +++ src/org/apache/roller/business/utils/ConsistencyCheck.java (Arbeitskopie)

typos.jar
Description: application/jar