You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2007/11/12 23:23:28 UTC
svn commit: r594319 [28/40] - in /tapestry/tapestry5/trunk: ./
tapestry-annotations/
tapestry-annotations/src/main/java/org/apache/tapestry/beaneditor/
tapestry-annotations/src/site/ tapestry-component-report/
tapestry-component-report/src/main/java/or...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Countdown.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Countdown.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Countdown.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Countdown.java Mon Nov 12 14:22:31 2007
@@ -21,7 +21,7 @@
{
@SuppressWarnings("unused")
@Component(parameters =
- { "start=10", "end=1", "value=countValue" })
+ {"start=10", "end=1", "value=countValue"})
private Count _count;
private int _countValue;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DateFieldDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DateFieldDemo.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DateFieldDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DateFieldDemo.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,12 @@
package org.apache.tapestry.integration.app1.pages;
+import org.apache.tapestry.annotations.Persist;
+import org.apache.tapestry.beaneditor.Validate;
+
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
-
-import org.apache.tapestry.annotations.Persist;
-import org.apache.tapestry.beaneditor.Validate;
public class DateFieldDemo
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/EventHandlerDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/EventHandlerDemo.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/EventHandlerDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/EventHandlerDemo.java Mon Nov 12 14:22:31 2007
@@ -76,6 +76,6 @@
public Object[] getTwoContext()
{
return new Object[]
- { 1, 2 };
+ {1, 2};
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridDemo.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridDemo.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,11 @@
package org.apache.tapestry.integration.app1.pages;
-import java.util.List;
-
import org.apache.tapestry.integration.app1.data.Track;
import org.apache.tapestry.integration.app1.services.MusicLibrary;
import org.apache.tapestry.ioc.annotations.Inject;
+
+import java.util.List;
public class GridDemo
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridEnumDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridEnumDemo.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridEnumDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridEnumDemo.java Mon Nov 12 14:22:31 2007
@@ -17,7 +17,9 @@
import org.apache.tapestry.integration.app1.services.ToDoDatabase;
import org.apache.tapestry.ioc.annotations.Inject;
-/** Used to demonstrate the built-in support for enum types. */
+/**
+ * Used to demonstrate the built-in support for enum types.
+ */
public class GridEnumDemo
{
@Inject
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridFormDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridFormDemo.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridFormDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/GridFormDemo.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,11 @@
package org.apache.tapestry.integration.app1.pages;
-import java.util.List;
-
import org.apache.tapestry.integration.app1.data.ToDoItem;
import org.apache.tapestry.integration.app1.services.ToDoDatabase;
import org.apache.tapestry.ioc.annotations.Inject;
+
+import java.util.List;
public class GridFormDemo
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/InstanceMixin.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/InstanceMixin.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/InstanceMixin.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/InstanceMixin.java Mon Nov 12 14:22:31 2007
@@ -14,6 +14,10 @@
package org.apache.tapestry.integration.app1.pages;
+import org.apache.tapestry.annotations.*;
+import org.apache.tapestry.integration.app1.components.Output;
+import org.apache.tapestry.integration.app1.mixins.Emphasis;
+
import java.sql.Date;
import java.text.DateFormat;
import java.text.Format;
@@ -21,26 +25,17 @@
import java.util.GregorianCalendar;
import java.util.Locale;
-import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.MixinClasses;
-import org.apache.tapestry.annotations.Mixins;
-import org.apache.tapestry.annotations.OnEvent;
-import org.apache.tapestry.annotations.Persist;
-import org.apache.tapestry.annotations.Retain;
-import org.apache.tapestry.integration.app1.components.Output;
-import org.apache.tapestry.integration.app1.mixins.Emphasis;
-
public class InstanceMixin
{
@SuppressWarnings("unused")
@Component(parameters =
- { "value=date2", "format=format", "test=showEmphasis" })
+ {"value=date2", "format=format", "test=showEmphasis"})
@Mixins("Emphasis")
private Output _output2;
@SuppressWarnings("unused")
@Component(parameters =
- { "value=date3", "format=format", "test=showEmphasis" })
+ {"value=date3", "format=format", "test=showEmphasis"})
@MixinClasses(Emphasis.class)
private Output _output3;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Kicker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Kicker.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Kicker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Kicker.java Mon Nov 12 14:22:31 2007
@@ -24,7 +24,7 @@
Object onAction()
{
_target.setActivationContext(new String[]
- { "betty", "wilma" });
+ {"betty", "wilma"});
return _target;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Localization.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Localization.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Localization.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Localization.java Mon Nov 12 14:22:31 2007
@@ -14,14 +14,14 @@
package org.apache.tapestry.integration.app1.pages;
-import java.util.Locale;
-
import org.apache.tapestry.annotations.Service;
import org.apache.tapestry.ioc.Messages;
import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.ioc.services.ClassFactory;
import org.apache.tapestry.services.PersistentLocale;
import org.apache.tapestry.services.Request;
+
+import java.util.Locale;
public class Localization
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MissingTemplate.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MissingTemplate.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MissingTemplate.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MissingTemplate.java Mon Nov 12 14:22:31 2007
@@ -14,7 +14,9 @@
package org.apache.tapestry.integration.app1.pages;
-/** A page that simple doesn't have a template. */
+/**
+ * A page that simple doesn't have a template.
+ */
public class MissingTemplate
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLinkContext.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLinkContext.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLinkContext.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PageLinkContext.java Mon Nov 12 14:22:31 2007
@@ -19,6 +19,6 @@
public Object[] getComputedContext()
{
return new Object[]
- { "fred", 7, true };
+ {"fred", 7, true};
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PaletteDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PaletteDemo.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PaletteDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/PaletteDemo.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
package org.apache.tapestry.integration.app1.pages;
-import java.util.List;
-
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.SelectModel;
import org.apache.tapestry.ValueEncoder;
@@ -24,6 +22,8 @@
import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.util.EnumSelectModel;
import org.apache.tapestry.util.EnumValueEncoder;
+
+import java.util.List;
public class PaletteDemo
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ReturnTypes.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ReturnTypes.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ReturnTypes.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ReturnTypes.java Mon Nov 12 14:22:31 2007
@@ -1,28 +1,28 @@
-// Copyright 2007 The Apache Software Foundation
-//
-// 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.
-
+// Copyright 2007 The Apache Software Foundation
+//
+// 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.
+
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotations.InjectPage;
-import org.apache.tapestry.ioc.annotations.Inject;
-import org.apache.tapestry.services.ComponentEventResultProcessor;
-import org.apache.tapestry.util.TextStreamResponse;
+import org.apache.tapestry.ComponentResources;
+import org.apache.tapestry.annotations.InjectPage;
+import org.apache.tapestry.ioc.annotations.Inject;
+import org.apache.tapestry.services.ComponentEventResultProcessor;
+import org.apache.tapestry.util.TextStreamResponse;
/**
* Tests the various event handler method return types.
- *
+ *
* @see ComponentEventResultProcessor
*/
public class ReturnTypes
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleTrackGridDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleTrackGridDemo.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleTrackGridDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/SimpleTrackGridDemo.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
package org.apache.tapestry.integration.app1.pages;
-import java.util.List;
-
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.beaneditor.BeanModel;
import org.apache.tapestry.integration.app1.data.SimpleTrack;
@@ -24,6 +22,8 @@
import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.services.BeanModelSource;
+import java.util.List;
+
public class SimpleTrackGridDemo
{
@Inject
@@ -31,10 +31,10 @@
@Inject
private BeanModelSource _beanModelSource;
-
+
@Inject
private ComponentResources _resources;
-
+
private SimpleTrack _track;
public SimpleTrack getTrack()
@@ -51,7 +51,7 @@
{
return _library.getTracks();
}
-
+
public BeanModel getSimpleTrackModel()
{
return _beanModelSource.create(SimpleTrack.class, false, _resources);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Target.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Target.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Target.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/Target.java Mon Nov 12 14:22:31 2007
@@ -51,7 +51,7 @@
public Object[] getContextToEncode()
{
return new Object[]
- { "fred", "barney", "clark kent" };
+ {"fred", "barney", "clark kent"};
}
public Object getObject()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoList.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
package org.apache.tapestry.integration.app1.pages;
-import java.util.List;
-
import org.apache.tapestry.PrimaryKeyEncoder;
import org.apache.tapestry.annotations.Component;
import org.apache.tapestry.corelib.components.Form;
@@ -23,6 +21,8 @@
import org.apache.tapestry.integration.app1.services.ToDoDatabase;
import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.util.DefaultPrimaryKeyEncoder;
+
+import java.util.List;
public class ToDoList
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoListVolatile.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoListVolatile.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoListVolatile.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/ToDoListVolatile.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,13 @@
package org.apache.tapestry.integration.app1.pages;
-import java.util.List;
-
import org.apache.tapestry.annotations.Component;
import org.apache.tapestry.corelib.components.Form;
import org.apache.tapestry.integration.app1.data.ToDoItem;
import org.apache.tapestry.integration.app1.services.ToDoDatabase;
import org.apache.tapestry.ioc.annotations.Inject;
+
+import java.util.List;
public class ToDoListVolatile
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/AppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/AppModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/AppModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/AppModule.java Mon Nov 12 14:22:31 2007
@@ -14,17 +14,6 @@
package org.apache.tapestry.integration.app1.services;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.io.IOException;
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-import java.net.URL;
-import java.util.List;
-
import org.apache.tapestry.integration.app1.data.Track;
import org.apache.tapestry.ioc.MappedConfiguration;
import org.apache.tapestry.ioc.OrderedConfiguration;
@@ -35,6 +24,16 @@
import org.apache.tapestry.services.Response;
import org.slf4j.Logger;
+import java.io.IOException;
+import java.lang.annotation.Documented;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+import java.net.URL;
+import java.util.List;
+
/**
* I was just dying to see how fast requests are!
*/
@@ -45,7 +44,7 @@
* same service interface.
*/
@Target(
- { PARAMETER, FIELD })
+ {PARAMETER, FIELD})
@Retention(RUNTIME)
@Documented
public @interface Local
@@ -78,8 +77,8 @@
public void contributeRequestHandler(OrderedConfiguration<RequestFilter> configuration,
- @Local
- RequestFilter filter)
+ @Local
+ RequestFilter filter)
{
configuration.add("Timing", filter);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/French.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/French.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/French.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/French.java Mon Nov 12 14:22:31 2007
@@ -14,17 +14,18 @@
package org.apache.tapestry.integration.app1.services;
+import java.lang.annotation.Documented;
import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-/** Marker interface. */
+/**
+ * Marker interface.
+ */
@Target(
-{ PARAMETER, FIELD })
+ {PARAMETER, FIELD})
@Retention(RUNTIME)
@Documented
public @interface French
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/MusicLibrary.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/MusicLibrary.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/MusicLibrary.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/MusicLibrary.java Mon Nov 12 14:22:31 2007
@@ -14,12 +14,14 @@
package org.apache.tapestry.integration.app1.services;
-import java.util.List;
-
import org.apache.tapestry.integration.app1.data.Track;
+import java.util.List;
+
public interface MusicLibrary
{
- /** Provides a list of all tracks in an indeterminate order. */
+ /**
+ * Provides a list of all tracks in an indeterminate order.
+ */
List<Track> getTracks();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/MusicLibraryParser.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/MusicLibraryParser.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/MusicLibraryParser.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/MusicLibraryParser.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,9 @@
package org.apache.tapestry.integration.app1.services;
-import static java.lang.String.format;
+import org.apache.tapestry.integration.app1.data.Track;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newStack;
-
-import java.io.BufferedInputStream;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.List;
-
-import org.apache.tapestry.integration.app1.data.Track;
import org.apache.tapestry.ioc.util.Stack;
import org.slf4j.Logger;
import org.xml.sax.Attributes;
@@ -33,6 +26,12 @@
import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.helpers.XMLReaderFactory;
+import java.io.BufferedInputStream;
+import java.io.InputStream;
+import static java.lang.String.format;
+import java.net.URL;
+import java.util.List;
+
/**
* Reads an iTunes music library file into a list of
* {@link org.apache.tapestry.integration.app1.data.Track} elements.
@@ -97,10 +96,14 @@
private int _state = STATE_START;
- /** Most recently seen key. */
+ /**
+ * Most recently seen key.
+ */
private String _key;
- /** Currently building Track. */
+ /**
+ * Currently building Track.
+ */
private Track _track;
public List<Track> getTracks()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/ToDoDatabase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/ToDoDatabase.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/ToDoDatabase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/ToDoDatabase.java Mon Nov 12 14:22:31 2007
@@ -14,30 +14,37 @@
package org.apache.tapestry.integration.app1.services;
-import java.util.List;
-
import org.apache.tapestry.integration.app1.data.ToDoItem;
+import java.util.List;
+
public interface ToDoDatabase
{
- /** Adds an item to the database, first assigning a unique id to the item. */
+ /**
+ * Adds an item to the database, first assigning a unique id to the item.
+ */
void add(ToDoItem item);
- /** Finds all items, sorted ascending by each item's order property. */
+ /**
+ * Finds all items, sorted ascending by each item's order property.
+ */
List<ToDoItem> findAll();
/**
* Updates an existing item.
- *
+ *
* @param item
- * @throws RuntimeException
- * if the item does not exist
+ * @throws RuntimeException if the item does not exist
*/
void update(ToDoItem item);
-
- /** Resets the database, clearing out all data, re-adding base data. */
+
+ /**
+ * Resets the database, clearing out all data, re-adding base data.
+ */
void reset();
- /** Deletes all items from the database. */
+ /**
+ * Deletes all items from the database.
+ */
void clear();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/ToDoDatabaseImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/ToDoDatabaseImpl.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/ToDoDatabaseImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/services/ToDoDatabaseImpl.java Mon Nov 12 14:22:31 2007
@@ -14,6 +14,8 @@
package org.apache.tapestry.integration.app1.services;
+import org.apache.tapestry.integration.app1.data.ToDoItem;
+import org.apache.tapestry.integration.app1.data.Urgency;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
@@ -21,9 +23,6 @@
import java.util.Comparator;
import java.util.List;
import java.util.Map;
-
-import org.apache.tapestry.integration.app1.data.ToDoItem;
-import org.apache.tapestry.integration.app1.data.Urgency;
/**
* We clone everything that comes in or goes out. This does a reasonable job of simulating an
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/FortyTwo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/FortyTwo.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/FortyTwo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/FortyTwo.java Mon Nov 12 14:22:31 2007
@@ -14,14 +14,14 @@
package org.apache.tapestry.integration.app2;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Target;
-/** Indicates that a method should return the answer to life, the universe, and everything.
+/**
+ * Indicates that a method should return the answer to life, the universe, and everything.
* Used for testing.
*/
@Target(ElementType.METHOD)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLocale.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLocale.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLocale.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLocale.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,11 @@
package org.apache.tapestry.integration.app2.pages;
-import java.util.Locale;
-
import org.apache.tapestry.annotations.OnEvent;
import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.services.PersistentLocale;
+
+import java.util.Locale;
public class TestPageForLocale
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLoop.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLoop.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLoop.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPageForLoop.java Mon Nov 12 14:22:31 2007
@@ -17,7 +17,7 @@
public class TestPageForLoop
{
private String[] _array =
- { "x", "y", "z" };
+ {"x", "y", "z"};
private String _value;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPrefixMethod.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPrefixMethod.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPrefixMethod.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/pages/TestPrefixMethod.java Mon Nov 12 14:22:31 2007
@@ -19,8 +19,9 @@
public class TestPrefixMethod
{
@FortyTwo
- public int getValue() {
+ public int getValue()
+ {
return 0;
}
-
+
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/services/LocaleAppModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/services/LocaleAppModule.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/services/LocaleAppModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app2/services/LocaleAppModule.java Mon Nov 12 14:22:31 2007
@@ -35,16 +35,17 @@
{
configuration.add("FortyTwo", new FortyTwoWorker());
}
-
- private static final class FortyTwoWorker implements ComponentClassTransformWorker {
+
+ private static final class FortyTwoWorker implements ComponentClassTransformWorker
+ {
public void transform(ClassTransformation transformation, MutableComponentModel model)
{
- for(TransformMethodSignature sig : transformation.findMethodsWithAnnotation(FortyTwo.class))
+ for (TransformMethodSignature sig : transformation.findMethodsWithAnnotation(FortyTwo.class))
{
transformation.prefixMethod(sig, "return 42;");
}
}
-
+
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/DTDTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/DTDTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/DTDTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/DTDTest.java Mon Nov 12 14:22:31 2007
@@ -32,11 +32,11 @@
public Object[][] dtd_page_provider()
{
return new Object[][]
- {
- { "DTDFromPage", FRAMESET, "slagheap", },
- { "DTDFromComponent", TRANSITIONAL, "flubber", },
- { "MultipleDTD", STRICT, "blubber", },
- { "NoDTD", "", "no_dtd_loser", } };
+ {
+ {"DTDFromPage", FRAMESET, "slagheap",},
+ {"DTDFromComponent", TRANSITIONAL, "flubber",},
+ {"MultipleDTD", STRICT, "blubber",},
+ {"NoDTD", "", "no_dtd_loser",}};
}
@Test(dataProvider = "dtd_page_provider")
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/FormTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/FormTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/FormTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/FormTest.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
package org.apache.tapestry.integration.pagelevel;
-import java.util.Map;
-
import org.apache.tapestry.dom.Document;
import org.apache.tapestry.dom.Element;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
@@ -23,6 +21,8 @@
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
+
+import java.util.Map;
public class FormTest extends Assert
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/LocaleTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/LocaleTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/LocaleTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/LocaleTest.java Mon Nov 12 14:22:31 2007
@@ -14,14 +14,14 @@
package org.apache.tapestry.integration.pagelevel;
-import java.util.Locale;
-
import org.apache.tapestry.dom.Document;
import org.apache.tapestry.test.PageTester;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+
+import java.util.Locale;
public class LocaleTest extends Assert
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/PrefixMethodTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/PrefixMethodTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/PrefixMethodTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/PrefixMethodTest.java Mon Nov 12 14:22:31 2007
@@ -23,7 +23,7 @@
public class PrefixMethodTest extends Assert
{
private PageTester _tester;
-
+
@Test
public void prefix_method() throws Exception
{
@@ -32,7 +32,7 @@
String appName = "";
_tester = new PageTester(appPackage, appName, PageTester.DEFAULT_CONTEXT_PATH, LocaleAppModule.class);
Document doc = _tester.renderPage("TestPrefixMethod");
-
+
assertEquals(doc.getElementById("value").getChildText(), "42");
// should override the method in the superclass
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/SubmitTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/SubmitTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/SubmitTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/pagelevel/SubmitTest.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
package org.apache.tapestry.integration.pagelevel;
-import java.util.Map;
-
import org.apache.tapestry.dom.Document;
import org.apache.tapestry.dom.Element;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
@@ -24,6 +22,8 @@
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+
+import java.util.Map;
public class SubmitTest extends Assert
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/OptionGroupModelImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/OptionGroupModelImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/OptionGroupModelImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/OptionGroupModelImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,15 @@
package org.apache.tapestry.internal;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
import org.apache.tapestry.OptionGroupModel;
import org.apache.tapestry.OptionModel;
import org.testng.Assert;
import org.testng.annotations.Test;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
public class OptionGroupModelImplTest extends Assert
{
@Test
@@ -55,7 +55,7 @@
List<OptionModel> options = Collections.emptyList();
OptionGroupModel group = new OptionGroupModelImpl("Label", true, options, "fred",
- "flintstone", "barney", "rubble");
+ "flintstone", "barney", "rubble");
Map<String, String> attributes = group.getAttributes();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/OptionModelImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/OptionModelImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/OptionModelImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/OptionModelImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,13 @@
package org.apache.tapestry.internal;
-import java.util.Collections;
-import java.util.Map;
-
import org.apache.tapestry.OptionModel;
import org.testng.Assert;
import org.testng.annotations.Test;
+import java.util.Collections;
+import java.util.Map;
+
public class OptionModelImplTest extends Assert
{
@Test
@@ -45,7 +45,7 @@
public void attributes_as_extra_parameters()
{
OptionModel model = new OptionModelImpl("Label", false, this, "fred", "flintstone",
- "barney", "rubble");
+ "barney", "rubble");
Map<String, String> attributes = model.getAttributes();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/ServletContextSymbolProviderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/ServletContextSymbolProviderTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/ServletContextSymbolProviderTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/ServletContextSymbolProviderTest.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,14 @@
package org.apache.tapestry.internal;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-
-import javax.servlet.ServletContext;
-
import org.apache.tapestry.ioc.services.SymbolProvider;
import org.apache.tapestry.ioc.test.TestBase;
import org.testng.annotations.Test;
+
+import javax.servlet.ServletContext;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
public class ServletContextSymbolProviderTest extends TestBase
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/TapestryAppInitializerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/TapestryAppInitializerTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/TapestryAppInitializerTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/TapestryAppInitializerTest.java Mon Nov 12 14:22:31 2007
@@ -27,7 +27,7 @@
public void testLoadAppModule()
{
Registry registry = new TapestryAppInitializer("org.apache.tapestry.integration.app0",
- "foo", "").getRegistry();
+ "foo", "").getRegistry();
Transformer<String> s1 = registry.getService("Service1", Transformer.class);
assertEquals(s1.transform("a"), "A");
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/TapestryInternalUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/TapestryInternalUtilsTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/TapestryInternalUtilsTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/TapestryInternalUtilsTest.java Mon Nov 12 14:22:31 2007
@@ -14,17 +14,6 @@
package org.apache.tapestry.internal;
-import java.io.Closeable;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.regex.Pattern;
-
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.OptionModel;
import org.apache.tapestry.SelectModel;
@@ -40,6 +29,11 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.*;
+import java.util.regex.Pattern;
+
public class TapestryInternalUtilsTest extends InternalBaseTestCase
{
private ClassFactory _classFactory;
@@ -105,11 +99,11 @@
public Object[][] to_user_presentable_data()
{
return new Object[][]
- {
- { "hello", "Hello" },
- { "userId", "User Id" },
- { "useHTML", "Use HTML" },
- { "underscored_name", "Underscored Name" }, };
+ {
+ {"hello", "Hello"},
+ {"userId", "User Id"},
+ {"useHTML", "Use HTML"},
+ {"underscored_name", "Underscored Name"},};
}
@Test
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/beaneditor/BeanModelUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/beaneditor/BeanModelUtilsTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/beaneditor/BeanModelUtilsTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/beaneditor/BeanModelUtilsTest.java Mon Nov 12 14:22:31 2007
@@ -30,17 +30,17 @@
private Object[] build(String propertyNames, String... expected)
{
return new Object[]
- { propertyNames, expected };
+ {propertyNames, expected};
}
@DataProvider(name = "split_inputs")
public Object[][] split_inputs()
{
return new Object[][]
- { build("fred", "fred"), build("fred,barney", "fred", "barney"),
- build(" fred, barney, wilma, betty ", "fred", "barney", "wilma", "betty"),
- new Object[]
- { " ", new String[0] } };
+ {build("fred", "fred"), build("fred,barney", "fred", "barney"),
+ build(" fred, barney, wilma, betty ", "fred", "barney", "wilma", "betty"),
+ new Object[]
+ {" ", new String[0]}};
}
@Test
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/beaneditor/ValidateAnnotationConstraintGeneratorTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/beaneditor/ValidateAnnotationConstraintGeneratorTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/beaneditor/ValidateAnnotationConstraintGeneratorTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/beaneditor/ValidateAnnotationConstraintGeneratorTest.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,13 @@
package org.apache.tapestry.internal.beaneditor;
-import java.util.Arrays;
-
import org.apache.tapestry.PropertyConduit;
import org.apache.tapestry.beaneditor.Validate;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.services.ValidationConstraintGenerator;
import org.testng.annotations.Test;
+
+import java.util.Arrays;
public class ValidateAnnotationConstraintGeneratorTest extends InternalBaseTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java Mon Nov 12 14:22:31 2007
@@ -202,7 +202,9 @@
verify();
}
- /** The "preamble" are the non-terminal property or method names. */
+ /**
+ * The "preamble" are the non-terminal property or method names.
+ */
@Test
public void property_path_with_explicit_method_in_preamble()
{
@@ -592,27 +594,27 @@
public Object[][] values()
{
return new Object[][]
- {
- { "true", true, },
- { "True", true, },
- { " true ", true, },
- { "false", false },
- { "null", null },
- { "3", 3l },
- { " 37 ", 37l },
- { " -227", -227l },
- { " 5.", 5d },
- { " -100.", -100d },
- { " -0.0 ", -0d },
- { "1..10", new IntegerRange(1, 10) },
- { " -20 .. -30 ", new IntegerRange(-20, -30) },
- { "0.", 0d },
- { " 227.75", 227.75d },
- { " -10123.67", -10123.67d },
- { "'Hello World'", "Hello World" },
- { " 'Whitespace Ignored' ", "Whitespace Ignored" },
- { " ' Inside ' ", " Inside " },
- { " 'Nested ' Quotes ' Inside'", "Nested ' Quotes ' Inside" },
- { "'''", "'" } };
+ {
+ {"true", true,},
+ {"True", true,},
+ {" true ", true,},
+ {"false", false},
+ {"null", null},
+ {"3", 3l},
+ {" 37 ", 37l},
+ {" -227", -227l},
+ {" 5.", 5d},
+ {" -100.", -100d},
+ {" -0.0 ", -0d},
+ {"1..10", new IntegerRange(1, 10)},
+ {" -20 .. -30 ", new IntegerRange(-20, -30)},
+ {"0.", 0d},
+ {" 227.75", 227.75d},
+ {" -10123.67", -10123.67d},
+ {"'Hello World'", "Hello World"},
+ {" 'Whitespace Ignored' ", "Whitespace Ignored"},
+ {" ' Inside ' ", " Inside "},
+ {" 'Nested ' Quotes ' Inside'", "Nested ' Quotes ' Inside"},
+ {"'''", "'"}};
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/StringHolder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/StringHolder.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/StringHolder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/StringHolder.java Mon Nov 12 14:22:31 2007
@@ -1,26 +1,26 @@
-// Copyright 2006, 2007 The Apache Software Foundation
-//
-// 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.
-
+// Copyright 2006, 2007 The Apache Software Foundation
+//
+// 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.
+
package org.apache.tapestry.internal.bindings;
public interface StringHolder
{
void setValue(String value);
- String getValue();
-
- String stringValue();
-
+ String getValue();
+
+ String stringValue();
+
void voidMethod();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/ValidateBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/ValidateBindingFactoryTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/ValidateBindingFactoryTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/bindings/ValidateBindingFactoryTest.java Mon Nov 12 14:22:31 2007
@@ -30,7 +30,9 @@
{
private interface FieldComponent extends Field, Component
{
- };
+ }
+
+ ;
@Test
public void not_a_field()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/grid/ListGridDataSourceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/grid/ListGridDataSourceTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/grid/ListGridDataSourceTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/grid/ListGridDataSourceTest.java Mon Nov 12 14:22:31 2007
@@ -14,9 +14,6 @@
package org.apache.tapestry.internal.grid;
-import java.util.Arrays;
-import java.util.List;
-
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.beaneditor.BeanModel;
import org.apache.tapestry.beaneditor.PropertyModel;
@@ -26,6 +23,9 @@
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+
+import java.util.Arrays;
+import java.util.List;
public class ListGridDataSourceTest extends InternalBaseTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/model/MutableComponentModelImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/model/MutableComponentModelImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/model/MutableComponentModelImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/model/MutableComponentModelImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,8 +14,6 @@
package org.apache.tapestry.internal.model;
-import java.util.Arrays;
-
import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.Location;
@@ -26,6 +24,8 @@
import org.apache.tapestry.model.ParameterModel;
import org.slf4j.Logger;
import org.testng.annotations.Test;
+
+import java.util.Arrays;
/**
* Tests {@link org.apache.tapestry.internal.model.MutableComponentModelImpl} and
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AliasImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AliasImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AliasImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AliasImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,18 +14,17 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-
-import java.util.Collections;
-import java.util.Map;
-
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.AnnotationProvider;
import org.apache.tapestry.ioc.ObjectLocator;
import org.apache.tapestry.ioc.ObjectProvider;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import org.apache.tapestry.services.Alias;
import org.apache.tapestry.services.AliasManager;
import org.testng.annotations.Test;
+
+import java.util.Collections;
+import java.util.Map;
public class AliasImplTest extends InternalBaseTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AliasManagerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AliasManagerImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AliasManagerImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AliasManagerImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,16 +14,16 @@
package org.apache.tapestry.internal.services;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Map;
-
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.services.AliasContribution;
import org.apache.tapestry.services.AliasManager;
import org.slf4j.Logger;
import org.testng.annotations.Test;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+
public class AliasManagerImplTest extends InternalBaseTestCase
{
@Test
@@ -35,8 +35,8 @@
replay();
AliasContribution[] contributions =
- { AliasContribution.create(String.class, "FRED"),
- AliasContribution.create(Runnable.class, r) };
+ {AliasContribution.create(String.class, "FRED"),
+ AliasContribution.create(Runnable.class, r)};
Collection<AliasContribution> configuration = Arrays.asList(contributions);
AliasManager manager = new AliasManagerImpl(logger, configuration);
@@ -62,9 +62,9 @@
replay();
AliasContribution[] contributions =
- { AliasContribution.create(String.class, "FRED"),
- AliasContribution.create(String.class, "FRED-CONFLICT"),
- AliasContribution.create(Runnable.class, r) };
+ {AliasContribution.create(String.class, "FRED"),
+ AliasContribution.create(String.class, "FRED-CONFLICT"),
+ AliasContribution.create(Runnable.class, r)};
Collection<AliasContribution> configuration = Arrays.asList(contributions);
AliasManager manager = new AliasManagerImpl(logger, configuration);
@@ -87,9 +87,9 @@
replay();
AliasContribution[] contributions =
- { AliasContribution.create(String.class, "FRED"),
- AliasContribution.create(String.class, "bar", "FRED-NON-CONFLICT"),
- AliasContribution.create(Runnable.class, r) };
+ {AliasContribution.create(String.class, "FRED"),
+ AliasContribution.create(String.class, "bar", "FRED-NON-CONFLICT"),
+ AliasContribution.create(Runnable.class, r)};
Collection<AliasContribution> configuration = Arrays.asList(contributions);
AliasManager manager = new AliasManagerImpl(logger, configuration);
@@ -112,9 +112,9 @@
replay();
AliasContribution[] contributions =
- { AliasContribution.create(String.class, "FRED"),
- AliasContribution.create(String.class, "bar", "FRED-NON-CONFLICT"),
- AliasContribution.create(Runnable.class, r) };
+ {AliasContribution.create(String.class, "FRED"),
+ AliasContribution.create(String.class, "bar", "FRED-NON-CONFLICT"),
+ AliasContribution.create(Runnable.class, r)};
Collection<AliasContribution> configuration = Arrays.asList(contributions);
AliasManager manager = new AliasManagerImpl(logger, configuration);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ApplicationStateManagerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ApplicationStateManagerImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ApplicationStateManagerImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ApplicationStateManagerImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,22 +14,17 @@
package org.apache.tapestry.internal.services;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.isA;
-
-import java.util.Collections;
-import java.util.Map;
-
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.internal.util.Holder;
-import org.apache.tapestry.services.ApplicationStateContribution;
-import org.apache.tapestry.services.ApplicationStateCreator;
-import org.apache.tapestry.services.ApplicationStateManager;
-import org.apache.tapestry.services.ApplicationStatePersistenceStrategy;
-import org.apache.tapestry.services.ApplicationStatePersistenceStrategySource;
+import org.apache.tapestry.services.*;
import org.easymock.EasyMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.isA;
import org.easymock.IAnswer;
import org.testng.annotations.Test;
+
+import java.util.Collections;
+import java.util.Map;
public class ApplicationStateManagerImplTest extends InternalBaseTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ApplicationStatePersistenceStrategySourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ApplicationStatePersistenceStrategySourceImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ApplicationStatePersistenceStrategySourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ApplicationStatePersistenceStrategySourceImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,15 +14,14 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-
-import java.util.Collections;
-import java.util.Map;
-
import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import org.apache.tapestry.services.ApplicationStatePersistenceStrategy;
import org.apache.tapestry.services.ApplicationStatePersistenceStrategySource;
import org.testng.annotations.Test;
+
+import java.util.Collections;
+import java.util.Map;
public class ApplicationStatePersistenceStrategySourceImplTest extends InternalBaseTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ApplicationStateWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ApplicationStateWorkerTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ApplicationStateWorkerTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ApplicationStateWorkerTest.java Mon Nov 12 14:22:31 2007
@@ -18,7 +18,6 @@
import javassist.CtClass;
import javassist.Loader;
import javassist.LoaderClassPath;
-
import org.apache.tapestry.annotations.ApplicationState;
import org.apache.tapestry.internal.InternalComponentResources;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
@@ -84,7 +83,8 @@
CtClass ctClass = pool.get(componentClassName);
InternalClassTransformation transformation = new InternalClassTransformationImpl(ctClass,
- _contextClassLoader, logger, null);
+ _contextClassLoader, logger,
+ null);
replay();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetDispatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetDispatcherTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetDispatcherTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetDispatcherTest.java Mon Nov 12 14:22:31 2007
@@ -14,11 +14,6 @@
package org.apache.tapestry.internal.services;
-import static org.easymock.EasyMock.contains;
-import static org.easymock.EasyMock.eq;
-
-import javax.servlet.http.HttpServletResponse;
-
import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.Resource;
@@ -27,7 +22,11 @@
import org.apache.tapestry.services.Dispatcher;
import org.apache.tapestry.services.Request;
import org.apache.tapestry.services.Response;
+import static org.easymock.EasyMock.contains;
+import static org.easymock.EasyMock.eq;
import org.testng.annotations.Test;
+
+import javax.servlet.http.HttpServletResponse;
public class AssetDispatcherTest extends InternalBaseTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetInjectionProviderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetInjectionProviderTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetInjectionProviderTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetInjectionProviderTest.java Mon Nov 12 14:22:31 2007
@@ -76,7 +76,8 @@
// tests for that.
ct
- .extendConstructor("myField = (java.lang.Object) as.findAsset(rez.getBaseResource(), \"foo.gif\", rez.getLocale());");
+ .extendConstructor(
+ "myField = (java.lang.Object) as.findAsset(rez.getBaseResource(), \"foo.gif\", rez.getLocale());");
ct.makeReadOnly(fieldName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetSourceImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/AssetSourceImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,10 +14,6 @@
package org.apache.tapestry.internal.services;
-import java.util.Collections;
-import java.util.Locale;
-import java.util.Map;
-
import org.apache.tapestry.Asset;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.Resource;
@@ -26,6 +22,10 @@
import org.apache.tapestry.services.AssetFactory;
import org.apache.tapestry.services.AssetSource;
import org.testng.annotations.Test;
+
+import java.util.Collections;
+import java.util.Locale;
+import java.util.Map;
public class AssetSourceImplTest extends InternalBaseTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanBlockSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanBlockSourceImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanBlockSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanBlockSourceImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,18 +14,17 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-
-import java.util.Collection;
-
import org.apache.tapestry.Block;
import org.apache.tapestry.internal.structure.ComponentPageElement;
import org.apache.tapestry.internal.structure.Page;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import org.apache.tapestry.services.BeanBlockContribution;
import org.apache.tapestry.services.BeanBlockSource;
import org.testng.annotations.Test;
+import java.util.Collection;
+
public class BeanBlockSourceImplTest extends InternalBaseTestCase
{
@Test
@@ -35,7 +34,7 @@
RequestPageCache cache = mockRequestPageCache();
Page page = mockPage();
BeanBlockContribution contribution = new BeanBlockContribution("mydata", "MyPage",
- "mydisplay", false);
+ "mydisplay", false);
Collection<BeanBlockContribution> configuration = newList(contribution);
train_get(cache, "MyPage", page);
@@ -112,7 +111,7 @@
RequestPageCache cache = mockRequestPageCache();
Page page = mockPage();
BeanBlockContribution contribution = new BeanBlockContribution("mydata", "MyPage",
- "mydisplay", true);
+ "mydisplay", true);
Collection<BeanBlockContribution> configuration = newList(contribution);
train_get(cache, "MyPage", page);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanModelSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanModelSourceImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanModelSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BeanModelSourceImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,9 +14,6 @@
package org.apache.tapestry.internal.services;
-import java.util.Arrays;
-import java.util.Collections;
-
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.PropertyConduit;
import org.apache.tapestry.beaneditor.BeanModel;
@@ -29,7 +26,12 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-/** Tests for the bean editor model source itself, as well as the model classes. */
+import java.util.Arrays;
+import java.util.Collections;
+
+/**
+ * Tests for the bean editor model source itself, as well as the model classes.
+ */
public class BeanModelSourceImplTest extends InternalBaseTestCase
{
private BeanModelSource _source;
@@ -46,7 +48,9 @@
_source = null;
}
- /** Tests defaults for property names, labels and conduits. */
+ /**
+ * Tests defaults for property names, labels and conduits.
+ */
@Test
public void default_model_for_bean()
{
@@ -391,7 +395,7 @@
assertSame(propertyModel.getPropertyType(), String[].class);
String[] value =
- { "foo", "bar" };
+ {"foo", "bar"};
StringArrayBean bean = new StringArrayBean();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BindingSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BindingSourceImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BindingSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/BindingSourceImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,18 +14,17 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-
-import java.util.Map;
-
import org.apache.tapestry.Binding;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.Location;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import org.apache.tapestry.ioc.internal.util.TapestryException;
import org.apache.tapestry.services.BindingFactory;
import org.apache.tapestry.services.BindingSource;
import org.testng.annotations.Test;
+
+import java.util.Map;
public class BindingSourceImplTest extends InternalBaseTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClassNameLocatorImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClassNameLocatorImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClassNameLocatorImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClassNameLocatorImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,13 +14,13 @@
package org.apache.tapestry.internal.services;
-import java.util.Collection;
-import java.util.Set;
-
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.testng.Assert;
import org.testng.annotations.Test;
+
+import java.util.Collection;
+import java.util.Set;
/**
* Tricky to test, since the code is literally hunting around inside its own brain. There's a lot of
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClasspathAssetAliasManagerImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,17 +14,16 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
-
-import java.util.Map;
-
import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newMap;
import org.apache.tapestry.services.ClasspathAssetAliasManager;
import org.apache.tapestry.services.Request;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import java.util.Map;
+
public class ClasspathAssetAliasManagerImplTest extends InternalBaseTestCase
{
@@ -49,7 +48,7 @@
replay();
ClasspathAssetAliasManager manager = new ClasspathAssetAliasManagerImpl(request,
- configuration());
+ configuration());
assertEquals(manager.toClientURL(resourcePath), "/ctx"
+ TapestryConstants.ASSET_PATH_PREFIX + expectedClientURL);
@@ -61,19 +60,19 @@
public Object[][] to_client_url_data()
{
return new Object[][]
- {
- { "foo/bar/Baz.txt", "foo/bar/Baz.txt" },
- { "com/example/mylib/Foo.bar", "mylib/Foo.bar" },
- { "com/example/mylib/nested/Foo.bar", "mylib/nested/Foo.bar" },
- { "org/apache/tapestry/internal/Foo.bar", "tapestry-internal/Foo.bar" },
- { "org/apache/tapestry/Foo.bar", "tapestry/Foo.bar" }, };
+ {
+ {"foo/bar/Baz.txt", "foo/bar/Baz.txt"},
+ {"com/example/mylib/Foo.bar", "mylib/Foo.bar"},
+ {"com/example/mylib/nested/Foo.bar", "mylib/nested/Foo.bar"},
+ {"org/apache/tapestry/internal/Foo.bar", "tapestry-internal/Foo.bar"},
+ {"org/apache/tapestry/Foo.bar", "tapestry/Foo.bar"},};
}
@Test(dataProvider = "to_resource_path_data")
public void to_resource_path(String clientURL, String expectedResourcePath)
{
ClasspathAssetAliasManager manager = new ClasspathAssetAliasManagerImpl(null,
- configuration());
+ configuration());
assertEquals(manager.toResourcePath(clientURL), expectedResourcePath);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorageImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorageImplTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorageImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ClientPersistentFieldStorageImplTest.java Mon Nov 12 14:22:31 2007
@@ -14,20 +14,19 @@
package org.apache.tapestry.internal.services;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.isA;
-
-import java.util.List;
-
import org.apache.tapestry.Link;
import org.apache.tapestry.internal.util.Holder;
+import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newList;
import org.apache.tapestry.services.PersistentFieldChange;
import org.apache.tapestry.services.Request;
import org.apache.tapestry.test.TapestryTestCase;
import org.easymock.EasyMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.isA;
import org.easymock.IAnswer;
import org.testng.annotations.Test;
+
+import java.util.List;
public class ClientPersistentFieldStorageImplTest extends TapestryTestCase
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentActionDispatcherTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentActionDispatcherTest.java?rev=594319&r1=594318&r2=594319&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentActionDispatcherTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentActionDispatcherTest.java Mon Nov 12 14:22:31 2007
@@ -14,21 +14,16 @@
package org.apache.tapestry.internal.services;
-import static org.easymock.EasyMock.aryEq;
-import static org.easymock.EasyMock.eq;
-
-import java.io.IOException;
-
import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.internal.InternalConstants;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.ActionResponseGenerator;
-import org.apache.tapestry.services.ComponentActionRequestHandler;
-import org.apache.tapestry.services.Dispatcher;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Response;
+import org.apache.tapestry.services.*;
+import static org.easymock.EasyMock.aryEq;
+import static org.easymock.EasyMock.eq;
import org.testng.annotations.Test;
+import java.io.IOException;
+
public class ComponentActionDispatcherTest extends InternalBaseTestCase
{
@Test
@@ -142,7 +137,7 @@
eq("eventname"),
aryEq(new String[0]),
aryEq(new String[]
- { "alpha", "beta" }))).andReturn(generator);
+ {"alpha", "beta"}))).andReturn(generator);
generator.sendClientResponse(response);
@@ -156,7 +151,7 @@
}
private void test(String requestPath, String logicalPageName, String nestedComponentId,
- String eventType, String... context) throws IOException
+ String eventType, String... context) throws IOException
{
ComponentActionRequestHandler handler = newComponentActionRequestHandler();
Request request = mockRequest();