Author: hlship
Date: Tue Nov 1 23:10:00 2011
New Revision: 1196361
URL: http://svn.apache.org/viewvc?rev=1196361&view=rev
Log:
TAP5-1739: Remove TransformMessages
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/TransformMessages.java
tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/internal/transform/TransformStrings.properties
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/BindParameterWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PageActivationContextWorker.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/BindParameterWorker.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/BindParameterWorker.java?rev=1196361&r1=1196360&r2=1196361&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/BindParameterWorker.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/BindParameterWorker.java
Tue Nov 1 23:10:00 2011
@@ -76,8 +76,8 @@ public class BindParameterWorker impleme
if
(containerResources.getComponentModel().isFormalParameter(containerParameterName))
conduit =
containerResources.getParameterConduit(containerParameterName);
else
- conduit =
getEmbeddedComponentResourcesForPublishedParameter(containerResources,
containerParameterName)
-
.getParameterConduit(containerParameterName);
+ conduit =
getEmbeddedComponentResourcesForPublishedParameter(containerResources,
containerParameterName)
+ .getParameterConduit(containerParameterName);
}
return conduit;
@@ -160,7 +160,8 @@ public class BindParameterWorker impleme
final String fieldName, final
String[] possibleNames)
{
if (!resources.isMixin())
- throw new
TapestryException(TransformMessages.bindParameterOnlyOnMixin(fieldName,
resources), null);
+ throw new TapestryException(String.format("@BindParameter was used
on field '%s' of component class '%s', but @BindParameter should only be used
in mixins.", fieldName, resources.getComponentModel()
+ .getComponentClassName()), null);
InternalComponentResources containerResources =
(InternalComponentResources) resources.getContainerResources();
@@ -190,11 +191,11 @@ public class BindParameterWorker impleme
{
if (model.isFormalParameter(name))
return name;
-
- if(isPublishedParameter(model, name))
- return name;
+
+ if (isPublishedParameter(model, name))
+ return name;
}
-
+
String message = String.format("Containing component %s does not
contain a formal parameter or a published parameter %s %s.",
model.getComponentClassName(),
@@ -208,73 +209,73 @@ public class BindParameterWorker impleme
throw new UnknownValueException(message, new AvailableValues("Formal
and published parameters", formalAndPublishedParameters));
}
-
+
/**
* Returns true if the parameter with the given parameterName is a
published parameter
* of any of the embedded components for the component with the given
model.
*/
- private boolean isPublishedParameter(ComponentModel model, String
parameterName)
- {
- for (String embeddedComponentId : model.getEmbeddedComponentIds())
- {
- EmbeddedComponentModel embeddedComponentModel = model
-
.getEmbeddedComponentModel(embeddedComponentId);
- if
(embeddedComponentModel.getPublishedParameters().contains(parameterName))
return true;
- }
-
- return false;
- }
-
+ private boolean isPublishedParameter(ComponentModel model, String
parameterName)
+ {
+ for (String embeddedComponentId : model.getEmbeddedComponentIds())
+ {
+ EmbeddedComponentModel embeddedComponentModel = model
+ .getEmbeddedComponentModel(embeddedComponentId);
+ if
(embeddedComponentModel.getPublishedParameters().contains(parameterName))
return true;
+ }
+
+ return false;
+ }
+
private List<String> getPublishedParameters(ComponentModel model)
{
- List<String> publishedParameters = CollectionFactory.newList();
- for (String embeddedComponentId : model.getEmbeddedComponentIds())
- {
- EmbeddedComponentModel embeddedComponentModel =
model.getEmbeddedComponentModel(embeddedComponentId);
-
publishedParameters.addAll(embeddedComponentModel.getPublishedParameters());
- }
- return publishedParameters;
+ List<String> publishedParameters = CollectionFactory.newList();
+ for (String embeddedComponentId : model.getEmbeddedComponentIds())
+ {
+ EmbeddedComponentModel embeddedComponentModel =
model.getEmbeddedComponentModel(embeddedComponentId);
+
publishedParameters.addAll(embeddedComponentModel.getPublishedParameters());
+ }
+ return publishedParameters;
}
- /**
+ /**
* Returns the {@link InternalComponentResources} of an embeddedComponent
that contains the published parameter
* publishedParameterName. This is basically a recursive search for
published parameters.
*/
- private InternalComponentResources
getEmbeddedComponentResourcesForPublishedParameter(InternalComponentResources
containerResources,
- String publishedParameterName)
- {
- List<InternalComponentResources> embeddedComponentResourcesList
= CollectionFactory.newList();
-
- embeddedComponentResourcesList.add(containerResources);
-
- while(!embeddedComponentResourcesList.isEmpty())
- {
- InternalComponentResources resources =
embeddedComponentResourcesList.remove(0);
-
- ComponentModel containerComponentModel =
resources.getComponentModel();
-
- for(String embeddedComponentId :
containerComponentModel.getEmbeddedComponentIds())
- {
- EmbeddedComponentModel embeddedComponentModel =
containerComponentModel
-
.getEmbeddedComponentModel(embeddedComponentId);
-
- InternalComponentResources
embeddedComponentResources = (InternalComponentResources) resources
-
.getEmbeddedComponent(embeddedComponentId).getComponentResources();
- /**
- * If the parameter is not a formal parameter, then the
parameter must be a published parameter
- * of an embeddedComponent of the component we are
currently examining.
- */
-
if(embeddedComponentModel.getPublishedParameters().contains(publishedParameterName)
- &&
embeddedComponentResources.getComponentModel().isFormalParameter(publishedParameterName))
- {
- return embeddedComponentResources;
- }
-
-
embeddedComponentResourcesList.add(embeddedComponentResources);
- }
- }
-
- return null;
- }
+ private InternalComponentResources
getEmbeddedComponentResourcesForPublishedParameter(InternalComponentResources
containerResources,
+
String publishedParameterName)
+ {
+ List<InternalComponentResources> embeddedComponentResourcesList =
CollectionFactory.newList();
+
+ embeddedComponentResourcesList.add(containerResources);
+
+ while (!embeddedComponentResourcesList.isEmpty())
+ {
+ InternalComponentResources resources =
embeddedComponentResourcesList.remove(0);
+
+ ComponentModel containerComponentModel =
resources.getComponentModel();
+
+ for (String embeddedComponentId :
containerComponentModel.getEmbeddedComponentIds())
+ {
+ EmbeddedComponentModel embeddedComponentModel =
containerComponentModel
+ .getEmbeddedComponentModel(embeddedComponentId);
+
+ InternalComponentResources embeddedComponentResources =
(InternalComponentResources) resources
+
.getEmbeddedComponent(embeddedComponentId).getComponentResources();
+ /**
+ * If the parameter is not a formal parameter, then the
parameter must be a published parameter
+ * of an embeddedComponent of the component we are currently
examining.
+ */
+ if
(embeddedComponentModel.getPublishedParameters().contains(publishedParameterName)
+ &&
embeddedComponentResources.getComponentModel().isFormalParameter(publishedParameterName))
+ {
+ return embeddedComponentResources;
+ }
+
+ embeddedComponentResourcesList.add(embeddedComponentResources);
+ }
+ }
+
+ return null;
+ }
}
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentWorker.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentWorker.java?rev=1196361&r1=1196360&r2=1196361&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentWorker.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/ComponentWorker.java
Tue Nov 1 23:10:00 2011
@@ -140,7 +140,8 @@ public class ComponentWorker implements
boolean orderEmpty = annotation.order().length == 0;
if (!orderEmpty && annotation.order().length !=
annotation.value().length)
- throw new
TapestryException(TransformMessages.badMixinConstraintLength(annotation,
field.getName()), model,
+ throw new TapestryException(String.format("%d mixins defined via
@MixinClasses on field '%s', but %d ordering constraints \\\n" +
+ " specified (expected 0 or %1$d).",
annotation.value().length, field.getName(), annotation.order().length), model,
null);
for (int i = 0; i < annotation.value().length; i++)
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectWorker.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectWorker.java?rev=1196361&r1=1196360&r2=1196361&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectWorker.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/InjectWorker.java
Tue Nov 1 23:10:00 2011
@@ -19,6 +19,7 @@ import org.apache.tapestry5.func.Predica
import org.apache.tapestry5.ioc.ObjectLocator;
import org.apache.tapestry5.ioc.OperationTracker;
import org.apache.tapestry5.ioc.annotations.Inject;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.model.MutableComponentModel;
import org.apache.tapestry5.plastic.PlasticClass;
import org.apache.tapestry5.plastic.PlasticField;
@@ -78,8 +79,7 @@ public class InjectWorker implements Com
}
} catch (RuntimeException ex)
{
- throw new
RuntimeException(TransformMessages.fieldInjectionError(plasticClass.getClassName(),
- fieldName, ex), ex);
+ throw new RuntimeException(String.format("Error
obtaining injected value for field %s.%s: %s", plasticClass.getClassName(),
fieldName, InternalUtils.toMessage(ex)), ex);
}
}
});
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PageActivationContextWorker.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PageActivationContextWorker.java?rev=1196361&r1=1196360&r2=1196361&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PageActivationContextWorker.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/PageActivationContextWorker.java
Tue Nov 1 23:10:00 2011
@@ -16,6 +16,8 @@ package org.apache.tapestry5.internal.tr
import org.apache.tapestry5.EventConstants;
import org.apache.tapestry5.annotations.PageActivationContext;
+import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
+import org.apache.tapestry5.ioc.internal.util.InternalUtils;
import org.apache.tapestry5.model.MutableComponentModel;
import org.apache.tapestry5.plastic.FieldHandle;
import org.apache.tapestry5.plastic.PlasticClass;
@@ -52,7 +54,14 @@ public class PageActivationContextWorker
default:
- throw new
RuntimeException(TransformMessages.illegalNumberOfPageActivationContextHandlers2(fields));
+ List<String> names = CollectionFactory.newList();
+
+ for (PlasticField field : fields)
+ {
+ names.add(field.getName());
+ }
+
+ throw new RuntimeException(String.format("Illegal number of
fields annotated with @PageActivationContext: %s. Only one field is allowed.",
InternalUtils.joinSorted(names)));
}
}
