You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/05/07 16:56:06 UTC
svn commit: r654133 [3/3] - in /tapestry/tapestry5/trunk:
tapestry-core/src/main/java/org/apache/tapestry/corelib/data/
tapestry-core/src/main/java/org/apache/tapestry/corelib/internal/
tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/ ta...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TextToken.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TextToken.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TextToken.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/parser/TextToken.java Wed May 7 07:55:59 2008
@@ -1,17 +1,17 @@
-// Copyright 2006 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 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.parser;
import org.apache.tapestry.ioc.Location;
@@ -21,13 +21,13 @@
*/
public class TextToken extends TemplateToken
{
- private final String _text;
+ private final String text;
public TextToken(String text, Location location)
{
super(TokenType.TEXT, location);
- _text = text;
+ this.text = text;
}
/**
@@ -35,12 +35,12 @@
*/
public String getText()
{
- return _text;
+ return text;
}
@Override
public String toString()
{
- return String.format("Text[%s]", _text);
+ return String.format("Text[%s]", text);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/ComponentResourcesRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/ComponentResourcesRenderer.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/ComponentResourcesRenderer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/ComponentResourcesRenderer.java Wed May 7 07:55:59 2008
@@ -26,11 +26,11 @@
*/
public class ComponentResourcesRenderer implements ObjectRenderer<ComponentResources>
{
- private final ObjectRenderer _masterRenderer;
+ private final ObjectRenderer masterRenderer;
public ComponentResourcesRenderer(@Primary ObjectRenderer masterRenderer)
{
- _masterRenderer = masterRenderer;
+ this.masterRenderer = masterRenderer;
}
public void render(ComponentResources object, MarkupWriter writer)
@@ -44,7 +44,7 @@
writer.element("br");
writer.end();
- _masterRenderer.render(location, writer);
+ masterRenderer.render(location, writer);
}
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/EventContextRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/EventContextRenderer.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/EventContextRenderer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/EventContextRenderer.java Wed May 7 07:55:59 2008
@@ -24,11 +24,11 @@
*/
public class EventContextRenderer implements ObjectRenderer<EventContext>
{
- private final ObjectRenderer _masterRenderer;
+ private final ObjectRenderer masterRenderer;
public EventContextRenderer(@Primary ObjectRenderer masterRenderer)
{
- _masterRenderer = masterRenderer;
+ this.masterRenderer = masterRenderer;
}
@@ -44,7 +44,7 @@
{
writer.element("li");
- _masterRenderer.render(object.get(Object.class, i), writer);
+ masterRenderer.render(object.get(Object.class, i), writer);
writer.end();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/ListRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/ListRenderer.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/ListRenderer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/ListRenderer.java Wed May 7 07:55:59 2008
@@ -25,11 +25,11 @@
*/
public class ListRenderer implements ObjectRenderer<List>
{
- private final ObjectRenderer _primaryObjectRenderer;
+ private final ObjectRenderer masterRenderer;
- public ListRenderer(@Primary ObjectRenderer primaryObjectRenderer)
+ public ListRenderer(@Primary ObjectRenderer masterRenderer)
{
- _primaryObjectRenderer = primaryObjectRenderer;
+ this.masterRenderer = masterRenderer;
}
public void render(List list, MarkupWriter writer)
@@ -48,7 +48,7 @@
{
writer.element("li");
- _primaryObjectRenderer.render(element, writer);
+ masterRenderer.render(element, writer);
writer.end();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/LocationRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/LocationRenderer.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/LocationRenderer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/LocationRenderer.java Wed May 7 07:55:59 2008
@@ -20,7 +20,7 @@
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.annotations.Scope;
-import static org.apache.tapestry.ioc.internal.util.CollectionFactory.newSet;
+import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.services.ObjectRenderer;
@@ -37,16 +37,16 @@
{
private static final int RANGE = 5;
- private final Set<Location> _rendered = newSet();
+ private final Set<Location> rendered = CollectionFactory.newSet();
public void render(Location location, MarkupWriter writer)
{
writer.write(location.toString());
/** If the full details were already rendered this request, then skip the rest. */
- if (_rendered.contains(location)) return;
+ if (rendered.contains(location)) return;
- _rendered.add(location);
+ rendered.add(location);
Resource r = location.getResource();
int line = location.getLine();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/ObjectArrayRenderer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/ObjectArrayRenderer.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/ObjectArrayRenderer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/renderers/ObjectArrayRenderer.java Wed May 7 07:55:59 2008
@@ -26,11 +26,11 @@
*/
public class ObjectArrayRenderer implements ObjectRenderer<Object[]>
{
- private final ObjectRenderer _masterObjectRenderer;
+ private final ObjectRenderer masterRenderer;
- public ObjectArrayRenderer(@Primary ObjectRenderer masterObjectRenderer)
+ public ObjectArrayRenderer(@Primary ObjectRenderer masterRenderer)
{
- _masterObjectRenderer = masterObjectRenderer;
+ this.masterRenderer = masterRenderer;
}
public void render(Object[] array, MarkupWriter writer)
@@ -45,6 +45,6 @@
List list = Arrays.asList(array);
- _masterObjectRenderer.render(list, writer);
+ masterRenderer.render(list, writer);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java Wed May 7 07:55:59 2008
@@ -160,7 +160,7 @@
// And exception message:
assertTextPresent(
- "Component InjectContainerMismatch is not assignable to field org.apache.tapestry.corelib.mixins.RenderDisabled._field (of type org.apache.tapestry.Field).");
+ "Component InjectContainerMismatch is not assignable to field org.apache.tapestry.corelib.mixins.RenderDisabled.field (of type org.apache.tapestry.Field).");
}
@Test
Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/index.apt?rev=654133&r1=654132&r2=654133&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/index.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/index.apt Wed May 7 07:55:59 2008
@@ -57,7 +57,7 @@
* About the Author
Howard Lewis Ship is the creator of Tapestry, and the Chair of the Tapestry Project Management Committee at Apache.
- Howard is an independent software consultant, specializing in customized Tapestry training, mentoring, architectural review and project work.
+ Howard is the Director of Open Source Technology at {{{http://formos.com}Formos Software Development}}.
Howard lives in Portland, Oregon with his wife Suzanne, a novelist.
====