make FileService.isNewDocument static (mikado method)

zanata · Jul 16, 2013 · 447bc09 · 447bc09
1 parent 6e92450
commit 447bc09
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/rest/service/FileService.java b/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
@@ -229,7 +229,7 @@ private Response tryUploadSourceFile(String projectSlug, String iterationSlug, S
          {
             tempFile.get().delete();
          }
-         return sourceUploadSuccessResponse(isNewDocument(projectSlug, iterationSlug, docId), totalChunks);
+         return sourceUploadSuccessResponse(isNewDocument(projectSlug, iterationSlug, docId, documentDAO), totalChunks);
       }
       catch (ChunkUploadException e)
       {
@@ -417,12 +417,12 @@ private static boolean isSinglePart(DocumentFileUploadForm uploadForm)
 
    private boolean useOfflinePo(String projectSlug, String iterationSlug, String docId)
    {
-      return !isNewDocument(projectSlug, iterationSlug, docId) && !translationFileServiceImpl.isPoDocument(projectSlug, iterationSlug, docId);
+      return !isNewDocument(projectSlug, iterationSlug, docId, documentDAO) && !translationFileServiceImpl.isPoDocument(projectSlug, iterationSlug, docId);
    }
 
-   private boolean isNewDocument(String projectSlug, String iterationSlug, String docId)
+   private static boolean isNewDocument(String projectSlug, String iterationSlug, String docId, DocumentDAO dao)
    {
-      return documentDAO.getByProjectIterationAndDocId(projectSlug, iterationSlug, docId) == null;
+      return dao.getByProjectIterationAndDocId(projectSlug, iterationSlug, docId) == null;
    }
 
    private File combineToTempFile(HDocumentUpload upload) throws SQLException
@@ -840,7 +840,7 @@ private void checkValidTranslationUploadType(DocumentFileUploadForm uploadForm)
 
    private void checkDocumentExists(String projectSlug, String iterationSlug, String docId, DocumentFileUploadForm uploadForm)
    {
-      if (isNewDocument(projectSlug, iterationSlug, docId))
+      if (isNewDocument(projectSlug, iterationSlug, docId, documentDAO))
       {
          throw new ChunkUploadException(Status.NOT_FOUND, 
                "No document with id \"" + docId + "\" exists in project-version \"" +