Merge pull request Azure#77 from gcheng/javadoc

fix the minor javadoc udpate for media service
joostdenijs · Jan 7, 2013 · 354ef2a · 354ef2a
2 parents 9a08f79 + f67a733
commit 354ef2a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/...osoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/Asset.java b/...osoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/Asset.java
@@ -301,8 +301,8 @@ public static EntityDeleteOperation delete(String assetId) {
      * 
      * @param assetId
      *            the asset id
-     * @param contentKeyUri
-     *            the content key uri
+     * @param contentKeyId
+     *            the content key id
      * @return the entity action operation
      */
     public static EntityLinkOperation linkContentKey(String assetId, String contentKeyId) {

diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/Task.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/media/models/Task.java
@@ -45,8 +45,6 @@ private Task() {
      *            the media processor id
      * @param taskBody
      *            the task body
-     * @param options
-     *            the options
      * @return the creates the batch operation
      */
     public static CreateBatchOperation create(String mediaProcessorId, String taskBody) {
@@ -102,8 +100,6 @@ public static class CreateBatchOperation extends EntityBatchOperation {
          *            the media processor id
          * @param taskBody
          *            the task body
-         * @param options
-         *            the options
          */
         public CreateBatchOperation(String mediaProcessorId, String taskBody) {
             this.verb = "POST";