didou Wed Mar 10 08:48:46 2004 EDT
Modified files:
/phpdoc/en/reference/java configure.xml reference.xml
/phpdoc/en/reference/java/functions java-last-exception-get.xml
Log:
s/php4/php-src and CS
http://cvs.php.net/diff.php/phpdoc/en/reference/java/configure.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/reference/java/configure.xml
diff -u phpdoc/en/reference/java/configure.xml:1.5
phpdoc/en/reference/java/configure.xml:1.6
--- phpdoc/en/reference/java/configure.xml:1.5 Wed Dec 31 10:25:20 2003
+++ phpdoc/en/reference/java/configure.xml Wed Mar 10 08:48:45 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<section id="java.installation">
&reftitle.install;
<para>
@@ -7,7 +7,7 @@
<option role="configure">--with-java[=DIR]</option> where DIR points
to the base install directory of your JDK. This extension can only be built
as a shared dl. More build instructions for this extension can be found in
- <filename>php4/ext/java/README</filename>.
+ <filename>php-src/ext/java/README</filename>.
</para>
<note>
<title>Note to Win32 Users</title>
http://cvs.php.net/diff.php/phpdoc/en/reference/java/reference.xml?r1=1.10&r2=1.11&ty=u
Index: phpdoc/en/reference/java/reference.xml
diff -u phpdoc/en/reference/java/reference.xml:1.10
phpdoc/en/reference/java/reference.xml:1.11
--- phpdoc/en/reference/java/reference.xml:1.10 Wed Dec 17 09:32:36 2003
+++ phpdoc/en/reference/java/reference.xml Wed Mar 10 08:48:45 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
<reference id="ref.java">
<title>PHP / Java Integration</title>
<titleabbrev>Java</titleabbrev>
@@ -52,21 +52,21 @@
<programlisting role="php">
<![CDATA[
<?php
- // get instance of Java class java.lang.System in PHP
- $system = new Java('java.lang.System');
+// get instance of Java class java.lang.System in PHP
+$system = new Java('java.lang.System');
- // demonstrate property access
- echo 'Java version=' . $system->getProperty('java.version') . '<br />';
- echo 'Java vendor=' . $system->getProperty('java.vendor') . '<br />';
- echo 'OS=' . $system->getProperty('os.name') . ' ' .
- $system->getProperty('os.version') . ' on ' .
- $system->getProperty('os.arch') . ' <br />';
-
- // java.util.Date example
- $formatter = new Java('java.text.SimpleDateFormat',
- "EEEE, MMMM dd, yyyy 'at' h:mm:ss a zzzz");
+// demonstrate property access
+echo 'Java version=' . $system->getProperty('java.version') . '<br />';
+echo 'Java vendor=' . $system->getProperty('java.vendor') . '<br />';
+echo 'OS=' . $system->getProperty('os.name') . ' ' .
+ $system->getProperty('os.version') . ' on ' .
+ $system->getProperty('os.arch') . ' <br />';
+
+// java.util.Date example
+$formatter = new Java('java.text.SimpleDateFormat',
+ "EEEE, MMMM dd, yyyy 'at' h:mm:ss a zzzz");
- echo $formatter->format(new Java('java.util.Date'));
+echo $formatter->format(new Java('java.util.Date'));
?>
]]>
</programlisting>
@@ -76,20 +76,20 @@
<programlisting role="php">
<![CDATA[
<?php
- // This example is only intended to be run as a CGI.
+// This example is only intended to be run as a CGI.
- $frame = new Java('java.awt.Frame', 'PHP');
- $button = new Java('java.awt.Button', 'Hello Java World!');
+$frame = new Java('java.awt.Frame', 'PHP');
+$button = new Java('java.awt.Button', 'Hello Java World!');
- $frame->add('North', $button);
- $frame->validate();
- $frame->pack();
- $frame->visible = True;
+$frame->add('North', $button);
+$frame->validate();
+$frame->pack();
+$frame->visible = True;
- $thread = new Java('java.lang.Thread');
- $thread->sleep(10000);
+$thread = new Java('java.lang.Thread');
+$thread->sleep(10000);
- $frame->dispose();
+$frame->dispose();
?>
]]>
</programlisting>
http://cvs.php.net/diff.php/phpdoc/en/reference/java/functions/java-last-exception-get.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/reference/java/functions/java-last-exception-get.xml
diff -u phpdoc/en/reference/java/functions/java-last-exception-get.xml:1.4
phpdoc/en/reference/java/functions/java-last-exception-get.xml:1.5
--- phpdoc/en/reference/java/functions/java-last-exception-get.xml:1.4 Mon Dec 15
11:51:19 2003
+++ phpdoc/en/reference/java/functions/java-last-exception-get.xml Wed Mar 10
08:48:46 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/java.xml, last change in rev 1.1 -->
<refentry id="function.java-last-exception-get">
<refnamediv>
@@ -22,25 +22,25 @@
<programlisting role="php">
<![CDATA[
<?php
- $stack = new Java('java.util.Stack');
- $stack->push(1);
+$stack = new Java('java.util.Stack');
+$stack->push(1);
- // This should succeed
- $result = $stack->pop();
- $ex = java_last_exception_get();
- if (!$ex) {
- echo "$result\n";
- }
+// This should succeed
+$result = $stack->pop();
+$ex = java_last_exception_get();
+if (!$ex) {
+ echo "$result\n";
+}
- // This should fail (error suppressed by @)
- $result = @$stack->pop();
- $ex = java_last_exception_get();
- if ($ex) {
- echo $ex->toString();
- }
+// This should fail (error suppressed by @)
+$result = @$stack->pop();
+$ex = java_last_exception_get();
+if ($ex) {
+ echo $ex->toString();
+}
- // Clear last exception
- java_last_exception_clear();
+// Clear last exception
+java_last_exception_clear();
?>
]]>
</programlisting>
