[jbosstools-commits] JBoss Tools SVN: r38373 - trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet.
Author: snjeza
Date: 2012-02-01 14:25:53 -0500 (Wed, 01 Feb 2012)
New Revision: 38373
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java
Log:
JBIDE-9635 Duplicate view-handler in faces-config.xml in JBoss Seam/Portlet Project
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java
===================================================================
---
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java 2012-02-01
18:29:51 UTC (rev 38372)
+++
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java 2012-02-01
19:25:53 UTC (rev 38373)
@@ -45,7 +45,8 @@
private static final String ORG_JBOSS_PORTLET_STATE_MANAGER =
"org.jboss.portletbridge.application.PortletStateManager"; //$NON-NLS-1$
private static final String ORG_JBOSS_PORTLET_VIEW_HANDLER =
"org.jboss.portletbridge.application.PortletViewHandler"; //$NON-NLS-1$
-
+ private static final String COM_SUN_FACELETS_VIEW_HANDLER =
"com.sun.facelets.FaceletViewHandler"; //$NON-NLS-1$
+
/*
* (non-Javadoc)
*
@@ -179,12 +180,19 @@
for (Iterator iterator = applications.iterator(); iterator.hasNext();) {
ApplicationType application = (ApplicationType) iterator.next();
EList viewHandlers = application.getViewHandler();
+ ViewHandlerType faceletsHandler = null;
for (Iterator iterator2 = viewHandlers.iterator(); iterator2.hasNext();) {
ViewHandlerType viewHandler = (ViewHandlerType) iterator2.next();
if (ORG_JBOSS_PORTLET_VIEW_HANDLER.equals(viewHandler.getTextContent())) {
facesState.viewHandlerExists = true;
}
- }
+ if (COM_SUN_FACELETS_VIEW_HANDLER.equals(viewHandler.getTextContent())) {
+ faceletsHandler = viewHandler;
+ }
+ }
+ if (faceletsHandler != null) {
+ viewHandlers.remove(faceletsHandler);
+ }
}
for (Iterator iterator = applications.iterator(); iterator.hasNext();) {
ApplicationType application = (ApplicationType) iterator.next();