You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2007/11/30 13:32:00 UTC
svn commit: r599800 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/component/
core/src/main/java/org/apache/myfaces/tobago/taglib/component/
theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/...
Author: bommel
Date: Fri Nov 30 04:31:54 2007
New Revision: 599800
URL: http://svn.apache.org/viewvc?rev=599800&view=rev
Log:
(TOBAGO-562) List of Popup in UIPage should be a Set
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPage.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPage.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPage.java?rev=599800&r1=599799&r2=599800&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPage.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPage.java Fri Nov 30 04:31:54 2007
@@ -17,13 +17,12 @@
* limitations under the License.
*/
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_APPLICATION_ICON;
import org.apache.commons.collections.KeyValue;
import org.apache.commons.collections.list.SetUniqueList;
import org.apache.commons.collections.set.ListOrderedSet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
+import static org.apache.myfaces.tobago.TobagoConstants.ATTR_APPLICATION_ICON;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_FOCUS_ID;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_HEIGHT;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STATE;
@@ -45,6 +44,7 @@
import java.util.List;
import java.util.Set;
import java.util.StringTokenizer;
+import java.util.TreeSet;
public class UIPage extends UIForm {
@@ -85,7 +85,7 @@
private Set<String> onsubmitScripts;
- private List<UIPopup> popups;
+ private Set<UIPopup> popups;
private Integer width;
@@ -104,7 +104,7 @@
onunloadScripts = new ListOrderedSet();
onexitScripts = new ListOrderedSet();
onsubmitScripts = new ListOrderedSet();
- popups = new ArrayList<UIPopup>();
+ popups = new TreeSet<UIPopup>();
}
@Override
@@ -361,7 +361,7 @@
return onsubmitScripts;
}
- public List<UIPopup> getPopups() {
+ public Set<UIPopup> getPopups() {
return popups;
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java?rev=599800&r1=599799&r2=599800&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java Fri Nov 30 04:31:54 2007
@@ -27,12 +27,10 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_WIDTH;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UIPage;
-import org.apache.myfaces.tobago.component.UIPopup;
import javax.faces.component.UIComponent;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTag;
-import java.util.List;
// Some Weblogic versions need explicit 'implements' for BodyTag
public class PageTag extends TobagoBodyTag
@@ -57,16 +55,13 @@
public int doEndTag() throws JspException {
UIPage page = (UIPage) getComponentInstance();
- List<UIPopup> popups = page.getPopups();
- int result = super.doEndTag();
-
+ // TODO is this required?
// clear popups;
- popups.clear();
+ page.getPopups().clear();
// reseting doctype and charset
doctype = "loose";
- //charset = null;
- return result;
+ return super.doEndTag();
}
public String getComponentType() {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java?rev=599800&r1=599799&r2=599800&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PageRenderer.java Fri Nov 30 04:31:54 2007
@@ -40,6 +40,7 @@
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UILayout;
import org.apache.myfaces.tobago.component.UIPage;
+import org.apache.myfaces.tobago.component.UIPopup;
import org.apache.myfaces.tobago.context.ClientProperties;
import org.apache.myfaces.tobago.context.ResourceManagerUtil;
import org.apache.myfaces.tobago.renderkit.PageRendererBase;
@@ -137,8 +138,7 @@
// write popup components
// beware of ConcurrentModificationException in cascating popups!
- for (int i = 0; i < page.getPopups().size(); i++) {
- UIComponent popup = page.getPopups().get(i);
+ for (UIPopup popup: page.getPopups()) {
RenderUtil.encode(facesContext, popup);
}