Author: gseitz
Date: Mon Oct 15 16:15:22 2007
New Revision: 584971
URL: http://svn.apache.org/viewvc?rev=584971&view=rev
Log:
WICKET-1078
Modified:
wicket/trunk/testing/wicket-threadtest/.settings/org.eclipse.jdt.ui.prefs
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test2.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App2Test1.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ContactDataProvider.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ResourceTestPage.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/UsPhoneNumber.java
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java
wicket/trunk/testing/wicket-threadtest/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
Modified:
wicket/trunk/testing/wicket-threadtest/.settings/org.eclipse.jdt.ui.prefs
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/.settings/org.eclipse.jdt.ui.prefs?rev=584971&r1=584970&r2=584971&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/.settings/org.eclipse.jdt.ui.prefs
(original)
+++ wicket/trunk/testing/wicket-threadtest/.settings/org.eclipse.jdt.ui.prefs
Mon Oct 15 16:15:22 2007
@@ -16,4 +16,52 @@
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0"
encoding\="UTF-8"?><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">/**\n * Gets ${bare_field_name}.\n * @return
${bare_field_name}\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">/**\n * Sets ${bare_field_name}.\n * @param ${param}
${bare_field_name}\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">/**\n * Construct.\n * ${tags}\n */</template><templa
te 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">/*\n * Copyright Teachscape\n */</template><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">/**\n * @author ${user}\n * ${tags}\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">/**\n * \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">/**\n * ${tags}\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">/**\n * ${see_to_overridden}\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">/**\n * ${tags}\n * ${see_to_target}\n
*/</template><template autoinsert\="true" context\="newtype_context"
deleted\="false" description\="Newly created files" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.newtype"
name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template
autoinsert\="true" context\="classbody_context" deleted\="false"
description\="Code in new class type bodies" enabled\="true" id\="org.ecli
pse.jdt.ui.text.codetemplates.classbody"
name\="classbody">\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">\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">\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">\n</template><template autoinsert\="true"
context\="catchblock_context" deleted\="false" description\="Code in new catch
blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock"
name\="catchblock">// ${todo} Auto-
generated catch block\n${exception_var}.printStackTrace();</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\="true"
context\="constructorbody_context" deleted\="false" description\="Code in
created constructor stubs" enabled\="true"
id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody"
name\="constructorbody">${body_statement}\n// ${todo} Auto-generated
constructor stub</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></templates>
+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/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java?rev=584971&r1=584970&r2=584971&view=diff
==============================================================================
---
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java
(original)
+++
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test1.java
Mon Oct 15 16:15:22 2007
@@ -26,7 +26,6 @@
import org.apache.wicket.util.io.WicketObjectStreamFactory;
import org.apache.wicket.util.lang.Objects;
-
/**
* @author eelcohillenius
*/
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test2.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test2.java?rev=584971&r1=584970&r2=584971&view=diff
==============================================================================
---
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test2.java
(original)
+++
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test2.java
Mon Oct 15 16:15:22 2007
@@ -24,7 +24,6 @@
import org.apache.wicket.threadtest.tester.SimpleGetCommand;
import org.apache.wicket.threadtest.tester.Tester;
-
/**
* @author eelcohillenius
*/
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java?rev=584971&r1=584970&r2=584971&view=diff
==============================================================================
---
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java
(original)
+++
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App1Test3.java
Mon Oct 15 16:15:22 2007
@@ -25,7 +25,6 @@
import org.apache.wicket.threadtest.tester.SimpleGetCommand;
import org.apache.wicket.threadtest.tester.Tester;
-
/**
* @author almaw
*/
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App2Test1.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App2Test1.java?rev=584971&r1=584970&r2=584971&view=diff
==============================================================================
---
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App2Test1.java
(original)
+++
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/App2Test1.java
Mon Oct 15 16:15:22 2007
@@ -24,7 +24,6 @@
import org.apache.wicket.threadtest.tester.SimpleGetCommand;
import org.apache.wicket.threadtest.tester.Tester;
-
/**
* @author eelcohillenius
*/
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ContactDataProvider.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ContactDataProvider.java?rev=584971&r1=584970&r2=584971&view=diff
==============================================================================
---
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ContactDataProvider.java
(original)
+++
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ContactDataProvider.java
Mon Oct 15 16:15:22 2007
@@ -21,7 +21,6 @@
import org.apache.wicket.markup.repeater.data.IDataProvider;
import org.apache.wicket.model.IModel;
-
/**
* Implementation of IDataProvider that retrieves contacts from the contact
* database.
@@ -29,10 +28,8 @@
* @author igor
*
*/
-public class ContactDataProvider implements IDataProvider
-{
- protected ContactsDatabase getContactsDB()
- {
+public class ContactDataProvider implements IDataProvider {
+ protected ContactsDatabase getContactsDB() {
return DatabaseLocator.getDatabase();
}
@@ -40,10 +37,10 @@
* retrieves contacts from database starting with index
<code>first</code>
* and ending with <code>first+count</code>
*
- * @see
org.apache.wicket.markup.repeater.data.IDataProvider#iterator(int, int)
+ * @see
org.apache.wicket.markup.repeater.data.IDataProvider#iterator(int,
+ * int)
*/
- public Iterator iterator(int first, int count)
- {
+ public Iterator iterator(int first, int count) {
return getContactsDB().find(first, count, "firstName",
true).iterator();
}
@@ -52,8 +49,7 @@
*
* @see org.apache.wicket.markup.repeater.data.IDataProvider#size()
*/
- public int size()
- {
+ public int size() {
return getContactsDB().getCount();
}
@@ -62,16 +58,14 @@
*
* @see
org.apache.wicket.markup.repeater.data.IDataProvider#model(java.lang.Object)
*/
- public IModel model(Object object)
- {
- return new DetachableContactModel((Contact)object);
+ public IModel model(Object object) {
+ return new DetachableContactModel((Contact) object);
}
/**
* @see org.apache.wicket.model.IDetachable#detach()
*/
- public void detach()
- {
+ public void detach() {
}
}
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java?rev=584971&r1=584970&r2=584971&view=diff
==============================================================================
---
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
(original)
+++
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/Home.java
Mon Oct 15 16:15:22 2007
@@ -58,7 +58,6 @@
import org.apache.wicket.util.convert.MaskConverter;
import org.apache.wicket.validation.validator.NumberValidator;
-
public class Home extends WebPage {
private class ActionPanel extends Panel {
@@ -139,7 +138,8 @@
public IConverter getConverter(Class clazz) {
return new IConverter() {
/**
- * @see
org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,
java.util.Locale)
+ * @see
org.apache.wicket.util.convert.IConverter#convertToObject(java.lang.String,
+ * java.util.Locale)
*/
public Object
convertToObject(String value, Locale locale) {
try {
@@ -150,7 +150,8 @@
}
/**
- * @see
org.apache.wicket.util.convert.IConverter#convertToString(java.lang.Object,
java.util.Locale)
+ * @see
org.apache.wicket.util.convert.IConverter#convertToString(java.lang.Object,
+ * java.util.Locale)
*/
public String
convertToString(Object value, Locale locale) {
return value != null ?
value.toString() : null;
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ResourceTestPage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ResourceTestPage.java?rev=584971&r1=584970&r2=584971&view=diff
==============================================================================
---
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ResourceTestPage.java
(original)
+++
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/ResourceTestPage.java
Mon Oct 15 16:15:22 2007
@@ -38,7 +38,6 @@
import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
import org.apache.wicket.util.time.Time;
-
import com.sun.image.codec.jpeg.JPEGCodec;
import com.sun.image.codec.jpeg.JPEGImageEncoder;
@@ -48,13 +47,13 @@
* @author almaw
*/
public class ResourceTestPage extends WebPage {
-
+
public static final int IMAGES_PER_PAGE = 20;
-
+
public ResourceTestPage() {
List list = Arrays.asList(new Object[IMAGES_PER_PAGE]);
add(new ListView("listView", list) {
-
+
@Override
protected void populateItem(ListItem item) {
final Random random = new Random();
@@ -63,57 +62,56 @@
gfx.setColor(new Color(random.nextFloat(),
random.nextFloat(), random.nextFloat()));
gfx.fillRect(0, 0, 32, 32);
gfx.dispose();
-
+
// Write it into a byte array as a JPEG.
ByteArrayOutputStream baos = new
ByteArrayOutputStream();
- JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(baos);
- try {
- encoder.encode(image);
- }
- catch (IOException e) {
+ JPEGImageEncoder encoder =
JPEGCodec.createJPEGEncoder(baos);
+ try {
+ encoder.encode(image);
+ } catch (IOException e) {
throw new WicketRuntimeException(e);
}
- final byte[] imageData = baos.toByteArray();
-
+ final byte[] imageData = baos.toByteArray();
+
item.add(new Image("image", new WebResource() {
-
+
@Override
public IResourceStream
getResourceStream() {
return new IResourceStream() {
-
+
public Time
lastModifiedTime() {
return
Time.now();
}
-
+
public void
setLocale(Locale locale) {
}
-
+
public long length() {
return
imageData.length;
}
-
+
public Locale
getLocale() {
return null;
}
-
+
// Make a 16x16
randomly background-coloured JPEG.
public InputStream
getInputStream() throws ResourceStreamNotFoundException {
return new
ByteArrayInputStream(imageData);
}
-
+
public String
getContentType() {
return
"image/jpeg";
}
-
+
public void close()
throws IOException {
}
-
+
};
}
-
+
}));
}
-
+
});
}
}
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java?rev=584971&r1=584970&r2=584971&view=diff
==============================================================================
---
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java
(original)
+++
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/TestApp1.java
Mon Oct 15 16:15:22 2007
@@ -36,7 +36,7 @@
/**
* Gets contactsDB.
- *
+ *
* @return contactsDB
*/
public ContactsDatabase getContactsDB() {
@@ -55,7 +55,7 @@
@Override
protected ISessionStore newSessionStore() {
- return new SecondLevelCacheSessionStore(this,new
FilePageStore());
- //return new HttpSessionStore();
+ return new SecondLevelCacheSessionStore(this, new
FilePageStore());
+ // return new HttpSessionStore();
}
}
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/UsPhoneNumber.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/UsPhoneNumber.java?rev=584971&r1=584970&r2=584971&view=diff
==============================================================================
---
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/UsPhoneNumber.java
(original)
+++
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/apps/app1/UsPhoneNumber.java
Mon Oct 15 16:15:22 2007
@@ -26,8 +26,7 @@
*
* @author Eelco Hillenius
*/
-public class UsPhoneNumber implements Serializable
-{
+public class UsPhoneNumber implements Serializable {
private String number;
/**
@@ -35,8 +34,7 @@
*
* @param number
*/
- public UsPhoneNumber(String number)
- {
+ public UsPhoneNumber(String number) {
this.number = number;
}
@@ -45,8 +43,7 @@
*
* @return text
*/
- public String getNumber()
- {
+ public String getNumber() {
return number;
}
@@ -56,16 +53,14 @@
* @param number
* text
*/
- public void setNumber(String number)
- {
+ public void setNumber(String number) {
this.number = number;
}
/**
* @see java.lang.Object#toString()
*/
- public String toString()
- {
+ public String toString() {
return number;
}
}
Modified:
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java?rev=584971&r1=584970&r2=584971&view=diff
==============================================================================
---
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java
(original)
+++
wicket/trunk/testing/wicket-threadtest/src/main/java/org/apache/wicket/threadtest/tester/Tester.java
Mon Oct 15 16:15:22 2007
@@ -31,7 +31,6 @@
import org.mortbay.jetty.Server;
import org.mortbay.jetty.webapp.WebAppContext;
-
/**
* @author eelcohillenius
*/
Modified:
wicket/trunk/testing/wicket-threadtest/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java?rev=584971&r1=584970&r2=584971&view=diff
==============================================================================
---
wicket/trunk/testing/wicket-threadtest/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
(original)
+++
wicket/trunk/testing/wicket-threadtest/src/test/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
Mon Oct 15 16:15:22 2007
@@ -16,8 +16,6 @@
*/
package org.apache.wicket.util.license;
-import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase;
-
/**
* 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
