Author: michiel
Date: 2010-04-20 18:48:55 +0200 (Tue, 20 Apr 2010)
New Revision: 41991
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/util/AbstractCloudContext.java
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/util/AbstractSequentialBridgeList.java
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/util/GrowingTreeList.java
mmbase/trunk/bridge/src/main/java/org/mmbase/util/LocalizedEntryListFactory.java
Log:
bunch of @Overrides and other netbeans recommendations
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/util/AbstractCloudContext.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/util/AbstractCloudContext.java
2010-04-20 16:47:37 UTC (rev 41990)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/util/AbstractCloudContext.java
2010-04-20 16:48:55 UTC (rev 41991)
@@ -35,35 +35,43 @@
}
+ @Override
public ModuleList getModules() {
return BridgeCollections.EMPTY_MODULELIST;
}
+ @Override
public Module getModule(String name) throws NotFoundException {
throw new NotFoundException();
}
+ @Override
public boolean hasModule(String name) {
return false;
}
+ @Override
public StringList getCloudNames() {
return BridgeCollections.unmodifiableStringList(clouds);
}
+ @Override
public String getDefaultCharacterEncoding() {
return "UTF-8";
}
+ @Override
public Locale getDefaultLocale() {
return Locale.getDefault();
}
+ @Override
public TimeZone getDefaultTimeZone() {
return TimeZone.getDefault();
}
+ @Override
public FieldList createFieldList() {
return new BasicFieldList();
}
@@ -73,52 +81,64 @@
}
+ @Override
public Cloud getCloud(String name) {
return getCloud(name, "anonymous", new HashMap<String, Object>());
}
+ @Override
public Cloud getCloud(String name, String authenticationType, Map<String,
?> loginInfo) throws NotFoundException {
UserContext uc = ((Authentication)
getAuthentication()).login(authenticationType, loginInfo, new Object[] {});
return getCloud(name, uc);
}
+ @Override
public NodeList createNodeList() {
return getCloud(getDefaultCloudName()).createNodeList();
}
+ @Override
public RelationList createRelationList() {
return getCloud(getDefaultCloudName()).createRelationList();
}
+ @Override
public NodeManagerList createNodeManagerList() {
return getCloud(getDefaultCloudName()).createNodeManagerList();
}
+ @Override
public RelationManagerList createRelationManagerList() {
return getCloud(getDefaultCloudName()).createRelationManagerList();
}
+ @Override
public ModuleList createModuleList() {
return new BasicModuleList();
}
+ @Override
public StringList createStringList() {
return new BasicStringList();
}
+ @Override
public AuthenticationData getAuthentication() {
return NOAUTHENTICATION;
}
+ @Override
public ActionRepository getActionRepository() {
return ActionRepository.getInstance();
}
+ @Override
public boolean isUp() {
return true;
}
+ @Override
public CloudContext assertUp() {
return this;
}
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/util/AbstractSequentialBridgeList.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/util/AbstractSequentialBridgeList.java
2010-04-20 16:47:37 UTC (rev 41990)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/util/AbstractSequentialBridgeList.java
2010-04-20 16:48:55 UTC (rev 41991)
@@ -14,7 +14,7 @@
import java.util.*;
/**
- * As AbstractSequentialList, but implements some extra methods required by
BridgeList
+ * As {...@link AbstractSequentialList}, but implements some extra methods
required by BridgeList
*
*
* @author Michiel Meeuwissen
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/util/GrowingTreeList.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/util/GrowingTreeList.java
2010-04-20 16:47:37 UTC (rev 41990)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/bridge/util/GrowingTreeList.java
2010-04-20 16:48:55 UTC (rev 41991)
@@ -167,7 +167,7 @@
cleanLeafConstraint = leafElementTemplate.getCleanConstraint();
}
- Iterator<Step> steps = pathElementTemplate.getSteps().iterator();;
+ Iterator<Step> steps = pathElementTemplate.getSteps().iterator();
steps.next(); // ignore first step
if (! steps.hasNext()) {
foundEnd = true;
Modified:
mmbase/trunk/bridge/src/main/java/org/mmbase/util/LocalizedEntryListFactory.java
===================================================================
---
mmbase/trunk/bridge/src/main/java/org/mmbase/util/LocalizedEntryListFactory.java
2010-04-20 16:47:37 UTC (rev 41990)
+++
mmbase/trunk/bridge/src/main/java/org/mmbase/util/LocalizedEntryListFactory.java
2010-04-20 16:48:55 UTC (rev 41991)
@@ -54,6 +54,7 @@
private static final long serialVersionUID = 1L;
ArrayList entries = new ArrayList(); // List of Map.Entries,
Bundles and DocumentSerializable's
ArrayList<Serializable> unusedKeys = new ArrayList<Serializable>(); //
List of unused keys;
+ @Override
public Object clone() {
try {
LocalizedEntry clone = (LocalizedEntry) super.clone();
@@ -69,6 +70,7 @@
return new LocalizedEntry();
}
}
+ @Override
public String toString() {
return "entries:" + entries + "uu:" + unusedKeys;
}
@@ -245,9 +247,11 @@
final Cloud cloud = c;
return new AbstractSequentialList<Map.Entry<C, String>> () {
+ @Override
public int size() {
return LocalizedEntryListFactory.this.size(cloud);
}
+ @Override
public ListIterator<Map.Entry<C, String>> listIterator(final int
index) {
return new ListIterator<Map.Entry<C, String>>() {
int i = -1;
@@ -325,51 +329,56 @@
final Query query =
QueryReader.parseQuery(element, qc, useCloud, null).query;
final org.mmbase.bridge.NodeList list
= query.getList();
subIterator = new
Iterator<Map.Entry<C, String>>() {
- final NodeIterator
nodeIterator = list.nodeIterator();
- public boolean hasNext() {
- return
nodeIterator.hasNext();
- }
- public Map.Entry<C, String>
next() {
- org.mmbase.bridge.Node
next = nodeIterator.nextNode();
- if (query instanceof
NodeQuery) {
- if (next == null) {
- return new
Entry<C, String>((C) next, "NULL_NODE");
- } else {
- try {
- Function
function = next.getFunction("gui");
- String gui =
function.getFunctionValue(function.createParameters()).toString();
- return new
Entry<C, String>((C) next, gui);
- } catch
(NotFoundException nfe) {
- if (node ==
null) {
- return new
Entry<C, String>((C) next, "-1");
- } else {
- return new
Entry<C, String>((C) next, "" + node.getNumber());
- }
+ final NodeIterator nodeIterator =
list.nodeIterator();
+ @Override
+ public boolean hasNext() {
+ return nodeIterator.hasNext();
+ }
+ @Override
+ public Map.Entry<C, String> next()
{
+ org.mmbase.bridge.Node next =
nodeIterator.nextNode();
+ if (query instanceof
NodeQuery) {
+ if (next == null) {
+ return new Entry<C,
String>((C) next, "NULL_NODE");
+ } else {
+ try {
+ Function function
= next.getFunction("gui");
+ String gui =
function.getFunctionValue(function.createParameters()).toString();
+ return new
Entry<C, String>((C) next, gui);
+ } catch
(NotFoundException nfe) {
+ if (node == null) {
+ return new
Entry<C, String>((C) next, "-1");
+ } else {
+ return new
Entry<C, String>((C) next, "" + node.getNumber());
+ }
- }
}
+ }
+ } else {
+ String alias =
Queries.getFieldAlias(query.getFields().get(0));
+ log.debug("using field " +
alias);
+ if
(query.getFields().size() == 1) {
+ return new Entry<C,
String>((C) next.getValue(alias),
+
next.getStringValue(alias));
} else {
- String alias =
Queries.getFieldAlias(query.getFields().get(0));
- log.debug("using field
" + alias);
- if
(query.getFields().size() == 1) {
- return new
Entry<C, String>((C) next.getValue(alias),
-
next.getStringValue(alias));
- } else {
- StringBuilder buf
= new StringBuilder();
- for (int i = 1 ; i
< query.getFields().size(); i++) {
- String a =
Queries.getFieldAlias(query.getFields().get(i));
- if
(buf.length() > 0) buf.append(" ");
-
buf.append(next.getStringValue(a));
+ StringBuilder buf =
new StringBuilder();
+ for (int i = 1; i <
query.getFields().size(); i++) {
+ String a =
Queries.getFieldAlias(query.getFields().get(i));
+ if (buf.length() >
0) {
+ buf.append("
");
}
- return new
Entry<C, String>((C) next.getValue(alias),
-
buf.toString());
+
buf.append(next.getStringValue(a));
}
+ return new Entry<C,
String>((C) next.getValue(alias),
+
buf.toString());
}
}
- public void remove() {
- throw new
UnsupportedOperationException();
- }
- };
+ }
+ @Override
+ public void remove() {
+ throw new
UnsupportedOperationException();
+ }
+ };
if (subIterator.hasNext()) {
break;
} else {
@@ -382,56 +391,65 @@
next = new Entry(candidate, candidate);
}
}
- }
+ }
- public boolean hasNext() {
- return next != null || subIterator != null;
- }
- public Map.Entry<C, String> next() {
- Map.Entry<C, String> res;
- if (subIterator != null) {
- res = subIterator.next();
- Object key = res.getKey();
- if (key != null && key instanceof
SortedBundle.ValueWrapper) {
- res = new
Entry(((SortedBundle.ValueWrapper) key).getKey(), res.getValue());
- }
- if (!subIterator.hasNext()) {
- subIterator = null;
- findNext();
- }
- } else {
- res = next;
+ @Override
+ public boolean hasNext() {
+ return next != null || subIterator != null;
+ }
+ @Override
+ public Map.Entry<C, String> next() {
+ Map.Entry<C, String> res;
+ if (subIterator != null) {
+ res = subIterator.next();
+ Object key = res.getKey();
+ if (key != null && key instanceof
SortedBundle.ValueWrapper) {
+ res = new Entry(((SortedBundle.ValueWrapper)
key).getKey(), res.getValue());
+ }
+ if (!subIterator.hasNext()) {
+ subIterator = null;
findNext();
}
- return res;
+ } else {
+ res = next;
+ findNext();
}
- public int nextIndex() {
- return i;
- }
- public int previousIndex() {
- return i - 1;
- }
- public boolean hasPrevious() {
- // TODO
- throw new UnsupportedOperationException();
- }
- public Map.Entry<C, String> previous() {
- // TODO
- throw new UnsupportedOperationException();
- }
- // this is why we hate java:
+ return res;
+ }
+ @Override
+ public int nextIndex() {
+ return i;
+ }
+ @Override
+ public int previousIndex() {
+ return i - 1;
+ }
+ @Override
+ public boolean hasPrevious() {
+ // TODO
+ throw new UnsupportedOperationException();
+ }
+ @Override
+ public Map.Entry<C, String> previous() {
+ // TODO
+ throw new UnsupportedOperationException();
+ }
+ // this is why we hate java:
- public void remove() {
- throw new UnsupportedOperationException();
- }
- public void add(Map.Entry<C, String> o) {
- throw new UnsupportedOperationException();
- }
- public void set(Map.Entry<C, String> o) {
- throw new UnsupportedOperationException();
- }
- };
+ @Override
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ @Override
+ public void add(Map.Entry<C, String> o) {
+ throw new UnsupportedOperationException();
+ }
+ @Override
+ public void set(Map.Entry<C, String> o) {
+ throw new UnsupportedOperationException();
+ }
+ };
}
};
}
@@ -571,6 +589,7 @@
throw new IllegalArgumentException("'" + key.getClass() +
Casting.toString(key) + "' cannot be cast to one of the keys of " + this + "
(using" + cloud + " " + usesCloud + ")");
}
+ @Override
public Object clone() {
try {
LocalizedEntryListFactory clone = (LocalizedEntryListFactory)
super.clone();
@@ -718,6 +737,7 @@
}
}
+ @Override
public String toString() {
return "(localized: " + localized + "bundles: " + bundles +
"fallBack: " + fallBack + ")";
}
@@ -776,9 +796,11 @@
}
+ @Override
public String toString() {
return resource + " " + constantsProvider + " " + wrapper + " " +
comparator;
}
+ @Override
public boolean equals(Object o) {
if (o instanceof Bundle) {
Bundle b = (Bundle) o;
@@ -793,6 +815,7 @@
return false;
}
}
+ @Override
public int hashCode() {
int result = 0;
result = HashCodeUtil.hashCode(result, resource);
@@ -803,6 +826,7 @@
return result;
}
+ @Override
public Bundle<D> clone() {
log.debug("Cloning bundle " + this);
try {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
