From 5b84976c1e22f012ebd6aa180cba04dd92fbbf91 Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Mon, 29 Dec 2014 14:03:58 -0200 Subject: [PATCH] Removed dead code --- .../scaffold/faces/FacesScaffoldProvider.java | 85 ------------------- 1 file changed, 85 deletions(-) diff --git a/javaee/faces/src/main/java/org/jboss/forge/addon/scaffold/faces/FacesScaffoldProvider.java b/javaee/faces/src/main/java/org/jboss/forge/addon/scaffold/faces/FacesScaffoldProvider.java index aa3a4f2969..547b84b89e 100644 --- a/javaee/faces/src/main/java/org/jboss/forge/addon/scaffold/faces/FacesScaffoldProvider.java +++ b/javaee/faces/src/main/java/org/jboss/forge/addon/scaffold/faces/FacesScaffoldProvider.java @@ -20,8 +20,6 @@ import javax.persistence.OneToOne; import org.jboss.forge.addon.configuration.Configuration; -import org.jboss.forge.addon.dependencies.Dependency; -import org.jboss.forge.addon.dependencies.builder.DependencyBuilder; import org.jboss.forge.addon.facets.FacetNotFoundException; import org.jboss.forge.addon.javaee.cdi.CDIFacet; import org.jboss.forge.addon.javaee.cdi.ui.CDISetupCommand; @@ -72,23 +70,15 @@ import org.jboss.shrinkwrap.descriptor.api.webcommon30.WelcomeFileListType; import org.jboss.shrinkwrap.descriptor.spi.node.Node; import org.jboss.shrinkwrap.descriptor.spi.node.NodeDescriptor; -import org.metawidget.statically.StaticMetawidget; import org.metawidget.statically.StaticUtils.IndentedWriter; -import org.metawidget.statically.StaticWidget; import org.metawidget.statically.faces.StaticFacesUtils; import org.metawidget.statically.faces.component.html.StaticHtmlMetawidget; import org.metawidget.statically.faces.component.html.widgetbuilder.HtmlOutcomeTargetLink; -import org.metawidget.statically.faces.component.html.widgetbuilder.ReadOnlyWidgetBuilder; -import org.metawidget.statically.faces.component.html.widgetbuilder.richfaces.RichFacesWidgetBuilder; import org.metawidget.statically.html.widgetbuilder.HtmlTag; import org.metawidget.statically.javacode.StaticJavaMetawidget; -import org.metawidget.util.ArrayUtils; import org.metawidget.util.CollectionUtils; import org.metawidget.util.XmlUtils; import org.metawidget.util.simple.StringUtils; -import org.metawidget.widgetbuilder.composite.CompositeWidgetBuilder; -import org.metawidget.widgetbuilder.composite.CompositeWidgetBuilderConfig; -import org.metawidget.widgetbuilder.iface.WidgetBuilder; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; @@ -143,11 +133,6 @@ public class FacesScaffoldProvider implements ScaffoldProvider private static final String PAGINATOR = "/resources/scaffold/paginator.xhtml"; private static final String SCAFFOLD_PAGINATOR = "/scaffold/faces/paginator.xhtml"; - private final Dependency richfaces3UI = DependencyBuilder.create("org.richfaces.ui:richfaces-ui"); - private final Dependency richfaces3Impl = DependencyBuilder.create("org.richfaces.framework:richfaces-impl"); - private final Dependency richfaces4UI = DependencyBuilder.create("org.richfaces.ui:richfaces-components-ui"); - private final Dependency richfaces4Impl = DependencyBuilder.create("org.richfaces.core:richfaces-core-impl"); - protected FreemarkerTemplateProcessor templateProcessor; protected Template backingBeanTemplate; protected int backingBeanTemplateQbeMetawidgetIndent; @@ -735,11 +720,6 @@ private List> generateFromEntity(String targetDir, final Resource { resetMetaWidgets(); - // FORGE-460: setupRichFaces during generateFromEntity, not during setup, as generally 'richfaces setup' is called - // *after* 'scaffold setup' - // TODO: Decide on whether to support Richfaces via the Faces scaffold - // setupRichFaces(); - // Track the list of resources generated List> result = new ArrayList>(); @@ -1026,69 +1006,4 @@ private void createErrorPageEntry(WebAppCommonDescriptor servletConfig, String e } servletConfig.createErrorPage().errorCode(errorCode).location(errorLocation); } - - protected void setupRichFaces() - { - if ((this.project.getFacet(DependencyFacet.class).hasEffectiveDependency(this.richfaces3UI) - && this.project.getFacet(DependencyFacet.class).hasEffectiveDependency(this.richfaces3Impl)) - || (this.project.getFacet(DependencyFacet.class).hasEffectiveDependency(this.richfaces4UI) - && this.project.getFacet(DependencyFacet.class).hasEffectiveDependency(this.richfaces4Impl))) - { - this.entityMetawidget - .setWidgetBuilder(insertRichFacesWidgetBuilder((CompositeWidgetBuilder) this.entityMetawidget - .getWidgetBuilder())); - - this.searchMetawidget - .setWidgetBuilder(insertRichFacesWidgetBuilder((CompositeWidgetBuilder) this.searchMetawidget - .getWidgetBuilder())); - - this.beanMetawidget - .setWidgetBuilder(insertRichFacesWidgetBuilder((CompositeWidgetBuilder) this.beanMetawidget - .getWidgetBuilder())); - } - } - - /** - * Locates a ReadOnlyWidgetBuilder in the list of WidgetBuilders, and inserts a - * RichFacesWidgetBuilder after it (unless there's a RichFacesWidgetBuilder in there - * already). - */ - protected CompositeWidgetBuilder insertRichFacesWidgetBuilder( - final CompositeWidgetBuilder compositeWidgetBuilder) - { - // Get the current WidgetBuilders... - - WidgetBuilder[] existingWidgetBuilders = compositeWidgetBuilder.getWidgetBuilders(); - - // ...find the ReadOnlyWidgetBuilder (if any)... - - int addAt = 0; - - for (int loop = 0; loop < existingWidgetBuilders.length; loop++) - { - // ...(abort if there's already a RichFacesWidgetBuilder)... - - // Use an Object loop variable here to avoid a nasty Java/Generics compiler bug - Object widgetBuilder = existingWidgetBuilders[loop]; - if (widgetBuilder instanceof RichFacesWidgetBuilder) - { - return compositeWidgetBuilder; - } - - if (widgetBuilder instanceof ReadOnlyWidgetBuilder) - { - addAt = loop + 1; - } - } - - // ...and insert our RichFacesWidgetBuilder just after it - - @SuppressWarnings("unchecked") - WidgetBuilder[] newWidgetBuilders = (WidgetBuilder[]) ArrayUtils.addAt(existingWidgetBuilders, addAt, - new RichFacesWidgetBuilder()); - - return new CompositeWidgetBuilder( - new CompositeWidgetBuilderConfig().setWidgetBuilders(newWidgetBuilders)); - } - }