Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv1812
Modified Files:
LocalizedString.java ReplacingLocalizedString.java
WrappedLocalizedString.java
Log Message:
Added some @Override's
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
Index: LocalizedString.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/LocalizedString.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- LocalizedString.java 27 Apr 2009 17:14:00 -0000 1.37
+++ LocalizedString.java 28 Apr 2009 06:31:22 -0000 1.38
@@ -32,7 +32,7 @@
*</p>
*
* @author Michiel Meeuwissen
- * @version $Id: LocalizedString.java,v 1.37 2009/04/27 17:14:00 michiel Exp $
+ * @version $Id: LocalizedString.java,v 1.38 2009/04/28 06:31:22 michiel Exp $
* @since MMBase-1.8
*/
public class LocalizedString implements java.io.Serializable,
PublicCloneable<LocalizedString> {
@@ -426,6 +426,7 @@
}
}
+ @Overrde
public boolean equals(Object o) {
if (o instanceof LocalizedString) {
LocalizedString os = (LocalizedString) o;
@@ -438,7 +439,7 @@
return false;
}
}
-
+ @Override
public int hashCode() {
int result = 0;
result = HashCodeUtil.hashCode(result, key);
Index: ReplacingLocalizedString.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/ReplacingLocalizedString.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ReplacingLocalizedString.java 27 Apr 2009 17:47:24 -0000 1.9
+++ ReplacingLocalizedString.java 28 Apr 2009 06:31:22 -0000 1.10
@@ -22,7 +22,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: ReplacingLocalizedString.java,v 1.9 2009/04/27 17:47:24
michiel Exp $
+ * @version $Id: ReplacingLocalizedString.java,v 1.10 2009/04/28 06:31:22
michiel Exp $
* @since MMBase-1.8
*/
public class ReplacingLocalizedString extends WrappedLocalizedString {
@@ -31,6 +31,7 @@
private List<Map.Entry<String, String>> replacements = new
ArrayList<Map.Entry<String, String>>();
+
/**
* @param s The wrapped LocalizedString.
*/
@@ -38,6 +39,7 @@
super(s);
}
+
public void replaceAll(String regexp, String replacement) {
replacements.add(new Entry<String, String>(regexp, replacement));
}
@@ -54,7 +56,7 @@
return output;
}
- // javadoc inherited
+ @Override
public String get(Locale locale) {
return replace(super.get(locale));
}
@@ -64,6 +66,7 @@
*
* Also takes into account the replacements in the values (but only
'lazily', when actually requested).
*/
+ @Override
public Map<Locale, String> asMap() {
final Map<Locale, String> map = super.asMap();
return new AbstractMap<Locale, String>() {
@@ -104,6 +107,7 @@
@SuppressWarnings("unchecked")
+ @Override
public ReplacingLocalizedString clone() {
ReplacingLocalizedString clone = (ReplacingLocalizedString)
super.clone();
clone.replacements = (List)((ArrayList)replacements).clone();
Index: WrappedLocalizedString.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/WrappedLocalizedString.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- WrappedLocalizedString.java 27 Apr 2009 17:14:00 -0000 1.3
+++ WrappedLocalizedString.java 28 Apr 2009 06:31:22 -0000 1.4
@@ -16,17 +16,17 @@
* Extends and wraps LocalizedString.
*
* @author Michiel Meeuwissen
- * @version $Id: WrappedLocalizedString.java,v 1.3 2009/04/27 17:14:00 michiel
Exp $
+ * @version $Id: WrappedLocalizedString.java,v 1.4 2009/04/28 06:31:22 michiel
Exp $
* @since MMBase-1.9
*/
public class WrappedLocalizedString extends LocalizedString {
private static final Logger log =
Logging.getLoggerInstance(WrappedLocalizedString.class);
-
- protected LocalizedString wrapped;
+ protected final LocalizedString wrapped;
private Locale defaultLocale = null;
+
/**
* @param s The wrapped LocalizedString.
*/
@@ -35,6 +35,7 @@
wrapped = s;
}
+
public Locale setLocale(Locale loc) {
Locale prev = defaultLocale;
defaultLocale = loc;
@@ -81,6 +82,10 @@
protected Map<Locale, String>getValues() {
return wrapped.getValues();
}
+ @Override
+ public boolean equals(Object o) {
+ return wrapped.equals(o);
+ }
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
