You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2007/03/19 02:44:50 UTC
svn commit: r519789 - in /tapestry/tapestry4/trunk: ./
tapestry-framework/src/java/org/apache/tapestry/engine/
tapestry-framework/src/java/org/apache/tapestry/resolver/
tapestry-framework/src/java/org/apache/tapestry/spec/
Author: jkuhnert
Date: Sun Mar 18 18:44:49 2007
New Revision: 519789
URL: http://svn.apache.org/viewvc?view=rev&rev=519789
Log:
Minor coide cleanups. Removed unused / deprecated for 4.1 interface.
Removed:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/IComponentClassEnhancer.java
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolverImpl.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/PropertySpecification.java
tapestry/tapestry4/trunk/tapestry.iws
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolverImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolverImpl.java?view=diff&rev=519789&r1=519788&r2=519789
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolverImpl.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolverImpl.java Sun Mar 18 18:44:49 2007
@@ -163,10 +163,8 @@
// Check with and without the leading slash
if (_simpleName.regionMatches(true, 0, WEB_INF, 0, WEB_INF.length())
- || _simpleName.regionMatches(true, 0, WEB_INF, 1, WEB_INF
- .length() - 1))
- throw new ApplicationRuntimeException(ResolverMessages
- .webInfNotAllowed(_simpleName));
+ || _simpleName.regionMatches(true, 0, WEB_INF, 1, WEB_INF.length() - 1))
+ throw new ApplicationRuntimeException(ResolverMessages.webInfNotAllowed(_simpleName));
String expectedName = _simpleName + ".page";
@@ -176,18 +174,22 @@
// as the library or application specification that's
// supposed to contain the page.
- if (found(namespaceLocation, expectedName)) return;
+ if (found(namespaceLocation, expectedName))
+ return;
if (namespace.isApplicationNamespace())
{
// The application namespace gets some extra searching.
- if (found(getWebInfAppLocation(), expectedName)) return;
+ if (found(getWebInfAppLocation(), expectedName))
+ return;
- if (found(getWebInfLocation(), expectedName)) return;
+ if (found(getWebInfLocation(), expectedName))
+ return;
- if (found(getContextRoot(), expectedName)) return;
+ if (found(getContextRoot(), expectedName))
+ return;
// The wierd one ... where we see if there's a template in the
// application root
@@ -195,8 +197,7 @@
String templateName = _simpleName + "." + getTemplateExtension();
- Resource templateResource = getContextRoot().getRelativeResource(
- templateName);
+ Resource templateResource = getContextRoot().getRelativeResource(templateName);
if (_log.isDebugEnabled())
_log.debug(ResolverMessages.checkingResource(templateResource));
@@ -213,9 +214,7 @@
if (_frameworkNamespace.containsPage(_simpleName))
{
if (_log.isDebugEnabled())
- _log
- .debug(ResolverMessages
- .foundFrameworkPage(_simpleName));
+ _log.debug(ResolverMessages.foundFrameworkPage(_simpleName));
setNamespace(_frameworkNamespace);
@@ -223,8 +222,7 @@
// for the framework! Framework pages must be
// defined in the framework library specification.
- setSpecification(_frameworkNamespace
- .getPageSpecification(_simpleName));
+ setSpecification(_frameworkNamespace.getPageSpecification(_simpleName));
return;
}
}
@@ -232,8 +230,7 @@
// Not found by any normal rule, so its time to
// consult the delegate.
- IComponentSpecification specification = getDelegate()
- .findPageSpecification(cycle, namespace, _simpleName);
+ IComponentSpecification specification = getDelegate().findPageSpecification(cycle, namespace, _simpleName);
if (specification != null)
{
@@ -247,14 +244,12 @@
if (_log.isDebugEnabled())
_log.debug(ResolverMessages.foundHTMLTemplate(resource));
- // TODO The SpecFactory in Specification parser should be used in some
- // way to
- // create an IComponentSpecification!
+ // TODO: The SpecFactory in Specification parser should be used in some
+ // way to create an IComponentSpecification!
// The virtual location of the page specification is relative to the
// namespace (typically, the application specification). This will be
- // used when
- // searching for the page's message catalog or other related assets.
+ // used when searching for the page's message catalog or other related assets.
Resource pageResource = namespaceLocation.getRelativeResource(_simpleName + ".page");
@@ -275,10 +270,10 @@
if (_log.isDebugEnabled())
_log.debug(ResolverMessages.checkingResource(resource));
- if (resource.getResourceURL() == null) return false;
+ if (resource.getResourceURL() == null)
+ return false;
- setSpecification(getSpecificationSource()
- .getPageSpecification(resource));
+ setSpecification(getSpecificationSource().getPageSpecification(resource));
install();
@@ -291,8 +286,7 @@
IComponentSpecification specification = getSpecification();
if (_log.isDebugEnabled())
- _log.debug(ResolverMessages.installingPage(_simpleName, namespace,
- specification));
+ _log.debug(ResolverMessages.installingPage(_simpleName, namespace, specification));
namespace.installPageSpecification(_simpleName, specification);
}
@@ -305,8 +299,7 @@
private String getTemplateExtension()
{
- return _componentPropertySource.getNamespaceProperty(getNamespace(),
- Tapestry.TEMPLATE_EXTENSION_PROPERTY);
+ return _componentPropertySource.getNamespaceProperty(getNamespace(), Tapestry.TEMPLATE_EXTENSION_PROPERTY);
}
/** @since 4.0 */
@@ -317,8 +310,7 @@
}
/** @since 4.0 */
- public void setComponentPropertySource(
- ComponentPropertySource componentPropertySource)
+ public void setComponentPropertySource(ComponentPropertySource componentPropertySource)
{
_componentPropertySource = componentPropertySource;
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/PropertySpecification.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/PropertySpecification.java?view=diff&rev=519789&r1=519788&r2=519789
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/PropertySpecification.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/spec/PropertySpecification.java Sun Mar 18 18:44:49 2007
@@ -17,10 +17,7 @@
import org.apache.hivemind.impl.BaseLocatable;
/**
- * Defines a transient or persistant property of a component or page. A
- * {@link org.apache.tapestry.engine.IComponentClassEnhancer}uses this
- * information to create a subclass with the necessary instance variables and
- * methods.
+ * Defines a transient or persistant property of a component or page.
*
* @author Howard Lewis Ship
* @since 3.0
Modified: tapestry/tapestry4/trunk/tapestry.iws
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry.iws?view=diff&rev=519789&r1=519788&r2=519789
==============================================================================
--- tapestry/tapestry4/trunk/tapestry.iws (original)
+++ tapestry/tapestry4/trunk/tapestry.iws Sun Mar 18 18:44:49 2007
@@ -18,9 +18,9 @@
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry.iws" afterPath="$PROJECT_DIR$/tapestry.iws" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-examples/Workbench/src/context/Dates.html" afterPath="$PROJECT_DIR$/tapestry-examples/Workbench/src/context/Dates.html" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestRequestLocaleManager.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestRequestLocaleManager.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/RequestLocaleManagerImpl.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/RequestLocaleManagerImpl.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/spec/PropertySpecification.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/spec/PropertySpecification.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolverImpl.java" afterPath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolverImpl.java" />
+ <change type="DELETED" beforePath="$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/engine/IComponentClassEnhancer.java" afterPath="" />
</list>
</component>
<component name="ChangesViewManager" flattened_view="true" />
@@ -541,7 +541,7 @@
<option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" />
<option name="PUT_FOCUS_INTO_COMMENT" value="false" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="Fixes TAPESTRY-996. RequestLocaleManager was being extremely picky about incoming locale requests matching filtered locales if the filtered list didn't contain exact matches when the original filter list has country/language specific listings only." />
+ <option name="LAST_COMMIT_MESSAGE" value="Minor coide cleanups. Removed unused / deprecated for 4.1 interface." />
<option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
<option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
@@ -562,6 +562,7 @@
<MESSAGE value="Upgraded commons-fileupload/commons-io." />
<MESSAGE value="Fixes TAPESTRY-937. Simple stupid indexOf check using > 1 instead of > -1. I'm sure I added this bug at some point." />
<MESSAGE value="Fixes TAPESTRY-996. RequestLocaleManager was being extremely picky about incoming locale requests matching filtered locales if the filtered list didn't contain exact matches when the original filter list has country/language specific listings only." />
+ <MESSAGE value="Minor coide cleanups. Removed unused / deprecated for 4.1 interface." />
</component>
<component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
@@ -578,115 +579,113 @@
<option name="myLastEditedConfigurable" value="Project Default" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/tapestry-examples/TimeTracker/src/java/org/apache/tapestry/timetracker/page/TaskEntryPage.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-examples/TimeTracker/src/context/Home.html">
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="38" selection-start="754" selection-end="754" vertical-scroll-proportion="0.07666099">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="43" column="11" selection-start="1531" selection-end="1531" vertical-scroll-proportion="0.3728223">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-contrib/src/java/org/apache/tapestry/contrib/table/model/ITableColumn.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-examples/Workbench/src/context/Dates.html">
+ <provider editor-type-id="HtmlPreview">
+ <state />
+ </provider>
<provider selected="true" editor-type-id="text-editor">
- <state line="28" column="21" selection-start="1137" selection-end="1137" vertical-scroll-proportion="0.2128821">
+ <state line="18" column="8" selection-start="487" selection-end="487" vertical-scroll-proportion="0.23519164">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/multipart/AbstractMultipartDecoder.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/form/PropertySelection.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="0" selection-start="1190" selection-end="1190" vertical-scroll-proportion="0.2044293">
+ <state line="47" column="4" selection-start="2214" selection-end="2214" vertical-scroll-proportion="0.4088586">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/multipart/MultipartDecoderImpl.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/RequestLocaleManagerImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="72" column="8" selection-start="2473" selection-end="2473" vertical-scroll-proportion="0.6516184">
+ <state line="115" column="0" selection-start="3646" selection-end="3646" vertical-scroll-proportion="0.34497446">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/multipart/MultipartDecoderFilter.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestRequestLocaleManager.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="20" selection-start="1253" selection-end="1253" vertical-scroll-proportion="0.19165248">
+ <state line="223" column="0" selection-start="6092" selection-end="6092" vertical-scroll-proportion="0.7572402">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/spec/ApplicationSpecification.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="203" column="40" selection-start="7952" selection-end="7952" vertical-scroll-proportion="0.42248723">
+ <state line="36" column="21" selection-start="1161" selection-end="1161" vertical-scroll-proportion="0.30664396">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/binding/BindingConstants.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/ComponentMessagesSource.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="42" column="31" selection-start="1286" selection-end="1286" vertical-scroll-proportion="0.5263158">
+ <state line="32" column="0" selection-start="987" selection-end="987" vertical-scroll-proportion="0.2427598">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestBindingSource.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/ApplicationSpecificationInitializer.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="215" column="0" selection-start="6208" selection-end="6208" vertical-scroll-proportion="0.56558776">
+ <state line="111" column="5" selection-start="3829" selection-end="3829" vertical-scroll-proportion="0.41226575">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/BindingSourceImpl.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/resolver/ISpecificationResolverDelegate.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="61" column="0" selection-start="1882" selection-end="1882" vertical-scroll-proportion="0.51107323">
+ <state line="32" column="1" selection-start="1161" selection-end="1161" vertical-scroll-proportion="0.22998296">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-examples/TimeTracker/pom.xml">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/resolver/AbstractSpecificationResolver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="96" column="11" selection-start="3434" selection-end="3434" vertical-scroll-proportion="0.4250426">
+ <state line="41" column="27" selection-start="1428" selection-end="1428" vertical-scroll-proportion="0.2938671">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-examples/TimeTracker/src/context/Home.html">
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/spec/PropertySpecification.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="43" column="11" selection-start="1531" selection-end="1531" vertical-scroll-proportion="0.3728223">
+ <state line="67" column="21" selection-start="1825" selection-end="1825" vertical-scroll-proportion="0.39608178">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-examples/Workbench/src/context/Dates.html">
- <provider editor-type-id="HtmlPreview">
- <state />
- </provider>
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/ComponentPropertySourceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="8" selection-start="487" selection-end="487" vertical-scroll-proportion="0.23519164">
+ <state line="40" column="13" selection-start="1422" selection-end="1422" vertical-scroll-proportion="0.17887564">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/form/PropertySelection.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/ComponentMessagesSourceImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="47" column="4" selection-start="2214" selection-end="2214" vertical-scroll-proportion="0.4088586">
+ <state line="266" column="0" selection-start="8947" selection-end="8947" vertical-scroll-proportion="0.42163545">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/services/impl/RequestLocaleManagerImpl.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/resolver/ComponentSpecificationResolverImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="115" column="0" selection-start="3646" selection-end="3646" vertical-scroll-proportion="0.34497446">
+ <state line="242" column="0" selection-start="8743" selection-end="8743" vertical-scroll-proportion="0.19505963">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestRequestLocaleManager.java">
+ <entry file="file://$PROJECT_DIR$/tapestry-framework/src/java/org/apache/tapestry/resolver/PageSpecificationResolverImpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="223" column="0" selection-start="6092" selection-end="6092" vertical-scroll-proportion="0.7572402">
+ <state line="174" column="40" selection-start="5871" selection-end="5871" vertical-scroll-proportion="0.64224875">
<folding />
</state>
</provider>