September 2009 - richfaces-svn-commits

JBoss Rich Faces SVN: r15693 - tags/3.3.2.GA/samples/richfaces-demo/src/main/java/org/richfaces/demo/common.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2009-09-30 15:45:51 -0400 (Wed, 30 Sep 2009) New Revision: 15693 Modified: tags/3.3.2.GA/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java Log: merged fix for missed tag information tab content from development branch Modified: tags/3.3.2.GA/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java =================================================================== --- tags/3.3.2.GA/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java 2009-09-30 15:22:25 UTC (rev 15692) +++ tags/3.3.2.GA/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java 2009-09-30 19:45:51 UTC (rev 15693) @@ -139,7 +139,7 @@ if (pos > 0) { return tldDocLocation.substring(pos); } - return tldDocLocation; + return "tlddoc/" + tldDocLocation; } public String getTagUsageLocation() {

16 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r15692 - tags/3.2.2.GA/samples/richfaces-demo/src/main/java/org/richfaces/demo/common.

by richfaces-svn-commits＠lists.jboss.org

Author: ilya_shaikovsky Date: 2009-09-30 11:22:25 -0400 (Wed, 30 Sep 2009) New Revision: 15692 Modified: tags/3.2.2.GA/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java Log: fixed missed tag information tab content Modified: tags/3.2.2.GA/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java =================================================================== --- tags/3.2.2.GA/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java 2009-09-30 13:22:38 UTC (rev 15691) +++ tags/3.2.2.GA/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentDescriptor.java 2009-09-30 15:22:25 UTC (rev 15692) @@ -25,8 +25,18 @@ private boolean current; private String activeTab; + + private boolean newComponent; + + public boolean isNewComponent() { + return newComponent; + } - public ComponentDescriptor() { + public void setNewComponent(boolean newComponent) { + this.newComponent = newComponent; + } + + public ComponentDescriptor() { this.id = ""; this.name = ""; this.captionImage = ""; @@ -36,6 +46,7 @@ this.javaDocLocation = ""; this.current = false; this.activeTab = "usage"; + this.newComponent=false; } public String getCaptionImage() { @@ -128,7 +139,7 @@ if (pos > 0) { return tldDocLocation.substring(pos); } - return tldDocLocation; + return "tlddoc/" + tldDocLocation; } public String getTagUsageLocation() {

16 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r15691 - tags/3.3.2.GA/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css.

by richfaces-svn-commits＠lists.jboss.org

Author: ilya_shaikovsky Date: 2009-09-30 09:22:38 -0400 (Wed, 30 Sep 2009) New Revision: 15691 Modified: tags/3.3.2.GA/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss Log: https://jira.jboss.org/jira/browse/RF-7935 Modified: tags/3.3.2.GA/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss =================================================================== --- tags/3.3.2.GA/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss 2009-09-30 13:15:43 UTC (rev 15690) +++ tags/3.3.2.GA/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss 2009-09-30 13:22:38 UTC (rev 15691) @@ -4,56 +4,12 @@ xmlns:u="http://jsf.exadel.com/template/util" xmlns="http://www.w3.org/1999/xhtml"> - <u:selector name=".rich-pmenu-disabled-element" > - <u:style name="color" skin="tabDisabledTextColor"/> - </u:selector> - - <u:selector name=".rich-pmenu-group"> - <u:style name="font-weight" skin="headerWeightFont"/> - <u:style name="font-family" skin="headerFamilyFont"/> - <u:style name="font-size" skin="headerSizeFont"/> - <u:style name="color" skin="generalTextColor"/> - <u:style name="border-top-color" skin="tableBorderColor"/> - </u:selector> - - <u:selector name=".rich-pmenu-hovered-element" > - <u:style name="background-color" skin="additionalBackgroundColor"/> - </u:selector> - - <u:selector name=".rich-pmenu-item"> - <u:style name="font-family" skin="generalFamilyFont"/> - <u:style name="font-weight" skin="generalWeightFont"/> - <u:style name="font-size" skin="generalSizeFont"/> - <u:style name="color" skin="generalTextColor"/> - <u:style name="border-top-color" skin="tableBorderColor"/> - </u:selector> - - <u:selector name=".rich-pmenu-top-group"> - <u:style name="font-weight" skin="headerWeightFont"/> - <u:style name="font-family" skin="generalFamilyFont"/> - <u:style name="font-size" skin="headerSizeFont"/> - <u:style name="color" skin="headerTextColor"/> - <u:style name="background-color" skin="headerBackgroundColor"/> - <u:style name="background-image" > - <f:resource f:key="org.richfaces.renderkit.html.gradientimages.PanelMenuGroupGradient" /> - </u:style> - </u:selector> - - <u:selector name=".rich-pmenu-top-group-div" > - <u:style name="border-color" skin="panelBorderColor"/> - </u:selector> - - <f:verbatim> .rich-pmenu { overflow: hidden; padding-right: 4px; } - .rich-pmenu-disabled-element { - cursor: default; - } - .rich-pmenu-group { padding: 2px 1px 1px; margin-top:1px; @@ -61,9 +17,14 @@ border-top: 1px solid; } - .rich-pmenu-group-self-label { - padding-left: 5px; - width: 100%; + .rich-pmenu-top-group { + height: 20px; + border-top: none; + margin-top: 0; + background-repeat: repeat-x; + background-position: left top; + padding: 2px 1px 2px 2px; + cursor: pointer; } .rich-pmenu-item { @@ -71,27 +32,9 @@ cursor: pointer; padding: 2px 1px 1px; margin-top: 1px; + } - .rich-pmenu-nowrap { - white-space: nowrap; - } - - .rich-pmenu-selected-element { - font-style : italic; - } - - - .rich-pmenu-top-group { - height: 20px; - border-top: none; - margin-top: 0; - background-repeat: repeat-x; - background-position: left top; - padding: 2px 1px 2px 2px; - cursor: pointer; - } - .rich-pmenu-top-group-div { border: 1px solid; margin-bottom: 3px; @@ -99,6 +42,64 @@ overflow: hidden; width: 100%; } + + .rich-pmenu-group-self-label { + padding-left: 5px; + width: 100%; + } + + .rich-pmenu-nowrap { + white-space: nowrap; + } + </f:verbatim> + <u:selector name=".rich-pmenu-group"> + <u:style name="font-weight" skin="headerWeightFont"/> + <u:style name="font-family" skin="headerFamilyFont"/> + <u:style name="font-size" skin="headerSizeFont"/> + <u:style name="color" skin="generalTextColor"/> + <u:style name="border-top-color" skin="tableBorderColor"/> + </u:selector> + + <u:selector name=".rich-pmenu-top-group"> + <u:style name="font-weight" skin="headerWeightFont"/> + <u:style name="font-family" skin="generalFamilyFont"/> + <u:style name="font-size" skin="headerSizeFont"/> + <u:style name="color" skin="headerTextColor"/> + <u:style name="background-color" skin="headerBackgroundColor"/> + <u:style name="background-image" > + <f:resource f:key="org.richfaces.renderkit.html.gradientimages.PanelMenuGroupGradient" /> + </u:style> + </u:selector> + + <u:selector name=".rich-pmenu-item"> + <u:style name="font-family" skin="generalFamilyFont"/> + <u:style name="font-weight" skin="generalWeightFont"/> + <u:style name="font-size" skin="generalSizeFont"/> + <u:style name="color" skin="generalTextColor"/> + <u:style name="border-top-color" skin="tableBorderColor"/> + </u:selector> + + <u:selector name=".rich-pmenu-top-group-div" > + <u:style name="border-color" skin="panelBorderColor"/> + </u:selector> + + <u:selector name=".rich-pmenu-disabled-element" > + <u:style name="color" skin="tabDisabledTextColor"/> + </u:selector> + + <u:selector name=".rich-pmenu-hovered-element" > + <u:style name="background-color" skin="additionalBackgroundColor"/> + </u:selector> + + <f:verbatim> + .rich-pmenu-disabled-element { + cursor: default; + } + .rich-pmenu-selected-element { + font-style : italic; + } + </f:verbatim> + </f:template> \ No newline at end of file

16 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r15690 - branches/community/3.3.X/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css.

by richfaces-svn-commits＠lists.jboss.org

Author: ilya_shaikovsky Date: 2009-09-30 09:15:43 -0400 (Wed, 30 Sep 2009) New Revision: 15690 Modified: branches/community/3.3.X/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss Log: https://jira.jboss.org/jira/browse/RF-7935 Modified: branches/community/3.3.X/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss =================================================================== --- branches/community/3.3.X/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss 2009-09-30 00:57:10 UTC (rev 15689) +++ branches/community/3.3.X/ui/panelmenu/src/main/resources/org/richfaces/renderkit/html/css/panelMenu.xcss 2009-09-30 13:15:43 UTC (rev 15690) @@ -4,56 +4,12 @@ xmlns:u="http://jsf.exadel.com/template/util" xmlns="http://www.w3.org/1999/xhtml"> - <u:selector name=".rich-pmenu-disabled-element" > - <u:style name="color" skin="tabDisabledTextColor"/> - </u:selector> - - <u:selector name=".rich-pmenu-group"> - <u:style name="font-weight" skin="headerWeightFont"/> - <u:style name="font-family" skin="headerFamilyFont"/> - <u:style name="font-size" skin="headerSizeFont"/> - <u:style name="color" skin="generalTextColor"/> - <u:style name="border-top-color" skin="tableBorderColor"/> - </u:selector> - - <u:selector name=".rich-pmenu-hovered-element" > - <u:style name="background-color" skin="additionalBackgroundColor"/> - </u:selector> - - <u:selector name=".rich-pmenu-item"> - <u:style name="font-family" skin="generalFamilyFont"/> - <u:style name="font-weight" skin="generalWeightFont"/> - <u:style name="font-size" skin="generalSizeFont"/> - <u:style name="color" skin="generalTextColor"/> - <u:style name="border-top-color" skin="tableBorderColor"/> - </u:selector> - - <u:selector name=".rich-pmenu-top-group"> - <u:style name="font-weight" skin="headerWeightFont"/> - <u:style name="font-family" skin="generalFamilyFont"/> - <u:style name="font-size" skin="headerSizeFont"/> - <u:style name="color" skin="headerTextColor"/> - <u:style name="background-color" skin="headerBackgroundColor"/> - <u:style name="background-image" > - <f:resource f:key="org.richfaces.renderkit.html.gradientimages.PanelMenuGroupGradient" /> - </u:style> - </u:selector> - - <u:selector name=".rich-pmenu-top-group-div" > - <u:style name="border-color" skin="panelBorderColor"/> - </u:selector> - - <f:verbatim> .rich-pmenu { overflow: hidden; padding-right: 4px; } - .rich-pmenu-disabled-element { - cursor: default; - } - .rich-pmenu-group { padding: 2px 1px 1px; margin-top:1px; @@ -61,9 +17,14 @@ border-top: 1px solid; } - .rich-pmenu-group-self-label { - padding-left: 5px; - width: 100%; + .rich-pmenu-top-group { + height: 20px; + border-top: none; + margin-top: 0; + background-repeat: repeat-x; + background-position: left top; + padding: 2px 1px 2px 2px; + cursor: pointer; } .rich-pmenu-item { @@ -71,27 +32,9 @@ cursor: pointer; padding: 2px 1px 1px; margin-top: 1px; + } - .rich-pmenu-nowrap { - white-space: nowrap; - } - - .rich-pmenu-selected-element { - font-style : italic; - } - - - .rich-pmenu-top-group { - height: 20px; - border-top: none; - margin-top: 0; - background-repeat: repeat-x; - background-position: left top; - padding: 2px 1px 2px 2px; - cursor: pointer; - } - .rich-pmenu-top-group-div { border: 1px solid; margin-bottom: 3px; @@ -99,6 +42,64 @@ overflow: hidden; width: 100%; } + + .rich-pmenu-group-self-label { + padding-left: 5px; + width: 100%; + } + + .rich-pmenu-nowrap { + white-space: nowrap; + } + </f:verbatim> + <u:selector name=".rich-pmenu-group"> + <u:style name="font-weight" skin="headerWeightFont"/> + <u:style name="font-family" skin="headerFamilyFont"/> + <u:style name="font-size" skin="headerSizeFont"/> + <u:style name="color" skin="generalTextColor"/> + <u:style name="border-top-color" skin="tableBorderColor"/> + </u:selector> + + <u:selector name=".rich-pmenu-top-group"> + <u:style name="font-weight" skin="headerWeightFont"/> + <u:style name="font-family" skin="generalFamilyFont"/> + <u:style name="font-size" skin="headerSizeFont"/> + <u:style name="color" skin="headerTextColor"/> + <u:style name="background-color" skin="headerBackgroundColor"/> + <u:style name="background-image" > + <f:resource f:key="org.richfaces.renderkit.html.gradientimages.PanelMenuGroupGradient" /> + </u:style> + </u:selector> + + <u:selector name=".rich-pmenu-item"> + <u:style name="font-family" skin="generalFamilyFont"/> + <u:style name="font-weight" skin="generalWeightFont"/> + <u:style name="font-size" skin="generalSizeFont"/> + <u:style name="color" skin="generalTextColor"/> + <u:style name="border-top-color" skin="tableBorderColor"/> + </u:selector> + + <u:selector name=".rich-pmenu-top-group-div" > + <u:style name="border-color" skin="panelBorderColor"/> + </u:selector> + + <u:selector name=".rich-pmenu-disabled-element" > + <u:style name="color" skin="tabDisabledTextColor"/> + </u:selector> + + <u:selector name=".rich-pmenu-hovered-element" > + <u:style name="background-color" skin="additionalBackgroundColor"/> + </u:selector> + + <f:verbatim> + .rich-pmenu-disabled-element { + cursor: default; + } + .rich-pmenu-selected-element { + font-style : italic; + } + </f:verbatim> + </f:template> \ No newline at end of file

16 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r15689 - in root/cdk/trunk/plugins: maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2009-09-29 20:57:10 -0400 (Tue, 29 Sep 2009) New Revision: 15689 Removed: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/velocity/ Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java root/cdk/trunk/plugins/xinclude/pom.xml Log: maven plugin configuration Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java =================================================================== --- root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java 2009-09-29 17:27:20 UTC (rev 15688) +++ root/cdk/trunk/plugins/maven-cdk-plugin/src/main/java/org/richfaces/builder/mojo/GenerateMojo.java 2009-09-30 00:57:10 UTC (rev 15689) @@ -44,10 +44,12 @@ import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.project.MavenProject; import org.codehaus.plexus.util.DirectoryScanner; +import org.richfaces.builder.maven.MavenLogger; import org.richfaces.cdk.CdkContextBase; import org.richfaces.cdk.CdkException; import org.richfaces.cdk.CdkWorker; import org.richfaces.cdk.LibraryBuilder; +import org.richfaces.cdk.LoggerFactory; import org.richfaces.cdk.ModelValidator; import org.richfaces.cdk.NamingConventions; import org.richfaces.cdk.RichFacesConventions; @@ -64,6 +66,7 @@ * @author asmirnov(a)exadel.com * * @goal generate + * @phase generate-sources */ public class GenerateMojo extends AbstractMojo { @@ -86,21 +89,31 @@ protected MavenProject project; /** + * List of filename patterns that will be included to process by annotations processor. + * By default, all *.java files will be processed. * @parameter */ protected String[] sourceIncludes; /** + * List of filename patterns that will be excluded from process by annotations processor. + * By default, all *.java files will be processed. * @parameter */ protected String[] sourceExcludes; /** + * The list of JSF configuration files that will be processed by CDK. + * By default, CDK looks for all files in the <code>src/main/config</code> folder + * with "xml" extension. * @parameter */ protected FileSet[] facesConfigs; /** + * The list of Renderer template files that will be processed by CDK. + * By default, CDK looks for all files in the <code>src/main/templates</code> folder + * with "xml" extension. * @parameter */ protected FileSet[] templates; @@ -108,20 +121,20 @@ /** * Directory where the output Java Files will be located. * - * @parameter expression="${project.build.directory}/generated-sources/java" + * @parameter expression="${project.build.directory}/cdk-generated/main/java" */ protected File outputJavaDirectory; /** - * @parameter expression="${project.build.directory}/generated-sources/test" + * @parameter expression="${project.build.directory}/cdk-generated/test/java" */ - protected File outputTestsDirectory; + protected File outputTestDirectory; /** * Directory where the output Java Files will be located. * * @parameter - * expression="${project.build.directory}/generated-sources/resources" + * expression="${project.build.directory}/cdk-generated/main/resources" */ protected File outputResourcesDirectory; @@ -129,7 +142,7 @@ * Directory where the output Java Files will be located. * * @parameter - * expression="${project.build.directory}/generated-sources/testresources" + * expression="${project.build.directory}/cdk-generated/test/resources" */ protected File outputTestResourcesDirectory; /** @@ -147,7 +160,7 @@ * @required * @readonly */ - protected List classpathElements; + protected List<String> classpathElements; /** * The directory for compiled classes. * @@ -169,9 +182,11 @@ */ @Override public void execute() throws MojoExecutionException, MojoFailureException { - // TODO set logging. + // Setup logger. + LoggerFactory.setLogger(new MavenLogger(getLog())); CdkContextBase context = new CdkContextBase(this .createProjectClassLoader(project)); + // Set source folders. ArrayList<File> folders = new ArrayList<File>(compileSourceRoots.size()); for (String sourceFolder : compileSourceRoots) { File folder = new File(sourceFolder); @@ -180,28 +195,18 @@ } } context.setSourceFolders(StandardSources.JAVA_SOURCES, folders); - if (!outputJavaDirectory.exists()) { - outputJavaDirectory.mkdirs(); - } - context.setOutputFolder(StandardOutputFolders.JAVA_CLASSES, - outputJavaDirectory); - if (!outputResourcesDirectory.exists()) { - outputResourcesDirectory.mkdirs(); - } - context.setOutputFolder(StandardOutputFolders.RESOURCES, - outputResourcesDirectory); - - if (!outputTestsDirectory.exists()) { - outputTestsDirectory.mkdirs(); - } - context.setOutputFolder(StandardOutputFolders.TEST_JAVA_CLASSES, - outputTestsDirectory); - if (!outputTestResourcesDirectory.exists()) { - outputTestResourcesDirectory.mkdirs(); - } - context.setOutputFolder(StandardOutputFolders.TEST_RESOURCES, - outputTestResourcesDirectory); - // TODO - configure. + // Non-java sources. + context.addSources(StandardSources.JAVA_SOURCES, findJavaFiles()); + context.addSources(StandardSources.RENDERER_TEMPLATES, + findTemplateFiles()); + context.addSources(StandardSources.FACES_CONFIGS, + findFacesConfigFiles()); + // Setup output folders. + setOutput(context, outputJavaDirectory, StandardOutputFolders.JAVA_CLASSES); + setOutput(context, outputResourcesDirectory, StandardOutputFolders.RESOURCES); + setOutput(context, outputTestDirectory, StandardOutputFolders.TEST_JAVA_CLASSES); + setOutput(context, outputTestResourcesDirectory, StandardOutputFolders.TEST_RESOURCES); + // configure CDK workers. boolean namingConventionsConfigured = false; boolean validatorConfigured = false; if (null != workers) { @@ -237,6 +242,7 @@ } } + // Set default naming conventions if it was not configured. if (namingConventionsConfigured) { RichFacesConventions facesConventions = new RichFacesConventions(); try { @@ -247,6 +253,7 @@ } context.addWorker(NamingConventions.class, facesConventions); } + // Set default model validator if it was not configured. if (validatorConfigured) { ValidatorImpl validatorImpl = new ValidatorImpl(); try { @@ -257,21 +264,18 @@ } context.addWorker(ModelValidator.class, validatorImpl); } - context.addSources(StandardSources.JAVA_SOURCES, findJavaFiles()); - context.addSources(StandardSources.RENDERER_TEMPLATES, - findTemplateFiles()); - context.addSources(StandardSources.FACES_CONFIGS, - findFacesConfigFiles()); try { + // Build JSF library. LibraryBuilder builder = LibraryBuilder.createInstance(context); ComponentLibrary model = builder.buildModel(); builder.generate(model); + // Tell project about generated files. project.addCompileSourceRoot(outputJavaDirectory.getAbsolutePath()); Resource resource = new Resource(); resource.setDirectory(outputResourcesDirectory.getAbsolutePath()); project.addResource(resource); - project.addTestCompileSourceRoot(outputTestsDirectory + project.addTestCompileSourceRoot(outputTestDirectory .getAbsolutePath()); Resource testResource = new Resource(); testResource.setDirectory(outputTestResourcesDirectory @@ -282,6 +286,25 @@ } } + /** + * <p class="changed_added_4_0">This utility method sets output directory for particular type. + * I such directory does not exist, it is created.</p> + * @param context + * @param directory + * @param type + */ + private static void setOutput(CdkContextBase context, File directory, + StandardOutputFolders type) { + if (!directory.exists()) { + directory.mkdirs(); + } + context.setOutputFolder(type, + directory); + } + + /** + * <p class="changed_added_4_0">This method checks library configuration and sets default values if necessary.</p> + */ protected void checkLibraryConfig() { // TODO Auto-generated method stub @@ -331,22 +354,18 @@ protected ClassLoader createProjectClassLoader(MavenProject project) { ClassLoader classLoader = null; try { - List<?> compileClasspathElements = project - .getCompileClasspathElements(); String outputDirectory = project.getBuild().getOutputDirectory(); - URL[] urls = new URL[compileClasspathElements.size() + 1]; + URL[] urls = new URL[classpathElements.size() + 1]; int i = 0; urls[i++] = new File(outputDirectory).toURI().toURL(); - for (Iterator<?> iter = compileClasspathElements.iterator(); iter + for (Iterator<String> iter = classpathElements.iterator(); iter .hasNext();) { - String element = (String) iter.next(); + String element = iter.next(); urls[i++] = new File(element).toURI().toURL(); } classLoader = new URLClassLoader(urls); } catch (MalformedURLException e) { getLog().error("Bad URL in classpath", e); - } catch (DependencyResolutionRequiredException e) { - getLog().error("Dependencies not resolved ", e); } return classLoader; Modified: root/cdk/trunk/plugins/xinclude/pom.xml =================================================================== --- root/cdk/trunk/plugins/xinclude/pom.xml 2009-09-29 17:27:20 UTC (rev 15688) +++ root/cdk/trunk/plugins/xinclude/pom.xml 2009-09-30 00:57:10 UTC (rev 15689) @@ -46,12 +46,12 @@ </dependency>  - <dependency> +   <dependency>

16 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r15688 - tags/3.3.2.GA/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script.

by richfaces-svn-commits＠lists.jboss.org

Author: pyaschenko Date: 2009-09-29 13:27:20 -0400 (Tue, 29 Sep 2009) New Revision: 15688 Modified: tags/3.3.2.GA/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js Log: https://jira.jboss.org/jira/browse/RF-7930 Modified: tags/3.3.2.GA/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js =================================================================== --- tags/3.3.2.GA/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2009-09-29 17:18:54 UTC (rev 15687) +++ tags/3.3.2.GA/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2009-09-29 17:27:20 UTC (rev 15688) @@ -40,6 +40,9 @@ this.tipArrowDec = $(tipArrowDecId) || document.getElementsByName(tipArrowDecId)[0]; } this.options = defaultOptions; + //QUICK FIX for RF-7930 // need to be reworked + this.options.minValue = parseFloat(this.options.minValue); + this.options.maxValue = parseFloat(this.options.maxValue); this.orientation = this.options.orientation;

16 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r15687 - branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script.

by richfaces-svn-commits＠lists.jboss.org

Author: pyaschenko Date: 2009-09-29 13:18:54 -0400 (Tue, 29 Sep 2009) New Revision: 15687 Modified: branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js Log: https://jira.jboss.org/jira/browse/RF-7930 Modified: branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js =================================================================== --- branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2009-09-29 17:09:11 UTC (rev 15686) +++ branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2009-09-29 17:18:54 UTC (rev 15687) @@ -40,6 +40,9 @@ this.tipArrowDec = $(tipArrowDecId) || document.getElementsByName(tipArrowDecId)[0]; } this.options = defaultOptions; + //QUICK FIX for RF-7930 // need to be reworked + this.options.minValue = parseFloat(this.options.minValue); + this.options.maxValue = parseFloat(this.options.maxValue); this.orientation = this.options.orientation; @@ -64,11 +67,6 @@ this.graggedImageOn = false; this.value = 0; this.digCount = 0; - - //QUICK FIX for RF-7930 // need to be reworked - this.options.minValue = this.roundFloat(this.options.minValue); - this.options.maxValue = this.roundFloat(this.options.maxValue); - this.delay = this.options.delay; if("" == this.input.value){ this.input.value = this.options.minValue;

16 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r15686 - branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script.

by richfaces-svn-commits＠lists.jboss.org

Author: pyaschenko Date: 2009-09-29 13:09:11 -0400 (Tue, 29 Sep 2009) New Revision: 15686 Modified: branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js Log: https://jira.jboss.org/jira/browse/RF-7930 Modified: branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js =================================================================== --- branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2009-09-29 15:42:04 UTC (rev 15685) +++ branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2009-09-29 17:09:11 UTC (rev 15686) @@ -64,6 +64,11 @@ this.graggedImageOn = false; this.value = 0; this.digCount = 0; + + //QUICK FIX for RF-7930 // need to be reworked + this.options.minValue = this.roundFloat(this.options.minValue); + this.options.maxValue = this.roundFloat(this.options.maxValue); + this.delay = this.options.delay; if("" == this.input.value){ this.input.value = this.options.minValue;

16 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r15685 - branches/community/3.3.X/examples/photoalbum/source/web/META-INF.

by richfaces-svn-commits＠lists.jboss.org

Author: amarkhel Date: 2009-09-29 11:42:04 -0400 (Tue, 29 Sep 2009) New Revision: 15685 Modified: branches/community/3.3.X/examples/photoalbum/source/web/META-INF/MANIFEST.MF Log: Modified: branches/community/3.3.X/examples/photoalbum/source/web/META-INF/MANIFEST.MF =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/web/META-INF/MANIFEST.MF 2009-09-29 14:43:58 UTC (rev 15684) +++ branches/community/3.3.X/examples/photoalbum/source/web/META-INF/MANIFEST.MF 2009-09-29 15:42:04 UTC (rev 15685) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 -Class-Path: commons-beanutils-1.7.0.jar commons-digester-1.8.1.jar jbo - ss-seam-debug-2.1.1.GA.jar jboss-seam-jul-2.1.1.GA.jar jboss-seam-rem - oting-2.1.1.GA.jar jboss-seam-ui-2.1.1.GA.jar jhighlight-1.0.jar jsf- - facelets-1.1.15.B1.jar junit-3.8.jar metadata-extractor-2.4.0-beta1.j - ar richfaces-impl-3.3.1-SNAPSHOT.jar richfaces-ui-3.3.1-SNAPSHOT.jar +Class-Path: commons-digester-1.8.1.jar jboss-seam-debug-2.1.1.GA.jar j + boss-seam-jul-2.1.1.GA.jar jboss-seam-remoting-2.1.1.GA.jar jboss-sea + m-ui-2.1.1.GA.jar jhighlight-1.0.jar jsf-facelets-1.1.15.B1.jar junit + -3.8.jar metadata-extractor-2.4.0-beta1.jar richfaces-impl-3.3.2-SNAP + SHOT.jar richfaces-ui-3.3.2-SNAPSHOT.jar

16 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r15684 - in root/ui-sandbox/trunk/components/tables: impl/src/main/java/org/richfaces/model and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2009-09-29 10:43:58 -0400 (Tue, 29 Sep 2009) New Revision: 15684 Removed: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/DataIterator.java Modified: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/ScrollableTableDataModel.java root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/DataModelCache.java root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ExtendedTableDataModel.java root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ExtendedTableDataModifiableModel.java root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ListSequenceDataModel.java root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ModifiableModel.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/ColumnsIterator.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISimpleDataTable.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/TableHolder.java Log: support new UIDataAdaptor API Modified: root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/ScrollableTableDataModel.java =================================================================== --- root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/ScrollableTableDataModel.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/api/src/main/java/org/richfaces/model/ScrollableTableDataModel.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -129,8 +129,7 @@ /** * Load data range, and iterate over it */ - public void walk(FacesContext context, DataVisitor visitor, Range range, - Object argument) throws IOException { + public void walk(FacesContext context, DataVisitor visitor, Range range, Object argument) { if (log.isTraceEnabled()) { log.trace("Starting walk"); Modified: root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/DataModelCache.java =================================================================== --- root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/DataModelCache.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/DataModelCache.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -194,8 +194,10 @@ return scrollableTableDataModel.getId(o); } +// public void walk(FacesContext context, DataVisitor visitor, Range range, +// Object argument) throws IOException { public void walk(FacesContext context, DataVisitor visitor, Range range, - Object argument) throws IOException { + Object argument) { // TODO Auto-generated method stub super.walk(context, visitor, range, argument); } Modified: root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ExtendedTableDataModel.java =================================================================== --- root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ExtendedTableDataModel.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ExtendedTableDataModel.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -92,8 +92,10 @@ * (non-Javadoc) * @see org.ajax4jsf.model.ExtendedDataModel#walk(javax.faces.context.FacesContext, org.ajax4jsf.model.DataVisitor, org.ajax4jsf.model.Range, java.lang.Object) */ +// public void walk(FacesContext context, DataVisitor visitor, Range range, +// Object argument) throws IOException { public void walk(FacesContext context, DataVisitor visitor, Range range, - Object argument) throws IOException { + Object argument) { int rowC = getRowCount(); int firstRow = ((SequenceRange) range).getFirstRow(); int numberOfRows = ((SequenceRange) range).getRows(); Modified: root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ExtendedTableDataModifiableModel.java =================================================================== --- root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ExtendedTableDataModifiableModel.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ExtendedTableDataModifiableModel.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -68,9 +68,11 @@ originalModel.setRowKey(key); } - @Override +// @Override +// public void walk(FacesContext context, DataVisitor visitor, Range range, +// Object argument) throws IOException { public void walk(FacesContext context, DataVisitor visitor, Range range, - Object argument) throws IOException { + Object argument){ final SequenceRange seqRange = (SequenceRange) range; int rows = seqRange.getRows(); int rowCount = getRowCount(); Modified: root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ListSequenceDataModel.java =================================================================== --- root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ListSequenceDataModel.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ListSequenceDataModel.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -70,8 +70,10 @@ * @see org.ajax4jsf.model.ExtendedDataModel#walk(javax.faces.context.FacesContext, org.ajax4jsf.model.DataVisitor, org.ajax4jsf.model.Range, java.lang.Object) */ @Override - public void walk(FacesContext context, DataVisitor visitor, Range range, - Object argument) throws IOException { +// public void walk(FacesContext context, DataVisitor visitor, Range range, +// Object argument) throws IOException { + public void walk(FacesContext context, DataVisitor visitor, Range range, + Object argument) { final SequenceRange seqRange = (SequenceRange) range; int rows = seqRange.getRows(); int rowCount = list !=null ? list.size() : -1; Modified: root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ModifiableModel.java =================================================================== --- root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ModifiableModel.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/impl/src/main/java/org/richfaces/model/ModifiableModel.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -140,8 +140,10 @@ } @Override +// public void walk(FacesContext context, DataVisitor visitor, Range range, +// Object argument) throws IOException { public void walk(FacesContext context, DataVisitor visitor, Range range, - Object argument) throws IOException { + Object argument) { final SequenceRange seqRange = (SequenceRange) range; int rows = seqRange.getRows(); int rowCount = getRowCount(); @@ -221,7 +223,7 @@ } FacesContext context = FacesContext.getCurrentInstance(); - try { +/* try { originalModel.walk(context, new DataVisitor() { public void process(FacesContext context, Object rowKey, @@ -235,7 +237,7 @@ null); } catch (IOException e) { log.error(e.getMessage(), e); - } + } */ filter(filterFields); sort(sortFields); Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/ColumnsIterator.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/ColumnsIterator.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/ColumnsIterator.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -23,7 +23,6 @@ import java.util.Iterator; import java.util.NoSuchElementException; -import javax.faces.component.UIColumn; import javax.faces.component.UIComponent; /** @@ -31,16 +30,16 @@ * @author asmirnov * */ -class ColumnsIterator implements Iterator<UIComponent>{ +class ColumnsIterator implements Iterator<UIColumn>{ - private UIComponent next; + private UIColumn next; private boolean initialized = false; protected Iterator<UIComponent> childrenIterator; - public ColumnsIterator(UIComponent dataTable) { + public ColumnsIterator(UISimpleDataTable dataTable) { this.childrenIterator = dataTable.getChildren().iterator(); } @@ -52,11 +51,11 @@ return null != next; } - public UIComponent next() { + public UIColumn next() { if (!hasNext()) { throw new NoSuchElementException(); } - UIComponent result = next; + UIColumn result = next; next = nextColumn(); return result; } @@ -65,12 +64,12 @@ throw new UnsupportedOperationException("Iterator is read-only"); } - protected UIComponent nextColumn(){ - UIComponent nextColumn = null; - while (childrenIterator.hasNext()) { + protected UIColumn nextColumn(){ + UIColumn nextColumn = null; + while (childrenIterator != null && childrenIterator.hasNext()) { UIComponent child = childrenIterator.next(); - if(child instanceof UIColumn || child instanceof Column){ - nextColumn = child; + if(child instanceof UIColumn){ + nextColumn = (UIColumn)child; break; } } Deleted: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/DataIterator.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/DataIterator.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/DataIterator.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -1,77 +0,0 @@ -/** - * License Agreement. - * - * Rich Faces - Natural Ajax for Java Server Faces (JSF) - * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package org.richfaces.component; - -import java.util.Iterator; - -import javax.faces.component.UIColumn; -import javax.faces.component.UIComponent; - -class DataIterator extends ColumnsIterator { - - protected Iterator<UIComponent> facetsIterator; - - public DataIterator(UIComponent dataTable) { - super(dataTable); - facetsIterator = dataTable.getFacets().values().iterator(); - } - - @Override - protected UIComponent nextColumn() { - UIComponent nextColumn = null; - while (null == nextColumn && childrenIterator.hasNext()) { - UIComponent child = childrenIterator.next(); - if (child.isRendered()) { - if (child instanceof UIColumn || child instanceof Column) { - nextColumn = child; - } else if (checkAjaxComponent(child)) { - nextColumn = child; - } - } - } - while (null == nextColumn && facetsIterator.hasNext()) { - UIComponent child = facetsIterator.next(); - if (checkAjaxComponent(child)) { - nextColumn = child; - break; - } - } - return nextColumn; - } - - /** - * @param child - * @return - */ - protected Iterator<UIComponent> getColumnChildrenIterator(UIComponent child) { - return child.getChildren().iterator(); - } - - /** - * @param child - * @return - */ - protected boolean checkAjaxComponent(UIComponent child) { -// return child instanceof AjaxSupport || child instanceof Dropzone; - return false; - } - -} Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIColumn.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -1,6 +1,10 @@ package org.richfaces.component; +/** + * @author Anton Belevich + * + */ public class UIColumn extends javax.faces.component.UIColumn { } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UIExtendedDataTable.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -1,5 +1,9 @@ package org.richfaces.component; +/** + * @author Anton Belevich + * + */ public abstract class UIExtendedDataTable extends UISimpleDataTable { } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISimpleDataTable.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISimpleDataTable.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISimpleDataTable.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -2,28 +2,17 @@ import java.util.Iterator; -import javax.faces.component.UIComponent; -import org.ajax4jsf.component.SequenceDataAdaptor; + /** * @author Anton Belevich * */ -public abstract class UISimpleDataTable extends SequenceDataAdaptor { - - @Override - protected Iterator<UIComponent> dataChildren() { - return new DataIterator(this); - } - - @Override - protected Iterator<UIComponent> fixedChildren() { - return null; - } +public abstract class UISimpleDataTable extends UISequence { - public Iterator<UIComponent> getColumnsIterator (){ - return new ColumnsIterator(this); - } -} + public Iterator<UIColumn> columns() { + return new ColumnsIterator(this); + } +} \ No newline at end of file Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractRowsRenderer.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -22,18 +22,16 @@ package org.richfaces.renderkit; import java.io.IOException; -import java.util.Map; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.ajax4jsf.component.SequenceDataAdaptor; -import org.ajax4jsf.component.UIDataAdaptor; +import org.ajax4jsf.model.DataVisitResult; import org.ajax4jsf.model.DataVisitor; import org.ajax4jsf.renderkit.RendererBase; -import org.ajax4jsf.renderkit.RendererUtils; import org.ajax4jsf.renderkit.RendererUtils.HTML; +import org.richfaces.component.UIDataAdaptor; /** * @author shura @@ -51,7 +49,7 @@ {"onmouseout","onRowMouseOut"} }; - +/* public static final String ROW_CLASS_KEY = AbstractRowsRenderer.class.getName() + ".rowClass"; @@ -66,30 +64,38 @@ public static final String SKIN_FIRST_ROW_CLASS_KEY = AbstractRowsRenderer.class.getName() + ".firstRowSkinClass"; - +*/ /* * (non-Javadoc) * * @see org.ajax4jsf.ajax.repeat.DataVisitor#process(javax.faces.context.FacesContext, * java.lang.Object, java.lang.Object) */ - public void process(FacesContext facesContext, Object rowKey, Object argument) - throws IOException { - + + public DataVisitResult process(FacesContext facesContext, Object rowKey, Object argument) { TableHolder holder = (TableHolder) argument; UIDataAdaptor table = holder.getTable(); table.setRowKey(facesContext, rowKey); + ResponseWriter writer = facesContext.getResponseWriter(); + try { writer.startElement(HTML.TR_ELEMENT, table); encodeOneRow(facesContext, holder); writer.endElement(HTML.TR_ELEMENT); + }catch (IOException e) { + //??? + } holder.nextRow(); + + return DataVisitResult.CONTINUE; } - + public void encodeRows(FacesContext facesContext, UIComponent component) throws IOException { encodeRows(facesContext, component, new TableHolder((UIDataAdaptor) component)); } + + /** * Iterate over all rows for this table. * @@ -124,7 +130,6 @@ public abstract void encodeOneRow(FacesContext context, TableHolder holder) throws IOException; - /* * (non-Javadoc) * @@ -139,8 +144,9 @@ encodeRows(context, component); } - public void encodeCaption(FacesContext context, SequenceDataAdaptor table) - throws IOException { + public void encodeCaption(FacesContext context, UIDataAdaptor table) throws IOException { + /* + UIComponent caption = table.getFacet("caption"); if (caption == null) { return; @@ -165,6 +171,7 @@ renderChild(context, caption); writer.endElement("caption"); + */ } /** @@ -172,14 +179,16 @@ * @param table * @throws IOException */ - protected void encodeRowEvents(FacesContext context, UIDataAdaptor table) - throws IOException { + + protected void encodeRowEvents(FacesContext context, UIDataAdaptor table) throws IOException { + /* RendererUtils utils2 = getUtils(); for (int i = 0; i < TABLE_EVENT_ATTRS.length; i++) { String[] attrs = TABLE_EVENT_ATTRS[i]; utils2.encodeAttribute(context, table, attrs[1], attrs[0]); } - } + */ + } /** * Encode HTML "class" attribute, if is not empty. Classes combined from @@ -196,8 +205,10 @@ * custom classes. * @throws IOException */ - protected void encodeStyleClass(ResponseWriter writer, Object parentPredefined, - Object predefined, Object parent, Object custom) throws IOException { + + protected void encodeStyleClass(ResponseWriter writer, Object parentPredefined, Object predefined, + Object parent, Object custom) throws IOException { + /* StringBuffer styleClass = new StringBuffer(); // Construct predefined classes @@ -216,10 +227,12 @@ } if (styleClass.length() > 0) { writer.writeAttribute(HTML.class_ATTRIBUTE, styleClass, "styleClass"); - } + } */ } + protected void encodeStyle(ResponseWriter writer, Object parentPredefined, Object predefined, Object parent, Object custom) throws IOException { + /* StringBuffer style = new StringBuffer(); // Construct predefined styles if (null != parentPredefined) { @@ -237,7 +250,8 @@ if (style.length() > 0) { writer.writeAttribute("style", style, "style"); } - } + */ + } /** @@ -255,10 +269,11 @@ * @param cellClass * @throws IOException */ + protected void encodeCellChildren(FacesContext context, UIComponent cell, String skinFirstRowClass, String skinRowClass, String rowClass, String skinCellClass, String cellClass) throws IOException { - + /* Map<String, Object> requestMap = context.getExternalContext().getRequestMap(); // Save top level class parameters ( if any ), and put new for this // component @@ -295,9 +310,9 @@ requestMap.put(SKIN_FIRST_ROW_CLASS_KEY, savedSkinFirstRowClass); requestMap.put(SKIN_ROW_CLASS_KEY, savedSkinRowClass); requestMap.put(SKIN_CELL_CLASS_KEY, savedSkinCellClass); + */ + } - } - protected void encodeTableHeaderFacet(FacesContext context, int columns, ResponseWriter writer, UIComponent footer, String skinFirstRowClass, String skinRowClass, String skinCellClass, String footerClass, String element) throws IOException { // boolean isColgroup = footer instanceof Row; // if (!isColgroup) { Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -9,9 +9,9 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import org.ajax4jsf.component.UIDataAdaptor; import org.ajax4jsf.renderkit.RendererUtils.HTML; import org.richfaces.component.UIColumn; +import org.richfaces.component.UIDataAdaptor; import org.richfaces.component.UISimpleDataTable; @ResourceDependencies({ @@ -40,18 +40,31 @@ writer.endElement("tbody"); } + @Override public void encodeOneRow(FacesContext facesContext, TableHolder holder) throws IOException { + ResponseWriter writer = facesContext.getResponseWriter(); UISimpleDataTable table = (UISimpleDataTable)holder.getTable(); - ResponseWriter writer = facesContext.getResponseWriter(); - Iterator<UIComponent> columns = table.getColumnsIterator(); + Iterator<UIColumn> columns = table.columns(); while (columns.hasNext()) { - UIComponent child = columns.next(); - if((child instanceof UIColumn) && child.isRendered()) { - writer.startElement(HTML.td_ELEM, child); - renderChildren(facesContext, child); - writer.endElement(HTML.td_ELEM); + UIColumn column = columns.next(); + if(column.isRendered()) { + encodeRowStart(writer, column); + encodeRow(facesContext, writer, column); + encodeRowEnd(writer, column); } } } + + private void encodeRowStart(ResponseWriter writer, UIColumn column) throws IOException { + writer.startElement(HTML.td_ELEM, column); + } + + private void encodeRowEnd(ResponseWriter writer, UIColumn column) throws IOException { + writer.endElement(HTML.td_ELEM); + } + + private void encodeRow(FacesContext facesContext, ResponseWriter writer, UIColumn column) throws IOException { + renderChildren(facesContext, column); + } } Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/TableHolder.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/TableHolder.java 2009-09-29 14:11:22 UTC (rev 15683) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/TableHolder.java 2009-09-29 14:43:58 UTC (rev 15684) @@ -23,7 +23,7 @@ import java.util.Map; -import org.ajax4jsf.component.UIDataAdaptor; +import org.richfaces.component.UIDataAdaptor; /** * Private class for keep reference to table and intermediate iteration values ( current row styles, events etc )

16 years, 1 month

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits September 2009