vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 14:17:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wise-org-pela' of ssh://wisemapping.com/var/git-repos/wise-source into wise-org-pela

Browse Source
This commit is contained in:
Pablo Luna 2011-05-06 15:29:48 +01:00
commit 1a06cf3658
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wise-webapp/src/main/java/com/wisemapping/exporter/ExporterFactory.java
View File

@ -215,9 +215,9 @@ public class ExporterFactory {
// Hack for backward compatibility . This can be removed in 2012. :) // Hack for backward compatibility . This can be removed in 2012. :)
String imgPath; String imgPath;
if (imgUrl.contains("images")) { if (imgUrl.contains("images")) {
imgPath = imgBaseUrl + "../images/" + iconName; imgPath = imgBaseUrl + "/../images/" + iconName;
} else { } else {
imgPath = imgBaseUrl + imgUrl; imgPath = imgBaseUrl + "/" + imgUrl;
} }
elem.setAttribute("xlink:href", imgPath); elem.setAttribute("xlink:href", imgPath);
elem.appendChild(document.createTextNode(" ")); elem.appendChild(document.createTextNode(" "));

2
wise-webapp/src/test/java/com/wisemapping/test/export/ExportTest.java
View File

@ -42,7 +42,7 @@ public class ExportTest {
final ExportProperties properties = ExportProperties.create(format); final ExportProperties properties = ExportProperties.create(format);
final ExportProperties.ImageProperties imageProperties = (ExportProperties.ImageProperties) properties; final ExportProperties.ImageProperties imageProperties = (ExportProperties.ImageProperties) properties;
imageProperties.setSize(ExportProperties.ImageProperties.Size.LARGE); imageProperties.setSize(ExportProperties.ImageProperties.Size.LARGE);
String baseUrl = "file://"+svgFile.getParentFile().getAbsolutePath()+"/../../../main/webapp/icons/"; String baseUrl = "file://"+svgFile.getParentFile().getAbsolutePath()+"/../../../main/webapp/icons";
properties.setBaseImagePath(baseUrl); properties.setBaseImagePath(baseUrl);
// Write content ... // Write content ...