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 2006/05/05 22:21:45 UTC
svn commit: r400165 - in /myfaces/tobago/trunk: ./
contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/
core/src/main/java/org/apache/myfaces/tobago/renderkit/
core/src/main/java/org/apache/myfaces/tobago/util/
core/src/test/java/org/apac...
Author: bommel
Date: Fri May 5 13:21:42 2006
New Revision: 400165
URL: http://svn.apache.org/viewcvs?rev=400165&view=rev
Log:
escape access key literal
some code cleanup
Modified:
myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java
myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java
myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java
myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java
myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java
myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKeyUnitTest.java
myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java
myfaces/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/Counter.java
myfaces/tobago/trunk/example/foreach/src/main/java/org/apache/myfaces/tobago/example/foreach/BirdList.java
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java
myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/pom.xml
myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/AbstractThemeMojo.java
myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/PackThemeMojo.java
myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/UnPackThemeMojo.java
Modified: myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java?rev=400165&r1=400164&r2=400165&view=diff
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java (original)
+++ myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java Fri May 5 13:21:42 2006
@@ -21,7 +21,6 @@
import com.sun.facelets.tag.TagConfig;
import com.sun.facelets.FaceletContext;
-import com.sun.facelets.FaceletException;
import org.apache.myfaces.tobago.util.BundleMapWrapper;
Modified: myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java?rev=400165&r1=400164&r2=400165&view=diff
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java (original)
+++ myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SheetStateChangeSourceRule.java Fri May 5 13:21:42 2006
@@ -33,7 +33,7 @@
* To change this template use File | Settings | File Templates.
*/
public class SheetStateChangeSourceRule extends MetaRule {
- public static final Class[] ACTION_LISTENER_SIG = new Class[]{SheetStateChangeEvent.class};
+ static final Class[] ACTION_LISTENER_SIG = new Class[]{SheetStateChangeEvent.class};
public static final SheetStateChangeSourceRule INSTANCE = new SheetStateChangeSourceRule();
public Metadata applyRule(String name, TagAttribute attribute,
Modified: myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java?rev=400165&r1=400164&r2=400165&view=diff
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java (original)
+++ myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SortActionSourceRule.java Fri May 5 13:21:42 2006
@@ -33,7 +33,7 @@
* To change this template use File | Settings | File Templates.
*/
public class SortActionSourceRule extends MetaRule {
- public static final Class[] ACTION_LISTENER_SIG = new Class[]{SortActionEvent.class};
+ static final Class[] ACTION_LISTENER_SIG = new Class[]{SortActionEvent.class};
public static final SortActionSourceRule INSTANCE = new SortActionSourceRule();
public Metadata applyRule(String name, TagAttribute attribute,
Modified: myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java?rev=400165&r1=400164&r2=400165&view=diff
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java (original)
+++ myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeListenerHandler.java Fri May 5 13:21:42 2006
@@ -22,7 +22,6 @@
import com.sun.facelets.tag.TagAttributeException;
import com.sun.facelets.tag.TagException;
import com.sun.facelets.FaceletContext;
-import com.sun.facelets.FaceletException;
import java.io.IOException;
Modified: myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java?rev=400165&r1=400164&r2=400165&view=diff
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java (original)
+++ myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/TabChangeSourceRule.java Fri May 5 13:21:42 2006
@@ -33,7 +33,7 @@
* To change this template use File | Settings | File Templates.
*/
public class TabChangeSourceRule extends MetaRule {
- public static final Class[] ACTION_LISTENER_SIG = new Class[]{TabChangeEvent.class};
+ static final Class[] ACTION_LISTENER_SIG = new Class[]{TabChangeEvent.class};
public static final SortActionSourceRule INSTANCE = new SortActionSourceRule();
public Metadata applyRule(String name, TagAttribute attribute,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java?rev=400165&r1=400164&r2=400165&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java Fri May 5 13:21:42 2006
@@ -18,6 +18,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.lang.StringUtils;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LABEL;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_VALUE;
import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_LABEL;
@@ -32,6 +33,7 @@
private Character accessKey;
private int pos = -1;
public static final char INDICATOR = '_';
+ public static final String ESCAPED_INDICATOR = "__";
public LabelWithAccessKey(UIComponent component) {
@@ -44,23 +46,30 @@
setup(text);
}
+ private void findIndicator(String label, int index, int escapedIndicatorCount) {
+ index = label.indexOf(INDICATOR, index);
+ if (index == -1) {
+ text = label;
+ } else if (index == label.length() - 1) {
+ LOG.warn(INDICATOR + " in label is last char, this is not allowed"
+ + "label='" + label + "'.");
+ text = label.substring(0, label.length() - 1);
+ pos = -1;
+ } else if (label.charAt(index+1) == INDICATOR) {
+ escapedIndicatorCount++;
+ findIndicator(label, index+2, escapedIndicatorCount);
+ } else {
+ text = label.substring(0, index)
+ + label.substring(index + 1);
+ accessKey = text.charAt(index);
+ pos = index - escapedIndicatorCount;
+ }
+ }
public void setup(String label) {
-
if (label != null) {
- pos = label.indexOf(INDICATOR);
- if (pos == -1) {
- text = label;
- } else if (pos == label.length() - 1) {
- LOG.warn(INDICATOR + " in label is last char, this is not allowed"
- + "label='" + label + "'.");
- text = label.substring(0, label.length() - 1);
- pos = -1;
- } else {
- text = label.substring(0, pos)
- + label.substring(pos + 1);
- accessKey = new Character(text.charAt(pos));
- }
+ findIndicator(label, 0, 0);
+ text = StringUtils.replace(text, ESCAPED_INDICATOR, String.valueOf(INDICATOR));
} else {
if (accessKey != null && text != null) {
pos = text.toLowerCase().indexOf(
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java?rev=400165&r1=400164&r2=400165&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComparatorBase.java Fri May 5 13:21:42 2006
@@ -86,8 +86,31 @@
return reverse ? -result : result;
}
+ /*
+ // TODO use this??
public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+
+ final ComparatorBase that = (ComparatorBase) o;
+
+ return !(comparator != null ? !comparator.equals(that.comparator) : that.comparator != null);
+
+ }
+
+ public int hashCode() {
+ return (comparator != null ? comparator.hashCode() : 0);
+ } */
+
+ public boolean equals(Object o) {
+ if (o == null) {
+ return false;
+ }
return ((ComparatorBase) o).getComparator().equals(comparator);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java?rev=400165&r1=400164&r2=400165&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/StringUtil.java Fri May 5 13:21:42 2006
@@ -16,6 +16,9 @@
* limitations under the License.
*/
+import org.apache.myfaces.tobago.renderkit.LabelWithAccessKey;
+import org.apache.commons.lang.StringUtils;
+
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
@@ -54,13 +57,18 @@
return list;
}
- public static String toString(List<Integer> intList) {
+ public static <T> String toString(List<T> list) {
StringBuffer buffer = new StringBuffer(",");
- for (Integer integer : intList) {
- buffer.append(integer);
+ for (T t : list) {
+ buffer.append(t);
buffer.append(",");
}
return buffer.toString();
+ }
+
+ public static String escapeAccessKeyIndicator(String label) {
+ return StringUtils.replace(label,
+ String.valueOf(LabelWithAccessKey.INDICATOR), LabelWithAccessKey.ESCAPED_INDICATOR);
}
}
Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKeyUnitTest.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKeyUnitTest.java?rev=400165&r1=400164&r2=400165&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKeyUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKeyUnitTest.java Fri May 5 13:21:42 2006
@@ -35,31 +35,27 @@
assertEquals(null, label.getAccessKey());
}
- // code-sniplet-start id="test1"
-/*
+
public void testWithKeyFirstLetter() {
UIComponent component = new UIOutput();
- component.getAttributes().put("label", "Save");
- component.getAttributes().put("accessKey", "s");
+ component.getAttributes().put("label", "Save_");
LabelWithAccessKey label = new LabelWithAccessKey(component);
assertEquals("Save", label.getText());
- assertEquals(0, label.getPos());
- assertEquals(new Character('s'), label.getAccessKey());
+ assertNull(label.getAccessKey());
}
-*/
- // code-sniplet-end id="test1"
-/*
+
+
public void testWithKeyLastLetter() {
+ String result = "A_n_aly_ze";
UIComponent component = new UIOutput();
- component.getAttributes().put("label", "Save");
- component.getAttributes().put("accessKey", "E");
+ component.getAttributes().put("label", "A__n__a_ly__ze");
LabelWithAccessKey label = new LabelWithAccessKey(component);
- assertEquals("Save", label.getText());
- assertEquals(3, label.getPos());
- assertEquals(new Character('E'), label.getAccessKey());
+ assertEquals(result, label.getText());
+ assertEquals(5, label.getPos());
+ assertEquals(new Character('l'), label.getAccessKey());
}
-*/
+
public void testAmpersand() {
UIComponent component = new UIOutput();
Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java?rev=400165&r1=400164&r2=400165&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/overview/OverviewController.java Fri May 5 13:21:42 2006
@@ -154,11 +154,15 @@
Integer i1 = -1;
try {
i1 = new Integer(s1.replaceAll("\\D", "").trim());
- } catch (NumberFormatException e) { }
+ } catch (NumberFormatException e) {
+ // ignore
+ }
Integer i2 = -1;
try {
i2 = new Integer(s2.replaceAll("\\D", "").trim());
- } catch (NumberFormatException e) { }
+ } catch (NumberFormatException e) {
+ // ignore
+ }
return i1.compareTo(i2);
}
};
Modified: myfaces/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/Counter.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/Counter.java?rev=400165&r1=400164&r2=400165&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/Counter.java (original)
+++ myfaces/tobago/trunk/example/facelets/src/main/java/org/apache/myfaces/tobago/example/facelets/Counter.java Fri May 5 13:21:42 2006
@@ -41,5 +41,4 @@
"Please type in 'Tobago'"));
}
}
-
-}
\ No newline at end of file
+}
Modified: myfaces/tobago/trunk/example/foreach/src/main/java/org/apache/myfaces/tobago/example/foreach/BirdList.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/example/foreach/src/main/java/org/apache/myfaces/tobago/example/foreach/BirdList.java?rev=400165&r1=400164&r2=400165&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/foreach/src/main/java/org/apache/myfaces/tobago/example/foreach/BirdList.java (original)
+++ myfaces/tobago/trunk/example/foreach/src/main/java/org/apache/myfaces/tobago/example/foreach/BirdList.java Fri May 5 13:21:42 2006
@@ -1,4 +1,5 @@
package org.apache.myfaces.tobago.example.foreach;
+
/*
* Copyright 2002-2005 The Apache Software Foundation.
*
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/pom.xml?rev=400165&r1=400164&r2=400165&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Fri May 5 13:21:42 2006
@@ -164,15 +164,15 @@
<artifactId>jxr-maven-plugin</artifactId>
</plugin>
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-checkstyle-plugin</artifactId>-->
- <!--<configuration>-->
- <!--<configLocation>org/apache/myfaces/tobago/checkstyle.xml</configLocation>-->
- <!--<xrefLocation>xref</xrefLocation>-->
- <!--<excludes>**/package-info.java</excludes>-->
- <!--</configuration>-->
- <!--</plugin>-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <configuration>
+ <configLocation>org/apache/myfaces/tobago/checkstyle.xml</configLocation>
+ <xrefLocation>xref</xrefLocation>
+ <excludes>**/package-info.java</excludes>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -372,11 +372,11 @@
<artifactId>wagon-ftp</artifactId>
<version>1.0-alpha-6</version>
</extension>
- <!--<extension>-->
- <!--<groupId>org.apache.myfaces.maven</groupId>-->
- <!--<artifactId>build-tools</artifactId>-->
- <!--<version>1.0.0-SNAPSHOT</version>-->
- <!--</extension>-->
+ <extension>
+ <groupId>org.apache.myfaces.maven</groupId>
+ <artifactId>build-tools</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </extension>
</extensions>
</build>
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java?rev=400165&r1=400164&r2=400165&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/FileRenderer.java Fri May 5 13:21:42 2006
@@ -87,16 +87,18 @@
LOG.error("Can't process multipart/form-data without TobagoRequest. "
+ "Please check the web.xml and define a TobagoMultipartFormdataFilter. "
+ "See documentation for <tc:file>");
- }
+ } else {
- FileItem item = request.getFileItem(input.getClientId(facesContext));
+ FileItem item = request.getFileItem(input.getClientId(facesContext));
- if (LOG.isDebugEnabled()) {
- LOG.debug("Uploaded file name : \"" + item.getName()
- + "\" size = " + item.getSize());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Uploaded file name : \"" + item.getName()
+ + "\" size = " + item.getSize());
+ }
+ input.setSubmittedValue(item);
+ //TODO remove this
+ input.setValid(true);
}
- input.setSubmittedValue(item);
- input.setValid(true);
}
public void encodeEndTobago(
Modified: myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/pom.xml?rev=400165&r1=400164&r2=400165&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/pom.xml Fri May 5 13:21:42 2006
@@ -9,20 +9,6 @@
<artifactId>maven-theme-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>Maven Tobago Theme Plugin</name>
- <reporting>
- <plugins>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <configLocation>config/maven_checks.xml</configLocation>
- <xrefLocation>xref</xrefLocation>
- </configuration>
- </plugin>
-
- </plugins>
- </reporting>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
Modified: myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/AbstractThemeMojo.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/AbstractThemeMojo.java?rev=400165&r1=400164&r2=400165&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/AbstractThemeMojo.java (original)
+++ myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/AbstractThemeMojo.java Fri May 5 13:21:42 2006
@@ -3,7 +3,7 @@
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0(the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
Modified: myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/PackThemeMojo.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/PackThemeMojo.java?rev=400165&r1=400164&r2=400165&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/PackThemeMojo.java (original)
+++ myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/PackThemeMojo.java Fri May 5 13:21:42 2006
@@ -3,7 +3,7 @@
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0(the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
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/viewcvs/myfaces/tobago/trunk/tobago-tool/maven-theme-plugin/src/main/java/org/apache/myfaces/tobago/maven/plugin/UnPackThemeMojo.java?rev=400165&r1=400164&r2=400165&view=diff
==============================================================================
--- 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 Fri May 5 13:21:42 2006
@@ -2,7 +2,7 @@
/*
* Copyright 2001-2005 The Apache Software Foundation.
*
- * Licensed under the Apache License, Version 2.0(the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*