rubys 02/01/02 11:12:58
Modified: proposal/gump/java Jenny.java Module.java Project.java
Log:
Appease the style police.
Revision Changes Path
1.7 +12 -6 jakarta-alexandria/proposal/gump/java/Jenny.java
Index: Jenny.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/java/Jenny.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Jenny.java 1 Jan 2002 23:45:05 -0000 1.6
+++ Jenny.java 2 Jan 2002 19:12:58 -0000 1.7
@@ -91,11 +91,13 @@
String source=href.getValue();
Node sub = parse(source);
- if (source.lastIndexOf(".")>0)
+ if (source.lastIndexOf(".")>0) {
source=source.substring(0,source.lastIndexOf("."));
+ }
- if (source.lastIndexOf("/")>0)
+ if (source.lastIndexOf("/")>0) {
source=source.substring(source.lastIndexOf("/")+1);
+ }
node.removeAttribute("href");
node.setAttribute("defined-in", source);
@@ -117,7 +119,9 @@
Node child=node.getFirstChild();
while (child != null) {
Node next=child.getNextSibling();
- if (child.getNodeType()==Node.ELEMENT_NODE) expand((Element)child);
+ if (child.getNodeType()==Node.ELEMENT_NODE) {
+ expand((Element)child);
+ }
child=next;
}
}
@@ -145,8 +149,9 @@
if (priorDefinition != null && priorDefinition != element) {
Element parent = (Element)priorDefinition.getParentNode();
String definedIn = parent.getAttribute("defined-in");
- if (!definedIn.equals(""))
+ if (!definedIn.equals("")) {
element.setAttribute("defined-in",definedIn);
+ }
moveChildren(priorDefinition, element);
parent.removeChild(priorDefinition);
@@ -190,10 +195,11 @@
*/
public static void main(String[] args) {
try {
- if (args.length == 1)
+ if (args.length == 1) {
new Jenny(args[0]);
- else
+ } else {
System.out.println("Usage: Jenny workspace.xml");
+ }
} catch (Exception e) {
e.printStackTrace();
System.exit(99);
1.12 +7 -4 jakarta-alexandria/proposal/gump/java/Module.java
Index: Module.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/java/Module.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Module.java 1 Jan 2002 23:45:05 -0000 1.11
+++ Module.java 2 Jan 2002 19:12:58 -0000 1.12
@@ -158,8 +158,9 @@
String definedIn = element.getAttribute("defined-in");
for (Enumeration e=projects.elements(); e.hasMoreElements(); ) {
Element project = (Element) e.nextElement();
- if (project.getAttributeNode("defined-in") == null)
+ if (project.getAttributeNode("defined-in") == null) {
project.setAttribute("defined-in", definedIn);
+ }
element.removeChild(project);
parent.appendChild(project);
}
@@ -175,7 +176,7 @@
Node child=element.getFirstChild();
for (; child != null; child=child.getNextSibling()) {
if (! child.getNodeName().equals("cvs")) continue;
- if (cvs == null) {
+ if (cvs == null) {
cvs = (Element) child;
} else {
Jenny.moveChildren((Element) child, cvs);
@@ -197,13 +198,15 @@
cvsroot += ":" + r.get("user");
cvsroot += "@";
- if (cvs.getAttributeNode("host-prefix") != null)
+ if (cvs.getAttributeNode("host-prefix") != null) {
cvsroot += cvs.getAttribute("host-prefix") + ".";
+ }
cvsroot += r.get("hostname");
cvsroot += ":" + r.get("path");
- if (cvs.getAttributeNode("dir") != null)
+ if (cvs.getAttributeNode("dir") != null) {
cvsroot += "/" + cvs.getAttribute("dir");
+ }
cvs.setAttribute("cvsroot", cvsroot);
cvs.setAttribute("password", r.get("password"));
1.23 +10 -5 jakarta-alexandria/proposal/gump/java/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/gump/java/Project.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Project.java 2 Jan 2002 14:34:02 -0000 1.22
+++ Project.java 2 Jan 2002 19:12:58 -0000 1.23
@@ -97,8 +97,9 @@
if (ant != null) {
genProperties(ant);
genDepends(ant);
- if (!get("target").equals(""))
+ if (!get("target").equals("")) {
ant.setAttribute("target", get("target"));
+ }
}
resolveJavadoc(javadoc);
@@ -168,12 +169,14 @@
Element depend = document.createElement("depend");
depend.setAttribute("project", dependency);
- if (property.getAttributeNode("classpath") == null)
+ if (property.getAttributeNode("classpath") == null) {
depend.appendChild(document.createElement("noclasspath"));
+ }
Attr runtime = property.getAttributeNode("runtime");
- if (runtime != null)
+ if (runtime != null) {
depend.setAttribute("runtime", runtime.getValue());
+ }
element.appendChild(depend);
dependsOn.put(dependency, depend);
@@ -247,8 +250,9 @@
Project target = (Project)projects.get(name);
Element depend = (Element) dependsOn.get(name);
- if (!depend.getNodeName().equals("option"))
+ if (!depend.getNodeName().equals("option")) {
require(target, "project", name);
+ }
if (target == null) continue;
target.referencedBy.put(this, depend);
@@ -553,8 +557,9 @@
// if there are no child nodes, add this project's description
if (!javadoc.hasChildNodes() && description!=null) {
Element desc = (Element) description.cloneNode(true);
- if (javadoc.getAttributeNode("title") != null)
+ if (javadoc.getAttributeNode("title") != null) {
desc.setAttribute("title", javadoc.getAttribute("title"));
+ }
javadoc.appendChild(desc);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
