Revert "devide getFileContent(): from branch and from revision #1"

This reverts commit b57ab50.

Author: host6

src/main/java/org/scm4j/vcs/svn/SVNVCS.java

@@ -222,39 +222,9 @@ public void setProxy(String host, int port, String proxyUser, String proxyPasswo
 		authManager.setProxy(host, port, proxyUser, proxyPassword.toCharArray());
 	}
 
-	@Override
-	public String getFileContentFromBranch(String branchName, String filePath) throws EVCSFileNotFound {
-		return getFileContent(branchName, filePath, null);
-	}
 
 	@Override
-	public String getFileContentFromRevision(String revision, String filePath) throws EVCSFileNotFound {
-		final String[] branchNames = new String[1];
-		ISVNLogEntryHandler handler = new ISVNLogEntryHandler() {
-            @Override
-            public void handleLogEntry(SVNLogEntry arg0) throws SVNException {
-                Map<String, SVNLogEntryPath> map = arg0.getChangedPaths();
-                for (Map.Entry<String, SVNLogEntryPath> entry: map.entrySet()) {
-                	if (branchNames[0] == null) {
-	                    SVNLogEntryPath svnLogEntryPath = entry.getValue();
-	                    branchNames[0] = svnLogEntryPath.getPath().replace(filePath, "").replaceFirst("/", "");
-                	}
-                }   
-            }
-        }; 
-		
-        try {
-        	repository.log(new String[] {""}, Long.parseLong(revision),  Long.parseLong(revision), true, true, 1, handler);
-        	return getFileContent(branchNames[0].equals(MASTER_PATH) ? null : branchNames[0], filePath, revision);
-        } catch (SVNException e) {
-			throw new EVCSException(e);
-			
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private String getFileContent(String branchName, String filePath, String revision) {
+	public String getFileContent(String branchName, String filePath, String revision) {
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		try {
 			repository.getFile(new File(getBranchName(branchName), filePath).getPath().replace("\\", "/"),
@@ -269,7 +239,7 @@ private String getFileContent(String branchName, String filePath, String revisio
 				} catch (SVNException e1) {
 					throw new EVCSException(e1);
 				}
-				throw new EVCSFileNotFound(getRepoUrl(), filePath, revision);
+				throw new EVCSFileNotFound(getRepoUrl(), getBranchName(branchName), filePath, revision);
 			}
 			throw new EVCSException(e);
 		} catch (Exception e) {

src/test/java/org/scm4j/vcs/svn/SVNVCSTest.java

@@ -267,7 +267,7 @@ public void testGetFileContentExceptions() throws Exception {
 		svn.setSVNRepository(mockedRepo);
 		doThrow(testSVNException).when(mockedRepo).getFile(anyString(), anyLong(), any(SVNProperties.class), any(OutputStream.class));
 		try {
-			vcs.getFileContentFromBranch("", "");
+			vcs.getFileContent("", "", "");
 			fail();
 		} catch (EVCSException e) {
 			checkEVCSException(e);
@@ -276,7 +276,7 @@ public void testGetFileContentExceptions() throws Exception {
 		SVNRepository repo = svn.getSVNRepository();
 		svn.setSVNRepository(null);
 		try {
-			vcs.getFileContentFromBranch("", "");
+			vcs.getFileContent("", "", "");
 			fail();
 		} catch (RuntimeException e) {
 			assertTrue(e.getCause() instanceof NullPointerException);
@@ -286,7 +286,7 @@ public void testGetFileContentExceptions() throws Exception {
 		doCallRealMethod().when(mockedRepo).getFile(anyString(), anyLong(), any(SVNProperties.class), any(OutputStream.class));
 		doThrow(testSVNException).when(mockedRepo).checkPath(anyString(), anyLong());
 		try {
-			vcs.getFileContentFromBranch("wrong-branch", "");
+			vcs.getFileContent("wrong-branch", "", "");
 			fail();
 		} catch (EVCSException e) {
 			checkEVCSException(e);