You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by th...@apache.org on 2020/12/16 01:34:28 UTC
[tapestry-5] branch master updated: TAP5-2654: fixing JavaDoc errors
This is an automated email from the ASF dual-hosted git repository.
thiagohp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
The following commit(s) were added to refs/heads/master by this push:
new 04b5359 TAP5-2654: fixing JavaDoc errors
04b5359 is described below
commit 04b53593827e75d29a097d2e3d4f39975d912d93
Author: Thiago H. de Paula Figueiredo <th...@arsmachina.com.br>
AuthorDate: Tue Dec 15 22:33:59 2020 -0300
TAP5-2654: fixing JavaDoc errors
---
tapestry-core/src/main/java/org/apache/tapestry5/Asset.java | 2 +-
tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java | 2 +-
.../src/main/java/org/apache/tapestry5/services/AssetFactory.java | 3 +--
.../src/main/java/org/apache/tapestry5/services/AssetSource.java | 4 +++-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/Asset.java b/tapestry-core/src/main/java/org/apache/tapestry5/Asset.java
index 7036b9f..23cf3a0 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/Asset.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/Asset.java
@@ -21,7 +21,7 @@ import org.apache.tapestry5.commons.Resource;
*
* An Asset's toString() will return the URL for the resource (the same value as {@link #toClientURL()}).
*
- * Release 5.1.0.0 introduced {@link org.apache.tapestry5.Asset2}, which extends this interface with an additional
+ * Release 5.1.0.0 introduced <code>org.apache.tapestry5.Asset2</code>, which extends this interface with an additional
* method.
*
* Release 5.7.0 merged Asset2 into Asset and Asset2 got removed.
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java b/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
index ad71507..7b23fb4 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/SymbolConstants.java
@@ -348,7 +348,7 @@ public class SymbolConstants
public static final String APPLICATION_FOLDER = "tapestry.application-folder";
/**
- * Boolean value to indicate if every {@link org.apache.tapestry5.Asset2} should be fully qualified or not.
+ * Boolean value to indicate if every {@link org.apache.tapestry5.Asset} should be fully qualified or not.
* Default to <code>false</code> meaning no Asset URL will be fully qualified.
*
* @since 5.3
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetFactory.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetFactory.java
index 4482369..d0c6e8b 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetFactory.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetFactory.java
@@ -38,8 +38,7 @@ public interface AssetFactory
Resource getRootResource();
/**
- * Creates an instance of an asset. Starting with 5.1.0.0, it is preferred (but not required) that the factory
- * return an instance of {@link org.apache.tapestry5.Asset2}.
+ * Creates an instance of an asset.
*
* @param resource
* a resource within this factories domain (derived from the {@linkplain #getRootResource() root
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetSource.java b/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetSource.java
index 8baa8c0..a9ce6f8 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetSource.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/services/AssetSource.java
@@ -30,7 +30,9 @@ import java.util.Locale;
*
* Since 5.1.0.0, is is preferred that
* {@link org.apache.tapestry5.services.AssetFactory#createAsset(org.apache.tapestry5.commons.Resource)} return an instance
- * of {@link org.apache.tapestry5.Asset2}.
+ * of <code>org.apache.tapestry5.Asset2</code>.
+ *
+ * Since 5.7.0, Asset2 was merged into Asset and removed.
*/
@UsesMappedConfiguration(AssetFactory.class)
public interface AssetSource