Author: gseitz
Date: Mon Oct 15 15:51:33 2007
New Revision: 584960
URL: http://svn.apache.org/viewvc?rev=584960&view=rev
Log:
WICKET-1078
Modified:
wicket/trunk/jdk-1.4/wicket-velocity/.settings/org.eclipse.jdt.core.prefs
wicket/trunk/jdk-1.4/wicket-velocity/.settings/org.eclipse.jdt.ui.prefs
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityHeaderContributor.java
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavascriptContributor.java
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
wicket/trunk/jdk-1.4/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java
wicket/trunk/jdk-1.4/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java
wicket/trunk/jdk-1.4/wicket-velocity/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
Modified:
wicket/trunk/jdk-1.4/wicket-velocity/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-velocity/.settings/org.eclipse.jdt.core.prefs?rev=584960&r1=584959&r2=584960&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-velocity/.settings/org.eclipse.jdt.core.prefs
(original)
+++ wicket/trunk/jdk-1.4/wicket-velocity/.settings/org.eclipse.jdt.core.prefs
Mon Oct 15 15:51:33 2007
@@ -72,26 +72,26 @@
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=32
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=20
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=48
org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=64
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=64
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=0
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=0
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
org.eclipse.jdt.core.formatter.blank_lines_before_package=0
@@ -101,17 +101,19 @@
org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
org.eclipse.jdt.core.formatter.comment.format_html=true
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
org.eclipse.jdt.core.formatter.comment.format_line_comments=true
@@ -120,7 +122,7 @@
org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.line_length=100
org.eclipse.jdt.core.formatter.compact_else_if=true
org.eclipse.jdt.core.formatter.continuation_indentation=2
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
@@ -159,7 +161,7 @@
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not
insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
@@ -188,7 +190,7 @@
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do
not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do
not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do
not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=do
not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do
not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do
not insert
org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do
not insert
@@ -217,7 +219,7 @@
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do
not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do
not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do
not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do
not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do
not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do
not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do
not insert
@@ -234,11 +236,11 @@
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do
not insert
org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do
not insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not
insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=insert
org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do
not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do
not insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not
insert
org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do
not insert
@@ -298,7 +300,7 @@
org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not
insert
org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do
not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do
not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do
not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do
not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do
not insert
@@ -306,18 +308,16 @@
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do
not insert
org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do
not insert
org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=true
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=90
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.lineSplit=100
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=true
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=true
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=2
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=tab
org.eclipse.jdt.core.formatter.tabulation.size=4
org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=false
Modified:
wicket/trunk/jdk-1.4/wicket-velocity/.settings/org.eclipse.jdt.ui.prefs
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-velocity/.settings/org.eclipse.jdt.ui.prefs?rev=584960&r1=584959&r2=584960&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket-velocity/.settings/org.eclipse.jdt.ui.prefs
(original)
+++ wicket/trunk/jdk-1.4/wicket-velocity/.settings/org.eclipse.jdt.ui.prefs Mon
Oct 15 15:51:33 2007
@@ -11,3 +11,52 @@
comment_separate_root_tags=true
eclipse.preferences.version=1
formatter_settings_version=11
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0"
encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false"
context\="gettercomment_context" deleted\="false" description\="Comment for
getter method" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment"
name\="gettercomment">/**\r\n * Gets ${bare_field_name}.\r\n * @return
${bare_field_name}\r\n */</template><template autoinsert\="false"
context\="settercomment_context" deleted\="false" description\="Comment for
setter method" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.settercomment"
name\="settercomment">/**\r\n * Sets ${bare_field_name}.\r\n * @param ${param}
${bare_field_name}\r\n */</template><template autoinsert\="false"
context\="constructorcomment_context" deleted\="false" description\="Comment
for created constructors" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment"
name\="constructorcomment">/**\r\n * Construct.\r\n
* ${tags}\r\n */</template><template autoinsert\="false"
context\="filecomment_context" deleted\="false" description\="Comment for
created Java files" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.filecomment"
name\="filecomment"/><template autoinsert\="false"
context\="typecomment_context" deleted\="false" description\="Comment for
created types" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.typecomment"
name\="typecomment">/**\r\n * @author ${user}\r\n * ${tags}\r\n
*/</template><template autoinsert\="true" context\="fieldcomment_context"
deleted\="false" description\="Comment for fields" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment"
name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true"
context\="methodcomment_context" deleted\="false" description\="Comment for
non-overriding methods" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment"
name\="methodcomment">/**\r\n * ${tags}
\r\n */</template><template autoinsert\="false"
context\="overridecomment_context" deleted\="false" description\="Comment for
overriding methods" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment"
name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n
*/</template><template autoinsert\="false" context\="newtype_context"
deleted\="false" description\="Newly created files" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">/*\r\n *
Licensed to the Apache Software Foundation (ASF) under one or more\r\n *
contributor license agreements. See the NOTICE file distributed with\r\n *
this work for additional information regarding copyright ownership.\r\n * The
ASF licenses this file to You under the Apache License, Version 2.0\r\n * (the
"License"); you may not use this file except in compliance with\r\n * the
License. You may obtain a copy of the License at\r\n *\r\n *
http\://www.apache.org/licenses/LICENSE-2.0\r\
n *\r\n * Unless required by applicable law or agreed to in writing,
software\r\n * distributed under the License is distributed on an "AS IS"
BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.\r\n * See the License for the specific language governing permissions
and\r\n * limitations under the License.\r\n
*/\r\n${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template
autoinsert\="false" context\="catchblock_context" deleted\="false"
description\="Code in new catch blocks" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">throw
new RuntimeException(${exception_var});</template><template autoinsert\="false"
context\="methodbody_context" deleted\="false" description\="Code in created
method stubs" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.methodbody"
name\="methodbody">${body_statement}</template><template autoinsert\="false"
context\="c
onstructorbody_context" deleted\="false" description\="Code in created
constructor stubs" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody"
name\="constructorbody">${body_statement}</template><template
autoinsert\="true" context\="getterbody_context" deleted\="false"
description\="Code in created getters" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.getterbody"
name\="getterbody">return ${field};</template><template autoinsert\="true"
context\="setterbody_context" deleted\="false" description\="Code in created
setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody"
name\="setterbody">${field} \= ${param};</template><template autoinsert\="true"
context\="classbody_context" deleted\="false" description\="Code in new class
type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.classbody"
name\="classbody">\r\n</template><template autoinsert\="true"
context\="interfacebody_context" deleted\="false"
description\="Code in new interface type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody"
name\="interfacebody">\r\n</template><template autoinsert\="true"
context\="enumbody_context" deleted\="false" description\="Code in new enum
type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.enumbody"
name\="enumbody">\r\n</template><template autoinsert\="true"
context\="annotationbody_context" deleted\="false" description\="Code in new
annotation type bodies" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody"
name\="annotationbody">\r\n</template><template autoinsert\="true"
context\="delegatecomment_context" deleted\="false" description\="Comment for
delegate methods" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment"
name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n
*/</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.format_source_code=true
+sp_cleanup.make_local_variable_final=false
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=true
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_blocks=false
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_parentheses_in_expressions=false
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
Modified:
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java?rev=584960&r1=584959&r2=584960&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/Initializer.java
Mon Oct 15 15:51:33 2007
@@ -34,12 +34,11 @@
import org.slf4j.LoggerFactory;
/**
- * An implementation of [EMAIL PROTECTED] wicket.IInitializer} for the
Velocity Runtime
- * Singleton. If Application is an instance of WebApplication, Initializer will
- * retrieve "velocityPropertiesFolder" as an initparam to point to the
directory
- * the properties file lives in, and "velocity.properties" for the name of the
- * properties file. If the params don't exist, then velocity.properties next to
- * this class will be loaded.
+ * An implementation of [EMAIL PROTECTED] wicket.IInitializer} for the
Velocity Runtime Singleton. If
+ * Application is an instance of WebApplication, Initializer will retrieve
+ * "velocityPropertiesFolder" as an initparam to point to the directory the
properties file lives
+ * in, and "velocity.properties" for the name of the properties file. If the
params don't exist,
+ * then velocity.properties next to this class will be loaded.
*
*/
public class Initializer implements IInitializer
@@ -79,7 +78,7 @@
{
if (application instanceof WebApplication)
{
- WebApplication webapp = (WebApplication) application;
+ WebApplication webapp = (WebApplication)application;
ServletContext servletContext =
webapp.getServletContext();
ServletContext sc = servletContext;
velocityPropertiesFolder =
sc.getInitParameter("velocityPropertiesFolder");
@@ -94,8 +93,7 @@
{
WebApplicationPath webPath = new
WebApplicationPath(sc);
webPath.add(velocityPropertiesFolder);
- IResourceStream stream =
webPath.find(Initializer.class,
- velocityPropertiesFile);
+ IResourceStream stream =
webPath.find(Initializer.class, velocityPropertiesFile);
InputStream is = null;
try
{
Modified:
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java?rev=584960&r1=584959&r2=584960&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityContributor.java
Mon Oct 15 15:51:33 2007
@@ -31,11 +31,10 @@
import org.apache.wicket.util.string.Strings;
/**
- * An IHeaderContributor implementation that renders a velocity template and
- * writes it to the response. The template is loaded via Velocity's resource
- * loading mechanism, as defined in your velocity.properties. If you do not
have
- * a velocity.properties for your app, it will default to a directory
- * "templates" in the root of your app.
+ * An IHeaderContributor implementation that renders a velocity template and
writes it to the
+ * response. The template is loaded via Velocity's resource loading mechanism,
as defined in your
+ * velocity.properties. If you do not have a velocity.properties for your app,
it will default to a
+ * directory "templates" in the root of your app.
*/
public class VelocityContributor extends AbstractBehavior implements
IHeaderContributor
{
@@ -50,10 +49,9 @@
/**
* Ctor for VelocityContributor
*
- * The templateName needs to have the full path relative to where the
- * resource loader starts looking. For example, if there is a template
next
- * to this class in the package called foo.vm, and you have configured
the
- * ClassPathResourceLoader, template name will then be
+ * The templateName needs to have the full path relative to where the
resource loader starts
+ * looking. For example, if there is a template next to this class in
the package called foo.vm,
+ * and you have configured the ClassPathResourceLoader, template name
will then be
* "wicket/contrib/util/resource/foo.vm". Wicket provides a nice utility
* [EMAIL PROTECTED] wicket.util.lang.Packages} for this.
*
@@ -74,7 +72,7 @@
{
if (model instanceof IDetachable)
{
- ((IDetachable) model).detach();
+ ((IDetachable)model).detach();
}
}
@@ -127,7 +125,7 @@
return null;
}
// create a Velocity context object using the model if set
- final VelocityContext ctx = new VelocityContext((Map)
model.getObject());
+ final VelocityContext ctx = new
VelocityContext((Map)model.getObject());
// create a writer for capturing the Velocity output
StringWriter writer = new StringWriter();
Modified:
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityHeaderContributor.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityHeaderContributor.java?rev=584960&r1=584959&r2=584960&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityHeaderContributor.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityHeaderContributor.java
Mon Oct 15 15:51:33 2007
@@ -25,8 +25,7 @@
import org.apache.wicket.markup.html.IHeaderContributor;
/**
- * a simple header contributor that delegates to a List of
- * [EMAIL PROTECTED] VelocityContributor}
+ * a simple header contributor that delegates to a List of [EMAIL PROTECTED]
VelocityContributor}
*
*/
public class VelocityHeaderContributor extends AbstractHeaderContributor
@@ -53,7 +52,7 @@
{
for (Iterator i = contributors.iterator(); i.hasNext();)
{
- VelocityContributor vc = (VelocityContributor) i.next();
+ VelocityContributor vc = (VelocityContributor)i.next();
vc.detach(component);
}
}
@@ -63,7 +62,7 @@
*/
public IHeaderContributor[] getHeaderContributors()
{
- return (IHeaderContributor[]) contributors
- .toArray(new
IHeaderContributor[contributors.size()]);
+ return (IHeaderContributor[])contributors.toArray(new
IHeaderContributor[contributors
+ .size()]);
}
}
Modified:
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavascriptContributor.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavascriptContributor.java?rev=584960&r1=584959&r2=584960&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavascriptContributor.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/VelocityJavascriptContributor.java
Mon Oct 15 15:51:33 2007
@@ -31,17 +31,15 @@
/**
* Ctor
*
- * Use this constructor if you have configured Velocity to use a
- * ClasspathResourceLoader. The templatePath will then be relative to
the
- * package for clazz
+ * Use this constructor if you have configured Velocity to use a
ClasspathResourceLoader. The
+ * templatePath will then be relative to the package for clazz
*
* @param clazz
* @param templatePath
* @param model
* @param id
*/
- public VelocityJavascriptContributor(Class clazz, String templatePath,
IModel model,
- String id)
+ public VelocityJavascriptContributor(Class clazz, String templatePath,
IModel model, String id)
{
super(Packages.absolutePath(clazz, templatePath), model);
this.id = id;
@@ -50,9 +48,8 @@
/**
* Construct.
*
- * Use this constructor when Velocity is configured with the
- * FileResourceLoader. templatePath with then be relative to the loader
path
- * configured in velocity.properties
+ * Use this constructor when Velocity is configured with the
FileResourceLoader. templatePath
+ * with then be relative to the loader path configured in
velocity.properties
*
* @param templatePath
* @param model
Modified:
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java?rev=584960&r1=584959&r2=584960&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-velocity/src/main/java/org/apache/wicket/velocity/markup/html/VelocityPanel.java
Mon Oct 15 15:51:33 2007
@@ -42,11 +42,10 @@
/**
* Panel that displays the result of rendering a <a
- * href="http://jakarta.apache.org/velocity";>Velocity</a> template. The
- * template itself can be any
+ * href="http://jakarta.apache.org/velocity";>Velocity</a> template. The
template itself can be any
* <code><a
href="http://wicket.apache.org/wicket/apidocs/org/apache/wicket/util/resource/IStringResourceStream.html";>IStringResourceStream</a></code>
- * implementation, of which there are a number of convenient implementations in
- * the wicket.util package. The model can be any normal
+ * implementation, of which there are a number of convenient implementations
in the wicket.util
+ * package. The model can be any normal
* <code><a
href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/Map.html";>Map</a></code>,
* which will be used to create the
* <code><a
href="http://jakarta.apache.org/velocity/docs/api/org/apache/velocity/VelocityContext.html";>VelocityContext</a></code>.
@@ -59,8 +58,8 @@
public abstract class VelocityPanel extends Panel
{
/**
- * Convenience factory method to create a [EMAIL PROTECTED]
VelocityPanel} instance
- * with a given [EMAIL PROTECTED] IStringResourceStream template
resource}.
+ * Convenience factory method to create a [EMAIL PROTECTED]
VelocityPanel} instance with a given
+ * [EMAIL PROTECTED] IStringResourceStream template resource}.
*
* @param id
* Component id
@@ -75,8 +74,7 @@
{
if (templateResource == null)
{
- throw new IllegalArgumentException(
- "argument templateResource must be not
null");
+ throw new IllegalArgumentException("argument
templateResource must be not null");
}
return new VelocityPanel(id, model)
@@ -96,8 +94,8 @@
* @param templateResource
* The velocity template as a string resource
* @param model
- * Model with variables that can be substituted by Velocity.
Must
- * return a [EMAIL PROTECTED] Map}.
+ * Model with variables that can be substituted by Velocity.
Must return a
+ * [EMAIL PROTECTED] Map}.
*/
public VelocityPanel(final String id, final IModel/* <Map> */model)
{
@@ -114,8 +112,7 @@
final IStringResourceStream resource = getTemplateResource();
if (resource == null)
{
- throw new IllegalArgumentException(
- "getTemplateResource must return a
resource");
+ throw new IllegalArgumentException("getTemplateResource
must return a resource");
}
final String template = resource.asString();
@@ -174,14 +171,13 @@
* @see
org.apache.wicket.markup.html.panel.Panel#onComponentTagBody(org.apache.wicket.markup.MarkupStream,
* org.apache.wicket.markup.ComponentTag)
*/
- protected void onComponentTagBody(final MarkupStream markupStream,
- final ComponentTag openTag)
+ protected void onComponentTagBody(final MarkupStream markupStream,
final ComponentTag openTag)
{
final Reader templateReader = getTemplateReader();
if (templateReader != null)
{
// Get model as a map
- final Map map = (Map) getModelObject();
+ final Map map = (Map)getModelObject();
// create a Velocity context object using the model if
set
final VelocityContext ctx = new VelocityContext(map);
@@ -221,8 +217,7 @@
{
MarkupParser parser =
getApplication().getMarkupSettings()
.getMarkupParserFactory().newMarkupParser(
-
new MarkupResourceStream(
-
new StringResourceStream(result)));
+
new MarkupResourceStream(new StringResourceStream(result)));
markup = parser.parse();
}
catch (ResourceStreamNotFoundException
e)
@@ -259,8 +254,7 @@
/**
* Gets whether to parse the resulting Wicket markup.
*
- * @return whether to parse the resulting Wicket markup. The default is
- * false.
+ * @return whether to parse the resulting Wicket markup. The default is
false.
*/
protected boolean parseGeneratedMarkup()
{
@@ -268,21 +262,18 @@
}
/**
- * Whether any velocity exception should be trapped and displayed on the
- * panel (false) or thrown up to be handled by the exception mechanism
of
- * Wicket (true). The default is false, which traps and displays any
- * exception without having consequences for the other components on the
+ * Whether any velocity exception should be trapped and displayed on
the panel (false) or thrown
+ * up to be handled by the exception mechanism of Wicket (true). The
default is false, which
+ * traps and displays any exception without having consequences for the
other components on the
* page.
* <p>
- * Trapping these exceptions without disturbing the other components is
- * especially usefull in CMS like applications, where 'normal' users are
- * allowed to do basic scripting. On errors, you want them to be able to
- * have them correct them while the rest of the application keeps on
+ * Trapping these exceptions without disturbing the other components is
especially usefull in
+ * CMS like applications, where 'normal' users are allowed to do basic
scripting. On errors, you
+ * want them to be able to have them correct them while the rest of the
application keeps on
* working.
* </p>
*
- * @return Whether any velocity exceptions should be thrown or trapped.
The
- * default is false.
+ * @return Whether any velocity exceptions should be thrown or trapped.
The default is false.
*/
protected boolean throwVelocityExceptions()
{
Modified:
wicket/trunk/jdk-1.4/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java?rev=584960&r1=584959&r2=584960&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityPanelTest.java
Mon Oct 15 15:51:33 2007
@@ -29,7 +29,8 @@
*/
public class VelocityPanelTest extends TestCase
{
- static {
+ static
+ {
try
{
Velocity.init();
@@ -43,7 +44,8 @@
/**
* Basic test
*/
- public void testVelocityPanel() {
+ public void testVelocityPanel()
+ {
WicketTester tester = new WicketTester();
tester.startPage(VelocityPage.class);
tester.assertContains(VelocityPage.TEST_STRING);
@@ -53,7 +55,8 @@
/**
* Test with Wicket markup parsing
*/
- public void testVelocityPanelWithMarkupParsing() {
+ public void testVelocityPanelWithMarkupParsing()
+ {
WicketTester tester = new WicketTester();
tester.startPage(VelocityWithMarkupParsingPage.class);
tester.assertLabel("velocityPanel:message",
VelocityPage.TEST_STRING);
Modified:
wicket/trunk/jdk-1.4/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java?rev=584960&r1=584959&r2=584960&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-velocity/src/test/java/org/apache/wicket/contrib/markup/html/velocity/VelocityWithMarkupParsingPage.java
Mon Oct 15 15:51:33 2007
@@ -39,13 +39,11 @@
{
HashMap values = new HashMap();
values.put("labelId", "message");
- VelocityPanel velocityPanel = new VelocityPanel("velocityPanel",
- new Model(values))
+ VelocityPanel velocityPanel = new
VelocityPanel("velocityPanel", new Model(values))
{
protected IStringResourceStream getTemplateResource()
{
- return new
UrlResourceStream(this.getClass().getResource(
- "testWithMarkup.html"));
+ return new
UrlResourceStream(this.getClass().getResource("testWithMarkup.html"));
}
public boolean parseGeneratedMarkup()
Modified:
wicket/trunk/jdk-1.4/wicket-velocity/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket-velocity/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java?rev=584960&r1=584959&r2=584960&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket-velocity/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket-velocity/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
Mon Oct 15 15:51:33 2007
@@ -17,9 +17,8 @@
package org.apache.wicket.util.license;
/**
- * Test that the license headers are in place in this project. The tests are
run
- * from [EMAIL PROTECTED] ApacheLicenseHeaderTestCase}, but you can add
project specific
- * tests here if needed.
+ * Test that the license headers are in place in this project. The tests are
run from
+ * [EMAIL PROTECTED] ApacheLicenseHeaderTestCase}, but you can add project
specific tests here if needed.
*/
public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase
{
@@ -30,7 +29,7 @@
public ApacheLicenceHeaderTest()
{
// addHeaders = true;
-
- velocityIgnore = new String[]{
"src/test/java/org/apache/wicket/contrib/velocity/testTemplate.vm" };
+
+ velocityIgnore = new String[] {
"src/test/java/org/apache/wicket/contrib/velocity/testTemplate.vm" };
}
}
