Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[New] XmlExportModelService can now export to absolute path

This commit is contained in:
Robert von Burg 2015-02-21 00:20:30 +01:00
parent 193b76ed60
commit f46e72bbdb
2 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
li.strolch.service/src/main/java/li/strolch/service/XmlExportModelArgument.java
View File

@ -24,6 +24,7 @@ public class XmlExportModelArgument extends ServiceArgument {
private static final long serialVersionUID = 1L;
public String modelFileName;
public boolean external;
public boolean overwrite;
public boolean multiFile;
public boolean doOrders = true;
@ -36,6 +37,9 @@ public class XmlExportModelArgument extends ServiceArgument {
StringBuilder builder = new StringBuilder();
builder.append("XmlExportModelArgument [ ");
builder.append("external=");
builder.append(this.external);
builder.append("modelFileName=");
builder.append(this.modelFileName);

31
li.strolch.service/src/main/java/li/strolch/service/XmlExportModelService.java
View File

@ -19,7 +19,6 @@ import java.io.File;
import java.text.MessageFormat;
import li.strolch.command.XmlExportModelCommand;
import li.strolch.exception.StrolchException;
import li.strolch.model.ModelStatistics;
import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.service.api.AbstractService;
@ -43,14 +42,32 @@ public class XmlExportModelService extends AbstractService<XmlExportModelArgumen
DBC.PRE.assertNotEmpty("Modelfile must be set!", arg.modelFileName);
File dataPath = getRuntimeConfiguration().getDataPath();
File modelFile = new File(dataPath, arg.modelFileName);
if (modelFile.exists()) {
File modelFile;
File dataPath = getRuntimeConfiguration().getDataPath();
File modelFileName = new File(arg.modelFileName);
if (modelFileName.isAbsolute()) {
if (!arg.external)
return ServiceResult.error("Model file is absolute, yet service argument is not marked as external!");
modelFile = modelFileName;
} else {
if (arg.external)
return ServiceResult.error("Model file is not absolute, yet service argument is marked as externa!");
modelFile = new File(dataPath, arg.modelFileName);
}
if (modelFile.exists()) {
if (!arg.overwrite) {
String msg = "Model File already exists with name {0} in data path {1}"; //$NON-NLS-1$
msg = MessageFormat.format(msg, arg.modelFileName, dataPath);
throw new StrolchException(msg);
if (modelFileName.isAbsolute()) {
String msg = "Model File already exists at path {0}"; //$NON-NLS-1$
msg = MessageFormat.format(msg, arg.modelFileName);
return ServiceResult.error(msg);
} else {
String msg = "Model File already exists with name {0} in data path {1}"; //$NON-NLS-1$
msg = MessageFormat.format(msg, arg.modelFileName, dataPath);
return ServiceResult.error(msg);
}
}
}