| Revision | 268 (tree) |
|---|---|
| Time | 2016-05-03 15:51:45 |
| Author | t_nakayama1971 |
(empty log message)
| @@ -14,6 +14,7 @@ | ||
| 14 | 14 | * See the License for the specific language governing permissions and |
| 15 | 15 | * limitations under the License. |
| 16 | 16 | */ |
| 17 | + | |
| 17 | 18 | package org.apache.commons.chain2; |
| 18 | 19 | |
| 19 | 20 | import java.util.Map; |
| @@ -64,6 +65,6 @@ | ||
| 64 | 65 | * method (and therefore need not be rethrown), return <code>FINISHED</code>; |
| 65 | 66 | * otherwise return <code>CONTINUE</code> |
| 66 | 67 | */ |
| 67 | - boolean postprocess(C context, Exception exception); | |
| 68 | + boolean postprocess(C context, Exception exception); | |
| 68 | 69 | |
| 69 | 70 | } |
| @@ -14,6 +14,7 @@ | ||
| 14 | 14 | * See the License for the specific language governing permissions and |
| 15 | 15 | * limitations under the License. |
| 16 | 16 | */ |
| 17 | + | |
| 17 | 18 | package org.apache.commons.chain2; |
| 18 | 19 | |
| 19 | 20 | import java.util.Iterator; |
| @@ -41,7 +42,7 @@ | ||
| 41 | 42 | * use this as the delimiter between the "catalog" name and the "command" |
| 42 | 43 | * name.</p> |
| 43 | 44 | */ |
| 44 | - public static final String DELIMITER = ":"; | |
| 45 | + String DELIMITER = ":"; | |
| 45 | 46 | |
| 46 | 47 | /** |
| 47 | 48 | * <p>Gets the default instance of Catalog associated with the factory |
| @@ -49,7 +50,7 @@ | ||
| 49 | 50 | * |
| 50 | 51 | * @return the default Catalog instance |
| 51 | 52 | */ |
| 52 | - public abstract Catalog<K, V, C> getCatalog(); | |
| 53 | + Catalog<K, V, C> getCatalog(); | |
| 53 | 54 | |
| 54 | 55 | /** |
| 55 | 56 | * <p>Sets the default instance of Catalog associated with the factory.</p> |
| @@ -56,7 +57,7 @@ | ||
| 56 | 57 | * |
| 57 | 58 | * @param catalog the default Catalog instance |
| 58 | 59 | */ |
| 59 | - public abstract void setCatalog(Catalog<K, V, C> catalog); | |
| 60 | + void setCatalog(Catalog<K, V, C> catalog); | |
| 60 | 61 | |
| 61 | 62 | /** |
| 62 | 63 | * <p>Retrieves a Catalog instance by name (if any); otherwise |
| @@ -65,7 +66,7 @@ | ||
| 65 | 66 | * @param name the name of the Catalog to retrieve |
| 66 | 67 | * @return the specified Catalog |
| 67 | 68 | */ |
| 68 | - public abstract Catalog<K, V, C> getCatalog(String name); | |
| 69 | + Catalog<K, V, C> getCatalog(String name); | |
| 69 | 70 | |
| 70 | 71 | /** |
| 71 | 72 | * <p>Adds a named instance of Catalog to the factory (for subsequent |
| @@ -74,7 +75,7 @@ | ||
| 74 | 75 | * @param name the name of the Catalog to add |
| 75 | 76 | * @param catalog the Catalog to add |
| 76 | 77 | */ |
| 77 | - public abstract void addCatalog(String name, Catalog<K, V, C> catalog); | |
| 78 | + void addCatalog(String name, Catalog<K, V, C> catalog); | |
| 78 | 79 | |
| 79 | 80 | /** |
| 80 | 81 | * <p>Return an <code>Iterator</code> over the set of named |
| @@ -82,7 +83,7 @@ | ||
| 82 | 83 | * If there are no known catalogs, an empty Iterator is returned.</p> |
| 83 | 84 | * @return An Iterator of the names of the Catalogs known by this factory. |
| 84 | 85 | */ |
| 85 | - public abstract Iterator<String> getNames(); | |
| 86 | + Iterator<String> getNames(); | |
| 86 | 87 | |
| 87 | 88 | /** |
| 88 | 89 | * <p>Return a <code>Command</code> based on the given commandID.</p> |
| @@ -100,7 +101,7 @@ | ||
| 100 | 101 | * more than one DELIMITER will cause an |
| 101 | 102 | * <code>IllegalArgumentException</code> to be thrown.</p> |
| 102 | 103 | * |
| 103 | - * @param <CMD> the expected {@link Command} type to be returned | |
| 104 | + * @param <T> the expected {@link Command} type to be returned | |
| 104 | 105 | * @param commandID the identifier of the command to return |
| 105 | 106 | * @return the command located with commandID, or <code>null</code> |
| 106 | 107 | * if either the command name or the catalog name cannot be resolved |
| @@ -109,7 +110,6 @@ | ||
| 109 | 110 | * |
| 110 | 111 | * @since Chain 1.1 |
| 111 | 112 | */ |
| 112 | - public abstract <CMD extends Command<K, V, C>> CMD getCommand( | |
| 113 | - String commandID); | |
| 113 | + <T extends Command<K, V, C>> T getCommand(String commandID); | |
| 114 | 114 | |
| 115 | 115 | } |
| @@ -14,6 +14,7 @@ | ||
| 14 | 14 | * See the License for the specific language governing permissions and |
| 15 | 15 | * limitations under the License. |
| 16 | 16 | */ |
| 17 | + | |
| 17 | 18 | package org.apache.commons.chain2; |
| 18 | 19 | |
| 19 | 20 | import java.util.Iterator; |
| @@ -45,23 +46,23 @@ | ||
| 45 | 46 | * to the set of named commands known to this {@link Catalog}, |
| 46 | 47 | * replacing any previous command for that name. |
| 47 | 48 | * |
| 48 | - * @param <CMD> the {@link Command} type to be added in the {@link Catalog} | |
| 49 | + * @param <T> the {@link Command} type to be added in the {@link Catalog} | |
| 49 | 50 | * @param name Name of the new command |
| 50 | 51 | * @param command {@link Command} or {@link Chain} to be returned |
| 51 | 52 | * for later lookups on this name |
| 52 | 53 | */ |
| 53 | - <CMD extends Command<K, V, C>> void addCommand(String name, CMD command); | |
| 54 | + <T extends Command<K, V, C>> void addCommand(String name, T command); | |
| 54 | 55 | |
| 55 | 56 | /** |
| 56 | 57 | * <p>Return the {@link Command} or {@link Chain} associated with the |
| 57 | 58 | * specified name, if any; otherwise, return <code>null</code>.</p> |
| 58 | 59 | * |
| 59 | - * @param <CMD> the expected {@link Command} type to be returned | |
| 60 | + * @param <T> the expected {@link Command} type to be returned | |
| 60 | 61 | * @param name Name for which a {@link Command} or {@link Chain} |
| 61 | 62 | * should be retrieved |
| 62 | 63 | * @return The Command associated with the specified name. |
| 63 | 64 | */ |
| 64 | - <CMD extends Command<K, V, C>> CMD getCommand(String name); | |
| 65 | + <T extends Command<K, V, C>> T getCommand(String name); | |
| 65 | 66 | |
| 66 | 67 | /** |
| 67 | 68 | * <p>Return an <code>Iterator</code> over the set of named commands |