Author: ajaquith
Date: Sat Dec 12 03:54:16 2009
New Revision: 889882
URL: http://svn.apache.org/viewvc?rev=889882&view=rev
Log:
Fixed some dumb license header issues.
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/GroupTypeConverter.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/LineDelimitedTypeConverter.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/LocaleConverter.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/PrincipalTypeConverter.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/TimeZoneConverter.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageTypeConverter.java
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/GroupTypeConverter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/GroupTypeConverter.java?rev=889882&r1=889881&r2=889882&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/GroupTypeConverter.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/GroupTypeConverter.java
Sat Dec 12 03:54:16 2009
@@ -1,16 +1,22 @@
-/* Copyright 2005-2006 Tim Fennell
- *
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
*/
package org.apache.wiki.ui.stripes;
@@ -46,12 +52,12 @@
* Converts a named wiki group into a valid
* {...@link org.apache.wiki.auth.authorize.Group} object by retrieving it
* via the wi...@link org.apache.wiki.auth.authorize.GroupManager}. If
- * the group cannot be found (perhaps because it does not exist), this
- * method will add a validation error to the supplied Collection of errors.
- * The error will be of type
+ * the group name is illegal, this method will add a validation error to
+ * the supplied Collection of errors. The error will be of type
* {...@link net.sourceforge.stripes.validation.LocalizableError} and will
have
* a message key of <code>group.doesnotexist</code> and a single parameter
- * (equal to the value passed for <code>groupName</code>).
+ * (equal to the value passed for <code>groupName</code>). If the group
+ * does not exist (perhaps because it is new), {...@code null} is returned.
*
* @param groupName the name of the WikiPage to retrieve
* @param targetType the type to return, which will always be of type
@@ -71,7 +77,7 @@
}
catch( NoSuchPrincipalException e )
{
- // Should never happen
+ // Group does not exist
}
catch( WikiSecurityException e )
{
@@ -81,6 +87,9 @@
return group;
}
+ /**
+ * No-op method that does nothing, because setting the Locale has no
effect on the conversion.
+ */
public void setLocale( Locale locale )
{
};
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/LineDelimitedTypeConverter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/LineDelimitedTypeConverter.java?rev=889882&r1=889881&r2=889882&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/LineDelimitedTypeConverter.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/LineDelimitedTypeConverter.java
Sat Dec 12 03:54:16 2009
@@ -33,6 +33,11 @@
public class LineDelimitedTypeConverter extends OneToManyTypeConverter
{
+ /**
+ * Overrides the regular expression used by the
+ * {...@link net.sourceforge.stripes.validation.OneToManyTypeConverter}
+ * with one that permits line-break characters and commas.
+ */
@Override
protected String getSplitRegex()
{
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/LocaleConverter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/LocaleConverter.java?rev=889882&r1=889881&r2=889882&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/LocaleConverter.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/LocaleConverter.java
Sat Dec 12 03:54:16 2009
@@ -1,16 +1,22 @@
-/* Copyright 2005-2006 Tim Fennell
- *
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
*/
package org.apache.wiki.ui.stripes;
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/PrincipalTypeConverter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/PrincipalTypeConverter.java?rev=889882&r1=889881&r2=889882&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/PrincipalTypeConverter.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/PrincipalTypeConverter.java
Sat Dec 12 03:54:16 2009
@@ -1,16 +1,22 @@
-/* Copyright 2005-2006 Tim Fennell
- *
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
*/
package org.apache.wiki.ui.stripes;
@@ -54,6 +60,9 @@
return new WikiPrincipal( principalName );
}
+ /**
+ * No-op method that does nothing, because setting the Locale has no
effect on the conversion.
+ */
public void setLocale( Locale locale )
{
};
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/TimeZoneConverter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/TimeZoneConverter.java?rev=889882&r1=889881&r2=889882&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/TimeZoneConverter.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/TimeZoneConverter.java
Sat Dec 12 03:54:16 2009
@@ -1,16 +1,22 @@
-/* Copyright 2005-2006 Tim Fennell
- *
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+/*
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you 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
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
*/
package org.apache.wiki.ui.stripes;
@@ -51,6 +57,9 @@
return TimeZone.getTimeZone( timeZone );
}
+ /**
+ * No-op method that does nothing, because setting the Locale has no
effect on the conversion.
+ */
public void setLocale( Locale locale )
{
};
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageTypeConverter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageTypeConverter.java?rev=889882&r1=889881&r2=889882&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageTypeConverter.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/ui/stripes/WikiPageTypeConverter.java
Sat Dec 12 03:54:16 2009
@@ -143,6 +143,9 @@
return null;
}
+ /**
+ * No-op method that does nothing, because setting the Locale has no
effect on the conversion.
+ */
public void setLocale( Locale locale )
{
}
