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/05/23 23:11:34 UTC
svn commit: r541081 - in /myfaces/tobago/trunk: ./
theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/
tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/
Author: bommel
Date: Wed May 23 14:11:33 2007
New Revision: 541081
URL: http://svn.apache.org/viewvc?view=rev&rev=541081
Log:
minor cleanup
Modified:
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java
myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/UnPackThemeMojo.java
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?view=diff&rev=541081&r1=541080&r2=541081
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Wed May 23 14:11:33 2007
@@ -219,13 +219,6 @@
<minimumTokens>100</minimumTokens>
<targetJdk>1.5</targetJdk>
</configuration>
- <!--<dependencies>
- <dependency>
- <groupId>org.apache.myfaces.maven</groupId>
- <artifactId>build-tools</artifactId>
- <version>1.0.5</version>
- </dependency>
- </dependencies>-->
</plugin>
<plugin>
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java?view=diff&rev=541081&r1=541080&r2=541081
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/GridLayoutRenderer.java Wed May 23 14:11:33 2007
@@ -80,13 +80,13 @@
}
public int getFixedWidth(FacesContext facesContext, UIComponent component) {
- int width = calculateLayoutWidth(facesContext, component, false);
+ int width = calculateLayoutWidth(facesContext, component, false);
- LayoutInformationProvider containerRenderer =
+ LayoutInformationProvider containerRenderer =
ComponentUtil.getRenderer(facesContext, component);
- width += containerRenderer.getPaddingWidth(facesContext, component);
- return width;
- }
+ width += containerRenderer.getPaddingWidth(facesContext, component);
+ return width;
+ }
private int calculateLayoutHeight(
FacesContext facesContext, UIComponent component, boolean minimum) {
Modified: myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/UnPackThemeMojo.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/UnPackThemeMojo.java?view=diff&rev=541081&r1=541080&r2=541081
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/UnPackThemeMojo.java (original)
+++ myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/UnPackThemeMojo.java Wed May 23 14:11:33 2007
@@ -110,10 +110,10 @@
workDirectory.mkdirs();
}
Artifact artifact = (Artifact) artifacts.next();
- getLog().debug("Expanding theme "+ artifact);
+ getLog().debug("Expanding theme "+ artifact);
if (Artifact.SCOPE_COMPILE.equals(artifact.getScope())
- && "jar".equals(artifact.getType())&& findThemeDescriptor(artifact.getFile())) {
+ && "jar".equals(artifact.getType()) && findThemeDescriptor(artifact.getFile())) {
String name = artifact.getFile().getName();
getLog().debug("Expanding theme "+ name);