Merge remote-tracking branch 'upstream/master'

src/main/resources/sharpen.properties

@@ -27,4 +27,5 @@
 24=-configurationClass: Overwrites default configuration Class with input class name. The default is 'sharpen.core.DefaultConfiguration'. For example: -configurationClass sharpen.core.MyConfiguration
 25=-junitConversion: JUnit conversion mode on
 26=-sharpenNamespace: Maps a java package name to a .NET namespace. For example:-namespaceMapping java.util.concurrent.locks Sharpen
-27=-help: Display Help    
+27=-flatDirectoryStructure: Flat namespace directory structure mode on. For example: "sharpen.core" package will go into a folder named "sharpen.core" and sub-folders won't be created like "sharpen/core"
+28=-help: Display Help

src/main/sharpen/core/Configuration.java

@@ -100,6 +100,8 @@ public abstract class Configuration {
 
 	private boolean _junitConvert;
 
+	private boolean _flatNamespaceDirectoryStructure;
+	
 	private String _sharpenNamespace = "Sharpen";
 
 	private List<String> _fullyQualifiedTypes = new ArrayList<String>();
@@ -441,6 +443,14 @@ public abstract class Configuration {
 		return _junitConvert;
 	}
 
+	public void enableFlatNamespaceDirectoryStructure() {
+		this._flatNamespaceDirectoryStructure = true;
+	}
+
+	public boolean flatNamespaceDirectoryStructure() {
+		return this._flatNamespaceDirectoryStructure;
+	}
+
 	public void setSharpenNamespace(String sharpenNamespace) {
 		if (null == sharpenNamespace) throw new IllegalArgumentException("sharpenNamespace");
 		_sharpenNamespace = sharpenNamespace;

src/main/sharpen/core/SharpenApplication.java

@@ -205,6 +205,10 @@ public class SharpenApplication {
 			ods("JUnit conversion mode on.");
 			configuration.enableJUnitConversion();
 		}
+		if (this._args.flatNamespaceDirectoryStructure) {
+			ods("Flat namespace directory structure mode on.");
+			configuration.enableFlatNamespaceDirectoryStructure();
+		}
 		if (_args.sharpenNamespace != null) {
 			ods("Sharpen namespace: " + _args.sharpenNamespace);
 			configuration.setSharpenNamespace(_args.sharpenNamespace);

src/main/sharpen/core/SharpenCommandLine.java

@@ -87,6 +87,7 @@ public class SharpenCommandLine {
 	public final Map<String, String> conditionalCompilation = new HashMap<String, String>();
 	public String configurationClass;
 	public boolean junitConversion;
+	public boolean flatNamespaceDirectoryStructure;
 	public String sharpenNamespace;
 	public boolean help;
 }

src/main/sharpen/core/SharpenCommandLineParser.java

@@ -146,6 +146,8 @@ class SharpenCommandLineParser extends CommandLineParser {
 			_cmdLine.configurationClass = consumeNext();		
 		} else if (areEqual(arg, "-junitConversion")) {
 			_cmdLine.junitConversion = true;
+		} else if (this.areEqual(arg, "-flatDirectoryStructure")) {
+			this._cmdLine.flatNamespaceDirectoryStructure = true;
 		} else if (areEqual(arg, "-sharpenNamespace")) {
 			_cmdLine.sharpenNamespace = consumeNext();	
 		} else if (areEqual(arg, "-help")) {

src/main/sharpen/core/SharpenConversionBatch.java

@@ -129,8 +129,10 @@ public class SharpenConversionBatch extends ConversionBatch {
 	}
 
 	private String getTargetPackageFolder(String targetFolder, String packageName) {
-		 targetFolder = targetFolder  +"/"  + packageName.replace('.', '/').toLowerCase();
-		 return targetFolder;
+		if (!this._configuration.flatNamespaceDirectoryStructure()) {
+			packageName = packageName.replace('.', '/').toLowerCase();
+		}
+		return targetFolder  +"/"  + packageName;
 	}
 	
 	private String getNameWithoutExtension(String name) {