Update deprecated reference

Squashed commit of the following: commit f94f440 Author: Alex Eng <aeng@redhat.com> Date: Mon May 18 07:41:53 2015 +1000 Remove unused class commit b946021 Author: Alex Eng <aeng@redhat.com> Date: Fri May 15 12:50:03 2015 +1000 Update deprecated reference
zanata · May 18, 2015 · 6d37c66 · 6d37c66
1 parent be308e9
commit 6d37c66
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 289 deletions.
diff --git a/zanata-common-api/src/main/java/org/zanata/rest/GenerateSamples.java b/zanata-common-api/src/main/java/org/zanata/rest/GenerateSamples.java
diff --git a/zanata-common-api/src/main/java/org/zanata/rest/GenerateSchema.java b/zanata-common-api/src/main/java/org/zanata/rest/GenerateSchema.java
diff --git a/zanata-common-api/src/main/java/org/zanata/rest/client/IFileResource.java b/zanata-common-api/src/main/java/org/zanata/rest/client/IFileResource.java
@@ -51,10 +51,15 @@
 @Consumes({ MediaType.APPLICATION_OCTET_STREAM })
 public interface IFileResource extends FileResource {
 
+    /**
+     * Deprecated.
+     * @see #acceptedFileTypeList
+     */
     @Override
     @GET
     @Path(ACCEPTED_TYPES_RESOURCE)
     @Produces(MediaType.TEXT_PLAIN)
+    @Deprecated
             public
             ClientResponse<String> acceptedFileTypes();
 

diff --git a/zanata-common-api/src/main/java/org/zanata/rest/enunciate/package-info.java b/zanata-common-api/src/main/java/org/zanata/rest/enunciate/package-info.java
@@ -11,7 +11,7 @@
  * build request URLs for resources whose @Path includes a @PathParam.
  * </p>
  */
-@edu.umd.cs.findbugs.annotations.SuppressWarnings(
+@edu.umd.cs.findbugs.annotations.SuppressFBWarnings(
     value = "NM_SAME_SIMPLE_NAME_AS_INTERFACE",
     justification = "Package-private, with nice names for documentation")
 package org.zanata.rest.enunciate;
diff --git a/zanata-common-api/src/test/java/org/zanata/rest/dto/stats/TranslationStatisticsTest.java b/zanata-common-api/src/test/java/org/zanata/rest/dto/stats/TranslationStatisticsTest.java
@@ -50,7 +50,7 @@ public void setGetUnitCount() {
         assertThat((int) stats.getApproved(), equalTo(unitCount.getApproved()));
         assertThat((int) stats.getRejected(), equalTo(unitCount.getRejected()));
         assertThat((int) stats.getTotal(), equalTo(unitCount.getTotal()));
-        assertThat((int) stats.getTranslated(),
+        assertThat((int) stats.getTranslatedAndApproved(),
                 equalTo(unitCount.getTranslated() + unitCount.getApproved()));
         assertThat((int) stats.getUntranslated(),
                 equalTo(unitCount.getUntranslated()));
@@ -69,7 +69,7 @@ public void setGetWordCount() {
         assertThat((int) stats.getApproved(), equalTo(wordCount.getApproved()));
         assertThat((int) stats.getRejected(), equalTo(wordCount.getRejected()));
         assertThat((int) stats.getTotal(), equalTo(wordCount.getTotal()));
-        assertThat((int) stats.getTranslated(),
+        assertThat((int) stats.getTranslatedAndApproved(),
                 equalTo(wordCount.getTranslated() + wordCount.getApproved()));
         assertThat((int) stats.getUntranslated(),
                 equalTo(wordCount.getUntranslated()));
@@ -99,7 +99,7 @@ public void add() {
         assertThat((int) stats.getApproved(), equalTo(unitCount.getApproved()));
         assertThat((int) stats.getRejected(), equalTo(unitCount.getRejected()));
         assertThat((int) stats.getTotal(), equalTo(unitCount.getTotal()));
-        assertThat((int) stats.getTranslated(), equalTo(unitCount.getApproved()
+        assertThat((int) stats.getTranslatedAndApproved(), equalTo(unitCount.getApproved()
                 + unitCount.getTranslated()));
         assertThat((int) stats.getUntranslated(),
                 equalTo(unitCount.getUntranslated()));