Skip to content

Fixed relative paths (Fixes #17) #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
forresthopkinsa wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed relative paths (Fixes #17) #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a7a020
FIXED relative paths not working with the chart.
forresthopkinsa Feb 4, 2017
d04fdb1
Made the pom work more relatively
forresthopkinsa Feb 8, 2017
61154cc
Added support for relative paths to report logo files
forresthopkinsa Feb 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<configuration>
<source>1.6</source>
<target>1.6</target>
<executable>F:/devtools/jdk1.6.0_31/bin/javac</executable>
<executable>${env.JAVA_HOME}/bin/javac</executable>
</configuration>
<version>2.3.2</version>
</plugin>
Expand Down
33 changes: 27 additions & 6 deletions src/main/java/com/uttesh/pdfngreport/util/PdfngUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import com.uttesh.pdfngreport.common.ImageUtils;
import com.uttesh.pdfngreport.model.SystemMeta;
import com.uttesh.pdfngreport.util.xml.ReportData;

import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -65,12 +67,20 @@ public String getProp(String name) {
}

public static String getReportLocation() {
String location = System.getProperty(Constants.SystemProps.REPORT_OUPUT_DIR);
if (location == null || location.trim().length() == 0) {
location = (String) PDFCache.getConfig(Constants.SystemProps.REPORT_OUPUT_DIR);
}
return location;
String outputDir = System.getProperty(Constants.SystemProps.REPORT_OUPUT_DIR);
if (outputDir == null || outputDir.trim().length() == 0) {
String configOption = (String) PDFCache.getConfig(Constants.SystemProps.REPORT_OUPUT_DIR);
return absolutify(configOption);
} else {
return absolutify(outputDir);
}
}

private static String absolutify(String relative) {
String backSlashes = new File(relative).getAbsolutePath();
String forwardSlashes = backSlashes.replace('\\', '/');
return forwardSlashes;
}

public void populateReportDataProperties(ReportData reportData) throws Exception {
String reportTitle = (String) PDFCache.getConfig(Constants.SystemProps.REPORT_TITLE_PROP);
Expand Down Expand Up @@ -100,6 +110,18 @@ public void populateReportDataProperties(ReportData reportData) throws Exception
} else {
exceptionPage = Constants.SHOW;
}

File logoFilepath = new File(logoFile);
if (logoFilepath.exists()) {
// This isn't really necessary; absolutify won't do anything to paths that are already absolute
if (logoFilepath.isAbsolute())
reportData.setLogoFile(logoFile);
else
reportData.setLogoFile(absolutify(logoFile));
} else {
System.err.println("[ERROR] Logo file located at '" + absolutify(logoFile) + "' cannot be found! Disabling logo...");
logo = "hide";
}

InputStream exceptionIcon = getClass().getClassLoader().getResourceAsStream(Constants.Icons.EXCEPTION_ICON);

Expand All @@ -120,7 +142,6 @@ public void populateReportDataProperties(ReportData reportData) throws Exception
reportData.setTitleAlign(titleAlign);
reportData.setReportLocation(reportLocation);
reportData.setChart(chart);
reportData.setLogoFile(logoFile);
reportData.setLogo(logo);
reportData.setLogoAlign(logoAlign);
reportData.setExceptionPage(exceptionPage);
Expand Down