Skip to content
This repository has been archived by the owner on Jan 10, 2019. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix for ValidationDecorator
and removed some dead code
  • Loading branch information
trsvax committed Aug 29, 2012
1 parent 9293687 commit 6061445
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 1,114 deletions.
14 changes: 0 additions & 14 deletions src/main/java/com/trsvax/bootstrap/FrameworkVisitor.java

This file was deleted.

7 changes: 3 additions & 4 deletions src/main/java/com/trsvax/bootstrap/mixins/FW.java
Expand Up @@ -18,7 +18,6 @@

import com.trsvax.bootstrap.FrameworkMixin;
import com.trsvax.bootstrap.FrameworkProvider;
import com.trsvax.bootstrap.FrameworkVisitor;
import com.trsvax.bootstrap.environment.FrameworkEnvironment;

//@SupportsInformalParameters
Expand All @@ -34,9 +33,9 @@ public class FW implements FrameworkMixin {
@Parameter
private Map<String,Object> fwargs;

@Inject
@Service("FrameworkVisitor")
private FrameworkVisitor vistor;
//@Inject
//@Service("FrameworkVisitor")
//private FrameworkVisitor vistor;

@Inject
private ComponentResources componentResources;
Expand Down
@@ -1,20 +1,28 @@
package com.trsvax.bootstrap.services;

import org.apache.tapestry5.Asset;
import org.apache.tapestry5.MarkupWriter;
import org.apache.tapestry5.ValidationDecorator;
import org.apache.tapestry5.annotations.Path;
import org.apache.tapestry5.internal.DefaultValidationDecorator;
import org.apache.tapestry5.services.Environment;
import org.apache.tapestry5.services.ValidationDecoratorFactory;
import org.slf4j.Logger;

public class BootStrapValidationDecoratorFactoryImpl implements ValidationDecoratorFactory {
private final Environment environment;
private final Asset spacerImage;

public BootStrapValidationDecoratorFactoryImpl(Environment environment) {
public BootStrapValidationDecoratorFactoryImpl(Environment environment, @Path("${tapestry.spacer-image}")
Asset spacerImage) {
this.environment = environment;
this.spacerImage = spacerImage;
}

public ValidationDecorator newInstance(MarkupWriter writer) {
return new BootStrapValidationDecorator(writer,environment);
DefaultValidationDecorator decorator = new DefaultValidationDecorator(environment, spacerImage, writer);
//return new BootStrapValidationDecorator(writer,environment);

return decorator;
}

}
65 changes: 12 additions & 53 deletions src/main/java/com/trsvax/bootstrap/services/BootstrapModule.java
Expand Up @@ -38,7 +38,6 @@

import com.trsvax.bootstrap.BootstrapProvider;
import com.trsvax.bootstrap.FrameworkProvider;
import com.trsvax.bootstrap.FrameworkVisitor;
import com.trsvax.bootstrap.environment.AlertsEnvironment;
import com.trsvax.bootstrap.environment.AlertsValues;
import com.trsvax.bootstrap.environment.BeanDisplayEnvironment;
Expand All @@ -59,8 +58,6 @@
import com.trsvax.bootstrap.environment.TableValues;
import com.trsvax.bootstrap.services.bootstrapprovider.AlertsProvider;
import com.trsvax.bootstrap.services.bootstrapprovider.BeanDisplayProvider;
import com.trsvax.bootstrap.services.bootstrapprovider.BootstrapFrameworkVisitor;
import com.trsvax.bootstrap.services.bootstrapprovider.BootstrapVisitor;
import com.trsvax.bootstrap.services.bootstrapprovider.BreadcrumbProvider;
import com.trsvax.bootstrap.services.bootstrapprovider.ButtonGroupProvider;
import com.trsvax.bootstrap.services.bootstrapprovider.ButtonProvider;
Expand All @@ -84,9 +81,8 @@ public static void bind(ServiceBinder binder) {
binder.bind(BindingFactory.class,SessionBindingFactory.class).withId("SessionBindingFactory");
binder.bind(BindingFactory.class,EnvironmentBindingFactory.class).withId("EnvironmentBindingFactory");
binder.bind(StringTemplateParser.class,StringTemplateParserImpl.class);
binder.bind(ValidationDecoratorFactory.class,BootStrapValidationDecoratorFactoryImpl.class).withId("BootStrapValidation");
binder.bind(FrameworkVisitor.class, BootstrapVisitor.class).withId(BootstrapVisitor.id);
binder.bind(FrameworkVisitor.class,BootstrapFrameworkVisitor.class).withId(BootstrapFrameworkVisitor.id);
//binder.bind(ValidationDecoratorFactory.class,BootStrapValidationDecoratorFactoryImpl.class).withId("BootStrapValidation");

binder.bind(ExcludeVisitor.class,ExcludeVisitorImpl.class);
binder.bind(EnvironmentSetup.class, EnvironmentSetupImpl.class);

Expand Down Expand Up @@ -161,14 +157,6 @@ public BootstrapProvider build(List<BootstrapProvider> configuration, ChainBuild
return chainBuilder.build(BootstrapProvider.class, configuration);
}

/*
@Contribute(FrameworkProvider.class)
public static void provideFrameworks(MappedConfiguration<String, FrameworkProvider> configuration,
@Primary BootstrapProvider bootstrapProvider) {
//configuration.add("Bootstrap", bootstrapProvider);
}
*/

@Contribute(ComponentClassTransformWorker2.class)
public static void provideWorkers(OrderedConfiguration<ComponentClassTransformWorker2> workers) {
Expand Down Expand Up @@ -196,7 +184,6 @@ public void contributeMarkupRenderer(OrderedConfiguration<MarkupRendererFilter>
final Environment environment,
final JavaScriptSupport javaScriptSupport,
final ExcludeVisitor excludeVistior,
@InjectService(BootstrapVisitor.id) final FrameworkVisitor frameworkVisitor,
@InjectService("FrameworkProvider") final FrameworkProvider frameworkProvider) {

MarkupRendererFilter bootstrapFilter = new MarkupRendererFilter() {
Expand All @@ -205,23 +192,7 @@ public void renderMarkup(MarkupWriter writer, MarkupRenderer renderer) {
renderer.renderMarkup(writer);
final FrameworkEnvironment values = environment.peek(FrameworkEnvironment.class);
environmentSetup.pop();

frameworkProvider.renderMarkup(writer);

/*
Element root = writer.getDocument().getRootElement();
if ( root != null ) {
Element head = root.find("head");
if ( head != null ) {
head.visit(excludeVistior.visit(values));
}
Element body = root.find("body");
if ( body != null) {
frameworkVisitor.visit(body);
}
}
*/

frameworkProvider.renderMarkup(writer);
}
};

Expand All @@ -244,8 +215,7 @@ public void contributePartialMarkupRenderer(OrderedConfiguration<PartialMarkupRe
final EnvironmentSetup environmentSetup,
final Environment environment,
final JavaScriptSupport javaScriptSupport,
final ExcludeVisitor excludeVistior,
@InjectService(BootstrapVisitor.id) final FrameworkVisitor frameworkVisitor) {
final ExcludeVisitor excludeVistior) {
PartialMarkupRendererFilter bootstrapFilter = new PartialMarkupRendererFilter() {

public void renderMarkup(MarkupWriter writer, JSONObject reply, PartialMarkupRenderer renderer) {
Expand All @@ -258,7 +228,8 @@ public void renderMarkup(MarkupWriter writer, JSONObject reply, PartialMarkupRen
if ( root != null ) {
Element body = root.find("ajax-partial");
if ( body != null) {
frameworkVisitor.visit(body);
//TODO use provider
//frameworkVisitor.visit(body);
reply.put("content", body.getChildMarkup());
}
}
Expand All @@ -267,25 +238,16 @@ public void renderMarkup(MarkupWriter writer, JSONObject reply, PartialMarkupRen
configuration.add("BootstrapAJAXFilter", bootstrapFilter,"before:*");
}

public static void contributeClasspathAssetAliasManager(MappedConfiguration<String, String> configuration)
{
public static void contributeClasspathAssetAliasManager(MappedConfiguration<String, String> configuration) {
configuration.add("tap-bootstrap", "com/trsvax/bootstrap");
}

@Contribute(FrameworkVisitor.class)
public static void provideBootStrapVisitors(MappedConfiguration<String, FrameworkVisitor> configuration,
@InjectService(BootstrapFrameworkVisitor.id) FrameworkVisitor fw) {
configuration.add(BootstrapFrameworkVisitor.id,fw);
}



/*
@Contribute(ServiceOverride.class)
public static void setupApplicationServiceOverrides(MappedConfiguration<Class,Object> configuration, @Local ValidationDecoratorFactory override )
{

public static void setupApplicationServiceOverrides(MappedConfiguration<Class,Object> configuration, @Local ValidationDecoratorFactory override ) {
configuration.add(ValidationDecoratorFactory.class, override);
}
*/

@Contribute(BeanBlockSource.class)
public static void provideDefaultBeanBlocks(Configuration<BeanBlockContribution> configuration) {
Expand All @@ -301,14 +263,11 @@ private static void addEditBlock(Configuration<BeanBlockContribution> configurat
configuration.add(new EditBlockContribution(dataType, "tb/AppPropertyEditBlocks", blockId));
}

private static void addDisplayBlock(Configuration<BeanBlockContribution> configuration, String dataType)
{
private static void addDisplayBlock(Configuration<BeanBlockContribution> configuration, String dataType) {
addDisplayBlock(configuration, dataType, dataType);
}

private static void addDisplayBlock(Configuration<BeanBlockContribution> configuration, String dataType,
String blockId)
{
private static void addDisplayBlock(Configuration<BeanBlockContribution> configuration, String dataType, String blockId) {
configuration.add(new DisplayBlockContribution(dataType, "tb/AppPropertyDisplayBlocks", blockId));
}

Expand Down

0 comments on commit 6061445

Please sign in to comment.