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

Bug WISE-422 fixed: Minor improvement.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2015-03-24 21:36:47 -03:00
parent f23d708385
commit 65c48562af
1 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ public class ExporterFactory {
transcoder.addTranscodingHint(ImageTranscoder.KEY_WIDTH, size.getWidth()); transcoder.addTranscodingHint(ImageTranscoder.KEY_WIDTH, size.getWidth());
// Create the transcoder input. // Create the transcoder input.
final String svgString = normalizeSvg(mapSvg, false); final String svgString = normalizeSvg(mapSvg);
final TranscoderInput input = new TranscoderInput(new CharArrayReader(svgString.toCharArray())); final TranscoderInput input = new TranscoderInput(new CharArrayReader(svgString.toCharArray()));
TranscoderOutput trascoderOutput = new TranscoderOutput(output); TranscoderOutput trascoderOutput = new TranscoderOutput(output);
@ -99,7 +99,7 @@ public class ExporterFactory {
transcoder.addTranscodingHint(ImageTranscoder.KEY_WIDTH, size.getWidth()); transcoder.addTranscodingHint(ImageTranscoder.KEY_WIDTH, size.getWidth());
// Create the transcoder input. // Create the transcoder input.
final String svgString = normalizeSvg(mapSvg, false); final String svgString = normalizeSvg(mapSvg);
final TranscoderInput input = new TranscoderInput(new CharArrayReader(svgString.toCharArray())); final TranscoderInput input = new TranscoderInput(new CharArrayReader(svgString.toCharArray()));
TranscoderOutput trascoderOutput = new TranscoderOutput(output); TranscoderOutput trascoderOutput = new TranscoderOutput(output);
@ -113,7 +113,7 @@ public class ExporterFactory {
final Transcoder transcoder = new PDFTranscoder(); final Transcoder transcoder = new PDFTranscoder();
// Create the transcoder input. // Create the transcoder input.
final String svgString = normalizeSvg(mapSvg, false); final String svgString = normalizeSvg(mapSvg);
final TranscoderInput input = new TranscoderInput(new CharArrayReader(svgString.toCharArray())); final TranscoderInput input = new TranscoderInput(new CharArrayReader(svgString.toCharArray()));
TranscoderOutput trascoderOutput = new TranscoderOutput(output); TranscoderOutput trascoderOutput = new TranscoderOutput(output);
@ -122,7 +122,7 @@ public class ExporterFactory {
break; break;
} }
case SVG: { case SVG: {
final String svgString = normalizeSvg(mapSvg, true); final String svgString = normalizeSvg(mapSvg);
output.write(svgString.getBytes(UTF_8_CHARSET_NAME)); output.write(svgString.getBytes(UTF_8_CHARSET_NAME));
break; break;
} }
@ -157,7 +157,7 @@ public class ExporterFactory {
} }
} }
private String normalizeSvg(@NotNull String svgXml, boolean embedImg) throws ExportException { private String normalizeSvg(@NotNull String svgXml) throws ExportException {
try { try {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
@ -195,13 +195,7 @@ public class ExporterFactory {
inlineImages(document, (Element) child); inlineImages(document, (Element) child);
return domToString(document); return domToString(document);
} catch (ParserConfigurationException e) { } catch (ParserConfigurationException | TransformerException | SAXException | IOException e) {
throw new ExportException(e);
} catch (IOException e) {
throw new ExportException(e);
} catch (SAXException e) {
throw new ExportException(e);
} catch (TransformerException e) {
throw new ExportException(e); throw new ExportException(e);
} }
@ -276,13 +270,10 @@ public class ExporterFactory {
String result = elem.getAttribute("href"); String result = elem.getAttribute("href");
if (result.isEmpty()) { if (result.isEmpty()) {
result = elem.getAttribute("xlink:href");
if (!result.isEmpty()) {
elem.removeAttribute("xlink:href");
}
// Bug WISE-422: This seems to be a bug in Safari. For some reason, img add prefixed with NS1 // Bug WISE-422: This seems to be a bug in Safari. For some reason, img add prefixed with NS1
// <image NS1:href="icons/sign_help.png" // <image NS1:href="icons/sign_help.png"
// Also: Remove replace "xlink:href" to href to uniform ...
final NamedNodeMap attributes = elem.getAttributes(); final NamedNodeMap attributes = elem.getAttributes();
for (int i = 0; i < attributes.getLength(); i++) { for (int i = 0; i < attributes.getLength(); i++) {
final Node node = attributes.item(i); final Node node = attributes.item(i);