Rename EncFSAlgorithm -> EncFSFilenameEncryptionAlgorithm

src/main/java/org/mrpdaemon/sec/encfs/BasicFilenameDecryptionStrategy.java

@@ -20,7 +20,7 @@ public abstract class BasicFilenameDecryptionStrategy extends
 		FilenameDecryptionStrategy {
 
 	BasicFilenameDecryptionStrategy(EncFSVolume volume, String volumePath,
-			EncFSAlgorithm algorithm) {
+			EncFSFilenameEncryptionAlgorithm algorithm) {
 		super(volume, volumePath, algorithm);
 	}
 

src/main/java/org/mrpdaemon/sec/encfs/BasicFilenameEncryptionStrategy.java

@@ -20,7 +20,7 @@ public abstract class BasicFilenameEncryptionStrategy extends
 		FilenameEncryptionStrategy {
 
 	BasicFilenameEncryptionStrategy(EncFSVolume volume, String volumePath,
-			EncFSAlgorithm algorithm) {
+			EncFSFilenameEncryptionAlgorithm algorithm) {
 		super(volume, volumePath, algorithm);
 	}
 

src/main/java/org/mrpdaemon/sec/encfs/BlockFilenameDecryptionStrategy.java

@@ -23,7 +23,7 @@ public class BlockFilenameDecryptionStrategy extends
 		BasicFilenameDecryptionStrategy {
 
 	public BlockFilenameDecryptionStrategy(EncFSVolume volume, String volumePath) {
-		super(volume, volumePath, EncFSAlgorithm.BLOCK);
+		super(volume, volumePath, EncFSFilenameEncryptionAlgorithm.BLOCK);
 	}
 
 	protected byte[] decryptConcrete(EncFSVolume volume, byte[] encFileName,

src/main/java/org/mrpdaemon/sec/encfs/BlockFilenameEncryptionStrategy.java

@@ -23,7 +23,7 @@ public class BlockFilenameEncryptionStrategy extends
 		BasicFilenameEncryptionStrategy {
 
 	public BlockFilenameEncryptionStrategy(EncFSVolume volume, String volumePath) {
-		super(volume, volumePath, EncFSAlgorithm.BLOCK);
+		super(volume, volumePath, EncFSFilenameEncryptionAlgorithm.BLOCK);
 	}
 
 	@Override

src/main/java/org/mrpdaemon/sec/encfs/EncFSConfig.java

@@ -43,7 +43,7 @@ public class EncFSConfig {
 	 */
 	private String base64Salt;
 	private int iterationForPasswordKeyDerivationCount;
-	private EncFSAlgorithm algorithm;
+	private EncFSFilenameEncryptionAlgorithm algorithm;
 	private int numberOfMACBytesForEachFileBlock;
 	private int numberOfRandomBytesInEachMACHeader;
 	private boolean supportedExternalIVChaining;
@@ -133,11 +133,11 @@ public class EncFSConfig {
 		this.iterationForPasswordKeyDerivationCount = iterationForPasswordKeyDerivationCount;
 	}
 
-	public EncFSAlgorithm getAlgorithm() {
+	public EncFSFilenameEncryptionAlgorithm getAlgorithm() {
 		return algorithm;
 	}
 
-	public void setAlgorithm(EncFSAlgorithm algorithm) {
+	public void setAlgorithm(EncFSFilenameEncryptionAlgorithm algorithm) {
 		this.algorithm = algorithm;
 	}
 

src/main/java/org/mrpdaemon/sec/encfs/EncFSConfigFactory.java

@@ -18,7 +18,7 @@ public final class EncFSConfigFactory {
 
 	public static EncFSConfig createDefault() {
 		EncFSConfig config = new EncFSConfig();
-		config.setAlgorithm(EncFSAlgorithm.BLOCK);
+		config.setAlgorithm(EncFSFilenameEncryptionAlgorithm.BLOCK);
 		config.setVolumeKeySizeInBits(192);
 		config.setEncryptedFileBlockSizeInBytes(1024);
 		config.setUseUniqueIV(true);

src/main/java/org/mrpdaemon/sec/encfs/EncFSConfigParser.java

@@ -144,7 +144,7 @@ class EncFSConfigParser {
 						if (nameAlgChildNode.getNodeName().equals("name")) {
 							String algName = getNodeValue(nameAlgChildNode);
 							try {
-								config.setAlgorithm(EncFSAlgorithm
+								config.setAlgorithm(EncFSFilenameEncryptionAlgorithm
 										.parse(algName));
 							} catch (IllegalArgumentException e) {
 								throw new EncFSInvalidConfigException(

src/main/java/org/mrpdaemon/sec/encfs/EncFSConfigWriter.java

@@ -77,7 +77,7 @@ class EncFSConfigWriter {
 
 		result += "\t<nameAlg>\n";
 
-		EncFSAlgorithm algorithm = config.getAlgorithm();
+		EncFSFilenameEncryptionAlgorithm algorithm = config.getAlgorithm();
 		result += "\t\t<name>" + algorithm.getIdentifier() + "</name>\n";
 		result += "\t\t<major>" + algorithm.getMajor() + "</major>\n";
 		result += "\t\t<minor>" + algorithm.getMinor() + "</minor>\n";

src/main/java/org/mrpdaemon/sec/encfs/EncFSCrypto.java

@@ -175,7 +175,7 @@ public class EncFSCrypto {
 			String volumePath) throws EncFSCorruptDataException,
 			EncFSChecksumException {
 
-		EncFSAlgorithm algorithm = volume.getConfig()
+		EncFSFilenameEncryptionAlgorithm algorithm = volume.getConfig()
 				.getAlgorithm();
 		switch (algorithm) {
 		case NULL:
@@ -195,7 +195,7 @@ public class EncFSCrypto {
 	public static String encodeName(EncFSVolume volume, String fileName,
 			String volumePath) throws EncFSCorruptDataException {
 
-		EncFSAlgorithm algorithm = volume.getConfig()
+		EncFSFilenameEncryptionAlgorithm algorithm = volume.getConfig()
 				.getAlgorithm();
 		switch (algorithm) {
 		case NULL:

src/main/java/org/mrpdaemon/sec/encfs/EncFSFilenameEncryptionAlgorithm.java

@@ -15,9 +15,9 @@
 package org.mrpdaemon.sec.encfs;
 
 /**
- * User: lars
+ * Enum representing the filename encryption algorithms used in EncFS
  */
-public enum EncFSAlgorithm {
+public enum EncFSFilenameEncryptionAlgorithm {
 	BLOCK("nameio/block", 3, 0), STREAM("nameio/stream", 2, 1), NULL(
 			"nameio/null", 1, 0);
 
@@ -25,14 +25,22 @@ public enum EncFSAlgorithm {
 	private final int major;
 	private final int minor;
 
-	EncFSAlgorithm(String identifier, int major, int minor) {
+	EncFSFilenameEncryptionAlgorithm(String identifier, int major, int minor) {
 		this.identifier = identifier;
 		this.major = major;
 		this.minor = minor;
 	}
 
-	public static EncFSAlgorithm parse(String identifier) {
-		for (EncFSAlgorithm a : values()) {
+	/**
+	 * Parse the given string and return the corresponding algorithm value
+	 * 
+	 * @param identifier
+	 *            String to parse
+	 * 
+	 * @return EncFSFileNameEncryptionAlgorithm corresponding to the string.
+	 */
+	public static EncFSFilenameEncryptionAlgorithm parse(String identifier) {
+		for (EncFSFilenameEncryptionAlgorithm a : values()) {
 			if (a.identifier.equals(identifier)) {
 				return a;
 			}

src/main/java/org/mrpdaemon/sec/encfs/FilenameDecryptionStrategy.java

@@ -7,7 +7,7 @@ abstract class FilenameDecryptionStrategy {
 
 	private final EncFSVolume volume;
 	private final String volumePath;
-	private final EncFSAlgorithm algorithm;
+	private final EncFSFilenameEncryptionAlgorithm algorithm;
 
 	String getVolumePath() {
 		return volumePath;
@@ -18,7 +18,7 @@ abstract class FilenameDecryptionStrategy {
 	}
 
 	FilenameDecryptionStrategy(EncFSVolume volume, String volumePath,
-			EncFSAlgorithm algorithm) {
+			EncFSFilenameEncryptionAlgorithm algorithm) {
 		this.volume = volume;
 		this.volumePath = volumePath;
 		this.algorithm = algorithm;

src/main/java/org/mrpdaemon/sec/encfs/FilenameEncryptionStrategy.java

@@ -7,7 +7,7 @@ abstract class FilenameEncryptionStrategy {
 
 	private final EncFSVolume volume;
 	private final String volumePath;
-	private final EncFSAlgorithm algorithm;
+	private final EncFSFilenameEncryptionAlgorithm algorithm;
 
 	String getVolumePath() {
 		return volumePath;
@@ -18,7 +18,7 @@ abstract class FilenameEncryptionStrategy {
 	}
 
 	FilenameEncryptionStrategy(EncFSVolume volume, String volumePath,
-			EncFSAlgorithm algorithm) {
+			EncFSFilenameEncryptionAlgorithm algorithm) {
 		this.volume = volume;
 		this.volumePath = volumePath;
 		this.algorithm = algorithm;

src/main/java/org/mrpdaemon/sec/encfs/NullFilenameDecryptionStrategy.java

@@ -3,7 +3,7 @@ package org.mrpdaemon.sec.encfs;
 public class NullFilenameDecryptionStrategy extends FilenameDecryptionStrategy {
 
 	public NullFilenameDecryptionStrategy(EncFSVolume volume, String volumePath) {
-		super(volume, volumePath, EncFSAlgorithm.NULL);
+		super(volume, volumePath, EncFSFilenameEncryptionAlgorithm.NULL);
 	}
 
 	@Override

src/main/java/org/mrpdaemon/sec/encfs/NullFilenameEncryptionStrategy.java

@@ -3,7 +3,7 @@ package org.mrpdaemon.sec.encfs;
 public class NullFilenameEncryptionStrategy extends FilenameEncryptionStrategy {
 
 	public NullFilenameEncryptionStrategy(EncFSVolume volume, String volumePath) {
-		super(volume, volumePath, EncFSAlgorithm.NULL);
+		super(volume, volumePath, EncFSFilenameEncryptionAlgorithm.NULL);
 	}
 
 	@Override

src/main/java/org/mrpdaemon/sec/encfs/StreamCrypto.java

@@ -137,7 +137,7 @@ public class StreamCrypto {
 			if ((curPath.length() > 0)
 					&& (!curPath.equals(EncFSVolume.PATH_SEPARATOR))) {
 				byte[] encodeBytes;
-				if (volume.getConfig().getAlgorithm() == EncFSAlgorithm.BLOCK) {
+				if (volume.getConfig().getAlgorithm() == EncFSFilenameEncryptionAlgorithm.BLOCK) {
 					encodeBytes = EncFSCrypto
 							.getBytesForBlockAlgorithm(curPath);
 				} else {

src/main/java/org/mrpdaemon/sec/encfs/StreamFilenameDecryptionStrategy.java

@@ -9,7 +9,7 @@ public class StreamFilenameDecryptionStrategy extends
 
 	public StreamFilenameDecryptionStrategy(EncFSVolume volume,
 			String volumePath) {
-		super(volume, volumePath, EncFSAlgorithm.STREAM);
+		super(volume, volumePath, EncFSFilenameEncryptionAlgorithm.STREAM);
 	}
 
 	protected byte[] decryptConcrete(EncFSVolume volume, byte[] encFileName,

src/main/java/org/mrpdaemon/sec/encfs/StreamFilenameEncryptionStrategy.java

@@ -9,7 +9,7 @@ public class StreamFilenameEncryptionStrategy extends
 
 	public StreamFilenameEncryptionStrategy(EncFSVolume volume,
 			String volumePath) {
-		super(volume, volumePath, EncFSAlgorithm.STREAM);
+		super(volume, volumePath, EncFSFilenameEncryptionAlgorithm.STREAM);
 	}
 
 	@Override

src/test/java/org/mrpdaemon/sec/encfs/EncFSAlgorithmTest.java

@@ -1,13 +0,0 @@
-package org.mrpdaemon.sec.encfs;
-
-import org.junit.Test;
-
-/**
- * User: lars
- */
-public class EncFSAlgorithmTest {
-	@Test(expected = IllegalArgumentException.class)
-	public void testParse() throws Exception {
-		EncFSAlgorithm.parse("nameio/sstream");
-	}
-}

src/test/java/org/mrpdaemon/sec/encfs/tests/EncFSFilenameEncryptionAlgorithmTest.java

@@ -0,0 +1,26 @@
+/*
+ * EncFS Java Library
+ * Copyright (C) 2013 encfs-java authors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ */
+package org.mrpdaemon.sec.encfs.tests;
+
+import org.junit.Test;
+
+import org.mrpdaemon.sec.encfs.EncFSFilenameEncryptionAlgorithm;
+
+public class EncFSFilenameEncryptionAlgorithmTest {
+	@Test(expected = IllegalArgumentException.class)
+	public void testParse() throws Exception {
+		EncFSFilenameEncryptionAlgorithm.parse("nameio/sstream");
+	}
+}

src/test/java/org/mrpdaemon/sec/encfs/tests/EncFSVolumeTest.java

@@ -107,7 +107,7 @@ public abstract class EncFSVolumeTest {
 	@Test
 	public void testStreamNameAlg() throws Exception {
 		EncFSConfig config = EncFSConfigFactory.createDefault();
-		config.setAlgorithm(EncFSAlgorithm.STREAM);
+		config.setAlgorithm(EncFSFilenameEncryptionAlgorithm.STREAM);
 
 		testFileOperations(config);
 	}