Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

o Unallow the nav bean to count children. Turns out it was simpler to do it in jelly.

Browse Source 
o Add new style for img.handle (no border, little bit of right padding)
o Update the templates to draw handles

I'm still not 100% on drawing an expanded handle on an uncollapsible node.
I think we could do to remove the little - in front of every item too.
PR: MAVEN-579


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113659 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
bwalding 2003-07-17 10:44:05 +00:00
parent 6ba41dd168
commit 48e967375d
5 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xdoc/src/main/org/apache/maven/NavBean.java
View File

@ -64,7 +64,7 @@ import org.dom4j.tree.DefaultElement;
/**
* @author <a href="bwalding@jakarta.org">Ben Walding</a>
* @version $Id: NavBean.java,v 1.5 2003/07/17 09:33:12 bwalding Exp $
* @version $Id: NavBean.java,v 1.6 2003/07/17 10:44:05 bwalding Exp $
*/
public class NavBean
{
@ -96,16 +96,6 @@ public class NavBean
return getAttribute(elem, "href", null);
}
/**
* Assumes that the node is visible.
* @param o
* @return the number of children for this node
*/
public int countChildren(DefaultElement elem) {
List l = elem.selectNodes("./item");
return l.size();
}
/**
* Determines if the given node is collapsed. If a parent of this node is
* collapsed, this will give spurious results.

5
xdoc/src/plugin-resources/css/maven.css
View File

@ -98,3 +98,8 @@ h3, h4 {
margin-top: 1em;
margin-bottom: 0;
}
img.handle {
border: 0;
padding-right: 2px;
}

BIN
xdoc/src/plugin-resources/images/collapsed.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 963 B

BIN
xdoc/src/plugin-resources/images/expanded.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 166 B

23
xdoc/src/test/org/apache/maven/NavBeanTest.java
View File

@ -64,11 +64,10 @@ import junit.framework.TestCase;
import org.dom4j.Document;
import org.dom4j.Node;
import org.dom4j.io.SAXReader;
import org.dom4j.tree.DefaultElement;
/**
* @author <a href="bwalding@jakarta.org">Ben Walding</a>
* @version $Id: NavBeanTest.java,v 1.3 2003/07/17 09:33:12 bwalding Exp $
* @version $Id: NavBeanTest.java,v 1.4 2003/07/17 10:44:03 bwalding Exp $
*/
public class NavBeanTest extends TestCase
{
@ -133,24 +132,4 @@ public class NavBeanTest extends TestCase
String s = "At location " + location + ", looking to generate link to " + href + ", expecting collapse = " + expected;
assertEquals(s, expected, nb.isCollapsed(node));
}
public void testCountChildren() throws Exception
{
testCountChildren("/alpha/index.html", 2);
testCountChildren("/alpha/one/index.html", 0);
testCountChildren("/alpha/two/index.html", 0);
testCountChildren("/beta/index.html", 2);
testCountChildren("/beta/one/index.html", 0);
testCountChildren("/beta/two/index.html", 0);
}
public void testCountChildren(String href, int expected)
{
Node node = nb.getFirstNodeByHREF(href);
assertNotNull(node);
String s = "At location " + href + ", expecting countChildren = " + expected;
assertEquals(s, expected, nb.countChildren((DefaultElement) node));
}
}