Update of /var/cvs/src/org/mmbase/module/builders
In directory james.mmbase.org:/tmp/cvs-serv6590
Modified Files:
VersionCacheNode.java VersionCacheWhenNode.java
VersionXMLCacheNodeReader.java Versions.java
Log Message:
code conventions
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/module/builders
Index: VersionCacheNode.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/builders/VersionCacheNode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- VersionCacheNode.java 12 Jun 2008 11:25:10 -0000 1.8
+++ VersionCacheNode.java 27 Aug 2008 17:29:52 -0000 1.9
@@ -18,26 +18,28 @@
* @javadoc
* @deprecated is this (cacheversionfile) used? seems obsolete now
* @author Daniel Ockeloen
- * @version $Id: VersionCacheNode.java,v 1.8 2008/06/12 11:25:10 michiel Exp $
+ * @version $Id: VersionCacheNode.java,v 1.9 2008/08/27 17:29:52 michiel Exp $
*/
class VersionCacheNode {
private static Logger log =
Logging.getLoggerInstance(VersionCacheNode.class.getName());
private MMObjectNode versionnode;
- private Vector<VersionCacheWhenNode> whens = new
Vector<VersionCacheWhenNode>();
+ private List<VersionCacheWhenNode> whens = new
Vector<VersionCacheWhenNode>();
private MMBase mmb;
public VersionCacheNode(MMBase mmb) {
this.mmb = mmb;
}
-
+ /**
+ * @javadoc
+ */
public void handleChanged(String buildername,int number) {
// method checks if this really something valid
// and we should signal a new version
boolean dirty = false;
for (VersionCacheWhenNode whennode : whens) {
- Vector<String> types = whennode.getTypes();
+ List<String> types = whennode.getTypes();
// check if im known in the types part
if (types.contains(buildername)) {
@@ -47,14 +49,14 @@
dirty = true;
} else {
// so multiple prepare a multilevel !
- Vector<String> nodes = whennode.getNodes();
+ List<String> nodes = whennode.getNodes();
- Vector<String> fields = new Vector<String>();
- fields.addElement(buildername + ".number");
- Vector<String> ordervec = new Vector<String>();
- Vector<String> dirvec = new Vector<String>();
+ List<String> fields = new Vector<String>();
+ fields.add(buildername + ".number");
+ List<String> ordervec = new Vector<String>();
+ List<String> dirvec = new Vector<String>();
- Vector<MMObjectNode> vec =
mmb.getClusterBuilder().searchMultiLevelVector(nodes,fields,"YES",types,buildername+".number=="+number,ordervec,dirvec);
+ List<MMObjectNode> vec =
mmb.getClusterBuilder().searchMultiLevelVector(nodes, fields, "YES", types,
buildername + ".number==" + number, ordervec, dirvec);
if (log.isDebugEnabled()) log.debug("VEC=" + vec);
if (vec != null && vec.size() > 0) {
dirty = true;
@@ -76,8 +78,11 @@
this.versionnode = versionnode;
}
+ /**
+ * @javadoc
+ */
public void addWhen(VersionCacheWhenNode when) {
- whens.addElement(when);
+ whens.add(when);
}
}
Index: VersionCacheWhenNode.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/builders/VersionCacheWhenNode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- VersionCacheWhenNode.java 12 Jun 2008 11:25:10 -0000 1.7
+++ VersionCacheWhenNode.java 27 Aug 2008 17:29:52 -0000 1.8
@@ -15,26 +15,32 @@
* @javadoc
* @deprecated is this (cacheversionfile) used? seems obsolete now
* @author Daniel Ockeloen
- * @version $Id: VersionCacheWhenNode.java,v 1.7 2008/06/12 11:25:10 michiel
Exp $
+ * @version $Id: VersionCacheWhenNode.java,v 1.8 2008/08/27 17:29:52 michiel
Exp $
*/
class VersionCacheWhenNode {
- private Vector<String> types = new Vector<String>();
- private Vector<String> nodes = new Vector<String>();
+ private List<String> types = new Vector<String>();
+ private List<String> nodes = new Vector<String>();
public void addType(String type) {
- types.addElement(type);
+ types.add(type);
}
public void addNode(String node) {
- nodes.addElement(node);
+ nodes.add(node);
}
- public Vector<String> getTypes() {
+ /**
+ * @javadoc
+ */
+ public List<String> getTypes() {
return types;
}
- public Vector<String> getNodes() {
+ /**
+ * @javadoc
+ */
+ public List<String> getNodes() {
return nodes;
}
}
Index: VersionXMLCacheNodeReader.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/module/builders/VersionXMLCacheNodeReader.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- VersionXMLCacheNodeReader.java 12 Jun 2008 11:25:10 -0000 1.10
+++ VersionXMLCacheNodeReader.java 27 Aug 2008 17:29:52 -0000 1.11
@@ -26,16 +26,15 @@
* @javadoc
* @deprecated is this (cacheversionfile) used? seems obsolete now
* @author Daniel Ockeloen
- * @version $Id: VersionXMLCacheNodeReader.java,v 1.10 2008/06/12 11:25:10
michiel Exp $
+ * @version $Id: VersionXMLCacheNodeReader.java,v 1.11 2008/08/27 17:29:52
michiel Exp $
*/
class VersionXMLCacheNodeReader {
- private static Logger log =
Logging.getLoggerInstance(VersionCacheNode.class.getName());
- Document document;
+ private static final Logger log =
Logging.getLoggerInstance(VersionCacheNode.class);
+ private final Document document;
Versions parent;
- public VersionXMLCacheNodeReader(String filename) {
- try {
+ public VersionXMLCacheNodeReader(String filename) throws SAXException,
IOException {
DocumentBuilder db = DocumentReader.getDocumentBuilder(false);
File file = new File(filename);
if (!file.exists()) {
@@ -43,21 +42,18 @@
}
document = db.parse(file);
}
- catch (SAXException e) {
- log.error("", e);
- }
- catch (IOException e) {
- log.error("", e);
- }
- }
+ /**
+ * @javadoc
+ */
public void setBuilder(Versions parent) {
this.parent = parent;
}
/**
+ * @javadoc
*/
- public Hashtable<String, Vector<VersionCacheNode>>
getCacheVersions(Hashtable<String, Vector<VersionCacheNode>> handlers) {
+ public Map<String, Vector<VersionCacheNode>> getCacheVersions(Map<String,
Vector<VersionCacheNode>> handlers) {
Node n1 = document.getFirstChild();
if (n1.getNodeType() == Node.DOCUMENT_TYPE_NODE) {
n1 = n1.getNextSibling();
@@ -135,15 +131,17 @@
}
return handlers;
}
-
- public Vector<Map<String,String>> getDefines() {
- Vector<Map<String,String>> results = new Vector<Map<String,String>>();
+ /**
+ * @javadoc
+ */
+ public List<Map<String, String>> getDefines() {
+ List<Map<String, String>> results = new ArrayList<Map<String,
String>>();
Node n1 = document.getFirstChild();
if (n1 != null) {
Node n2 = n1.getFirstChild();
while (n2 != null) {
if (n2.getNodeName().equals("define")) {
- Map<String,String> rep = new Hashtable<String,String>();
+ Map<String, String> rep = new HashMap<String,String>();
// decode all the needed values in the replace itself
NamedNodeMap nm = n2.getAttributes();
@@ -183,7 +181,7 @@
}
- results.addElement(rep);
+ results.add(rep);
}
n2 = n2.getNextSibling();
}
Index: Versions.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/module/builders/Versions.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- Versions.java 6 Dec 2007 08:03:47 -0000 1.22
+++ Versions.java 27 Aug 2008 17:29:52 -0000 1.23
@@ -18,13 +18,13 @@
/**
* @javadoc
* @author Daniel Ockeloen
- * @version $Id: Versions.java,v 1.22 2007/12/06 08:03:47 michiel Exp $
+ * @version $Id: Versions.java,v 1.23 2008/08/27 17:29:52 michiel Exp $
*/
public class Versions extends MMObjectBuilder implements MMBaseObserver {
private static final Logger log =
Logging.getLoggerInstance(Versions.class);
- private Hashtable<String, Vector<VersionCacheNode>> cacheVersionHandlers =
new Hashtable<String, Vector<VersionCacheNode>>();
+ private Map<String, Vector<VersionCacheNode>> cacheVersionHandlers = new
Hashtable<String, Vector<VersionCacheNode>>();
private Map<String, Integer> versionsCache = new Hashtable<String,
Integer>();
@@ -36,9 +36,12 @@
public boolean init() {
if (!initialized) {
super.init();
+ try {
startCacheTypes();
- List<MMObjectNode> versionNodes = getNodes();
- for (MMObjectNode versionNode : versionNodes) {
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ }
+ for (MMObjectNode versionNode : getNodes()) {
String name = versionNode.getStringValue("name");
String type = versionNode.getStringValue("type");
Integer number = versionNode.getNumber();
@@ -127,7 +130,7 @@
/**
* @javadoc
*/
- public void startCacheTypes() {
+ public void startCacheTypes() throws org.xml.sax.SAXException,
java.io.IOException {
// is there a CacheVersion file ?
String cacheversionfile = getInitParameter("cacheversionfile");
@@ -136,8 +139,7 @@
parser.setBuilder(this);
cacheVersionHandlers =
parser.getCacheVersions(cacheVersionHandlers);
}
- for (Enumeration<String> e = cacheVersionHandlers.keys();
e.hasMoreElements();) {
- String bname = e.nextElement();
+ for (String bname : cacheVersionHandlers.keySet()) {
MMObjectBuilder builder = mmb.getBuilder(bname);
if (builder != null) {
builder.addLocalObserver(this);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
