diff --git a/apps/samples/Ensemble8/legal/syntaxhighlighter.md b/apps/samples/Ensemble8/legal/syntaxhighlighter.md index 5d799367a1..e3a7bf684e 100644 --- a/apps/samples/Ensemble8/legal/syntaxhighlighter.md +++ b/apps/samples/Ensemble8/legal/syntaxhighlighter.md @@ -1,8 +1,8 @@ -## SyntaxHighlighter v3.0.83 +## SyntaxHighlighter v4.0.1 ### MIT License
-Copyright (C) 2004-2010 Alex Gorbatchev. +Copyright (c) 2004-2013, Alex Gorbatchev Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), diff --git a/apps/samples/Ensemble8/src/app/java/ensemble/samplepage/SourceTab.java b/apps/samples/Ensemble8/src/app/java/ensemble/samplepage/SourceTab.java index 647d39806b..aadc51627a 100644 --- a/apps/samples/Ensemble8/src/app/java/ensemble/samplepage/SourceTab.java +++ b/apps/samples/Ensemble8/src/app/java/ensemble/samplepage/SourceTab.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2016, Oracle and/or its affiliates. + * Copyright (c) 2008, 2019, Oracle and/or its affiliates. * All rights reserved. Use is subject to license terms. * * This file is available and licensed under the following license: @@ -93,21 +93,19 @@ public SourceTab(URL sourceURL) { private static final Pattern JAVA_DOC_PATTERN = Pattern.compile("(^\\s+\\*$\\s)?^\\s+\\*\\s+@.*$\\s",Pattern.MULTILINE); private static String shCoreJs; - private static String shBrushJScript; - private static String shCoreDefaultCss; + private static String shThemeCss; private static String convertToHTML(String source) { // load syntax highlighter if (shCoreJs == null) { - shCoreJs = Utils.loadFile(EnsembleApp.class.getResource("syntaxhighlighter/shCore.js")) +";"; + shCoreJs = Utils.loadFile(EnsembleApp.class.getResource("syntaxhighlighter/syntaxhighlighter.js")); } - if (shBrushJScript == null) { - shBrushJScript = Utils.loadFile(EnsembleApp.class.getResource("syntaxhighlighter/shBrushJava.js")); + if (shThemeCss == null) { + shThemeCss = Utils.loadFile(EnsembleApp.class.getResource("syntaxhighlighter/theme.css")) + .replaceAll("!important",""); } - if (shCoreDefaultCss == null) { - shCoreDefaultCss = Utils.loadFile(EnsembleApp.class.getResource("syntaxhighlighter/shCoreDefault.css")).replaceAll("!important",""); - } - // split copy right and source + + // split copyright and source String[] parts = source.split("\\*/",2); String copyRight = null; if (parts.length > 1) { @@ -128,11 +126,9 @@ private static String convertToHTML(String source) { html.append(" \n"); html.append(" \n"); html.append("