Author: jleroux
Date: Fri May 12 13:09:35 2017
New Revision: 1794974
URL: http://svn.apache.org/viewvc?rev=1794974&view=rev
Log:
No functional changes.
Fixes a comment and formats Java code
Modified:
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/BirtWorker.java
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtUtil.java
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/webapp/view/BirtViewHandler.java
Modified:
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/BirtWorker.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/BirtWorker.java?rev=1794974&r1=1794973&r2=1794974&view=diff
==============================================================================
---
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/BirtWorker.java
(original)
+++
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/BirtWorker.java
Fri May 12 13:09:35 2017
@@ -130,7 +130,7 @@ public final class BirtWorker {
}
// set output options
- if (! BirtUtil.isSupportedMimeType(contentType)) {
+ if (!BirtUtil.isSupportedMimeType(contentType)) {
throw new GeneralException("Unknown content type : " +
contentType);
}
RenderOption options = new RenderOption();
@@ -264,7 +264,7 @@ public final class BirtWorker {
new
GeneralException(ServiceUtil.getErrorMessage(resultElectronicText));
}
String reportForm = (String) resultElectronicText.get("textData");
- if (! reportForm.startsWith("<?xml")) {
+ if (!reportForm.startsWith("<?xml")) {
StringBuffer xmlHeaderForm = new StringBuffer("<?xml
version=\"1.0\" encoding=\"UTF-8\"?>");
xmlHeaderForm.append("<forms
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\";
xsi:noNamespaceSchemaLocation=\"http://ofbiz.apache.org/dtds/widget-form.xsd\";>");
xmlHeaderForm.append(reportForm);
@@ -281,7 +281,7 @@ public final class BirtWorker {
String dataResourceIdRpt = delegator.getNextSeqId("DataResource");
String contentIdRpt = delegator.getNextSeqId("Content");
String rptDesignName = BirtUtil.encodeReportName(reportName);
- if (! rptDesignName.endsWith(".rptdesign")) {
+ if (!rptDesignName.endsWith(".rptdesign")) {
rptDesignName = rptDesignName.concat(".rptdesign");
}
dispatcher.runSync("createDataResource",
UtilMisc.toMap("dataResourceId", dataResourceIdRpt, "dataResourceTypeId",
"LOCAL_FILE", "mimeTypeId", "text/rptdesign", "dataResourceName",
rptDesignName, "objectInfo", templateFileLocation, "userLogin", userLogin));
Modified:
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java?rev=1794974&r1=1794973&r2=1794974&view=diff
==============================================================================
---
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java
(original)
+++
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtServices.java
Fri May 12 13:09:35 2017
@@ -815,7 +815,7 @@ public class BirtServices {
// adding to styles those which are not already present
while (iterUser.hasNext()) {
DesignElementHandle item = (DesignElementHandle) iterUser.next();
- if (! listStyleNames.contains(item.getName())) {
+ if (!listStyleNames.contains(item.getName())) {
DesignElementHandle copy =
item.copy().getHandle(item.getModule());
try {
designStored.getStyles().add(copy);
Modified:
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtUtil.java?rev=1794974&r1=1794973&r2=1794974&view=diff
==============================================================================
---
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtUtil.java
(original)
+++
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/flexible/BirtUtil.java
Fri May 12 13:09:35 2017
@@ -180,8 +180,8 @@ public final class BirtUtil {
/**
* Resolve the template path location where rptDesign file are stored,
- * first try the resolution from birt.properties with rptDesign.output.path
- * second from content.properties content.upload.path.prefix
+ * first try the resolution from content.properties
content.upload.path.prefix
+ * second from birt.properties with rptDesign.output.path
* and add birtReptDesign directory
* default OFBIZ_HOME/runtime/uploads/birtRptDesign/
* Note: the Birt.properties file does not exist OOTB but can be added for
convenience.
@@ -193,13 +193,13 @@ public final class BirtUtil {
if (UtilValidate.isEmpty(templatePathLocation)) {
templatePathLocation = UtilProperties.getPropertyValue("content",
"content.upload.path.prefix", "runtime/uploads");
}
- if (! templatePathLocation.endsWith("/")) {
+ if (!templatePathLocation.endsWith("/")) {
templatePathLocation = templatePathLocation.concat("/");
}
- if (! templatePathLocation.endsWith("/birtRptDesign/")) {
+ if (!templatePathLocation.endsWith("/birtRptDesign/")) {
templatePathLocation =
templatePathLocation.concat("birtRptDesign/");
}
- if (! templatePathLocation.startsWith("/")) templatePathLocation =
System.getProperty("ofbiz.home").concat("/").concat(templatePathLocation);
+ if (!templatePathLocation.startsWith("/")) templatePathLocation =
System.getProperty("ofbiz.home").concat("/").concat(templatePathLocation);
return templatePathLocation;
}
Modified:
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/webapp/view/BirtViewHandler.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/webapp/view/BirtViewHandler.java?rev=1794974&r1=1794973&r2=1794974&view=diff
==============================================================================
---
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/webapp/view/BirtViewHandler.java
(original)
+++
ofbiz/ofbiz-plugins/trunk/birt/src/main/java/org/apache/ofbiz/birt/webapp/view/BirtViewHandler.java
Fri May 12 13:09:35 2017
@@ -122,7 +122,7 @@ public class BirtViewHandler implements
if (UtilValidate.isNotEmpty(outputFileName)) {
outputFileName = BirtUtil.encodeReportName(outputFileName);
String format = BirtUtil.getMimeTypeFileExtension(contentType);
- if (! outputFileName.endsWith(format)) {
+ if (!outputFileName.endsWith(format)) {
outputFileName = outputFileName.concat(format);
}
outputFileName =
UtilHttp.canonicalizeParameter(outputFileName);
@@ -130,7 +130,7 @@ public class BirtViewHandler implements
}
// checking consistency between Birt content type and response
content type
- if (! contentType.equals(response.getContentType())) {
+ if (!contentType.equals(response.getContentType())) {
response.setContentType(contentType);
}
