Fixed some inconsistencies

Author: phax

ph-css/src/main/java/com/helger/css/decl/CSSExpressionMemberFunction.java

@@ -124,6 +124,7 @@ public final boolean hasExpression ()
   @NonNull
   public CSSExpressionMemberFunction getClone ()
   {
+    // Note: m_aExpression is not clonable!
     return new CSSExpressionMemberFunction (m_sFunctionName, m_aExpression);
   }
 

ph-css/src/main/java/com/helger/css/decl/CSSExpressionMemberTermURI.java

@@ -22,6 +22,7 @@
 import com.helger.annotation.Nonempty;
 import com.helger.annotation.Nonnegative;
 import com.helger.annotation.concurrent.NotThreadSafe;
+import com.helger.annotation.style.ReturnsMutableObject;
 import com.helger.base.enforce.ValueEnforcer;
 import com.helger.base.hashcode.HashCodeGenerator;
 import com.helger.base.tostring.ToStringGenerator;
@@ -53,6 +54,7 @@ public CSSExpressionMemberTermURI (@NonNull final CSSURI aURI)
    * @return The contained {@link CSSURI} object. Never <code>null</code>.
    */
   @NonNull
+  @ReturnsMutableObject
   public final CSSURI getURI ()
   {
     return m_aURI;
@@ -86,8 +88,7 @@ public final CSSExpressionMemberTermURI setURI (@NonNull final CSSURI aURI)
    * Replace the URI string in the existing {@link CSSURI} object.
    *
    * @param sURIString
-   *        The new URI string to set. May not be <code>null</code> but may be
-   *        empty.
+   *        The new URI string to set. May not be <code>null</code> but may be empty.
    * @return this
    */
   @NonNull

ph-css/src/main/java/com/helger/css/decl/CSSSelectorMemberFunctionLike.java

@@ -22,6 +22,7 @@
 import com.helger.annotation.Nonempty;
 import com.helger.annotation.Nonnegative;
 import com.helger.annotation.concurrent.NotThreadSafe;
+import com.helger.annotation.style.ReturnsMutableObject;
 import com.helger.base.enforce.ValueEnforcer;
 import com.helger.base.hashcode.HashCodeGenerator;
 import com.helger.base.tostring.ToStringGenerator;
@@ -30,8 +31,7 @@
 import com.helger.css.ICSSWriterSettings;
 
 /**
- * Represents a single CSS complex selector pseudo element. Like
- * <code>:lang(fr)</code>
+ * Represents a single CSS complex selector pseudo element. Like <code>:lang(fr)</code>
  *
  * @author Philip Helger
  */
@@ -42,7 +42,8 @@ public class CSSSelectorMemberFunctionLike implements ICSSSelectorMember, ICSSSo
   private final CSSExpression m_aParamExpr;
   private CSSSourceLocation m_aSourceLocation;
 
-  public CSSSelectorMemberFunctionLike (@NonNull @Nonempty final String sFuncName, @NonNull final CSSExpression aParamExpr)
+  public CSSSelectorMemberFunctionLike (@NonNull @Nonempty final String sFuncName,
+                                        @NonNull final CSSExpression aParamExpr)
   {
     ValueEnforcer.notEmpty (sFuncName, "FunctionName");
     if (!sFuncName.endsWith ("("))
@@ -64,6 +65,7 @@ public String getFunctionName ()
   }
 
   @NonNull
+  @ReturnsMutableObject
   public CSSExpression getParameterExpression ()
   {
     return m_aParamExpr;
@@ -107,8 +109,8 @@ public int hashCode ()
   @Override
   public String toString ()
   {
-    return new ToStringGenerator (null).append ("functionName", m_sFuncName)
-                                       .append ("paramExpr", m_aParamExpr)
+    return new ToStringGenerator (null).append ("FunctionName", m_sFuncName)
+                                       .append ("ParamExpr", m_aParamExpr)
                                        .appendIfNotNull ("SourceLocation", m_aSourceLocation)
                                        .getToString ();
   }

ph-css/src/main/java/com/helger/css/decl/CSSSelectorMemberNot.java

@@ -199,7 +199,7 @@ public int hashCode ()
   @Override
   public String toString ()
   {
-    return new ToStringGenerator (null).append ("nestedSelectors", m_aNestedSelectors)
+    return new ToStringGenerator (null).append ("NestedSelectors", m_aNestedSelectors)
                                        .appendIfNotNull ("SourceLocation", m_aSourceLocation)
                                        .getToString ();
   }

ph-css/src/main/java/com/helger/css/parser/CSSParseHelper.java

@@ -338,31 +338,31 @@ public static String validateIdentifier (@NonNull final StringBuilder aPattern)
     return aPattern.toString ();
   }
 
-  /**
-   * Unescape e.g. <code>\26</code> or <code>\000026</code> to <code>&amp;</code>.
-   *
-   * @param aImage
-   *        Source string
-   * @return Unmasked string
-   */
-  @NonNull
-  public static String unescapeUnicode (final StringBuilder aImage)
-  {
-    // FIXME
-    return aImage.toString ();
-  }
-
-  /**
-   * Unescape e.g. <code>\x</code> to x.
-   *
-   * @param aImage
-   *        Source string
-   * @return Unmasked string
-   */
-  @NonNull
-  public static String unescapeOther (final StringBuilder aImage)
-  {
-    // FIXME
-    return aImage.toString ();
-  }
+  // /**
+  // * Unescape e.g. <code>\26</code> or <code>\000026</code> to <code>&amp;</code>.
+  // *
+  // * @param aImage
+  // * Source string
+  // * @return Unmasked string
+  // */
+  // @NonNull
+  // public static String unescapeUnicode (final StringBuilder aImage)
+  // {
+  // // FIXME
+  // return aImage.toString ();
+  // }
+
+  // /**
+  // * Unescape e.g. <code>\x</code> to x.
+  // *
+  // * @param aImage
+  // * Source string
+  // * @return Unmasked string
+  // */
+  // @NonNull
+  // public static String unescapeOther (final StringBuilder aImage)
+  // {
+  // // FIXME
+  // return aImage.toString ();
+  // }
 }