diff options
3 files changed, 8 insertions, 5 deletions
diff --git a/doc/org.eclipse.eef.documentation.export/META-INF/MANIFEST.MF b/doc/org.eclipse.eef.documentation.export/META-INF/MANIFEST.MF index 886f91eae..e02c58e68 100644 --- a/doc/org.eclipse.eef.documentation.export/META-INF/MANIFEST.MF +++ b/doc/org.eclipse.eef.documentation.export/META-INF/MANIFEST.MF @@ -9,6 +9,6 @@ Bundle-Localization: plugin Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)", org.eclipse.eef.documentation;bundle-version="[2.0.0,3.0.0)", org.eclipse.core.runtime;bundle-version="[3.10.0,4.0.0)", - com.google.guava;bundle-version="[15.0.0,16.0.0)", + com.google.guava;bundle-version="[15.0.0,22.0.0)", org.hamcrest.library;bundle-version="1.3.0" Export-Package: org.eclipse.eef.documentation.export.internal;version="1.6.0";x-internal:=true diff --git a/doc/org.eclipse.eef.documentation.export/src/org/eclipse/eef/documentation/export/internal/Exporter.java b/doc/org.eclipse.eef.documentation.export/src/org/eclipse/eef/documentation/export/internal/Exporter.java index 59de08bf2..8148f3cb6 100644 --- a/doc/org.eclipse.eef.documentation.export/src/org/eclipse/eef/documentation/export/internal/Exporter.java +++ b/doc/org.eclipse.eef.documentation.export/src/org/eclipse/eef/documentation/export/internal/Exporter.java @@ -14,7 +14,6 @@ import static org.junit.Assert.fail; import com.google.common.base.Charsets; import com.google.common.collect.Lists; -import com.google.common.io.ByteStreams; import com.google.common.io.CharStreams; import com.google.common.io.Closeables; import com.google.common.io.Files; @@ -27,6 +26,7 @@ import java.net.URL; import java.nio.charset.Charset; import java.nio.file.Path; import java.nio.file.Paths; +import java.nio.file.StandardCopyOption; import java.util.ArrayList; import java.util.Enumeration; import java.util.Iterator; @@ -246,8 +246,10 @@ public class Exporter { Path outputPath = this.getOutputPath(documentationVersion, path); outputPath.toFile().getParentFile().mkdirs(); outputPath.toFile().createNewFile(); - ByteStreams.copy(inputStream, Files.newOutputStreamSupplier(outputPath.toFile())); + + java.nio.file.Files.copy(inputStream, outputPath.toFile().toPath(), StandardCopyOption.REPLACE_EXISTING); } catch (IOException e) { + e.printStackTrace(); fail(e.getMessage()); } finally { try { @@ -313,7 +315,8 @@ public class Exporter { lines.add(" <ul class=\"breadcrumb\">"); //$NON-NLS-1$ if (breadcrumbTopics.size() > 0) { - lines.add(" <li><a href=\"" + ROOT_DOCUMENTATION_URL + '/' + documentationVersion + "\">" + documentationVersion + "</a> <span class=\"divider\">/</span></li>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + lines.add(" <li><a href=\"" + ROOT_DOCUMENTATION_URL + '/' + documentationVersion + "\">" + documentationVersion //$NON-NLS-1$ //$NON-NLS-2$ + + "</a> <span class=\"divider\">/</span></li>"); //$NON-NLS-1$ } else { lines.add(" <li><a href=\"" + ROOT_DOCUMENTATION_URL + '/' + documentationVersion + "\">" + documentationVersion + "</a></li>"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } diff --git a/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF index 6ea8a2f82..5a0f39da6 100644 --- a/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.eef.tests/META-INF/MANIFEST.MF @@ -15,5 +15,5 @@ Require-Bundle: org.junit;bundle-version="[4.11.0,5.0.0)", org.eclipse.emf.ecore.xmi;bundle-version="[2.8.0,3.0.0)", org.eclipse.acceleo.query;bundle-version="[5.0.0,7.0.0)", org.antlr.runtime;bundle-version="[4.3.0,5.0.0)" -Import-Package: com.google.common.cache;version="[15.0.0,16.0.0)", +Import-Package: com.google.common.cache;version="[15.0.0,22.0.0)", org.eclipse.sirius.common.interpreter.api;version="1.0.0" |