Author: maksimkaszynski Date: 2007-11-20 11:30:38 -0500 (Tue, 20 Nov 2007) New Revision: 4111 Modified: branches/3.1.x/sandbox/ui/contextMenu/pom.xml branches/3.1.x/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuContentHandler.java branches/3.1.x/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java branches/3.1.x/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java branches/3.1.x/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/Lifo.java Log: context menu moved to 3.1.x branch Modified: branches/3.1.x/sandbox/ui/contextMenu/pom.xml =================================================================== --- branches/3.1.x/sandbox/ui/contextMenu/pom.xml 2007-11-20 16:25:31 UTC (rev 4110) +++ branches/3.1.x/sandbox/ui/contextMenu/pom.xml 2007-11-20 16:30:38 UTC (rev 4111) @@ -2,19 +2,19 @@ <parent> <artifactId>ui</artifactId> <groupId>org.richfaces.sandbox</groupId> - <version>3.2.0-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.richfaces.sandbox.ui</groupId> <artifactId>contextMenu</artifactId> <name>contextMenu</name> - <version>3.2.0-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> <build> <plugins> <plugin> <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> <executions> <execution> <phase>generate-sources</phase> @@ -44,12 +44,12 @@ <dependency> <groupId>org.richfaces.framework</groupId> <artifactId>richfaces-impl</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </dependency> <dependency> <groupId>org.richfaces.ui</groupId> <artifactId>menu-components</artifactId> - <version>3.2.0-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </dependency> </dependencies> </project> \ No newline at end of file Modified: branches/3.1.x/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuContentHandler.java =================================================================== --- branches/3.1.x/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuContentHandler.java 2007-11-20 16:25:31 UTC (rev 4110) +++ branches/3.1.x/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuContentHandler.java 2007-11-20 16:30:38 UTC (rev 4111) @@ -40,7 +40,7 @@ public class ContextMenuContentHandler extends MacroDefinitionJSContentHandler { - private static final Set<String> INTERPOLATED_ATTRIBUTES = new HashSet<String>(); + private static final Set INTERPOLATED_ATTRIBUTES = new HashSet(); static { String[] attrs = { @@ -59,12 +59,12 @@ HTML.onselect_ATTRIBUTE }; - for (String string : attrs) { - INTERPOLATED_ATTRIBUTES.add(string); + for (int i = 0; i < attrs.length; i++) { + INTERPOLATED_ATTRIBUTES.add(attrs[i]); } } - private Lifo<String> elementStack = new Lifo<String>(); + private Lifo elementStack = new Lifo(); /** @@ -76,22 +76,19 @@ super(writer, prolog, epilog); } - @Override public void startElement(String uri, String localName, String name, Attributes attributes) throws SAXException { elementStack.push(localName); super.startElement(uri, localName, name, attributes); } - @Override public void endElement(String uri, String localName, String name) throws SAXException { elementStack.pop(); super.endElement(uri, localName, name); } - @Override - protected List<?> parseExpressiion(String expressionString) + protected List parseExpressiion(String expressionString) throws SAXException { if (HTML.SCRIPT_ELEM.equals(elementStack.peek())) { @@ -101,7 +98,7 @@ } } - @Override + protected void encodeAttributeValue(Attributes attributes, int idx) throws SAXException, IOException { Modified: branches/3.1.x/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java =================================================================== --- branches/3.1.x/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java 2007-11-20 16:25:31 UTC (rev 4110) +++ branches/3.1.x/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java 2007-11-20 16:30:38 UTC (rev 4111) @@ -60,22 +60,19 @@ System.arraycopy(ownScripts, 0, scripts, delegateScripts.length, ownScripts.length); } - @Override protected InternetResource[] getScripts() { return scripts; } - @Override protected InternetResource[] getStyles() { return delegate.getStyles(); } - @Override - protected Class<? extends UIComponent> getComponentClass() { + protected Class getComponentClass() { return delegate.getComponentClass(); } - @Override + protected void doEncodeBegin(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { writer.startElement(HTML.DIV_ELEM, component); @@ -83,7 +80,6 @@ } - @Override public void renderChildren(FacesContext context, UIComponent component) throws IOException { delegate.encodeChildren(context, component); @@ -102,13 +98,11 @@ - @Override protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException { writer.endElement(HTML.DIV_ELEM); } - @Override protected ContentHandler createContentHandler(Writer writer) { return new ContextMenuContentHandler(writer, "Richfaces.evalMacro(\"", "\", context)"); } Modified: branches/3.1.x/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java =================================================================== --- branches/3.1.x/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java 2007-11-20 16:25:31 UTC (rev 4110) +++ branches/3.1.x/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java 2007-11-20 16:30:38 UTC (rev 4111) @@ -39,7 +39,6 @@ /* (non-Javadoc) * @see org.richfaces.renderkit.html.AbstractMenuRenderer#getLayerScript(javax.faces.context.FacesContext, javax.faces.component.UIComponent) */ - @Override protected String getLayerScript(FacesContext context, UIComponent component) { StringBuffer buffer = new StringBuffer(); JSFunction function = new JSFunction("new RichFaces.Menu.Layer"); @@ -107,8 +106,7 @@ /* (non-Javadoc) * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() */ - @Override - protected Class<? extends UIComponent> getComponentClass() { + protected Class getComponentClass() { return UIContextMenu.class; } Modified: branches/3.1.x/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/Lifo.java =================================================================== --- branches/3.1.x/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/Lifo.java 2007-11-20 16:25:31 UTC (rev 4110) +++ branches/3.1.x/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/Lifo.java 2007-11-20 16:30:38 UTC (rev 4111) @@ -21,13 +21,13 @@ package org.richfaces.renderkit.html; -public class Lifo<T> { +public class Lifo { private class Element { - private T content; + private Object content; private Element next; - public Element(Element next, T content) { + public Element(Element next, Object content) { super(); this.next = next; this.content = content; @@ -37,11 +37,11 @@ private Element top = null; - public void push(T element) { + public void push(Object element) { top = new Element(top, element); } - public T pop() { + public Object pop() { if (top == null) { return null; } @@ -52,7 +52,7 @@ return e.content; } - public T peek() { + public Object peek() { if (top == null) { return null; }