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/26 20:57:53 UTC
svn commit: r598403 [1/2] - in /tapestry/tapestry5/trunk: ./
tapestry-core/src/main/java/org/apache/tapestry/
tapestry-core/src/main/java/org/apache/tapestry/beaneditor/
tapestry-core/src/main/java/org/apache/tapestry/corelib/base/
tapestry-core/src/ma...
Author: hlship
Date: Mon Nov 26 11:57:50 2007
New Revision: 598403
URL: http://svn.apache.org/viewvc?rev=598403&view=rev
Log:
Use MarkMail as the mail archive for the Tapestry lists.
Apply a number of IntelliJ inspections to the code.
Modified:
tapestry/tapestry5/trunk/pom.xml
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MarkupWriter.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/beaneditor/PropertyModel.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractTextField.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Checkbox.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/DateField.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Form.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/PropertyEditor.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/RadioGroup.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Select.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Submit.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/internal/FormSupportImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/RenderInformals.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Comment.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalComponentResources.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryInternalUtils.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AbstractBinding.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentActionRequestHandler.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateManagerImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetObjectProvider.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassNameLocatorImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ConstructorArg.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextResource.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CookiesImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectionProvider.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/GenericValueEncoderFactory.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LinkFactoryImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/LocationRenderer.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MessagesSource.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MessagesSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/MetaDataLocatorImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/OpaqueConstantTarget.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLoaderProcessor.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistentLocaleImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServicesMessages.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/TemplateParserImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ValidationMessagesSourceImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/test/TestableCookieSinkSource.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/Base64OutputStream.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/IntegerRange.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/PrintOutCollector.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/URLChangeTracker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONArray.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONObject.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/json/JSONTokener.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/model/ComponentModel.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/runtime/Component.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClassTransformation.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ComponentLayer.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/InjectionProvider.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/PersistentFieldStrategy.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/Request.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformConstants.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/EnumSelectModel.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/SubmitTest.java
Modified: tapestry/tapestry5/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/pom.xml?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/pom.xml (original)
+++ tapestry/tapestry5/trunk/pom.xml Mon Nov 26 11:57:50 2007
@@ -72,19 +72,19 @@
<name>Tapestry User List</name>
<subscribe>users-subscribe@tapestry.apache.org</subscribe>
<unsubscribe>users-unsubscribe@tapestry.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/tapestry-users/</archive>
+ <archive>http://markmail.org/search/list:org.apache.tapestry.users</archive>
</mailingList>
<mailingList>
<name>Tapestry Developer List</name>
<subscribe>dev-subscribe@tapestry.apache.org</subscribe>
<unsubscribe>dev-unsubscribe@tapestry.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/tapestry-dev/</archive>
+ <archive>http://markmail.org/search/list:org.apache.tapestry.dev</archive>
</mailingList>
<mailingList>
<name>Tapestry Commits List</name>
<subscribe>commits-subscribe@tapestry.apache.org</subscribe>
<unsubscribe>commits-unsubscribe@tapestry.apache.org</unsubscribe>
- <archive>http://mail-archives.apache.org/mod_mbox/tapestry-commits/</archive>
+ <archive>http://markmail.org/search/list:org.apache.tapestry.commits</archive>
</mailingList>
</mailingLists>
@@ -94,6 +94,7 @@
<module>tapestry-annotations</module>
<module>tapestry-core</module>
+ <!-- Integrations -->
<module>tapestry-spring</module>
<module>tapestry-hibernate</module>
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MarkupWriter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MarkupWriter.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MarkupWriter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/MarkupWriter.java Mon Nov 26 11:57:50 2007
@@ -37,9 +37,6 @@
* element. The new Element is returned and can be directly manipulated (possibly at a later
* date). Optionally, attributes for the new element can be specified directly.
* <p/>
- * If the element is intended to be clickable or submittable in the
- * {@link org.apache.tapestry.test.PageTester}, you should call
- * {@link #linkElement(String, Link, Object[])} instead.
*
* @param name the name of the element to create
* @param attributes an even number of values, alternating names and values
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/beaneditor/PropertyModel.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/beaneditor/PropertyModel.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/beaneditor/PropertyModel.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/beaneditor/PropertyModel.java Mon Nov 26 11:57:50 2007
@@ -58,8 +58,7 @@
/**
* Returns an object used to read or update the property. For virtual properties (properties
- * that do not actually exist on the bean), the conduit may be null until one is provided via
- * {@link MutablePropertyEditModel#conduit(PropertyConduit)}.
+ * that do not actually exist on the bean), the conduit may be null.
*/
PropertyConduit getConduit();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractField.java Mon Nov 26 11:57:50 2007
@@ -183,7 +183,7 @@
private void processSubmission()
{
- if (!_disabled) processSubmission(_formSupport, _elementName);
+ if (!_disabled) processSubmission(_elementName);
}
/**
@@ -203,18 +203,15 @@
* form. The element's elementName property will already have been set. This method is only
* invoked if the field is <strong>not {@link #isDisabled() disabled}</strong>.
*
- * @param formSupport support for the form submission, used to
- * {@link FormSupport#getParameterValue(String) obtain submitted parameter values}.
- * Passing this value in saves subclasses from having to (re)inject it.
* @param elementName the name of the element (used to find the correct parameter in the request)
*/
- protected abstract void processSubmission(FormSupport formSupport, String elementName);
+ protected abstract void processSubmission(String elementName);
/**
* Allows the validation decorator to write markup before the field itself writes markup.
*/
@BeginRender
- final void beforeDecorator(MarkupWriter writer)
+ final void beforeDecorator()
{
_decorator.beforeField(this);
}
@@ -224,7 +221,7 @@
* markup.
*/
@AfterRender
- final void afterDecorator(MarkupWriter writer)
+ final void afterDecorator()
{
_decorator.afterField(this);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractTextField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractTextField.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractTextField.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/base/AbstractTextField.java Mon Nov 26 11:57:50 2007
@@ -20,7 +20,10 @@
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.ioc.annotations.Inject;
-import org.apache.tapestry.services.*;
+import org.apache.tapestry.services.FieldValidationSupport;
+import org.apache.tapestry.services.FieldValidatorDefaultSource;
+import org.apache.tapestry.services.Request;
+import org.apache.tapestry.services.TranslatorDefaultSource;
import java.util.Locale;
@@ -163,7 +166,7 @@
@SuppressWarnings({"unchecked"})
@Override
- protected final void processSubmission(FormSupport formSupport, String elementName)
+ protected final void processSubmission(String elementName)
{
String rawValue = _request.getParameter(elementName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java Mon Nov 26 11:57:50 2007
@@ -45,8 +45,6 @@
}
}
- ;
-
/**
* The object to be edited by the BeanEditor. This will be read when the component renders and
* updated when the form for the component is submitted. Typically, the container will listen
@@ -157,7 +155,7 @@
if (_model == null)
{
- Class<? extends Object> beanType = _object.getClass();
+ Class<?> beanType = _object.getClass();
_model = _modelSource.create(beanType, true, _overrides.getContainerResources());
}
@@ -177,10 +175,9 @@
}
catch (Exception ex)
{
- throw new TapestryException(InternalMessages.failureInstantiatingObject(
- type,
- _resources.getCompleteId(),
- ex), _resources.getLocation(), ex);
+ throw new TapestryException(
+ InternalMessages.failureInstantiatingObject(type, _resources.getCompleteId(), ex),
+ _resources.getLocation(), ex);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Checkbox.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Checkbox.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Checkbox.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Checkbox.java Mon Nov 26 11:57:50 2007
@@ -22,7 +22,6 @@
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.corelib.base.AbstractField;
import org.apache.tapestry.ioc.annotations.Inject;
-import org.apache.tapestry.services.FormSupport;
import org.apache.tapestry.services.Request;
/**
@@ -71,7 +70,7 @@
}
@Override
- protected void processSubmission(FormSupport formSupport, String elementName)
+ protected void processSubmission(String elementName)
{
String postedValue = _request.getParameter(elementName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/DateField.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/DateField.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/DateField.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/DateField.java Mon Nov 26 11:57:50 2007
@@ -25,7 +25,6 @@
import org.apache.tapestry.ioc.internal.util.TapestryException;
import org.apache.tapestry.json.JSONObject;
import org.apache.tapestry.services.FieldValidatorDefaultSource;
-import org.apache.tapestry.services.FormSupport;
import org.apache.tapestry.services.Request;
import java.text.ParseException;
@@ -212,7 +211,7 @@
}
@Override
- protected void processSubmission(FormSupport formSupport, String elementName)
+ protected void processSubmission(String elementName)
{
// TODO: Validation
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Form.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Form.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Form.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Form.java Mon Nov 26 11:57:50 2007
@@ -271,7 +271,7 @@
_tracker = _environment.pop(ValidationTracker.class);
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked", "InfiniteLoopStatement"})
Object onAction(Object[] context)
{
_tracker.clear();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java Mon Nov 26 11:57:50 2007
@@ -31,6 +31,8 @@
* {@linkplain FormSupport#store(Object, ComponentAction) as ComponentActions}). This is not ideal
* ... in a situation where the data set can shift between the form render and the form submission,
* this can cause unexpected results, including applying changes to the wrong objects.
+ *
+ * @jira TAPESTRY-1650 Tracking issue for Ajax support
*/
public class GridRows
{
@@ -51,8 +53,6 @@
}
}
- ;
-
/**
* Parameter used to set the CSS class for each row (each <tr> element) within the
* <tbody>). This is not cached, so it will be recomputed for each row.
@@ -98,8 +98,6 @@
private boolean _recordingStateInsideForm;
- private int _startRow;
-
private int _endRow;
private int _rowIndex;
@@ -132,10 +130,10 @@
if (_currentPage > maxPages) _currentPage = maxPages;
- _startRow = (_currentPage - 1) * _rowsPerPage;
- _endRow = Math.min(availableRows - 1, _startRow + _rowsPerPage - 1);
+ int startRow = (_currentPage - 1) * _rowsPerPage;
+ _endRow = Math.min(availableRows - 1, startRow + _rowsPerPage - 1);
- _rowIndex = _startRow;
+ _rowIndex = startRow;
_recordingStateInsideForm = !_volatile && _formSupport != null;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Loop.java Mon Nov 26 11:57:50 2007
@@ -65,7 +65,6 @@
component.setupForVolatile();
}
- ;
};
/**
@@ -96,7 +95,6 @@
component.endHeartbeat();
}
- ;
};
/**
@@ -120,8 +118,6 @@
}
}
- ;
-
/**
* Restores the value using a stored primary key via
* {@link PrimaryKeyEncoder#toValue(Serializable)}.
@@ -143,8 +139,6 @@
}
}
- ;
-
/**
* Stores a list of keys to be passed to {@link PrimaryKeyEncoder#prepareForKeys(List)}.
*/
@@ -168,8 +162,6 @@
}
}
- ;
-
/**
* Defines the collection of values for the loop to iterate over.
*/
@@ -222,8 +214,6 @@
@Inject
private ComponentResources _resources;
- private List<Serializable> _keyList;
-
@SetupRender
boolean setup()
{
@@ -246,12 +236,12 @@
if (_encoder != null)
{
- _keyList = newList();
+ List<Serializable> keyList = newList();
// We'll keep updating the _keyList while the Loop renders, the values will "lock
// down" when the Form serializes all the data.
- _formSupport.store(this, new PrepareForKeys(_keyList));
+ _formSupport.store(this, new PrepareForKeys(keyList));
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java Mon Nov 26 11:57:50 2007
@@ -23,7 +23,6 @@
import org.apache.tapestry.ioc.annotations.Inject;
import static org.apache.tapestry.ioc.internal.util.CollectionFactory.*;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
-import org.apache.tapestry.services.FormSupport;
import org.apache.tapestry.services.Request;
import java.util.Collections;
@@ -75,16 +74,8 @@
{
public void render(MarkupWriter writer)
{
- writer.element(
- "select",
- "id",
- getClientId() + ":avail",
- "multiple",
- "multiple",
- "size",
- getSize(),
- "name",
- getElementName() + ":avail");
+ writer.element("select", "id", getClientId() + ":avail", "multiple", "multiple", "size", getSize(), "name",
+ getElementName() + ":avail");
writeDisabled(writer, isDisabled());
@@ -144,16 +135,8 @@
{
public void render(MarkupWriter writer)
{
- writer.element(
- "select",
- "id",
- getClientId(),
- "multiple",
- "multiple",
- "size",
- getSize(),
- "name",
- getElementName());
+ writer.element("select", "id", getClientId(), "multiple", "multiple", "size", getSize(), "name",
+ getElementName());
writeDisabled(writer, isDisabled());
@@ -297,7 +280,7 @@
}
@Override
- protected void processSubmission(FormSupport formSupport, String elementName)
+ protected void processSubmission(String elementName)
{
String values = _request.getParameter(elementName + ":values");
@@ -305,10 +288,8 @@
List<Object> selected = _selected;
- if (selected == null)
- selected = newList();
- else
- selected.clear();
+ if (selected == null) selected = newList();
+ else selected.clear();
ValueEncoder encoder = _encoder;
@@ -360,22 +341,10 @@
_renderSupport.addScriptLink(_paletteLibrary);
- _renderSupport.addScript(
- "new Tapestry.Palette('%s', %s, '%s');",
- clientId,
- _reorder,
- naturalOrder);
-
- writer.element(
- "input",
- "type",
- "hidden",
- "id",
- clientId + ":values",
- "name",
- getElementName() + ":values",
- "value",
- selectedValues);
+ _renderSupport.addScript("new Tapestry.Palette('%s', %s, '%s');", clientId, _reorder, naturalOrder);
+
+ writer.element("input", "type", "hidden", "id", clientId + ":values", "name", getElementName() + ":values",
+ "value", selectedValues);
writer.end();
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/PropertyEditor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/PropertyEditor.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/PropertyEditor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/PropertyEditor.java Mon Nov 26 11:57:50 2007
@@ -53,8 +53,6 @@
}
}
- ;
-
static class CleanupEnvironment implements ComponentAction<PropertyEditor>
{
private static final long serialVersionUID = 7878694042753046523L;
@@ -65,8 +63,6 @@
}
}
- ;
-
/**
* The object to be edited by the BeanEditor. This will be read when the component renders and
* updated when the form for the component is submitted. Typically, the container will listen
@@ -164,13 +160,10 @@
public FieldValidator getValidator(Field field)
{
- return _fieldValidatorDefaultSource.createDefaultValidator(
- field,
- propertyName,
- _overrides.getContainerMessages(),
- _locale,
- _propertyModel.getPropertyType(),
- _propertyModel.getConduit());
+ return _fieldValidatorDefaultSource.createDefaultValidator(field, propertyName,
+ _overrides.getContainerMessages(), _locale,
+ _propertyModel.getPropertyType(),
+ _propertyModel.getConduit());
}
public void setPropertyValue(Object value)
@@ -234,12 +227,7 @@
}
catch (RuntimeException ex)
{
- String message = _messages.format(
- "block-error",
- _propertyModel.getPropertyName(),
- dataType,
- _object,
- ex);
+ String message = _messages.format("block-error", _propertyModel.getPropertyName(), dataType, _object, ex);
throw new TapestryException(message, _resources.getLocation(), ex);
}
@@ -258,9 +246,8 @@
/**
* Used for testing.
*/
- void inject(ComponentResources resources, ComponentResources overrides,
- PropertyModel propertyModel, BeanBlockSource beanBlockSource, Messages messages,
- Object object)
+ void inject(ComponentResources resources, ComponentResources overrides, PropertyModel propertyModel,
+ BeanBlockSource beanBlockSource, Messages messages, Object object)
{
_resources = resources;
_overrides = overrides;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/RadioGroup.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/RadioGroup.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/RadioGroup.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/RadioGroup.java Mon Nov 26 11:57:50 2007
@@ -93,8 +93,6 @@
}
}
- ;
-
private static final ComponentAction<RadioGroup> PROCESS_SUBMISSION = new ComponentAction<RadioGroup>()
{
private static final long serialVersionUID = -3857110108918776386L;
@@ -114,9 +112,7 @@
{
String clientValue = _request.getParameter(_elementName);
- Object value = _encoder.toValue(clientValue);
-
- _value = value;
+ _value = _encoder.toValue(clientValue);
}
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Select.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Select.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Select.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Select.java Mon Nov 26 11:57:50 2007
@@ -109,7 +109,7 @@
@SuppressWarnings({"unchecked"})
@Override
- protected void processSubmission(FormSupport formSupport, String elementName)
+ protected void processSubmission(String elementName)
{
String primaryKey = _request.getParameter(elementName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Submit.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Submit.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Submit.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Submit.java Mon Nov 26 11:57:50 2007
@@ -75,7 +75,7 @@
}
@Override
- protected void processSubmission(FormSupport formSupport, String elementName)
+ protected void processSubmission(String elementName)
{
String value = _request.getParameter(elementName);
@@ -94,10 +94,8 @@
// information will change if we defer. Another option might be to wait until the next
// heartbeak?
- if (_defer)
- _formSupport.defer(sendNotification);
- else
- _heartbeat.defer(sendNotification);
+ if (_defer) _formSupport.defer(sendNotification);
+ else _heartbeat.defer(sendNotification);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/internal/FormSupportImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/internal/FormSupportImpl.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/internal/FormSupportImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/internal/FormSupportImpl.java Mon Nov 26 11:57:50 2007
@@ -140,7 +140,7 @@
{
String fieldId = field.getClientId();
- JSONArray specs = null;
+ JSONArray specs;
if (_validations.has(fieldId)) specs = _validations.getJSONArray(fieldId);
else
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/RenderInformals.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/RenderInformals.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/RenderInformals.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/mixins/RenderInformals.java Mon Nov 26 11:57:50 2007
@@ -20,7 +20,7 @@
import org.apache.tapestry.ioc.annotations.Inject;
/**
- * Used to render out all informal parameters, in the {@link PostBeginRender} phase.
+ * Used to render out all informal parameters, at the end of the {@link org.apache.tapestry.annotations.BeginRender} phase.
* <p/>
* This mixin can be used with components that render a single tag inside the {@link BeginRender}
* phase. RenderInformals will activate during the PostBeginRender phase to write additional
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Comment.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Comment.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Comment.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/dom/Comment.java Mon Nov 26 11:57:50 2007
@@ -21,7 +21,7 @@
*/
public final class Comment extends Node
{
- private String _comment;
+ private final String _comment;
Comment(Node container, String comment)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalComponentResources.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalComponentResources.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalComponentResources.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/InternalComponentResources.java Mon Nov 26 11:57:50 2007
@@ -23,8 +23,7 @@
* that are private to the framework and not exposed in any public APIs. Ideally, there will not be
* any need for this interface (we'll see as we go).
*/
-public interface InternalComponentResources extends ComponentResources,
- InternalComponentResourcesCommon
+public interface InternalComponentResources extends ComponentResources, InternalComponentResourcesCommon
{
/**
* Reads the value of a parameter, via the parameter's {@link org.apache.tapestry.Binding}.
@@ -59,7 +58,7 @@
/**
* Posts a change to a persistent field. If the component is still loading, then this change is
* ignored. Otherwise, it is propagated, via the
- * {@link Page#persistFieldChange(org.apache.tapestry.internal.structure.ComponentPageElement, String, Object) page}
+ * {@link Page#persistFieldChange(org.apache.tapestry.ComponentResources, String, Object) page}
* to the {@link PersistentFieldManager}.
*/
void persistFieldChange(String fieldName, Object newValue);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryAppInitializer.java Mon Nov 26 11:57:50 2007
@@ -23,12 +23,11 @@
import org.apache.tapestry.ioc.services.SymbolProvider;
import org.apache.tapestry.services.Alias;
import org.apache.tapestry.services.TapestryModule;
-import org.apache.tapestry.test.PageTester;
/**
* This class is used to build the {@link Registry}. The Registry contains
* {@link org.apache.tapestry.ioc.services.TapestryIOCModule} and {@link TapestryModule}, any
- * modules identified by {@link #addModules(RegistryBuilder)}, plus the application module.
+ * modules identified by {@link #addModules(Class[])} )}, plus the application module.
* <p/>
* The application module is optional.
* <p/>
@@ -39,8 +38,6 @@
{
private final SymbolProvider _appProvider;
- private final String _appPackage;
-
private final String _appName;
private final String _aliasMode;
@@ -53,23 +50,20 @@
public TapestryAppInitializer(String appPackage, String appName, String aliasMode)
{
- this(new SingleKeySymbolProvider(InternalConstants.TAPESTRY_APP_PACKAGE_PARAM, appPackage),
- appName, aliasMode);
+ this(new SingleKeySymbolProvider(InternalConstants.TAPESTRY_APP_PACKAGE_PARAM, appPackage), appName, aliasMode);
}
/**
- * @param appProvider provides symbols for the application (normally, from the ServletContext init
- * parameters)
- * @param appName the name of the application (i.e., the name of the application servlet)
- * @param aliasMode the mode, used by the {@link Alias} service, normally "servlet"
- * @param serviceOverrides specific service overrides (used by {@link PageTester}
- * @param moduleDefs additional module definitions to be mixed in to those automatically located
+ * @param appProvider provides symbols for the application (normally, from the ServletContext init
+ * parameters)
+ * @param appName the name of the application (i.e., the name of the application servlet)
+ * @param aliasMode the mode, used by the {@link Alias} service, normally "servlet"
*/
public TapestryAppInitializer(SymbolProvider appProvider, String appName, String aliasMode)
{
_appProvider = appProvider;
- _appPackage = _appProvider.valueForSymbol(InternalConstants.TAPESTRY_APP_PACKAGE_PARAM);
+ String appPackage = _appProvider.valueForSymbol(InternalConstants.TAPESTRY_APP_PACKAGE_PARAM);
_appName = appName;
_aliasMode = aliasMode;
@@ -82,8 +76,7 @@
addModules(TapestryModule.class);
- String className = _appPackage + ".services." + InternalUtils.capitalize(_appName)
- + "Module";
+ String className = appPackage + ".services." + InternalUtils.capitalize(_appName) + "Module";
try
{
@@ -124,13 +117,15 @@
private void addSyntheticSymbolSourceModule()
{
- ContributionDef symbolSourceContribution = new SyntheticSymbolSourceContributionDef(
- "ServletContext", _appProvider, "before:ApplicationDefaults");
-
- ContributionDef aliasModeContribution = new SyntheticSymbolSourceContributionDef(
- "AliasMode", new SingleKeySymbolProvider(
- InternalConstants.TAPESTRY_ALIAS_MODE_SYMBOL, _aliasMode),
- "before:ServletContext");
+ ContributionDef symbolSourceContribution = new SyntheticSymbolSourceContributionDef("ServletContext",
+ _appProvider,
+ "before:ApplicationDefaults");
+
+ ContributionDef aliasModeContribution = new SyntheticSymbolSourceContributionDef("AliasMode",
+ new SingleKeySymbolProvider(
+ InternalConstants.TAPESTRY_ALIAS_MODE_SYMBOL,
+ _aliasMode),
+ "before:ServletContext");
ContributionDef appNameContribution = new SyntheticSymbolSourceContributionDef("AppName",
new SingleKeySymbolProvider(
@@ -138,8 +133,7 @@
_appName),
"before:ServletContext");
- _builder.add(new SyntheticModuleDef(symbolSourceContribution, aliasModeContribution,
- appNameContribution));
+ _builder.add(new SyntheticModuleDef(symbolSourceContribution, aliasModeContribution, appNameContribution));
}
public Registry getRegistry()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryInternalUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryInternalUtils.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryInternalUtils.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/TapestryInternalUtils.java Mon Nov 26 11:57:50 2007
@@ -52,7 +52,7 @@
// Prevent instantiation.
}
- public static final void close(Closeable stream)
+ public static void close(Closeable stream)
{
if (stream != null) try
{
@@ -77,10 +77,8 @@
boolean postSpace = true;
boolean upcaseNext = true;
- for (int i = 0; i < chars.length; i++)
+ for (char ch : chars)
{
- char ch = chars[i];
-
if (upcaseNext)
{
builder.append(Character.toUpperCase(ch));
@@ -383,13 +381,11 @@
OrderBefore beforeAnnotation = pa.getAnnotation(OrderBefore.class);
- if (beforeAnnotation != null)
- propertyConstraints.add("before:" + beforeAnnotation.value());
+ if (beforeAnnotation != null) propertyConstraints.add("before:" + beforeAnnotation.value());
OrderAfter afterAnnotation = pa.getAnnotation(OrderAfter.class);
- if (afterAnnotation != null)
- propertyConstraints.add("after:" + afterAnnotation.value());
+ if (afterAnnotation != null) propertyConstraints.add("after:" + afterAnnotation.value());
if (!propertyConstraints.isEmpty()) constraints.put(name, propertyConstraints);
@@ -424,10 +420,8 @@
continue;
}
- if (prev == null)
- orderer.add(name, name);
- else
- orderer.add(name, name, "after:" + prev);
+ if (prev == null) orderer.add(name, name);
+ else orderer.add(name, name, "after:" + prev);
prev = name;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AbstractBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AbstractBinding.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AbstractBinding.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/bindings/AbstractBinding.java Mon Nov 26 11:57:50 2007
@@ -32,7 +32,7 @@
this(null);
}
- public AbstractBinding(Location location)
+ protected AbstractBinding(Location location)
{
super(location);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentActionRequestHandler.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentActionRequestHandler.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentActionRequestHandler.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AjaxComponentActionRequestHandler.java Mon Nov 26 11:57:50 2007
@@ -115,7 +115,7 @@
return true;
}
- public void sendClientResponse(Page page, RenderCommand rootRenderCommand) throws IOException
+ private void sendClientResponse(Page page, RenderCommand rootRenderCommand) throws IOException
{
// This may be problematic as the charset of the response is not
// going to be set properly I think. We'll loop back to that.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateManagerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateManagerImpl.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateManagerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateManagerImpl.java Mon Nov 26 11:57:50 2007
@@ -55,8 +55,6 @@
}
}
- ;
-
/**
* The map will be extended periodically as new ASOs, not in the configuration, are encountered.
* Thut is is thread safe.
@@ -75,10 +73,8 @@
{
ApplicationStateContribution contribution = configuration.get(asoClass);
- ApplicationStateAdapter adapter = newAdapter(
- asoClass,
- contribution.getStrategy(),
- contribution.getCreator());
+ ApplicationStateAdapter adapter = newAdapter(asoClass, contribution.getStrategy(),
+ contribution.getCreator());
_classToAdapter.put(asoClass, adapter);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateWorker.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateWorker.java Mon Nov 26 11:57:50 2007
@@ -46,16 +46,14 @@
if (names.isEmpty()) return;
- String managerFieldName = transformation.addInjectedField(
- ApplicationStateManager.class,
- "applicationStateManager",
- _applicationStateManager);
+ String managerFieldName = transformation.addInjectedField(ApplicationStateManager.class,
+ "applicationStateManager", _applicationStateManager);
for (String fieldName : names)
{
String fieldType = transformation.getFieldType(fieldName);
- Class fieldClass = null;
+ Class fieldClass;
try
{
@@ -67,10 +65,7 @@
}
- String typeFieldName = transformation.addInjectedField(
- Class.class,
- fieldName + "_type",
- fieldClass);
+ String typeFieldName = transformation.addInjectedField(Class.class, fieldName + "_type", fieldClass);
replaceRead(transformation, fieldName, fieldType, managerFieldName, typeFieldName);
@@ -80,21 +75,21 @@
String booleanFieldName = fieldName + "Exists";
- if (transformation.isField(booleanFieldName)
- && transformation.getFieldType(booleanFieldName).equals("boolean"))
+ if (transformation.isField(booleanFieldName) && transformation.getFieldType(booleanFieldName).equals(
+ "boolean"))
{
replaceFlagRead(transformation, booleanFieldName, typeFieldName, managerFieldName);
}
}
}
- private void replaceFlagRead(ClassTransformation transformation, String booleanFieldName,
- String typeFieldName, String managerFieldName)
+ private void replaceFlagRead(ClassTransformation transformation, String booleanFieldName, String typeFieldName,
+ String managerFieldName)
{
String readMethodName = transformation.newMemberName("read", booleanFieldName);
- TransformMethodSignature sig = new TransformMethodSignature(Modifier.PRIVATE, "boolean", readMethodName,
- null, null);
+ TransformMethodSignature sig = new TransformMethodSignature(Modifier.PRIVATE, "boolean", readMethodName, null,
+ null);
String body = format("return %s.exists(%s);", managerFieldName, typeFieldName);
@@ -105,14 +100,14 @@
transformation.removeField(booleanFieldName);
}
- private void replaceWrite(ClassTransformation transformation, String fieldName,
- String fieldType, String managerFieldName, String typeFieldName)
+ private void replaceWrite(ClassTransformation transformation, String fieldName, String fieldType,
+ String managerFieldName, String typeFieldName)
{
String writeMethodName = transformation.newMemberName("write", fieldName);
TransformMethodSignature writeSignature = new TransformMethodSignature(Modifier.PRIVATE, "void",
- writeMethodName, new String[]
- {fieldType}, null);
+ writeMethodName, new String[]{fieldType},
+ null);
String body = format("%s.set(%s, $1);", managerFieldName, typeFieldName);
@@ -121,8 +116,8 @@
transformation.replaceWriteAccess(fieldName, writeMethodName);
}
- private void replaceRead(ClassTransformation transformation, String fieldName,
- String fieldType, String managerFieldName, String typeFieldName)
+ private void replaceRead(ClassTransformation transformation, String fieldName, String fieldType,
+ String managerFieldName, String typeFieldName)
{
String readMethodName = transformation.newMemberName("read", fieldName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetObjectProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetObjectProvider.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetObjectProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/AssetObjectProvider.java Mon Nov 26 11:57:50 2007
@@ -19,7 +19,6 @@
import org.apache.tapestry.ioc.AnnotationProvider;
import org.apache.tapestry.ioc.ObjectLocator;
import org.apache.tapestry.ioc.ObjectProvider;
-import org.apache.tapestry.ioc.Resource;
import org.apache.tapestry.ioc.services.Builtin;
import org.apache.tapestry.ioc.services.SymbolSource;
import org.apache.tapestry.ioc.services.TypeCoercer;
@@ -38,14 +37,11 @@
private final SymbolSource _symbolSource;
- public AssetObjectProvider(@Core
- AssetSource source,
+ public AssetObjectProvider(@Core AssetSource source,
- @Builtin
- TypeCoercer typeCoercer,
+ @Builtin TypeCoercer typeCoercer,
- @Builtin
- SymbolSource symbolSource)
+ @Builtin SymbolSource symbolSource)
{
_source = source;
_typeCoercer = typeCoercer;
@@ -56,13 +52,10 @@
* Provides the asset. If the expression does not identify an asset domain, with a prefix, it is
* assumed to be a path on the classpath, relative to the root of the classpath.
*
- * @param expression expression used to find the asset, passed to
- * {@link AssetSource#findAsset(Resource, String, java.util.Locale)
* @param objectType the type of object (which must be Object or Asset)
* @param locator not used
*/
- public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider,
- ObjectLocator locator)
+ public <T> T provide(Class<T> objectType, AnnotationProvider annotationProvider, ObjectLocator locator)
{
Path path = annotationProvider.getAnnotation(Path.class);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassNameLocatorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassNameLocatorImpl.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassNameLocatorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ClassNameLocatorImpl.java Mon Nov 26 11:57:50 2007
@@ -56,9 +56,8 @@
try
{
- Collection<String> result = findClassesWithinPath(packagePath);
- return result;
+ return findClassesWithinPath(packagePath);
}
catch (IOException ex)
@@ -83,8 +82,7 @@
return result;
}
- private void scanURL(String packagePath, Collection<String> componentClassNames, URL url)
- throws IOException
+ private void scanURL(String packagePath, Collection<String> componentClassNames, URL url) throws IOException
{
URLConnection connection = url.openConnection();
@@ -158,10 +156,10 @@
}
}
- private void scanDirStream(String packagePath, URL packageURL,
- Collection<String> componentClassNames, Stack<Queued> queue) throws IOException
+ private void scanDirStream(String packagePath, URL packageURL, Collection<String> componentClassNames,
+ Stack<Queued> queue) throws IOException
{
- InputStream is = null;
+ InputStream is;
try
{
@@ -197,8 +195,7 @@
// packagePath ends with '/', packageName ends with '.'
- String fullClassName = packageName
- + line.substring(0, line.length() - CLASS_SUFFIX.length());
+ String fullClassName = packageName + line.substring(0, line.length() - CLASS_SUFFIX.length());
componentClassNames.add(fullClassName);
@@ -227,8 +224,7 @@
}
- private void scanJarFile(String packagePath, Collection<String> componentClassNames,
- JarFile jarFile) throws IOException
+ private void scanJarFile(String packagePath, Collection<String> componentClassNames, JarFile jarFile)
{
Enumeration<JarEntry> e = jarFile.entries();
@@ -244,9 +240,7 @@
// Strip off .class and convert the slashes back to periods.
- String className = name.substring(0, name.length() - CLASS_SUFFIX.length()).replace(
- "/",
- ".");
+ String className = name.substring(0, name.length() - CLASS_SUFFIX.length()).replace("/", ".");
componentClassNames.add(className);
}
@@ -273,8 +267,8 @@
}
else if (fileName.endsWith(CLASS_SUFFIX))
{
- String className = packageName + "."
- + fileName.substring(0, fileName.length() - CLASS_SUFFIX.length());
+ String className = packageName + "." + fileName.substring(0,
+ fileName.length() - CLASS_SUFFIX.length());
componentClassNames.add(className);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentClassResolverImpl.java Mon Nov 26 11:57:50 2007
@@ -408,7 +408,7 @@
});
}
- public Collection<String> presentableNames(Map<String, ?> map)
+ Collection<String> presentableNames(Map<String, ?> map)
{
Set<String> result = newSet();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentInstantiatorSourceImpl.java Mon Nov 26 11:57:50 2007
@@ -166,10 +166,6 @@
diag = "END";
}
- catch (ClassNotFoundException ex)
- {
- throw new CannotCompileException(ex);
- }
finally
{
_logger.debug(String.format("%5s onLoad %s", diag, classname));
@@ -203,7 +199,7 @@
_changeTracker.add(url);
}
- private void forceSuperclassTransform(CtClass ctClass) throws NotFoundException, ClassNotFoundException
+ private void forceSuperclassTransform(CtClass ctClass) throws NotFoundException
{
CtClass superClass = ctClass.getSuperclass();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ConstructorArg.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ConstructorArg.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ConstructorArg.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ConstructorArg.java Mon Nov 26 11:57:50 2007
@@ -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.services;
import javassist.CtClass;
@@ -20,11 +20,11 @@
/**
* Stores transformation type data about one argument to a class constructor.
*/
-public class ConstructorArg
+class ConstructorArg
{
- final CtClass _type;
+ private final CtClass _type;
- final Object _value;
+ private final Object _value;
/**
* Constructs new instance.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextResource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextResource.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextResource.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ContextResource.java Mon Nov 26 11:57:50 2007
@@ -28,7 +28,7 @@
{
private static final int PRIME = 37;
- private Context _context;
+ private final Context _context;
public ContextResource(Context context, String path)
{
@@ -69,12 +69,9 @@
@Override
public boolean equals(Object obj)
{
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
+ if (this == obj) return true;
+ if (obj == null) return false;
+ if (getClass() != obj.getClass()) return false;
final ContextResource other = (ContextResource) obj;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CookiesImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CookiesImpl.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CookiesImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/CookiesImpl.java Mon Nov 26 11:57:50 2007
@@ -25,11 +25,11 @@
*/
public class CookiesImpl implements Cookies
{
- private Request _request;
+ private final Request _request;
private CookieSource _cookieSource;
- private CookieSink _cookieSink;
+ private final CookieSink _cookieSink;
private int _defaultMaxAge;
@@ -54,9 +54,9 @@
if (cookies == null) return null;
- for (int i = 0; i < cookies.length; i++)
+ for (Cookie cooky : cookies)
{
- if (cookies[i].getName().equals(name)) return cookies[i].getValue();
+ if (cooky.getName().equals(name)) return cooky.getValue();
}
return null;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectWorker.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectWorker.java Mon Nov 26 11:57:50 2007
@@ -39,15 +39,14 @@
{
Inject annotation = transformation.getFieldAnnotation(fieldName, Inject.class);
- inject(fieldName, transformation, model);
+ inject(fieldName, transformation);
transformation.claimField(fieldName, annotation);
}
}
@SuppressWarnings("unchecked")
- private void inject(String fieldName, ClassTransformation transformation,
- MutableComponentModel model)
+ private void inject(String fieldName, ClassTransformation transformation)
{
String fieldType = transformation.getFieldType(fieldName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectionProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectionProvider.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectionProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/DefaultInjectionProvider.java Mon Nov 26 11:57:50 2007
@@ -24,12 +24,12 @@
import java.lang.annotation.Annotation;
/**
- * Worker for the {@link org.apache.tapestry.annotations.Inject} annotation that delegates out to
- * the master {@link MasterObjectProvier} to access the value. This worker must be scheduled after
- * certain other workers, such as {@link InjectBlockWorker} (which is keyed off a combination of
+ * Worker for the {@link org.apache.tapestry.ioc.annotations.Inject} annotation that delegates out to
+ * the master {@link MasterObjectProvider} to access the value. This worker must be scheduled after
+ * certain other workers, such as {@link BlockInjectionProvider} (which is keyed off a combination of
* type and the Inject annotation).
*
- * @see MasterObjectProvier
+ * @see org.apache.tapestry.services.MasterObjectProvider
*/
public class DefaultInjectionProvider implements InjectionProvider
{
@@ -55,11 +55,7 @@
}
};
- Object inject = _masterObjectProvider.provide(
- fieldType,
- annotationProvider,
- _locator,
- false);
+ Object inject = _masterObjectProvider.provide(fieldType, annotationProvider, _locator, false);
// Null means that no ObjectProvider could provide the value. We have set up the chain of
// command so that InjectResources can give it a try next. Later, we'll try to match against
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorSourceImpl.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/FieldValidatorSourceImpl.java Mon Nov 26 11:57:50 2007
@@ -188,7 +188,6 @@
int start = -1;
String type = null;
- String value = null;
boolean skipWhitespace = true;
State state = State.TYPE_START;
@@ -262,11 +261,10 @@
if (Character.isWhitespace(ch) || ch == ',')
{
- value = specification.substring(start, cursor);
+ String value = specification.substring(start, cursor);
result.add(new ValidatorSpecification(type, value));
type = null;
- value = null;
skipWhitespace = true;
state = State.COMMA;
@@ -312,9 +310,8 @@
break;
case VALUE_END:
- value = specification.substring(start);
- result.add(new ValidatorSpecification(type, value));
+ result.add(new ValidatorSpecification(type, specification.substring(start)));
break;
// For better or worse, ending the string with a comma is valid.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/GenericValueEncoderFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/GenericValueEncoderFactory.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/GenericValueEncoderFactory.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/GenericValueEncoderFactory.java Mon Nov 26 11:57:50 2007
@@ -25,7 +25,7 @@
*/
public class GenericValueEncoderFactory<V> implements ValueEncoderFactory<V>
{
- private ValueEncoder<V> _encoder;
+ private final ValueEncoder<V> _encoder;
public GenericValueEncoderFactory(ValueEncoder<V> encoder)
{
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java?rev=598403&r1=598402&r2=598403&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java Mon Nov 26 11:57:50 2007
@@ -136,22 +136,17 @@
addImplementedInterface(Component.class);
- _resourcesFieldName = addInjectedFieldUncached(
- InternalComponentResources.class,
- "resources",
- null);
-
- TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC
- | Modifier.FINAL, ComponentResources.class.getName(), "getComponentResources",
- null, null);
+ _resourcesFieldName = addInjectedFieldUncached(InternalComponentResources.class, "resources", null);
+
+ TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC | Modifier.FINAL,
+ ComponentResources.class.getName(),
+ "getComponentResources", null, null);
addMethod(sig, "return " + _resourcesFieldName + ";");
}
- public InternalClassTransformationImpl(CtClass ctClass,
- InternalClassTransformation parentTransformation, ClassLoader loader,
- Logger logger,
- ComponentModel componentModel)
+ public InternalClassTransformationImpl(CtClass ctClass, InternalClassTransformation parentTransformation,
+ ClassLoader loader, Logger logger, ComponentModel componentModel)
{
_ctClass = ctClass;
_classPool = _ctClass.getClassPool();
@@ -183,7 +178,8 @@
// $0 is implicitly self, so the 0-index ConstructorArg will be Javassisst
// pseudeo-variable $1, and so forth.
- _constructor.append("$" + i);
+ _constructor.append("$");
+ _constructor.append(i);
}
_constructor.append(");\n");
@@ -274,17 +270,13 @@
return findAnnotationInList(annotationClass, annotations);
}
- public <T extends Annotation> T getMethodAnnotation(TransformMethodSignature signature,
- Class<T> annotationClass)
+ public <T extends Annotation> T getMethodAnnotation(TransformMethodSignature signature, Class<T> annotationClass)
{
failIfFrozen();
CtMethod method = findMethod(signature);
- if (method == null)
- throw new IllegalArgumentException(ServicesMessages.noDeclaredMethod(
- _ctClass,
- signature));
+ if (method == null) throw new IllegalArgumentException(ServicesMessages.noDeclaredMethod(_ctClass, signature));
List<Annotation> annotations = findMethodAnnotations(method);
@@ -300,8 +292,7 @@
* @param annotations the available annotations
* @return the matching annotation instance, or null if not found
*/
- private <T extends Annotation> T findAnnotationInList(Class<T> annotationClass,
- List<Annotation> annotations)
+ private <T extends Annotation> T findAnnotationInList(Class<T> annotationClass, List<Annotation> annotations)
{
for (Object annotation : annotations)
{
@@ -383,8 +374,7 @@
}
catch (NotFoundException ex)
{
- throw new RuntimeException(ServicesMessages.missingDeclaredField(_ctClass, fieldName),
- ex);
+ throw new RuntimeException(ServicesMessages.missingDeclaredField(_ctClass, fieldName), ex);
}
}
@@ -452,7 +442,7 @@
}
}
- private void addDefaultImplementation(CtMethod method) throws NotFoundException
+ private void addDefaultImplementation(CtMethod method)
{
// Javassist has an oddity for interfaces: methods "inherited" from java.lang.Object show
// up as methods of the interface. We skip those and only consider the methods
@@ -521,11 +511,7 @@
if (existing != null)
{
- String message = ServicesMessages.fieldAlreadyClaimed(
- fieldName,
- _ctClass,
- existing,
- tag);
+ String message = ServicesMessages.fieldAlreadyClaimed(fieldName, _ctClass, existing, tag);
throw new RuntimeException(message);
}
@@ -567,8 +553,7 @@
try
{
- CtMethod method = new CtMethod(returnType, signature.getMethodName(), parameters,
- _ctClass);
+ CtMethod method = new CtMethod(returnType, signature.getMethodName(), parameters, _ctClass);
// TODO: Check for duplicate method add
@@ -583,10 +568,8 @@
}
catch (CannotCompileException ex)
{
- throw new MethodCompileException(ServicesMessages.methodCompileError(
- signature,
- methodBody,
- ex), methodBody, ex);
+ throw new MethodCompileException(ServicesMessages.methodCompileError(signature, methodBody, ex), methodBody,
+ ex);
}
catch (NotFoundException ex)
{
@@ -630,10 +613,8 @@
}
catch (CannotCompileException ex)
{
- throw new MethodCompileException(ServicesMessages.methodCompileError(
- methodSignature,
- methodBody,
- ex), methodBody, ex);
+ throw new MethodCompileException(ServicesMessages.methodCompileError(methodSignature, methodBody, ex),
+ methodBody, ex);
}
addMethodToDescription("extend", methodSignature, methodBody);
@@ -652,18 +633,15 @@
}
catch (CannotCompileException ex)
{
- throw new MethodCompileException(ServicesMessages.methodCompileError(
- methodSignature,
- methodBody,
- ex), methodBody, ex);
+ throw new MethodCompileException(ServicesMessages.methodCompileError(methodSignature, methodBody, ex),
+ methodBody, ex);
}
addMethodToDescription("prefix", methodSignature, methodBody);
_addedMethods.add(method);
}
- private void addMethodToDescription(String operation, TransformMethodSignature methodSignature,
- String methodBody)
+ private void addMethodToDescription(String operation, TransformMethodSignature methodSignature, String methodBody)
{
_formatter.format("%s method: %s %s %s(", operation, Modifier.toString(methodSignature
.getModifiers()), methodSignature.getReturnType(), methodSignature.getMethodName());
@@ -681,10 +659,8 @@
String[] exceptionTypes = methodSignature.getExceptionTypes();
for (int i = 0; i < exceptionTypes.length; i++)
{
- if (i == 0)
- _description.append("\n throws ");
- else
- _description.append(", ");
+ if (i == 0) _description.append("\n throws ");
+ else _description.append(", ");
_description.append(exceptionTypes[i]);
}
@@ -702,9 +678,7 @@
if (result != null) return result;
- throw new IllegalArgumentException(ServicesMessages.noDeclaredMethod(
- _ctClass,
- methodSignature));
+ throw new IllegalArgumentException(ServicesMessages.noDeclaredMethod(_ctClass, methodSignature));
}
private CtMethod findDeclaredMethod(TransformMethodSignature methodSignature)
@@ -829,8 +803,7 @@
return result;
}
- public List<TransformMethodSignature> findMethodsWithAnnotation(
- Class<? extends Annotation> annotationClass)
+ public List<TransformMethodSignature> findMethodsWithAnnotation(Class<? extends Annotation> annotationClass)
{
failIfFrozen();
@@ -881,8 +854,8 @@
String[] parameters = toTypeNames(method.getParameterTypes());
String[] exceptions = toTypeNames(method.getExceptionTypes());
- result = new TransformMethodSignature(method.getModifiers(), type,
- method.getName(), parameters, exceptions);
+ result = new TransformMethodSignature(method.getModifiers(), type, method.getName(), parameters,
+ exceptions);
_methodSignatures.put(method, result);
}
@@ -1069,10 +1042,7 @@
throw new RuntimeException(ex);
}
- String fieldName = addField(
- Modifier.PROTECTED | Modifier.FINAL,
- type.getName(),
- suggestedName);
+ String fieldName = addField(Modifier.PROTECTED | Modifier.FINAL, type.getName(), suggestedName);
addInjectToConstructor(fieldName, ctType, value);
@@ -1085,8 +1055,7 @@
if (result != null) return result;
- if (_parentTransformation != null)
- return _parentTransformation.searchForPreviousInjection(key);
+ if (_parentTransformation != null) return _parentTransformation.searchForPreviousInjection(key);
return null;
}
@@ -1205,10 +1174,8 @@
{
String className = _ctClass.getName();
- if (!className.equals(componentClass.getName()))
- throw new IllegalArgumentException(ServicesMessages.incorrectClassForInstantiator(
- className,
- componentClass));
+ if (!className.equals(componentClass.getName())) throw new IllegalArgumentException(
+ ServicesMessages.incorrectClassForInstantiator(className, componentClass));
Object[] parameters = new Object[_constructorArgs.size()];
@@ -1226,17 +1193,14 @@
private void failIfFrozen()
{
- if (_frozen)
- throw new IllegalStateException("The ClassTransformation instance (for "
- + _ctClass.getName()
- + ") has completed all transformations and may not be further modified.");
+ if (_frozen) throw new IllegalStateException(
+ "The ClassTransformation instance (for " + _ctClass.getName() + ") has completed all transformations and may not be further modified.");
}
private void failIfNotFrozen()
{
- if (!_frozen)
- throw new IllegalStateException("The ClassTransformation instance (for "
- + _ctClass.getName() + ") has not yet completed all transformations.");
+ if (!_frozen) throw new IllegalStateException(
+ "The ClassTransformation instance (for " + _ctClass.getName() + ") has not yet completed all transformations.");
}
public IdAllocator getIdAllocator()
@@ -1292,20 +1256,15 @@
{
Formatter formatter = new Formatter(builder);
- formatter.format(
- "%s %s extends %s",
- Modifier.toString(_ctClass.getModifiers()),
- _ctClass.getName(),
- _ctClass.getSuperclass().getName());
+ formatter.format("%s %s extends %s", Modifier.toString(_ctClass.getModifiers()), _ctClass.getName(),
+ _ctClass.getSuperclass().getName());
CtClass[] interfaces = _ctClass.getInterfaces();
for (int i = 0; i < interfaces.length; i++)
{
- if (i == 0)
- builder.append("\n implements ");
- else
- builder.append(", ");
+ if (i == 0) builder.append("\n implements ");
+ else builder.append(", ");
builder.append(interfaces[i].getName());
}
@@ -1328,9 +1287,8 @@
String fieldType = getFieldType(fieldName);
- TransformMethodSignature sig = new TransformMethodSignature(Modifier.PRIVATE, "void",
- methodName, new String[]
- {fieldType}, null);
+ TransformMethodSignature sig = new TransformMethodSignature(Modifier.PRIVATE, "void", methodName,
+ new String[]{fieldType}, null);
String message = ServicesMessages.readOnlyField(_ctClass.getName(), fieldName);
@@ -1430,8 +1388,7 @@
if (_addedMethods.contains(access.where())) return;
- Map<String, String> transformMap = access.isReader() ? _fieldReadTransforms
- : _fieldWriteTransforms;
+ Map<String, String> transformMap = access.isReader() ? _fieldReadTransforms : _fieldWriteTransforms;
String body = transformMap.get(access.getFieldName());
if (body == null) return;