You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by rw...@apache.org on 2018/02/02 17:28:06 UTC
svn commit: r1822989 - in /pivot/trunk: ./
demos/src/org/apache/pivot/demos/json/
demos/src/org/apache/pivot/demos/xml/ demos/www/ demos/xsl/
examples/src/org/apache/pivot/examples/sheets/
tests/src/org/apache/pivot/tests/ tutorials-server/src/org/apac...
Author: rwhitcomb
Date: Fri Feb 2 17:28:06 2018
New Revision: 1822989
URL: http://svn.apache.org/viewvc?rev=1822989&view=rev
Log:
Some cleanup in the build:
* Add "examples" as a target, which compiles and copies the relevant
source files.
* Include "examples" in the "clean", "compile" and "test" targets.
* Add some more source files types to "trim-whitespace", namely:
+ css, csv, js, xsl, sql
* And fix some smart quotes in CSS files that wouldn't actually work.
Then, check in the files that had whitespace trimmed, or other changes
found by these build fixes.
Modified:
pivot/trunk/build.xml
pivot/trunk/demos/src/org/apache/pivot/demos/json/json_viewer.js
pivot/trunk/demos/src/org/apache/pivot/demos/xml/xml_viewer.js
pivot/trunk/demos/www/demo_print.css
pivot/trunk/demos/xsl/demo.html.xsl
pivot/trunk/demos/xsl/demo.jnlp.xsl
pivot/trunk/examples/src/org/apache/pivot/examples/sheets/SheetSlideDirectionWindow.java
pivot/trunk/tests/src/org/apache/pivot/tests/clipboard.js
pivot/trunk/tests/src/org/apache/pivot/tests/javascript_console_test.js
pivot/trunk/tests/src/org/apache/pivot/tests/result_list_test.sql
pivot/trunk/tests/src/org/apache/pivot/tests/scripts_diagnostic_messages.js
pivot/trunk/tests/src/org/apache/pivot/tests/utilities_script.js
pivot/trunk/tutorials-server/src/org/apache/pivot/tutorials/webqueries/server/expenses.csv
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/clipboard/clipboard.js
pivot/trunk/tutorials/www/tutorial.css
pivot/trunk/tutorials/www/tutorial_print.css
pivot/trunk/tutorials/xsl/tutorial.xsl
Modified: pivot/trunk/build.xml
URL: http://svn.apache.org/viewvc/pivot/trunk/build.xml?rev=1822989&r1=1822988&r2=1822989&view=diff
==============================================================================
--- pivot/trunk/build.xml (original)
+++ pivot/trunk/build.xml Fri Feb 2 17:28:06 2018
@@ -409,7 +409,7 @@ limitations under the License.
<!-- Compile all classes (not including tests, because they depend on packaged .jar files) -->
<target name="compile" description="Compiles all projects"
- depends="environment-info, charts, core, demos, demos-server, tutorials, tutorials-server, web, web-server, wtk, wtk-terra"/>
+ depends="environment-info, charts, core, demos, demos-server, examples, tutorials, tutorials-server, web, web-server, wtk, wtk-terra"/>
<!-- Compile all classes (tests included) -->
<target name="compile-tests" description="Compiles tests after compiling everything else"
@@ -462,6 +462,7 @@ limitations under the License.
<test project="core"/>
<test project="demos"/>
<test project="demos-server"/>
+ <test project="examples"/>
<test project="tests"/>
<test project="tutorials"/>
<test project="tutorials-server"/>
@@ -478,6 +479,7 @@ limitations under the License.
<clean project="core"/>
<clean project="demos"/>
<clean project="demos-server"/>
+ <clean project="examples"/>
<clean project="tests"/>
<clean project="tutorials"/>
<clean project="tutorials-server"/>
@@ -536,6 +538,21 @@ limitations under the License.
</compile>
</target>
+ <target name="examples" depends="core, wtk, wtk-terra, web">
+ <compile project="examples"/>
+ <copy todir="examples/${folder.bin}">
+ <fileset dir="examples/src" includes="**/*.bxml"/>
+ <fileset dir="examples/src" includes="**/*.html"/>
+ <fileset dir="examples/src" includes="**/*.icns"/>
+ <fileset dir="examples/src" includes="**/*.ico"/>
+ <fileset dir="examples/src" includes="**/*.json"/>
+ <fileset dir="examples/src" includes="**/*.png"/>
+ <fileset dir="examples/src" includes="**/*.svg"/>
+ <fileset dir="examples/src" includes="**/*.txt"/>
+ <fileset dir="examples/src" includes="**/*.xml"/>
+ </copy>
+ </target>
+
<target name="tests" depends="core, web, wtk, wtk-terra">
<compile project="tests">
<fileset dir="wtk" includes="lib/**/*.jar"/>
@@ -950,14 +967,19 @@ limitations under the License.
<include name="RELEASE-NOTES"/>
<include name="**/*.java"/>
<include name="**/*.html"/>
+ <include name="**/*.css"/>
+ <include name="**/*.csv"/>
+ <include name="**/*.js"/>
<include name="**/*.jsp"/>
<include name="**/*.txt"/>
<include name="**/*.properties"/>
<include name="**/*.xml"/>
<include name="**/*.bxml"/>
+ <include name="**/*.xsl"/>
<include name="**/*.json"/>
<include name="**/*.groovy"/>
<include name="**/*.scala"/>
+ <include name="**/*.sql"/>
</fileset>
<replaceregexp match="[\t]" replace=" " flags="gm" byline="true">
<fileset refid="trimfiles"/>
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/json/json_viewer.js
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/json/json_viewer.js?rev=1822989&r1=1822988&r2=1822989&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/json/json_viewer.js (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/json/json_viewer.js Fri Feb 2 17:28:06 2018
@@ -36,7 +36,7 @@ var treeViewDropTarget = new DropTarget(
return (dragContent.containsFileList() ? DropAction.COPY : null);
},
- userDropActionChange: function(component, dragContent, supportedDropActions, x, y,
+ userDropActionChange: function(component, dragContent, supportedDropActions, x, y,
userDropAction) {
return (dragContent.containsFileList() ? DropAction.COPY : null);
},
@@ -45,7 +45,7 @@ var treeViewDropTarget = new DropTarget(
var dropAction = null;
if (dragContent.containsFileList()) {
- return application.drop(dragContent);
+ return application.drop(dragContent);
}
dragExit(component);
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/xml/xml_viewer.js
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/xml/xml_viewer.js?rev=1822989&r1=1822988&r2=1822989&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/xml/xml_viewer.js (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/xml/xml_viewer.js Fri Feb 2 17:28:06 2018
@@ -36,7 +36,7 @@ var treeViewDropTarget = new DropTarget(
return (dragContent.containsFileList() ? DropAction.COPY : null);
},
- userDropActionChange: function(component, dragContent, supportedDropActions, x, y,
+ userDropActionChange: function(component, dragContent, supportedDropActions, x, y,
userDropAction) {
return (dragContent.containsFileList() ? DropAction.COPY : null);
},
@@ -45,7 +45,7 @@ var treeViewDropTarget = new DropTarget(
var dropAction = null;
if (dragContent.containsFileList()) {
- return application.drop(dragContent);
+ return application.drop(dragContent);
}
dragExit(component);
Modified: pivot/trunk/demos/www/demo_print.css
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/www/demo_print.css?rev=1822989&r1=1822988&r2=1822989&view=diff
==============================================================================
--- pivot/trunk/demos/www/demo_print.css (original)
+++ pivot/trunk/demos/www/demo_print.css Fri Feb 2 17:28:06 2018
@@ -16,31 +16,31 @@ limitations under the License.
*/
body {
- background: white;
- font-family: Georgia, Times New Roman, serif;
- font-size: small;
- color: #000000;
+ background: white;
+ font-family: Georgia, 'Times New Roman', serif;
+ font-size: small;
+ color: #000000;
}
#content, .content {
- background: transparent;
- width: 100%;
- margin: 0;
- float: none;
+ background: transparent;
+ width: 100%;
+ margin: 0;
+ float: none;
}
#nav, #sidebar {
- display: none;
+ display: none;
}
a:link {
- color: #252525;
- font-weight: bold;
- text-decoration: underline;
+ color: #252525;
+ font-weight: bold;
+ text-decoration: underline;
}
.noprint {
- display: none;
+ display: none;
}
Modified: pivot/trunk/demos/xsl/demo.html.xsl
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/xsl/demo.html.xsl?rev=1822989&r1=1822988&r2=1822989&view=diff
==============================================================================
--- pivot/trunk/demos/xsl/demo.html.xsl (original)
+++ pivot/trunk/demos/xsl/demo.html.xsl Fri Feb 2 17:28:06 2018
@@ -117,25 +117,25 @@ limitations under the License.
};
<!-- Java arguments -->
- <xsl:choose>
- <xsl:when test="/document/properties/java_memory_options_huge">
+ <xsl:choose>
+ <xsl:when test="/document/properties/java_memory_options_huge">
var javaArguments = ["-Dsun.awt.noerasebackground=true",
"-Dsun.awt.erasebackgroundonresize=true",
"-Xms256M -Xmx1024M"
];
- </xsl:when>
- <xsl:otherwise>
+ </xsl:when>
+ <xsl:otherwise>
var javaArguments = ["-Dsun.awt.noerasebackground=true",
"-Dsun.awt.erasebackgroundonresize=true"];
- </xsl:otherwise>
- </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
<xsl:if test="java-arguments">
<xsl:for-each select="java-arguments/*">
javaArguments.push("-D<xsl:value-of select="name(.)"/>=<xsl:apply-templates/>");
</xsl:for-each>
</xsl:if>
-
+
parameters.java_arguments = javaArguments.join(" ");
<!-- Startup properties -->
Modified: pivot/trunk/demos/xsl/demo.jnlp.xsl
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/xsl/demo.jnlp.xsl?rev=1822989&r1=1822988&r2=1822989&view=diff
==============================================================================
--- pivot/trunk/demos/xsl/demo.jnlp.xsl (original)
+++ pivot/trunk/demos/xsl/demo.jnlp.xsl Fri Feb 2 17:28:06 2018
@@ -90,16 +90,16 @@ limitations under the License.
<property name="sun.awt.erasebackgroundonresize=true" value="true"/>
</xsl:if>
- <xsl:choose>
- <xsl:when test="/document/properties/java_memory_options_huge">
+ <xsl:choose>
+ <xsl:when test="/document/properties/java_memory_options_huge">
<java version="1.7+" href="http://java.sun.com/products/autodl/j2se"
- initial-heap-size="256M" max-heap-size="1024M"
- />
- </xsl:when>
- <xsl:otherwise>
+ initial-heap-size="256M" max-heap-size="1024M"
+ />
+ </xsl:when>
+ <xsl:otherwise>
<java version="1.7+" href="http://java.sun.com/products/autodl/j2se"/>
- </xsl:otherwise>
- </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
<xsl:variable name="signed" select="libraries/@signed"/>
<xsl:for-each select="libraries/library">
@@ -122,10 +122,10 @@ limitations under the License.
<xsl:choose>
<xsl:when test='$signed'>
- <jar href="lib/svgSalamander-tiny.signed.jar"/>
+ <jar href="lib/svgSalamander-tiny.signed.jar"/>
</xsl:when>
<xsl:otherwise>
- <jar href="lib/svgSalamander-tiny.jar"/>
+ <jar href="lib/svgSalamander-tiny.jar"/>
</xsl:otherwise>
</xsl:choose>
</resources>
Modified: pivot/trunk/examples/src/org/apache/pivot/examples/sheets/SheetSlideDirectionWindow.java
URL: http://svn.apache.org/viewvc/pivot/trunk/examples/src/org/apache/pivot/examples/sheets/SheetSlideDirectionWindow.java?rev=1822989&r1=1822988&r2=1822989&view=diff
==============================================================================
--- pivot/trunk/examples/src/org/apache/pivot/examples/sheets/SheetSlideDirectionWindow.java (original)
+++ pivot/trunk/examples/src/org/apache/pivot/examples/sheets/SheetSlideDirectionWindow.java Fri Feb 2 17:28:06 2018
@@ -87,7 +87,7 @@ public class SheetSlideDirectionWindow e
tablePane = null;
// Mouse handler to enable users to quickly close the sheet
- final ContainerMouseListener displayMouseHandler = new ContainerMouseListener.Adapter() {
+ final ContainerMouseListener displayMouseHandler = new ContainerMouseListener() {
@Override
public boolean mouseDown(Container container, Mouse.Button button, int x, int y) {
Display display = (Display) container;
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/clipboard.js
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/clipboard.js?rev=1822989&r1=1822988&r2=1822989&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/clipboard.js (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/clipboard.js Fri Feb 2 17:28:06 2018
@@ -28,14 +28,14 @@ function copy() {
Clipboard.setContent(content);
// Diagnostic info
- // Alert("Copy Image").open(window);
+ // Alert("Copy Image").open(window);
}
function paste() {
// Diagnostic info
- // Prompt("Paste Image").open(window);
+ // Prompt("Paste Image").open(window);
- // Paste any available image from the clipboard
+ // Paste any available image from the clipboard
var content = Clipboard.getContent();
if (content != null) {
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/javascript_console_test.js
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/javascript_console_test.js?rev=1822989&r1=1822988&r2=1822989&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/javascript_console_test.js (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/javascript_console_test.js Fri Feb 2 17:28:06 2018
@@ -21,39 +21,39 @@ importPackage(org.apache.pivot.wtk); /
function log(msg) {
- if (msg == undefined || msg == null || typeof msg != "string")
- return ;
+ if (msg == undefined || msg == null || typeof msg != "string")
+ return ;
System.out.println(msg);
}
function logObject(msg) {
- if (msg == undefined || msg == null)
- return ;
+ if (msg == undefined || msg == null)
+ return ;
- application.logObject(msg);
+ application.logObject(msg);
}
function updateStatus(msg) {
- if (msg == undefined || msg == null || typeof msg != "string")
- return ;
+ if (msg == undefined || msg == null || typeof msg != "string")
+ return ;
- if (msg.length < 50)
- textStatus.text = msg;
+ if (msg.length < 50)
+ textStatus.text = msg;
}
function clearStatus() {
- updateStatus("");
+ updateStatus("");
}
function clearConsole() {
- templateButton.selectedIndex = 0;
- textJSSource.text = "";
- textJSOutput.text = "";
- // runButton.enabled = false; // ok
- runButton.setEnabled(false); // explicit usage of the setter
- log("Console cleared");
- clearStatus();
+ templateButton.selectedIndex = 0;
+ textJSSource.text = "";
+ textJSOutput.text = "";
+ // runButton.enabled = false; // ok
+ runButton.setEnabled(false); // explicit usage of the setter
+ log("Console cleared");
+ clearStatus();
}
function decodeLabel(name) {
@@ -68,7 +68,7 @@ function buildListDataFromLabels() {
logObject(numValues);
log("Expected " + numValues + " number of values for list");
if (numValues != null && numValues.length() > 0) {
- for (var i = 0; i < numValues; i++) {
+ for (var i = 0; i < numValues; i++) {
templateButtonListData.add(decodeLabel("valuesTemplates_" + i));
}
}
@@ -78,18 +78,18 @@ function buildListDataFromLabels() {
function runConsole() {
- var text = textJSSource.text;
- log("Console Text length = " + text.length());
- if (text.length() < 1)
- return ;
- // else
- var msg = "Run JS Code in Console";
- log(msg);
- updateStatus(msg + " ...");
- textJSOutput.text = "";
+ var text = textJSSource.text;
+ log("Console Text length = " + text.length());
+ if (text.length() < 1)
+ return ;
+ // else
+ var msg = "Run JS Code in Console";
+ log(msg);
+ updateStatus(msg + " ...");
+ textJSOutput.text = "";
// TODO: continue here, but calling a Java method inside the application, with the stuff inside ...
- ;
+ ;
}
//TODO: temp ...
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/result_list_test.sql
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/result_list_test.sql?rev=1822989&r1=1822988&r2=1822989&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/result_list_test.sql (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/result_list_test.sql Fri Feb 2 17:28:06 2018
@@ -4,9 +4,9 @@
-- The ASF licenses this file to you under the Apache License,
-- Version 2.0 (the "License"); you may not use this file except in
-- compliance with the License. You may obtain a copy of the License at
---
+--
-- http://www.apache.org/licenses/LICENSE-2.0
---
+--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,8 +20,8 @@ CREATE TABLE result_list_test (
b TINYINT
);
-INSERT INTO result_list_test (i, f, s, b)
+INSERT INTO result_list_test (i, f, s, b)
VALUES (1, 101.1, 'ABCD', 0);
-INSERT INTO result_list_test (i, f, s, b)
+INSERT INTO result_list_test (i, f, s, b)
VALUES (NULL, NULL, NULL, NULL);
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/scripts_diagnostic_messages.js
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/scripts_diagnostic_messages.js?rev=1822989&r1=1822988&r2=1822989&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/scripts_diagnostic_messages.js (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/scripts_diagnostic_messages.js Fri Feb 2 17:28:06 2018
@@ -19,34 +19,34 @@ importPackage(org.apache.pivot.util); /
importPackage(org.apache.pivot.wtk); // required to use Pivot WTK classes
function alert1() {
- Alert.alert("Alert message", window);
+ Alert.alert("Alert message", window);
}
function alert2() {
- Alert("Alert message").open(window);
+ Alert("Alert message").open(window);
}
function prompt1() {
- Prompt.prompt("Prompt message", window);
+ Prompt.prompt("Prompt message", window);
}
function prompt2() {
- Prompt("Prompt message").open(window);
+ Prompt("Prompt message").open(window);
}
function logDirectMessage() {
- System.out.println("Log message via direct call to System.out");
+ System.out.println("Log message via direct call to System.out");
}
function logDirectError() {
- System.err.println("Log error via direct call to System.err");
+ System.err.println("Log error via direct call to System.err");
}
function logConsoleMessage() {
- Console.log("Log message via Console");
+ Console.log("Log message via Console");
}
function logConsoleError() {
- Console.logError("Log error via Console");
+ Console.logError("Log error via Console");
}
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/utilities_script.js
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/utilities_script.js?rev=1822989&r1=1822988&r2=1822989&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/utilities_script.js (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/utilities_script.js Fri Feb 2 17:28:06 2018
@@ -21,16 +21,16 @@ importPackage(org.apache.pivot.wtk); /
function log(msg) {
- if (msg == undefined || msg == null || typeof msg != "string")
- return ;
+ if (msg == undefined || msg == null || typeof msg != "string")
+ return ;
System.out.println(msg);
}
function logObject(msg) {
- if (msg == undefined || msg == null)
- return ;
+ if (msg == undefined || msg == null)
+ return ;
- application.logObject(msg);
+ application.logObject(msg);
}
Modified: pivot/trunk/tutorials-server/src/org/apache/pivot/tutorials/webqueries/server/expenses.csv
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials-server/src/org/apache/pivot/tutorials/webqueries/server/expenses.csv?rev=1822989&r1=1822988&r2=1822989&view=diff
==============================================================================
--- pivot/trunk/tutorials-server/src/org/apache/pivot/tutorials/webqueries/server/expenses.csv (original)
+++ pivot/trunk/tutorials-server/src/org/apache/pivot/tutorials/webqueries/server/expenses.csv Fri Feb 2 17:28:06 2018
@@ -1,8 +1,8 @@
2010-03-28, Travel, 1286.90, Ticket #145-XX-71903-09
2010-03-28, Meals, 34.12, Took client out
-2010-03-31, Meals, 27.00,
-2010-04-01, Meals, 12.55,
-2010-04-02, Meals, 18.86,
+2010-03-31, Meals, 27.00,
+2010-04-01, Meals, 12.55,
+2010-04-02, Meals, 18.86,
2010-04-02, Parking, 30.00, Cambridge Center parking
-2010-04-03, Meals, 20.72,
+2010-04-03, Meals, 20.72,
2010-04-06, Travel, 529.00, Marriott reservation #DF-9982-BRN
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/clipboard/clipboard.js
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/clipboard/clipboard.js?rev=1822989&r1=1822988&r2=1822989&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/clipboard/clipboard.js (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/clipboard/clipboard.js Fri Feb 2 17:28:06 2018
@@ -28,14 +28,14 @@ function copy() {
Clipboard.setContent(content);
// Diagnostic info
- // Alert("Copy Image").open(window);
+ // Alert("Copy Image").open(window);
}
function paste() {
// Diagnostic info
- // Prompt("Paste Image").open(window);
+ // Prompt("Paste Image").open(window);
- // Paste any available image from the clipboard
+ // Paste any available image from the clipboard
var content = Clipboard.getContent();
if (content != null) {
Modified: pivot/trunk/tutorials/www/tutorial.css
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/www/tutorial.css?rev=1822989&r1=1822988&r2=1822989&view=diff
==============================================================================
--- pivot/trunk/tutorials/www/tutorial.css (original)
+++ pivot/trunk/tutorials/www/tutorial.css Fri Feb 2 17:28:06 2018
@@ -26,7 +26,7 @@ p.caption {
}
p.command {
- font-family:"Consolas", "Monaco", "Bitstream Vera Sans Mono", "Courier New";
+ font-family:"Consolas", "Monaco", "Bitstream Vera Sans Mono", "Courier New";
background-color:#E7E5DC;
padding-top:12px;
padding-left:24px;
@@ -37,8 +37,8 @@ p.command {
pre.snippet {
padding:6px;
border:#E7E5DC solid 1px;
- font-family:"Consolas", "Monaco", "Bitstream Vera Sans Mono", "Courier New";
- font-size:1em;
+ font-family:"Consolas", "Monaco", "Bitstream Vera Sans Mono", "Courier New";
+ font-size:1em;
}
tt {
Modified: pivot/trunk/tutorials/www/tutorial_print.css
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/www/tutorial_print.css?rev=1822989&r1=1822988&r2=1822989&view=diff
==============================================================================
--- pivot/trunk/tutorials/www/tutorial_print.css (original)
+++ pivot/trunk/tutorials/www/tutorial_print.css Fri Feb 2 17:28:06 2018
@@ -16,31 +16,31 @@ limitations under the License.
*/
body {
- background: white;
- font-family: Georgia, Times New Roman, serif;
- font-size: small;
- color: #000000;
+ background: white;
+ font-family: Georgia, 'Times New Roman', serif;
+ font-size: small;
+ color: #000000;
}
#content, .content {
- background: transparent;
- width: 100%;
- margin: 0;
- float: none;
+ background: transparent;
+ width: 100%;
+ margin: 0;
+ float: none;
}
#nav, #sidebar {
- display: none;
+ display: none;
}
a:link {
- color: #252525;
- font-weight: bold;
- text-decoration: underline;
+ color: #252525;
+ font-weight: bold;
+ text-decoration: underline;
}
.noprint {
- display: none;
+ display: none;
}
Modified: pivot/trunk/tutorials/xsl/tutorial.xsl
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/xsl/tutorial.xsl?rev=1822989&r1=1822988&r2=1822989&view=diff
==============================================================================
--- pivot/trunk/tutorials/xsl/tutorial.xsl (original)
+++ pivot/trunk/tutorials/xsl/tutorial.xsl Fri Feb 2 17:28:06 2018
@@ -126,7 +126,7 @@ limitations under the License.
libraries.push("lib/svgSalamander-tiny.jar");
</xsl:otherwise>
</xsl:choose>
-
+
attributes.archive = libraries.join(",");
<!-- Base parameters -->
@@ -144,7 +144,7 @@ limitations under the License.
javaArguments.push("-D<xsl:value-of select="name(.)"/>=<xsl:apply-templates/>");
</xsl:for-each>
</xsl:if>
-
+
parameters.java_arguments = javaArguments.join(" ");
<!-- Startup properties -->