Merge remote-tracking branch 'upstream/master'
This commit is contained in:
Коммит
d6ea9528fc
|
@ -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
|
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
|
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
|
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
|
||||||
|
|
|
@ -99,6 +99,8 @@ public abstract class Configuration {
|
||||||
private boolean _paramCountFileNames;
|
private boolean _paramCountFileNames;
|
||||||
|
|
||||||
private boolean _junitConvert;
|
private boolean _junitConvert;
|
||||||
|
|
||||||
|
private boolean _flatNamespaceDirectoryStructure;
|
||||||
|
|
||||||
private String _sharpenNamespace = "Sharpen";
|
private String _sharpenNamespace = "Sharpen";
|
||||||
|
|
||||||
|
@ -441,6 +443,14 @@ public abstract class Configuration {
|
||||||
return _junitConvert;
|
return _junitConvert;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void enableFlatNamespaceDirectoryStructure() {
|
||||||
|
this._flatNamespaceDirectoryStructure = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean flatNamespaceDirectoryStructure() {
|
||||||
|
return this._flatNamespaceDirectoryStructure;
|
||||||
|
}
|
||||||
|
|
||||||
public void setSharpenNamespace(String sharpenNamespace) {
|
public void setSharpenNamespace(String sharpenNamespace) {
|
||||||
if (null == sharpenNamespace) throw new IllegalArgumentException("sharpenNamespace");
|
if (null == sharpenNamespace) throw new IllegalArgumentException("sharpenNamespace");
|
||||||
_sharpenNamespace = sharpenNamespace;
|
_sharpenNamespace = sharpenNamespace;
|
||||||
|
|
|
@ -205,6 +205,10 @@ public class SharpenApplication {
|
||||||
ods("JUnit conversion mode on.");
|
ods("JUnit conversion mode on.");
|
||||||
configuration.enableJUnitConversion();
|
configuration.enableJUnitConversion();
|
||||||
}
|
}
|
||||||
|
if (this._args.flatNamespaceDirectoryStructure) {
|
||||||
|
ods("Flat namespace directory structure mode on.");
|
||||||
|
configuration.enableFlatNamespaceDirectoryStructure();
|
||||||
|
}
|
||||||
if (_args.sharpenNamespace != null) {
|
if (_args.sharpenNamespace != null) {
|
||||||
ods("Sharpen namespace: " + _args.sharpenNamespace);
|
ods("Sharpen namespace: " + _args.sharpenNamespace);
|
||||||
configuration.setSharpenNamespace(_args.sharpenNamespace);
|
configuration.setSharpenNamespace(_args.sharpenNamespace);
|
||||||
|
|
|
@ -87,6 +87,7 @@ public class SharpenCommandLine {
|
||||||
public final Map<String, String> conditionalCompilation = new HashMap<String, String>();
|
public final Map<String, String> conditionalCompilation = new HashMap<String, String>();
|
||||||
public String configurationClass;
|
public String configurationClass;
|
||||||
public boolean junitConversion;
|
public boolean junitConversion;
|
||||||
|
public boolean flatNamespaceDirectoryStructure;
|
||||||
public String sharpenNamespace;
|
public String sharpenNamespace;
|
||||||
public boolean help;
|
public boolean help;
|
||||||
}
|
}
|
||||||
|
|
|
@ -145,7 +145,9 @@ class SharpenCommandLineParser extends CommandLineParser {
|
||||||
} else if (areEqual(arg, "-configurationClass")) {
|
} else if (areEqual(arg, "-configurationClass")) {
|
||||||
_cmdLine.configurationClass = consumeNext();
|
_cmdLine.configurationClass = consumeNext();
|
||||||
} else if (areEqual(arg, "-junitConversion")) {
|
} else if (areEqual(arg, "-junitConversion")) {
|
||||||
_cmdLine.junitConversion = true;
|
_cmdLine.junitConversion = true;
|
||||||
|
} else if (this.areEqual(arg, "-flatDirectoryStructure")) {
|
||||||
|
this._cmdLine.flatNamespaceDirectoryStructure = true;
|
||||||
} else if (areEqual(arg, "-sharpenNamespace")) {
|
} else if (areEqual(arg, "-sharpenNamespace")) {
|
||||||
_cmdLine.sharpenNamespace = consumeNext();
|
_cmdLine.sharpenNamespace = consumeNext();
|
||||||
} else if (areEqual(arg, "-help")) {
|
} else if (areEqual(arg, "-help")) {
|
||||||
|
|
|
@ -129,8 +129,10 @@ public class SharpenConversionBatch extends ConversionBatch {
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getTargetPackageFolder(String targetFolder, String packageName) {
|
private String getTargetPackageFolder(String targetFolder, String packageName) {
|
||||||
targetFolder = targetFolder +"/" + packageName.replace('.', '/').toLowerCase();
|
if (!this._configuration.flatNamespaceDirectoryStructure()) {
|
||||||
return targetFolder;
|
packageName = packageName.replace('.', '/').toLowerCase();
|
||||||
|
}
|
||||||
|
return targetFolder +"/" + packageName;
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getNameWithoutExtension(String name) {
|
private String getNameWithoutExtension(String name) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче