http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Service.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Service.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Service.java
index 1f977ab..369ffa5 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Service.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Service.java
@@ -39,11 +39,7 @@
  */
 package org.rometools.feed.module.base;
 
-import org.rometools.feed.module.base.types.CurrencyEnumeration;
-import org.rometools.feed.module.base.types.FloatUnit;
-import org.rometools.feed.module.base.types.PaymentTypeEnumeration;
-import org.rometools.feed.module.base.types.PriceTypeEnumeration;
-import org.rometools.feed.module.base.types.ShippingType;
+import org.rometools.feed.module.base.types.*;
 
 
 /**
@@ -93,7 +89,7 @@ public interface Service extends GlobalInterface {
      *        </tbody></table>
      * @param value Currency  of the price amount for an item.
      */
-    public void setCurrency(CurrencyEnumeration value);
+    void setCurrency(CurrencyEnumeration value);
 
     /**
      * Currency  of the price amount for an item.
@@ -134,7 +130,7 @@ public interface Service extends GlobalInterface {
      *        </tbody></table>
      * @return Currency  of the price amount for an item.
      */
-    public CurrencyEnumeration getCurrency();
+    CurrencyEnumeration getCurrency();
 
     /**
      * Additional instructions to explain the item’s delivery process.
@@ -172,7 +168,7 @@ public interface Service extends GlobalInterface {
      *        </tbody></table>
      * @param deliveryNotes Additional instructions to explain the item’s 
delivery process.
      */
-    public void setDeliveryNotes(String deliveryNotes);
+    void setDeliveryNotes(String deliveryNotes);
 
 
     /**
@@ -211,7 +207,7 @@ public interface Service extends GlobalInterface {
      *        </tbody></table>
      * @return Additional instructions to explain the item’s delivery 
process.
      */
-    public String getDeliveryNotes();
+    String getDeliveryNotes();
 
     /**
      * The maximum distance you will deliver an item in any direction.
@@ -250,7 +246,7 @@ public interface Service extends GlobalInterface {
      *        </tbody></table>
      * @param deliveryRadius The maximum distance you will deliver an item in 
any direction.
      */
-    public void setDeliveryRadius(FloatUnit deliveryRadius);
+    void setDeliveryRadius(FloatUnit deliveryRadius);
     /**
      * The maximum distance you will deliver an item in any direction.
      *        <table border="1" cellpadding="5" cellspacing="0" width="640">
@@ -288,7 +284,7 @@ public interface Service extends GlobalInterface {
      *        </tbody></table>
      * @return The maximum distance you will deliver an item in any direction.
      */
-    public FloatUnit getDeliveryRadius();
+    FloatUnit getDeliveryRadius();
 
     /**
      * Location of the where the service is offered.
@@ -338,7 +334,7 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @param location Location of the where the service is offered.
      */
-    public void setLocation(String location);
+    void setLocation(String location);
 
     /**
      * Location of the where the service is offered.
@@ -388,7 +384,7 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @return  Location of the where the service is offered.
      */
-    public String getLocation();
+    String getLocation();
 
     /**
      * Payment Methods acceptable for the service.
@@ -445,7 +441,7 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @param paymentAccepted Payment Methods acceptable for the service.
      */
-    public void setPaymentAccepted(PaymentTypeEnumeration[] paymentAccepted);
+    void setPaymentAccepted(PaymentTypeEnumeration[] paymentAccepted);
 
     /**
      * Payment Methods acceptable for the service.
@@ -502,7 +498,7 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @return Payment Methods acceptable for the service.
      */
-    public PaymentTypeEnumeration[] getPaymentAccepted();
+    PaymentTypeEnumeration[] getPaymentAccepted();
 
     /**
      * Additional payment information.
@@ -547,7 +543,7 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @param paymentNotes Additional payment information.
      */
-    public void setPaymentNotes(String paymentNotes);
+    void setPaymentNotes(String paymentNotes);
 
     /**
      * Additional payment information.
@@ -592,7 +588,7 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @return Additional payment information.
      */
-    public String getPaymentNotes();
+    String getPaymentNotes();
 
     /**
      * Price for the service.
@@ -646,7 +642,7 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @param price Price for the service.
      */
-    public void setPrice(FloatUnit price);
+    void setPrice(FloatUnit price);
 
     /**
      * Price for the service.
@@ -700,7 +696,7 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @return Price for the service.
      */
-    public FloatUnit getPrice();
+    FloatUnit getPrice();
 
     /**
      * Price type information.
@@ -746,7 +742,7 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @param priceType Price type information.
      */
-    public void setPriceType(PriceTypeEnumeration priceType);
+    void setPriceType(PriceTypeEnumeration priceType);
 
     /**
      * Price type information.
@@ -792,7 +788,7 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @return Price type information.
      */
-    public PriceTypeEnumeration getPriceType();
+    PriceTypeEnumeration getPriceType();
 
     /**
      * Quantity available.
@@ -846,7 +842,7 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @param quantity Quantity available.
      */
-    public void setQuantity(Integer quantity);
+    void setQuantity(Integer quantity);
 
     /**
      * Quantity available.
@@ -900,7 +896,7 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @return Quantity available.
      */
-    public Integer getQuantity();
+    Integer getQuantity();
 
     /**
      * The type of service being offered.
@@ -943,7 +939,7 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @param serviceType The type of service being offered.
      */
-    public void setServiceType(String serviceType);
+    void setServiceType(String serviceType);
 
     /**
      * The type of service being offered.
@@ -986,7 +982,7 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @return The type of service being offered.
      */
-    public String getServiceType();
+    String getServiceType();
 
     /**
      * Shipping options available for an item.
@@ -1043,7 +1039,7 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @param shipping Shipping options available for an item.
      */
-    public void setShipping(ShippingType[] shipping);
+    void setShipping(ShippingType[] shipping);
 
     /**
      * Shipping options available for an item.
@@ -1100,7 +1096,7 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @return Shipping options available for an item.
      */
-    public ShippingType[] getShipping();
+    ShippingType[] getShipping();
 
     /**
      * Tax rate associated with the item.
@@ -1144,7 +1140,7 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @param taxPercent Tax rate associated with the event.
      */
-    public void setTaxPercent(Float taxPercent);
+    void setTaxPercent(Float taxPercent);
 
     /**
     * Tax rate associated with the service.
@@ -1188,7 +1184,7 @@ public interface Service extends GlobalInterface {
     * </tbody></table>
     * @return Tax rate associated with the event.
     */
-    public Float getTaxPercent();
+    Float getTaxPercent();
 
     /**
      * Region where tax applies.
@@ -1235,7 +1231,7 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @param taxRegion Region where tax applies.
      */
-    public void setTaxRegion(String taxRegion);
+    void setTaxRegion(String taxRegion);
 
     /**
      * Region where tax applies.
@@ -1282,5 +1278,5 @@ public interface Service extends GlobalInterface {
      * </tbody></table>
      * @return Region where tax applies.
      */
-    public String getTaxRegion();
+    String getTaxRegion();
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Travel.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Travel.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Travel.java
index 5d647a9..4dfc049 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Travel.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Travel.java
@@ -39,12 +39,7 @@
  */
 package org.rometools.feed.module.base;
 
-import org.rometools.feed.module.base.types.CurrencyEnumeration;
-import org.rometools.feed.module.base.types.DateTimeRange;
-import org.rometools.feed.module.base.types.FloatUnit;
-import org.rometools.feed.module.base.types.PaymentTypeEnumeration;
-import org.rometools.feed.module.base.types.PriceTypeEnumeration;
-import org.rometools.feed.module.base.types.ShippingType;
+import org.rometools.feed.module.base.types.*;
 
 
 /**This is an interface for the GoogleBase plug in that exposes methods used 
for
@@ -93,7 +88,7 @@ public interface Travel extends GlobalInterface {
      *        </tbody></table>
      * @param value Currency  of the price amount for an item.
      */
-    public void setCurrency(CurrencyEnumeration value);
+    void setCurrency(CurrencyEnumeration value);
 
     /**
      * Currency  of the price amount for an item.
@@ -134,7 +129,7 @@ public interface Travel extends GlobalInterface {
      *        </tbody></table>
      * @return Currency  of the price amount for an item.
      */
-    public CurrencyEnumeration getCurrency();
+    CurrencyEnumeration getCurrency();
 
     /**
      * Additional instructions to explain the item’s delivery process.
@@ -172,7 +167,7 @@ public interface Travel extends GlobalInterface {
      *        </tbody></table>
      * @param deliveryNotes Additional instructions to explain the item’s 
delivery process.
      */
-    public void setDeliveryNotes(String deliveryNotes);
+    void setDeliveryNotes(String deliveryNotes);
 
     /**
      * Additional instructions to explain the item’s delivery process.
@@ -210,7 +205,7 @@ public interface Travel extends GlobalInterface {
      *        </tbody></table>
      * @return Additional instructions to explain the item’s delivery 
process.
      */
-    public String getDeliveryNotes();
+    String getDeliveryNotes();
 
     /**
      * The maximum distance you will deliver an item in any direction.
@@ -249,7 +244,7 @@ public interface Travel extends GlobalInterface {
      *        </tbody></table>
      * @param deliveryRadius The maximum distance you will deliver an item in 
any direction.
      */
-    public void setDeliveryRadius(FloatUnit deliveryRadius);
+    void setDeliveryRadius(FloatUnit deliveryRadius);
 
     /**
      * The maximum distance you will deliver an item in any direction.
@@ -288,7 +283,7 @@ public interface Travel extends GlobalInterface {
      *        </tbody></table>
      * @return The maximum distance you will deliver an item in any direction.
      */
-    public FloatUnit getDeliveryRadius();
+    FloatUnit getDeliveryRadius();
 
     /**
      * Starting city and state/country of the trip.
@@ -330,7 +325,7 @@ public interface Travel extends GlobalInterface {
      *        </tbody></table>
      * @param fromLocation Starting city and state/country of the trip.
      */
-    public void setFromLocation(String fromLocation);
+    void setFromLocation(String fromLocation);
 
     /**
      * Starting city and state/country of the trip.
@@ -372,7 +367,7 @@ public interface Travel extends GlobalInterface {
      *        </tbody></table>
      * @return Starting city and state/country of the trip.
      */
-    public String getFromLocation();
+    String getFromLocation();
 
     /**
      * Acceptable payment methods for item purchases.
@@ -428,7 +423,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @param paymentAccepted Acceptable payment methods for item purchases.
      */
-    public void setPaymentAccepted(PaymentTypeEnumeration[] paymentAccepted);
+    void setPaymentAccepted(PaymentTypeEnumeration[] paymentAccepted);
 
     /**
      * Acceptable payment methods for item purchases.
@@ -484,7 +479,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @return Acceptable payment methods for item purchases.
      */
-    public PaymentTypeEnumeration[] getPaymentAccepted();
+    PaymentTypeEnumeration[] getPaymentAccepted();
 
     /**
      * Additional instructions to explain a payment policy.
@@ -530,7 +525,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @param paymentNotes Additional instructions to explain a payment policy.
      */
-    public void setPaymentNotes(String paymentNotes);
+    void setPaymentNotes(String paymentNotes);
 
     /**
      * Additional instructions to explain a payment policy.
@@ -576,7 +571,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @return Additional instructions to explain a payment policy.
      */
-    public String getPaymentNotes();
+    String getPaymentNotes();
 
     /**
      * Price of the item.
@@ -629,7 +624,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @return Price of the item.
      */
-    public FloatUnit getPrice();
+    FloatUnit getPrice();
 
     /**
      * The type of pricing for the item.
@@ -674,7 +669,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @param priceType The type of pricing for the item.
      */
-    public void setPriceType(PriceTypeEnumeration priceType);
+    void setPriceType(PriceTypeEnumeration priceType);
 
     /**
      * The type of pricing for the item.
@@ -719,7 +714,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @return The type of pricing for the item.
      */
-    public PriceTypeEnumeration getPriceType();
+    PriceTypeEnumeration getPriceType();
 
 
     /**
@@ -774,7 +769,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @param quantity Quantity available.
      */
-    public void setQuantity(Integer quantity);
+    void setQuantity(Integer quantity);
 
     /**
      * Quantity available.
@@ -828,7 +823,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @return Quantity available.
      */
-    public Integer getQuantity();
+    Integer getQuantity();
 
     
     /**
@@ -873,7 +868,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @param taxPercent Tax rate associated with the event.
      */
-    public void setTaxPercent(Float taxPercent);
+    void setTaxPercent(Float taxPercent);
 
     /**
     * Tax rate associated with the service.
@@ -917,7 +912,7 @@ public interface Travel extends GlobalInterface {
     * </tbody></table>
     * @return Tax rate associated with the event.
     */
-    public Float getTaxPercent();
+    Float getTaxPercent();
 
     /**
      * Region where tax applies.
@@ -964,7 +959,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @param taxRegion Region where tax applies.
      */
-    public void setTaxRegion(String taxRegion);
+    void setTaxRegion(String taxRegion);
 
     /**
      * Region where tax applies.
@@ -1011,7 +1006,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @return Region where tax applies.
      */
-    public String getTaxRegion();
+    String getTaxRegion();
     
     /**
      * Destination city and state/country of the trip.
@@ -1063,7 +1058,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @param toLocation Destination city and state/country of the trip.
      */
-    public void setToLocation(String toLocation);
+    void setToLocation(String toLocation);
 
     /**
      * Destination city and state/country of the trip.
@@ -1115,7 +1110,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @return Destination city and state/country of the trip.
      */
-    public String getToLocation();
+    String getToLocation();
 
     /**
      * Departure date and time of the trip.
@@ -1168,7 +1163,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @param travelDateRange Departure date and time of the trip.
      */
-    public void setTravelDateRange(DateTimeRange travelDateRange);
+    void setTravelDateRange(DateTimeRange travelDateRange);
 
     /**
      * Departure date and time of the trip.
@@ -1221,7 +1216,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @return Departure date and time of the trip.
      */
-    public DateTimeRange getTravelDateRange();
+    DateTimeRange getTravelDateRange();
     /**
      * Location of the property.
      * <table border="1" cellpadding="5" cellspacing="0" width="640">
@@ -1270,7 +1265,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @param location Location of the property.
      */
-    public void setLocation(String location);
+    void setLocation(String location);
 
     /**
      * Location of the property.
@@ -1320,7 +1315,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @return Location of the property.
      */
-    public String getLocation();
+    String getLocation();
     
     
     /**
@@ -1378,7 +1373,7 @@ public interface Travel extends GlobalInterface {
      * </tbody></table>
      * @return Shipping options available for an item.
      */
-    public ShippingType[] getShipping();
+    ShippingType[] getShipping();
 
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Unknown.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Unknown.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Unknown.java
index 6a095b1..dfe7b56 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Unknown.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Unknown.java
@@ -39,10 +39,10 @@
  */
 package org.rometools.feed.module.base;
 
-import java.net.URL;
-
 import org.rometools.feed.module.base.types.IntUnit;
 
+import java.net.URL;
+
 
 /**
  * This interface contains all the other schema elements that the document
@@ -52,27 +52,27 @@ import org.rometools.feed.module.base.types.IntUnit;
  *         Cooper</a>
  */
 public interface Unknown extends GlobalInterface {
-    public void setLicenses(String[] licenses);
+    void setLicenses(String[] licenses);
 
-    public String[] getLicenses();
+    String[] getLicenses();
 
-    public void setOperatingSystems(String systems);
+    void setOperatingSystems(String systems);
 
-    public String getOperatingSystems();
+    String getOperatingSystems();
 
-    public void setProgrammingLanguages(String[] languages);
+    void setProgrammingLanguages(String[] languages);
 
-    public String[] getProgrammingLanguages();
+    String[] getProgrammingLanguages();
 
-    public void setRelatedLinks(URL[] links);
+    void setRelatedLinks(URL[] links);
 
-    public URL[] getRelatedLinks();
+    URL[] getRelatedLinks();
 
-    public void setSquareFootages(IntUnit[] squareFootages);
+    void setSquareFootages(IntUnit[] squareFootages);
 
-    public IntUnit[] getSquareFootages();
+    IntUnit[] getSquareFootages();
 
-    public void setSubjectAreas(String[] subjectAreas);
+    void setSubjectAreas(String[] subjectAreas);
 
-    public String[] getSubjectAreas();
+    String[] getSubjectAreas();
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Vehicle.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Vehicle.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Vehicle.java
index 6a5c512..85a26d4 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Vehicle.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Vehicle.java
@@ -39,12 +39,7 @@
  */
 package org.rometools.feed.module.base;
 
-import org.rometools.feed.module.base.types.CurrencyEnumeration;
-import org.rometools.feed.module.base.types.FloatUnit;
-import org.rometools.feed.module.base.types.PaymentTypeEnumeration;
-import org.rometools.feed.module.base.types.PriceTypeEnumeration;
-import org.rometools.feed.module.base.types.ShippingType;
-import org.rometools.feed.module.base.types.YearType;
+import org.rometools.feed.module.base.types.*;
 
 
 /**
@@ -96,7 +91,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @param color Color of an item.
      */
-    public void setColors(String[] color);
+    void setColors(String[] color);
 
     /**
      * Color of an item.
@@ -140,7 +135,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @return Color of an item.
      */
-    public String[] getColors();
+    String[] getColors();
 
     /**
      * Condition of the item. For example: new, used, or refurbished.
@@ -179,7 +174,7 @@ public interface Vehicle extends GlobalInterface {
      *        </tbody></table>
      * @param condition Condition of the item. For example: new, used, or 
refurbished.
      */
-    public void setCondition(String condition);
+    void setCondition(String condition);
 
     /**
      * Condition of the item. For example: new, used, or refurbished.
@@ -218,7 +213,7 @@ public interface Vehicle extends GlobalInterface {
      *        </tbody></table>
      * @return Condition of the item. For example: new, used, or refurbished.
      */
-    public String getCondition();
+    String getCondition();
 
     /**
      * Currency  of the price amount for an item.
@@ -259,7 +254,7 @@ public interface Vehicle extends GlobalInterface {
      *        </tbody></table>
      * @param value Currency  of the price amount for an item.
      */
-    public void setCurrency(CurrencyEnumeration value);
+    void setCurrency(CurrencyEnumeration value);
 
     /**
      * Currency  of the price amount for an item.
@@ -300,7 +295,7 @@ public interface Vehicle extends GlobalInterface {
      *        </tbody></table>
      * @return Currency  of the price amount for an item.
      */
-    public CurrencyEnumeration getCurrency();
+    CurrencyEnumeration getCurrency();
 
     /**
      * Additional instructions to explain the item’s delivery process.
@@ -338,7 +333,7 @@ public interface Vehicle extends GlobalInterface {
      *        </tbody></table>
      * @param deliveryNotes Additional instructions to explain the item’s 
delivery process.
      */
-    public void setDeliveryNotes(String deliveryNotes);
+    void setDeliveryNotes(String deliveryNotes);
 
     /**
      * Additional instructions to explain the item’s delivery process.
@@ -376,7 +371,7 @@ public interface Vehicle extends GlobalInterface {
      *        </tbody></table>
      * @return Additional instructions to explain the item’s delivery 
process.
      */
-    public String getDeliveryNotes();
+    String getDeliveryNotes();
 
     /**
      * The maximum distance you will deliver an item in any direction.
@@ -415,7 +410,7 @@ public interface Vehicle extends GlobalInterface {
      *        </tbody></table>
      * @param deliveryRadius The maximum distance you will deliver an item in 
any direction.
      */
-    public void setDeliveryRadius(FloatUnit deliveryRadius);
+    void setDeliveryRadius(FloatUnit deliveryRadius);
 
     /**
      * The maximum distance you will deliver an item in any direction.
@@ -454,7 +449,7 @@ public interface Vehicle extends GlobalInterface {
      *        </tbody></table>
      * @return The maximum distance you will deliver an item in any direction.
      */
-    public FloatUnit getDeliveryRadius();
+    FloatUnit getDeliveryRadius();
 
     /**
      * Location of a property. Should include street, city, state, postal 
code, and country, in that order.
@@ -504,7 +499,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @param location Location of a property. Should include street, city, 
state, postal code, and country, in that order.
      */
-    public void setLocation(String location);
+    void setLocation(String location);
 
     /**
      * Location of a property. Should include street, city, state, postal 
code, and country, in that order.
@@ -554,7 +549,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @return Location of a property. Should include street, city, state, 
postal code, and country, in that order.
      */
-    public String getLocation();
+    String getLocation();
 
 
     /**
@@ -599,7 +594,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @param make The vehicle manufacturer.
      */
-    public void setMake(String make);
+    void setMake(String make);
 
     /**
      * The vehicle manufacturer.
@@ -643,7 +638,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @return The vehicle manufacturer.
      */
-    public String getMake();
+    String getMake();
 
     /**
      * Current mileage of the vehicle.
@@ -686,7 +681,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @param mileage Current mileage of the vehicle.
      */
-    public void setMileage(Integer mileage);
+    void setMileage(Integer mileage);
 
     /**
      * Current mileage of the vehicle.
@@ -729,7 +724,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @return Current mileage of the vehicle.
      */
-    public Integer getMileage();
+    Integer getMileage();
 
     /**
      * The vehicle model.
@@ -763,7 +758,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @param model The vehicle model.
      */
-    public void setModel(String model);
+    void setModel(String model);
 
     /**
      * The vehicle model.
@@ -797,7 +792,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @return The vehicle model.
      */
-    public String getModel();
+    String getModel();
 
 /**
      * Payment Methods acceptable for the service.
@@ -854,7 +849,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @param paymentAccepted Payment Methods acceptable for the service.
      */
-    public void setPaymentAccepted(PaymentTypeEnumeration[] paymentAccepted);
+void setPaymentAccepted(PaymentTypeEnumeration[] paymentAccepted);
 
     /**
      * Payment Methods acceptable for the service.
@@ -911,7 +906,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @return Payment Methods acceptable for the service.
      */
-    public PaymentTypeEnumeration[] getPaymentAccepted();
+    PaymentTypeEnumeration[] getPaymentAccepted();
 
     /**
      * Additional payment information.
@@ -956,7 +951,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @param paymentNotes Additional payment information.
      */
-    public void setPaymentNotes(String paymentNotes);
+    void setPaymentNotes(String paymentNotes);
 
     /**
      * Additional payment information.
@@ -1001,7 +996,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @return Additional payment information.
      */
-    public String getPaymentNotes();
+    String getPaymentNotes();
 
     /**
      * Price for the service.
@@ -1055,7 +1050,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @param price Price for the service.
      */
-    public void setPrice(FloatUnit price);
+    void setPrice(FloatUnit price);
 
     /**
      * Price for the service.
@@ -1109,7 +1104,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @return Price for the service.
      */
-    public FloatUnit getPrice();
+    FloatUnit getPrice();
 
     /**
      * Price type information.
@@ -1155,7 +1150,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @param priceType Price type information.
      */
-    public void setPriceType(PriceTypeEnumeration priceType);
+    void setPriceType(PriceTypeEnumeration priceType);
 
     /**
      * Price type information.
@@ -1201,7 +1196,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @return Price type information.
      */
-    public PriceTypeEnumeration getPriceType();
+    PriceTypeEnumeration getPriceType();
 
 
     /**
@@ -1256,7 +1251,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @param quantity Quantity available.
      */
-    public void setQuantity(Integer quantity);
+    void setQuantity(Integer quantity);
 
     /**
      * Quantity available.
@@ -1310,7 +1305,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @return Quantity available.
      */
-    public Integer getQuantity();
+    Integer getQuantity();
 
     /**
      * Shipping options available for an item.
@@ -1367,7 +1362,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @param shipping Shipping options available for an item.
      */
-    public void setShipping(ShippingType[] shipping);
+    void setShipping(ShippingType[] shipping);
 
     /**
      * Shipping options available for an item.
@@ -1424,7 +1419,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @return Shipping options available for an item.
      */
-    public ShippingType[] getShipping();
+    ShippingType[] getShipping();
 
 
     
@@ -1470,7 +1465,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @param taxPercent Tax rate associated with the event.
      */
-    public void setTaxPercent(Float taxPercent);
+    void setTaxPercent(Float taxPercent);
 
     /**
     * Tax rate associated with the item.
@@ -1514,7 +1509,7 @@ public interface Vehicle extends GlobalInterface {
     * </tbody></table>
     * @return Tax rate associated with the event.
     */
-    public Float getTaxPercent();
+    Float getTaxPercent();
 
     /**
      * Region where tax applies.
@@ -1561,7 +1556,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @param taxRegion Region where tax applies.
      */
-    public void setTaxRegion(String taxRegion);
+    void setTaxRegion(String taxRegion);
 
     /**
      * Region where tax applies.
@@ -1608,7 +1603,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @return Region where tax applies.
      */
-    public String getTaxRegion();
+    String getTaxRegion();
 
 
     /**
@@ -1654,7 +1649,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @param vehicleType The type of vehicle: Car, motorcycle, scooter, etc.
      */
-    public void setVehicleType(String vehicleType);
+    void setVehicleType(String vehicleType);
 
     /**
      * The type of vehicle: Car, motorcycle, scooter, etc.
@@ -1699,7 +1694,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @return The type of vehicle: Car, motorcycle, scooter, etc.
      */
-    public String getVehicleType();
+    String getVehicleType();
 
     /**
      * Vehicle Identification Number.
@@ -1742,7 +1737,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @param vin Vehicle Identification Number.
      */
-    public void setVin(String vin);
+    void setVin(String vin);
 
     /**
      * Vehicle Identification Number.
@@ -1785,7 +1780,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @return Vehicle Identification Number.
      */
-    public String getVin();
+    String getVin();
 
     /**
      * The four digit model year or year built. 
@@ -1838,7 +1833,7 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @param year The four digit model year or year built. 
      */
-    public void setYear(YearType year);
+    void setYear(YearType year);
 
     /**
      * The four digit model year or year built. 
@@ -1891,5 +1886,5 @@ public interface Vehicle extends GlobalInterface {
      * </tbody></table>
      * @return The four digit model year or year built. 
      */
-    public YearType getYear();
+    YearType getYear();
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Wanted.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Wanted.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Wanted.java
index c3333c7..15a14b4 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Wanted.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/Wanted.java
@@ -85,7 +85,7 @@ public interface Wanted extends GlobalInterface {
      *        </tbody></table>
      * @param deliveryNotes Additional instructions to explain the item’s 
delivery process.
      */
-    public void setDeliveryNotes(String deliveryNotes);
+    void setDeliveryNotes(String deliveryNotes);
 
     /**
      * Additional instructions to explain the item’s delivery process.
@@ -123,7 +123,7 @@ public interface Wanted extends GlobalInterface {
      *        </tbody></table>
      * @return Additional instructions to explain the item’s delivery 
process.
      */
-    public String getDeliveryNotes();
+    String getDeliveryNotes();
 
     /**
      * The maximum distance you will deliver an item in any direction.
@@ -162,7 +162,7 @@ public interface Wanted extends GlobalInterface {
      *        </tbody></table>
      * @param deliveryRadius The maximum distance you will deliver an item in 
any direction.
      */
-    public void setDeliveryRadius(FloatUnit deliveryRadius);
+    void setDeliveryRadius(FloatUnit deliveryRadius);
 
     /**
      * The maximum distance you will deliver an item in any direction.
@@ -201,7 +201,7 @@ public interface Wanted extends GlobalInterface {
      *        </tbody></table>
      * @return The maximum distance you will deliver an item in any direction.
      */
-    public FloatUnit getDeliveryRadius();
+    FloatUnit getDeliveryRadius();
 
 /**
      * Location of the property.
@@ -251,7 +251,7 @@ public interface Wanted extends GlobalInterface {
      * </tbody></table>
      * @param location Location of the property.
      */
-    public void setLocation(String location);
+void setLocation(String location);
 
     /**
      * Location of the property.
@@ -301,6 +301,6 @@ public interface Wanted extends GlobalInterface {
      * </tbody></table>
      * @return Location of the property.
      */
-    public String getLocation();
+    String getLocation();
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/types/CloneableType.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/types/CloneableType.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/types/CloneableType.java
index f4a4064..22fb7b3 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/types/CloneableType.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/types/CloneableType.java
@@ -46,5 +46,5 @@ package org.rometools.feed.module.base.types;
  * @version $Revision: 1.1 $
  */
 public interface CloneableType extends Cloneable {
-    public Object clone();
+    Object clone();
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/types/DateTimeRange.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/types/DateTimeRange.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/types/DateTimeRange.java
index 4907def..fed6f55 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/types/DateTimeRange.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/types/DateTimeRange.java
@@ -120,8 +120,6 @@ public class DateTimeRange implements CloneableType {
        }
        if( this.start != null && !this.start.equals( d.getStart()) )
            return false;
-       if( this.end != null && !this.end.equals( d.getEnd()) )
-           return false;
-       return true;
+        return !(this.end != null && !this.end.equals(d.getEnd()));
     }
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/types/FloatUnit.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/types/FloatUnit.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/types/FloatUnit.java
index 933b1f1..e3a064c 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/types/FloatUnit.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/base/types/FloatUnit.java
@@ -151,9 +151,6 @@ public class FloatUnit implements CloneableType {
        if( f.getValue() != this.value ){
            return false;           
        }
-       if( this.units == f.getUnits() || ( this.units != null && 
this.units.equals( f.getUnits() )) ){
-           return true;
-       }
-       return false;
+        return this.units == f.getUnits() || (this.units != null && 
this.units.equals(f.getUnits()));
     }
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/cc/CreativeCommons.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/cc/CreativeCommons.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/cc/CreativeCommons.java
index 839d633..c772e82 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/cc/CreativeCommons.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/cc/CreativeCommons.java
@@ -49,11 +49,11 @@ import org.rometools.feed.module.cc.types.License;
  */
 public interface CreativeCommons extends Module {
     
-    public static final String URI = "rome:CreativeCommons";
+    String URI = "rome:CreativeCommons";
     
-    public License[] getAllLicenses();
-    public void setAllLicenses(License[] licenses);
+    License[] getAllLicenses();
+    void setAllLicenses(License[] licenses);
     
-    public License[] getLicenses();
-    public void setLicenses(License[] license );
+    License[] getLicenses();
+    void setLicenses(License[] license);
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/cc/CreativeCommonsImpl.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/cc/CreativeCommonsImpl.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/cc/CreativeCommonsImpl.java
index b4d3f70..3cf389d 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/cc/CreativeCommonsImpl.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/cc/CreativeCommonsImpl.java
@@ -44,6 +44,7 @@ import com.sun.syndication.feed.CopyFrom;
 import com.sun.syndication.feed.impl.EqualsBean;
 import com.sun.syndication.feed.impl.ToStringBean;
 import org.rometools.feed.module.cc.types.License;
+
 import java.lang.reflect.Array;
 
 /**
@@ -66,9 +67,7 @@ public class CreativeCommonsImpl implements CreativeCommons {
 
         Object[] array = 
(Object[])Array.newInstance(source.getClass().getComponentType(),source.length);
 
-        for(int i = 0; i < source.length; i++) {
-            array[i] = source[i];
-        }
+        System.arraycopy(source, 0, array, 0, source.length);
 
         return array;
     }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/content/ContentItem.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/content/ContentItem.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/content/ContentItem.java
index 8f9a45e..1faf124 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/content/ContentItem.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/content/ContentItem.java
@@ -143,7 +143,7 @@ public class ContentItem implements Cloneable {
             //System.out.println("enc");
             return false;
         }
-        String thisCV = this.contentValue.replaceAll(" 
xmlns=\"http://www.w3.org/1999/xhtml\"";, "").trim();;
+        String thisCV = this.contentValue.replaceAll(" 
xmlns=\"http://www.w3.org/1999/xhtml\"";, "").trim();
         String thatCV = other.contentValue.replaceAll(" 
xmlns=\"http://www.w3.org/1999/xhtml\"";, "").trim();
         if ((this.contentValue == null) ? (other.contentValue != null) : 
!thisCV.equals(thatCV)) {
 
@@ -165,11 +165,7 @@ public class ContentItem implements Cloneable {
             //System.out.println("ns");
             return false;
         }
-        if ((this.contentResource == null) ? (other.contentResource != null) : 
!this.contentResource.equals(other.contentResource)) {
-           //System.out.println("res");
-            return false;
-        }
-        return true;
+        return (this.contentResource == null) ? other.contentResource == null 
: this.contentResource.equals(other.contentResource);
     }
 
 

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/content/ContentModule.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/content/ContentModule.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/content/ContentModule.java
index 15b4b6d..7126a5c 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/content/ContentModule.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/content/ContentModule.java
@@ -41,6 +41,7 @@
 package org.rometools.feed.module.content;
 
 import com.sun.syndication.feed.module.Module;
+
 import java.util.List;
 
 
@@ -49,46 +50,46 @@ import java.util.List;
  * @author  <a href="mailto:[email protected]";>Robert "kebernet" 
Cooper</a>
  */
 public interface ContentModule extends Module {
-    public static final String URI = 
"http://purl.org/rss/1.0/modules/content/";;
-    public static final String RDF_URI = 
"http://www.w3.org/1999/02/22-rdf-syntax-ns#";;
+    String URI = "http://purl.org/rss/1.0/modules/content/";;
+    String RDF_URI = "http://www.w3.org/1999/02/22-rdf-syntax-ns#";;
 
     /** Returns a List of Strings containing the New Syntax Encoded values
      * are in the element.
      * @return List of content Strings
      */
-    public List getEncodeds();
+    List getEncodeds();
 
     /** Sets a List of Strings containing the New Syntax Encoded values
      * are in the element.
      * @return List of content Strings
      */
-    public void setEncodeds(List encodeds);
+    void setEncodeds(List encodeds);
 
-    public String getUri();
+    String getUri();
 
-    public String toString(String str);
+    String toString(String str);
 
     /** Contains a list of ContentItems that represent the "Original Syntax" 
set.
      * @see com.totsp.xml.syndication.content.ContentItem
      * @return List of ContentItems.
      */
-    public List getContentItems();
+    List getContentItems();
 
     /** Contains a list of ContentItems that represent the "Original Syntax" 
set.
      * @see com.totsp.xml.syndication.content.ContentItem
      * @param List of ContentItems.
      */
-    public void setContentItems(List list);
+    void setContentItems(List list);
 
     /** Returns a List of Strings containing whatever new or original syntax 
items
      * are in the element.
      * @return List of content Strings
      */
-    public List getContents();
+    List getContents();
 
     /** Sets a List of Strings containing whatever new or original syntax items
      * are in the element.
      * @return List of content Strings
      */
-    public void setContents(List contents);
+    void setContents(List contents);
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/feedburner/FeedBurner.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/feedburner/FeedBurner.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/feedburner/FeedBurner.java
index 3da1200..09fb16a 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/feedburner/FeedBurner.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/feedburner/FeedBurner.java
@@ -17,10 +17,10 @@
 
 package org.rometools.feed.module.feedburner;
 
-import java.io.Serializable;
-
 import com.sun.syndication.feed.module.Module;
 
+import java.io.Serializable;
+
 /**
  * Interface for the FeedBurner RSS extension.
  *
@@ -30,18 +30,18 @@ import com.sun.syndication.feed.module.Module;
  */
 public interface FeedBurner extends Module, Serializable, Cloneable {
 
-       public static final String URI = 
"http://rssnamespace.org/feedburner/ext/1.0";;
+       String URI = "http://rssnamespace.org/feedburner/ext/1.0";;
 
-       public String getAwareness();
+       String getAwareness();
 
-       public void setAwareness(String awareness);
+       void setAwareness(String awareness);
 
-       public String getOrigLink();
+       String getOrigLink();
 
-       public void setOrigLink(String origLink);
+       void setOrigLink(String origLink);
 
-       public String getOrigEnclosureLink();
+       String getOrigEnclosureLink();
 
-       public void setOrigEnclosureLink(String origEnclosureLink);
+       void setOrigEnclosureLink(String origEnclosureLink);
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/itunes/EntryInformation.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/itunes/EntryInformation.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/itunes/EntryInformation.java
index afca1a8..fd2bd4b 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/itunes/EntryInformation.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/itunes/EntryInformation.java
@@ -56,12 +56,12 @@ public interface EntryInformation extends ITunes{
      * Returns the Duration object for this Item
      * @return Returns the Duration object for this Item
      */
-    public Duration getDuration();
+    Duration getDuration();
 
     /**
      * Sets the Duration object for this Item
      * @param duration Sets the Duration object for this Item
      */
-    public void setDuration(Duration duration) ;
+    void setDuration(Duration duration) ;
 
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/itunes/FeedInformation.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/itunes/FeedInformation.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/itunes/FeedInformation.java
index be0a4e4..339b6a2 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/itunes/FeedInformation.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/itunes/FeedInformation.java
@@ -56,13 +56,13 @@ public interface FeedInformation extends ITunes {
      * The parent categories for this feed
      * @return The parent categories for this feed
      */
-    public List getCategories() ;
+    List getCategories() ;
 
     /**
      * The parent categories for this feed
      * @param categories The parent categories for this feed
      */
-    public void setCategories(List categories);
+    void setCategories(List categories);
     
     /**
      * Sets the URL for the image.
@@ -70,7 +70,7 @@ public interface FeedInformation extends ITunes {
      * NOTE: To specification images should be in PNG or JPEG format.
      * @param image Sets the URL for the image.
      */
-    public void setImage(URL image);
+    void setImage(URL image);
 
     /**
      * Returns the URL for the image.
@@ -78,29 +78,29 @@ public interface FeedInformation extends ITunes {
      * NOTE: To specification images should be in PNG or JPEG format.
      * @return Returns the URL for the image.
      */
-    public URL getImage();
+    URL getImage();
 
     /**
      * Sets the owner email address for the feed.
      * @param ownerEmailAddress Sets the owner email address for the feed.
      */
-    public void setOwnerEmailAddress(String ownerEmailAddress);
+    void setOwnerEmailAddress(String ownerEmailAddress);
 
     /**
      * Returns the owner email address for the feed.
      * @return Returns the owner email address for the feed.
      */
-    public String getOwnerEmailAddress();
+    String getOwnerEmailAddress();
 
     /**
      * Sets the owner name for the feed
      * @param ownerName Sets the owner name for the feed
      */
-    public void setOwnerName(String ownerName);
+    void setOwnerName(String ownerName);
 
     /**
      * Returns the owner name for the feed
      * @return  Returns the owner name for the feed
      */
-    public String getOwnerName();
+    String getOwnerName();
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/itunes/ITunes.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/itunes/ITunes.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/itunes/ITunes.java
index d26e5cd..b175894 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/itunes/ITunes.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/itunes/ITunes.java
@@ -41,7 +41,6 @@
 package org.rometools.feed.module.itunes;
 
 import com.sun.syndication.feed.module.Module;
-import org.rometools.feed.module.itunes.types.Category;
 
 /**
  * This interface contains the methods common to all iTunes module points.
@@ -51,43 +50,43 @@ import org.rometools.feed.module.itunes.types.Category;
  */
 public interface ITunes extends Module {
     
-    public static final String URI = AbstractITunesObject.URI;
+    String URI = AbstractITunesObject.URI;
     
     /**
      * Returns the author string for this feed or entry
      * @return Returns the author string for this feed or entry
      */
-    public String getAuthor();
+    String getAuthor();
 
     /**
      * Sets the author string for this feed or entry
      * @param author Sets the author string for this feed or entry
      */
-    public void setAuthor(String author) ;
+    void setAuthor(String author) ;
     
     /**
      * Boolean as to whether to block this feed or entry
      * @return Boolean as to whether to block this feed or entry
      */
-    public boolean getBlock();
+    boolean getBlock();
 
     /**
      * Boolean as to whether to block this feed or entry
      * @param block Boolean as to whether to block this feed or entry
      */
-    public void setBlock(boolean block) ;
+    void setBlock(boolean block) ;
 
     /**
      * Boolean as to whether this feed or entry contains adult content
      * @return Boolean as to whether this feed or entry contains adult content
      */
-    public boolean getExplicit() ;
+    boolean getExplicit() ;
 
     /**
      * Boolean as to whether this feed or entry contains adult content
      * @param explicit Boolean as to whether this feed or entry contains adult 
content
      */
-    public void setExplicit(boolean explicit) ;
+    void setExplicit(boolean explicit) ;
 
     /**
      * A list of keywords for this feed or entry
@@ -95,7 +94,7 @@ public interface ITunes extends Module {
      * Must not contain spaces
      * @return A list of keywords for this feed or entry
      */
-    public String[] getKeywords() ;
+    String[] getKeywords() ;
 
     /**
      * A list of keywords for this feed or entry
@@ -103,30 +102,30 @@ public interface ITunes extends Module {
      * Must not contain spaces
      * @param keywords A list of keywords for this feed or enty
      */
-    public void setKeywords(String[] keywords);
+    void setKeywords(String[] keywords);
     /**
      * A subtitle for this feed or entry
      * @return A subtitle for this feed or entry
      */
-    public String getSubtitle();
+    String getSubtitle();
 
     /**
      * A subtitle for this feed or entry
      * @param subtitle A subtitle for this feed or entry
      */
-    public void setSubtitle(String subtitle);
+    void setSubtitle(String subtitle);
     
 
     /**
      * A subtitle for this feed or entry
      * @return A subtitle for this feed or entry
      */
-    public String getSummary() ;
+    String getSummary() ;
 
     /**
      * A subtitle for this feed or entry
      * @param summary A subtitle for this feed or entry
      */
-    public void setSummary(String summary);
+    void setSummary(String summary);
     
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/MediaEntryModule.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/MediaEntryModule.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/MediaEntryModule.java
index 9f52962..7ada4c8 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/MediaEntryModule.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/MediaEntryModule.java
@@ -35,11 +35,11 @@ public interface MediaEntryModule extends MediaModule {
      * Returns the MediaContent items for the entry.
      * @return Returns the MediaContent items for the entry.
      */
-    public MediaContent[] getMediaContents();
+    MediaContent[] getMediaContents();
 
     /**
      * Returns the media groups for the entry.
      * @return Returns the media groups for the entry.
      */
-    public MediaGroup[] getMediaGroups();
+    MediaGroup[] getMediaGroups();
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/MediaModule.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/MediaModule.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/MediaModule.java
index 13d51e5..7b7e6cb 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/MediaModule.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/MediaModule.java
@@ -35,17 +35,17 @@ import 
org.rometools.feed.module.mediarss.types.PlayerReference;
  */
 public interface MediaModule extends Module {
     //the URI of the MediaRSS specification as hosted by yahoo
-    public final static String URI = "http://search.yahoo.com/mrss/";;
+    String URI = "http://search.yahoo.com/mrss/";;
 
     /**
      * Returns Metadata associated with the feed.
      * @return Returns Metadata associated with the feed.
      */
-    public Metadata getMetadata();
+    Metadata getMetadata();
 
     /**
      * Returns a player reference associated with the feed.
      * @return Returns a player reference associated with the feed.
      */
-    public PlayerReference getPlayer();
+    PlayerReference getPlayer();
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/io/MediaModuleGenerator.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/io/MediaModuleGenerator.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/io/MediaModuleGenerator.java
index 5480405..191e35e 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/io/MediaModuleGenerator.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/io/MediaModuleGenerator.java
@@ -22,23 +22,12 @@
 package org.rometools.feed.module.mediarss.io;
 
 import com.sun.syndication.feed.module.Module;
-import org.rometools.feed.module.mediarss.MediaEntryModule;
-import org.rometools.feed.module.mediarss.MediaModule;
-import org.rometools.feed.module.mediarss.types.Category;
-import org.rometools.feed.module.mediarss.types.Credit;
-import org.rometools.feed.module.mediarss.types.MediaContent;
-import org.rometools.feed.module.mediarss.types.MediaGroup;
-import org.rometools.feed.module.mediarss.types.Metadata;
-import org.rometools.feed.module.mediarss.types.PlayerReference;
-import org.rometools.feed.module.mediarss.types.Rating;
-import org.rometools.feed.module.mediarss.types.Restriction;
-import org.rometools.feed.module.mediarss.types.Text;
-import org.rometools.feed.module.mediarss.types.Thumbnail;
-import org.rometools.feed.module.mediarss.types.UrlReference;
-import com.sun.syndication.io.*;
-
+import com.sun.syndication.io.ModuleGenerator;
 import org.jdom2.Element;
 import org.jdom2.Namespace;
+import org.rometools.feed.module.mediarss.MediaEntryModule;
+import org.rometools.feed.module.mediarss.MediaModule;
+import org.rometools.feed.module.mediarss.types.*;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -233,9 +222,7 @@ public class MediaModuleGenerator implements 
ModuleGenerator {
     }
 
     protected void addNotNullAttribute(Element target, String name, Object 
value) {
-        if ((target == null) || (value == null)) {
-            return;
-        } else {
+        if (target != null && value != null) {
             target.setAttribute(name, value.toString());
         }
     }
@@ -244,12 +231,12 @@ public class MediaModuleGenerator implements 
ModuleGenerator {
         Object value) {
         if (value == null) {
             return null;
-        } else {
-            Element e = generateSimpleElement(name, value.toString());
-            target.addContent(e);
-
-            return e;
         }
+
+        Element e = generateSimpleElement(name, value.toString());
+        target.addContent(e);
+
+        return e;
     }
 
     protected Element generateSimpleElement(String name, String value) {

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/io/MediaModuleParser.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/io/MediaModuleParser.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/io/MediaModuleParser.java
index b35d7c8..011ae30 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/io/MediaModuleParser.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/mediarss/io/MediaModuleParser.java
@@ -22,32 +22,16 @@
 package org.rometools.feed.module.mediarss.io;
 
 import com.sun.syndication.feed.module.Module;
-import org.rometools.feed.module.mediarss.MediaEntryModuleImpl;
-import org.rometools.feed.module.mediarss.MediaModule;
-import org.rometools.feed.module.mediarss.MediaModuleImpl;
-import org.rometools.feed.module.mediarss.types.Category;
-import org.rometools.feed.module.mediarss.types.Credit;
-import org.rometools.feed.module.mediarss.types.Expression;
-import org.rometools.feed.module.mediarss.types.Hash;
-import org.rometools.feed.module.mediarss.types.MediaContent;
-import org.rometools.feed.module.mediarss.types.MediaGroup;
-import org.rometools.feed.module.mediarss.types.Metadata;
-import org.rometools.feed.module.mediarss.types.PlayerReference;
-import org.rometools.feed.module.mediarss.types.Rating;
-import org.rometools.feed.module.mediarss.types.Restriction;
-import org.rometools.feed.module.mediarss.types.Text;
-import org.rometools.feed.module.mediarss.types.Thumbnail;
-import org.rometools.feed.module.mediarss.types.Time;
-import org.rometools.feed.module.mediarss.types.UrlReference;
 import com.sun.syndication.io.ModuleParser;
 import com.sun.syndication.io.impl.NumberParser;
-
-import java.net.URI;
-
 import org.jdom2.Element;
 import org.jdom2.Namespace;
+import org.rometools.feed.module.mediarss.MediaEntryModuleImpl;
+import org.rometools.feed.module.mediarss.MediaModule;
+import org.rometools.feed.module.mediarss.MediaModuleImpl;
+import org.rometools.feed.module.mediarss.types.*;
 
-
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
@@ -191,9 +175,7 @@ public class MediaModuleParser implements ModuleParser {
                         LOG.log(Level.WARNING, "Exception parsing content 
tag.", ex);
                     }
                     
-                    
mc.setDefaultContent((content.getAttributeValue("isDefault") == null)
-                    ? false
-                            : Boolean.getBoolean(content.getAttributeValue(
+                    
mc.setDefaultContent(content.getAttributeValue("isDefault") != null && 
Boolean.getBoolean(content.getAttributeValue(
                             "isDefault")));                    
                 } else {
                        LOG.log(Level.WARNING, "Could not find MediaContent.");

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/opensearch/OpenSearchModule.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/opensearch/OpenSearchModule.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/opensearch/OpenSearchModule.java
index 5c7424d..db9ee91 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/opensearch/OpenSearchModule.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/opensearch/OpenSearchModule.java
@@ -22,6 +22,6 @@ import com.sun.syndication.feed.module.Module;
  */
 public interface OpenSearchModule extends Module, OpenSearchResponse{
 
-       public final static String URI = "http://a9.com/-/spec/opensearch/1.1/";;
+       String URI = "http://a9.com/-/spec/opensearch/1.1/";;
        
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/opensearch/OpenSearchResponse.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/opensearch/OpenSearchResponse.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/opensearch/OpenSearchResponse.java
index 2ee1fcd..0f4b4db 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/opensearch/OpenSearchResponse.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/opensearch/OpenSearchResponse.java
@@ -15,11 +15,11 @@
 
 package org.rometools.feed.module.opensearch;
 
-import java.util.List;
-
 import com.sun.syndication.feed.atom.Link;
 import org.rometools.feed.module.opensearch.entity.OSQuery;
 
+import java.util.List;
+
 /** Provides access to A9 Open Search information.
  * @author Michael W. Nassif ([email protected])
  */
@@ -33,7 +33,7 @@ public interface OpenSearchResponse{
      *    * Requirements: May appear zero or one time.
      * @param totalResults A positive integer value.
      */
-       public void setTotalResults(int totalResults);
+    void setTotalResults(int totalResults);
        
     /**
      * #  totalResults – the maximum number of results available for these 
search terms
@@ -43,7 +43,7 @@ public interface OpenSearchResponse{
      *    * Requirements: May appear zero or one time.
      * @return a positive integer value.
      */
-       public int getTotalResults();
+    int getTotalResults();
        
     /**
      * #  startIndex – the index of the first item returned in the result.
@@ -54,7 +54,7 @@ public interface OpenSearchResponse{
      *    * Requirements: May appear zero or one time.
      * @param startIndex int value >= 1.
      */
-       public void setStartIndex(int startIndex);
+    void setStartIndex(int startIndex);
        
     /**
      * #  startIndex – the index of the first item returned in the result.
@@ -65,7 +65,7 @@ public interface OpenSearchResponse{
      *    * Requirements: May appear zero or one time.
      * @return int value >= 1.
      */
-       public int getStartIndex();
+    int getStartIndex();
        
     /**
      * #  itemsPerPage – the maximum number of items that can appear in one 
page of results.
@@ -75,7 +75,7 @@ public interface OpenSearchResponse{
      *    * Requirements: May appear zero or one time.
      * @param itemsPerPage int value >= 1.
      */
-       public void setItemsPerPage(int itemsPerPage);
+    void setItemsPerPage(int itemsPerPage);
        
     /**
      * #  itemsPerPage – the maximum number of items that can appear in one 
page of results.
@@ -85,7 +85,7 @@ public interface OpenSearchResponse{
      *    * Requirements: May appear zero or one time.
      * @return int value >= 1
      */
-       public int getItemsPerPage();
+    int getItemsPerPage();
        
     /**
      * #  link – a reference back to the OpenSearch Description file
@@ -96,7 +96,7 @@ public interface OpenSearchResponse{
      *    * Requirements: May appear zero or one time.
      * @param link link to the open search spec.
      */
-       public void setLink(Link link);
+    void setLink(Link link);
        
     /**
      * #  link – a reference back to the OpenSearch Description file
@@ -107,7 +107,7 @@ public interface OpenSearchResponse{
      *    * Requirements: May appear zero or one time.
      * @return link to the opensearch spec.
      */
-       public Link getLink();
+    Link getLink();
        
        // list of OSResponseQuery interfaces
     /**
@@ -118,7 +118,7 @@ public interface OpenSearchResponse{
      *        <li>Requirements: May appear zero or more times. Note that the 
“Q” is capitalized.</li>
      * @param query List of OSQuery objects.
      */
-       public void setQueries(List query);
+    void setQueries(List query);
        
     /**
      * <code>Query</code> – in an OpenSearch Response, can be used both to 
echo back the original query and to suggest new searches.
@@ -128,12 +128,12 @@ public interface OpenSearchResponse{
      *        <li>Requirements: May appear zero or more times. Note that the 
“Q” is capitalized.</li>
      * @return A list of OSQuery objects.
      */
-       public List getQueries();
+    List getQueries();
        
        // convenience method
     /**
      * Adds a query to the module.
      * @param query OSQuery object to add.
      */
-       public void addQuery(OSQuery query);
+    void addQuery(OSQuery query);
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleParser.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleParser.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleParser.java
index 1485079..96ba18a 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleParser.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/opensearch/impl/OpenSearchModuleParser.java
@@ -15,22 +15,21 @@
 
 package org.rometools.feed.module.opensearch.impl;
 
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
+import com.sun.syndication.feed.atom.Link;
+import com.sun.syndication.feed.module.Module;
+import com.sun.syndication.io.ModuleParser;
 import org.jdom2.Attribute;
 import org.jdom2.Element;
 import org.jdom2.Namespace;
 import org.jdom2.Parent;
-
-import com.sun.syndication.feed.atom.Link;
-import com.sun.syndication.feed.module.Module;
 import org.rometools.feed.module.opensearch.OpenSearchModule;
 import org.rometools.feed.module.opensearch.entity.OSQuery;
-import com.sun.syndication.io.ModuleParser;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 
 /**
  * @author Michael W. Nassif ([email protected])
@@ -183,12 +182,9 @@ public class OpenSearchModuleParser implements 
ModuleParser{
     }
        
        private static boolean isRelativeURI(String uri) {
-        if (  uri.startsWith("http://";)
-           || uri.startsWith("https://";)
-           || uri.startsWith("/")) {
-            return false;
-        }
-        return true;
+        return !(uri.startsWith("http://";)
+                || uri.startsWith("https://";)
+                || uri.startsWith("/"));
     }
        
     /** Use xml:base attributes at feed and entry level to resolve relative 
links */

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/photocast/PhotocastModule.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/photocast/PhotocastModule.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/photocast/PhotocastModule.java
index cd5d8e8..6bd00e6 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/photocast/PhotocastModule.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/photocast/PhotocastModule.java
@@ -43,7 +43,6 @@ import com.sun.syndication.feed.module.Module;
 import org.rometools.feed.module.photocast.types.Metadata;
 
 import java.net.URL;
-
 import java.util.Date;
 
 
@@ -58,65 +57,65 @@ public interface PhotocastModule extends Module {
     /**
      * The URI of the namespace. ("http://www.apple.com/ilife/wallpapers";)
      */
-    public static final String URI = "http://www.apple.com/ilife/wallpapers";;
+    String URI = "http://www.apple.com/ilife/wallpapers";;
 
     /**
      * Returns the Item level photoDate value.
      * @return Returns the Item level photoDate value. 
      */
-    public Date getPhotoDate();
+    Date getPhotoDate();
 
     /**
      * Set the Item level photoDate value.
      * @param photoDate Item level photoDate value
      */
-    public void setPhotoDate(Date photoDate);
+    void setPhotoDate(Date photoDate);
 
     /**
      * Returns the cropDate value from the item level.
      * @return Item level cropDate value
      */
-    public Date getCropDate();
+    Date getCropDate();
 
     /**
      * Sets the cropDate value for the item level.
      * @param cropDate cropDate value for the item level
      */
-    public void setCropDate(Date cropDate);
+    void setCropDate(Date cropDate);
 
     /**
      * The URL of the image.
      * @return The URL of the image.
      */
-    public URL getImageUrl();
+    URL getImageUrl();
 
     /**
      * The URL of the image.
      * @param imageUrl The URL of the image.
      */
-    public void setImageUrl(URL imageUrl);
+    void setImageUrl(URL imageUrl);
 
     /**
      * The URL of the image thumbnail.
      * @return The URL of the image thumbnail.
      */
-    public URL getThumbnailUrl();
+    URL getThumbnailUrl();
 
     /**
      * The URL of the image thumbnail.
      * @param thumbnailUrl The URL of the image thumbnail.
      */
-    public void setThumbnailUrl(URL thumbnailUrl);
+    void setThumbnailUrl(URL thumbnailUrl);
 
     /**
      * The iPhoto metadata for the image.
      * @return The iPhoto metadata for the image.
      */
-    public Metadata getMetadata();
+    Metadata getMetadata();
 
     /**
      * The iPhoto metadata for the image.
      * @param metadata The iPhoto metadata for the image.
      */
-    public void setMetadata(Metadata metadata);
+    void setMetadata(Metadata metadata);
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/photocast/types/PhotoDate.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/photocast/types/PhotoDate.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/photocast/types/PhotoDate.java
index 51b3773..ba2ee2a 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/photocast/types/PhotoDate.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/photocast/types/PhotoDate.java
@@ -94,10 +94,7 @@ public class PhotoDate extends Date{
     }
     
     public boolean equals( Object o ){
-        if( o instanceof Date || ((Date)o).getTime()/1000 == 
this.getTime()/1000 )
-            return true;
-        else
-            return false;
+        return o instanceof Date || ((Date) o).getTime() / 1000 == 
this.getTime() / 1000;
     }
    
     

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/slash/Slash.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/slash/Slash.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/slash/Slash.java
index 3b1e545..ef24c92 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/slash/Slash.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/slash/Slash.java
@@ -41,6 +41,7 @@
 package org.rometools.feed.module.slash;
 
 import com.sun.syndication.feed.module.Module;
+
 import java.io.Serializable;
 
 /** This interface represents the Slash RSS extension.
@@ -49,22 +50,22 @@ import java.io.Serializable;
  */
 public interface Slash extends Module, Serializable {
     
-    public static final String URI = "http://purl.org/rss/1.0/modules/slash/";;
+    String URI = "http://purl.org/rss/1.0/modules/slash/";;
     
-    public String getSection();
+    String getSection();
     
-    public void setSection(String section);
+    void setSection(String section);
     
-    public String getDepartment();
+    String getDepartment();
     
-    public void setDepartment(String department);
+    void setDepartment(String department);
     
-    public Integer getComments();
+    Integer getComments();
     
-    public void setComments(Integer comments );
+    void setComments(Integer comments);
     
-    public Integer[] getHitParade();
+    Integer[] getHitParade();
     
-    public void setHitParade( Integer[] hitParade );
+    void setHitParade(Integer[] hitParade);
     
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/slash/SlashImpl.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/slash/SlashImpl.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/slash/SlashImpl.java
index 916669f..60ecfcb 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/slash/SlashImpl.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/slash/SlashImpl.java
@@ -120,9 +120,7 @@ public class SlashImpl implements Slash {
         }
 
         Integer[] array = new Integer[ source.length ];
-        for(int i = 0; i < source.length; i++) {
-            array[i] = source[i];
-        }
+        System.arraycopy(source, 0, array, 0, source.length);
 
         return array;
     }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/SimpleListExtension.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/SimpleListExtension.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/SimpleListExtension.java
index b70dd98..4211b4d 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/SimpleListExtension.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/SimpleListExtension.java
@@ -31,42 +31,42 @@ public interface SimpleListExtension extends Module {
     /**
      * "http://www.microsoft.com/schemas/rss/core/2005";
      */
-    public static final String URI = 
"http://www.microsoft.com/schemas/rss/core/2005";;
+    String URI = "http://www.microsoft.com/schemas/rss/core/2005";;
 
     /**
      * The cf:group element is intended to inform the client that the property 
to which it refers is one that is “groupable” – that is, that the client 
should provide a user interface that allows the user to group or filter on the 
values of that property. Groupable properties should contain a small set of 
discrete values (e.g. book genres are perfect for groups).
      * @param groupFields Array of types.Group objects.
      */
-    public void setGroupFields(Group[] groupFields);
+    void setGroupFields(Group[] groupFields);
 
     /**
      * The cf:group element is intended to inform the client that the property 
to which it refers is one that is “groupable” – that is, that the client 
should provide a user interface that allows the user to group or filter on the 
values of that property. Groupable properties should contain a small set of 
discrete values (e.g. book genres are perfect for groups).
      * @return Array of types.Group objects.
      */
-    public Group[] getGroupFields();
+    Group[] getGroupFields();
 
     /**
      * The cf:sort element is intended to inform the client that the property 
to which it refers is one that is “sortable” – that is, that the client 
should provide a user interface that allows the user to sort on that property.
      * @param sortFields Array of types.Sort objects
      */
-    public void setSortFields(Sort[] sortFields);
+    void setSortFields(Sort[] sortFields);
 
     /**
      * The cf:sort element is intended to inform the client that the property 
to which it refers is one that is “sortable” – that is, that the client 
should provide a user interface that allows the user to sort on that property.
      * @return Array of types.Sort objects
      */
-    public Sort[] getSortFields();
+    Sort[] getSortFields();
 
     /**
      * This XML element allows the publisher of a feed document to indicate to 
the consumers of the feed that the feed is intended to be consumed as a list.
      * (defaults to "list" )
      * @param value treatAs value
      */
-    public void setTreatAs(String value);
+    void setTreatAs(String value);
 
     /**
      * This XML element allows the publisher of a feed document to indicate to 
the consumers of the feed that the feed is intended to be consumed as a list.
      * @return treatAs value.
      */
-    public String getTreatAs();
+    String getTreatAs();
 }

http://git-wip-us.apache.org/repos/asf/marmotta/blob/37707785/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/SleEntry.java
----------------------------------------------------------------------
diff --git 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/SleEntry.java
 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/SleEntry.java
index 9604df3..5819860 100644
--- 
a/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/SleEntry.java
+++ 
b/commons/marmotta-sesame-tools/marmotta-rio-rss/src/ext/java/org/rometools/feed/module/sle/SleEntry.java
@@ -18,7 +18,7 @@
 package org.rometools.feed.module.sle;
 
 import com.sun.syndication.feed.module.Module;
-import org.rometools.feed.module.sle.io.*;
+import org.rometools.feed.module.sle.io.ModuleParser;
 import org.rometools.feed.module.sle.types.EntryValue;
 import org.rometools.feed.module.sle.types.Group;
 import org.rometools.feed.module.sle.types.Sort;
@@ -34,27 +34,27 @@ public interface SleEntry extends Module {
     /**
      * A bogus namespace used for temporarily storing values during parsing.
      */
-    public static final String URI = ModuleParser.TEMP.getURI();
+    String URI = ModuleParser.TEMP.getURI();
 
     /**
      * Returns an EntryValue for the given element name.
      * @param element element name to look for
      * @return Returns an EntryValue for the given element name.
      */
-    public EntryValue getGroupByElement(Group element);
+    EntryValue getGroupByElement(Group element);
 
     /**
      * An array of EntryValue objects that correspond to the grouping for the 
feed.
      * @return An array of EntryValue objects that correspond to the grouping 
for the feed.
      */
-    public EntryValue[] getGroupValues();
+    EntryValue[] getGroupValues();
 
     /**
      * Returns an EntryValue for the given element name.
      * @param element element name
      * @return Returns an EntryValue for the given element name.
      */
-    public EntryValue getSortByElement(Sort element);
+    EntryValue getSortByElement(Sort element);
 
     /**
      * Returns an array of EntryValues for the fields declared in the heading.
@@ -65,5 +65,5 @@ public interface SleEntry extends Module {
      * rely on these values data display to a user!
      * @return Array of EntryValue implementations from this entry.
      */
-    public EntryValue[] getSortValues();
+    EntryValue[] getSortValues();
 }

Reply via email to