Commit: 3495e7827432a999af87cde91e773107694ac10a
Author: krakjoe <joe.watk...@live.co.uk> Fri, 29 Nov 2013 09:38:00
+0000
Parents: 216e3668d60429b32b4e01570af3377f00d6dfbb
Branches: PHP-5.6
Link:
http://git.php.net/?p=php-src.git;a=commitdiff;h=3495e7827432a999af87cde91e773107694ac10a
Log:
...
Changed paths:
M .gitignore
M tutorials/java/build/built-jar.properties
D tutorials/java/build/classes/.netbeans_automatic_build
D tutorials/java/build/classes/.netbeans_update_resources
M tutorials/java/build/classes/phpdbg/ui/CommandHistory.class
M tutorials/java/build/classes/phpdbg/ui/DebugSocket.class
M tutorials/java/build/classes/phpdbg/ui/JConsole$1.class
M tutorials/java/build/classes/phpdbg/ui/JConsole$2.class
M tutorials/java/build/classes/phpdbg/ui/JConsole$3.class
M tutorials/java/build/classes/phpdbg/ui/JConsole$4$1.class
M tutorials/java/build/classes/phpdbg/ui/JConsole$4.class
M tutorials/java/build/classes/phpdbg/ui/JConsole$MessageType.class
M tutorials/java/build/classes/phpdbg/ui/JConsole.class
D tutorials/java/build/classes/phpdbg/ui/JConsole.form
M tutorials/java/dist/phpdbg-ui.jar
diff --git a/.gitignore b/.gitignore
index a9e84f8..297efcb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
.libs/
-phpdbg
+./phpdbg
*.lo
*.o
-
+build
diff --git a/tutorials/java/build/built-jar.properties
b/tutorials/java/build/built-jar.properties
index e642ca0..0a4931e 100644
--- a/tutorials/java/build/built-jar.properties
+++ b/tutorials/java/build/built-jar.properties
@@ -1,4 +1,4 @@
-#Fri, 29 Nov 2013 09:01:15 +0000
+#Fri, 29 Nov 2013 09:36:09 +0000
/usr/src/phpdbg/tutorials/java=
diff --git a/tutorials/java/build/classes/.netbeans_automatic_build
b/tutorials/java/build/classes/.netbeans_automatic_build
deleted file mode 100644
index e69de29..0000000
diff --git a/tutorials/java/build/classes/.netbeans_update_resources
b/tutorials/java/build/classes/.netbeans_update_resources
deleted file mode 100644
index e69de29..0000000
diff --git a/tutorials/java/build/classes/phpdbg/ui/CommandHistory.class
b/tutorials/java/build/classes/phpdbg/ui/CommandHistory.class
index 2e9bf45..c7683af 100644
Binary files a/tutorials/java/build/classes/phpdbg/ui/CommandHistory.class and
b/tutorials/java/build/classes/phpdbg/ui/CommandHistory.class differ
diff --git a/tutorials/java/build/classes/phpdbg/ui/DebugSocket.class
b/tutorials/java/build/classes/phpdbg/ui/DebugSocket.class
index af241d4..bd41313 100644
Binary files a/tutorials/java/build/classes/phpdbg/ui/DebugSocket.class and
b/tutorials/java/build/classes/phpdbg/ui/DebugSocket.class differ
diff --git a/tutorials/java/build/classes/phpdbg/ui/JConsole$1.class
b/tutorials/java/build/classes/phpdbg/ui/JConsole$1.class
index 6d8f361..4a79425 100644
Binary files a/tutorials/java/build/classes/phpdbg/ui/JConsole$1.class and
b/tutorials/java/build/classes/phpdbg/ui/JConsole$1.class differ
diff --git a/tutorials/java/build/classes/phpdbg/ui/JConsole$2.class
b/tutorials/java/build/classes/phpdbg/ui/JConsole$2.class
index 26f4b99..5803529 100644
Binary files a/tutorials/java/build/classes/phpdbg/ui/JConsole$2.class and
b/tutorials/java/build/classes/phpdbg/ui/JConsole$2.class differ
diff --git a/tutorials/java/build/classes/phpdbg/ui/JConsole$3.class
b/tutorials/java/build/classes/phpdbg/ui/JConsole$3.class
index e42eba1..5adbfa8 100644
Binary files a/tutorials/java/build/classes/phpdbg/ui/JConsole$3.class and
b/tutorials/java/build/classes/phpdbg/ui/JConsole$3.class differ
diff --git a/tutorials/java/build/classes/phpdbg/ui/JConsole$4$1.class
b/tutorials/java/build/classes/phpdbg/ui/JConsole$4$1.class
index f592992..4ef4d31 100644
Binary files a/tutorials/java/build/classes/phpdbg/ui/JConsole$4$1.class and
b/tutorials/java/build/classes/phpdbg/ui/JConsole$4$1.class differ
diff --git a/tutorials/java/build/classes/phpdbg/ui/JConsole$4.class
b/tutorials/java/build/classes/phpdbg/ui/JConsole$4.class
index 3447931..407f622 100644
Binary files a/tutorials/java/build/classes/phpdbg/ui/JConsole$4.class and
b/tutorials/java/build/classes/phpdbg/ui/JConsole$4.class differ
diff --git a/tutorials/java/build/classes/phpdbg/ui/JConsole$MessageType.class
b/tutorials/java/build/classes/phpdbg/ui/JConsole$MessageType.class
index 5fc8bd6..b9a864f 100644
Binary files
a/tutorials/java/build/classes/phpdbg/ui/JConsole$MessageType.class and
b/tutorials/java/build/classes/phpdbg/ui/JConsole$MessageType.class differ
diff --git a/tutorials/java/build/classes/phpdbg/ui/JConsole.class
b/tutorials/java/build/classes/phpdbg/ui/JConsole.class
index 9c6715b..39129fe 100644
Binary files a/tutorials/java/build/classes/phpdbg/ui/JConsole.class and
b/tutorials/java/build/classes/phpdbg/ui/JConsole.class differ
diff --git a/tutorials/java/build/classes/phpdbg/ui/JConsole.form
b/tutorials/java/build/classes/phpdbg/ui/JConsole.form
deleted file mode 100644
index 4d43235..0000000
--- a/tutorials/java/build/classes/phpdbg/ui/JConsole.form
+++ /dev/null
@@ -1,179 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<Form version="1.3" maxVersion="1.9"
type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
- <NonVisualComponents>
- <Container class="javax.swing.JPopupMenu" name="stdoutPopupMenu">
-
- <Layout
class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
- <Property name="useNullLayout" type="boolean" value="true"/>
- </Layout>
- <SubComponents>
- <MenuItem class="javax.swing.JMenuItem" name="resetStdout">
- <Properties>
- <Property name="text" type="java.lang.String" value="Clear"/>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed"
listener="java.awt.event.ActionListener"
parameters="java.awt.event.ActionEvent" handler="resetStdoutActionPerformed"/>
- </Events>
- </MenuItem>
- </SubComponents>
- </Container>
- </NonVisualComponents>
- <Properties>
- <Property name="defaultCloseOperation" type="int" value="2"/>
- <Property name="title" type="java.lang.String" value="phpdbg jui"/>
- </Properties>
- <SyntheticProperties>
- <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
- <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
- </SyntheticProperties>
- <AuxValues>
- <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer"
value="0"/>
- <AuxValue name="FormSettings_autoSetComponentName"
type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean"
value="true"/>
- <AuxValue name="FormSettings_generateMnemonicsCode"
type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean"
value="false"/>
- <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer"
value="1"/>
- <AuxValue name="FormSettings_listenerGenerationStyle"
type="java.lang.Integer" value="0"/>
- <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean"
value="false"/>
- <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer"
value="2"/>
- </AuxValues>
-
- <Layout>
- <DimensionLayout dim="0">
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" attributes="0">
- <EmptySpace max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" attributes="0">
- <Component id="mainSplit" max="32767" attributes="0"/>
- <Group type="102" attributes="0">
- <Component id="hostLabel" min="-2" max="-2"
attributes="0"/>
- <EmptySpace max="-2" attributes="0"/>
- <Component id="host" pref="359" max="32767"
attributes="0"/>
- <EmptySpace type="unrelated" max="-2" attributes="0"/>
- <Component id="stdinCheckBox" min="-2" max="-2"
attributes="0"/>
- <EmptySpace type="unrelated" max="-2" attributes="0"/>
- <Component id="stdinPort" min="-2" pref="60" max="-2"
attributes="0"/>
- <EmptySpace type="separate" max="-2" attributes="0"/>
- <Component id="stdoutCheckBox" min="-2" max="-2"
attributes="0"/>
- <EmptySpace type="unrelated" max="-2" attributes="0"/>
- <Component id="stdoutPort" min="-2" pref="60" max="-2"
attributes="0"/>
- <EmptySpace type="unrelated" max="-2" attributes="0"/>
- <Component id="openButton" min="-2" max="-2"
attributes="0"/>
- </Group>
- </Group>
- <EmptySpace max="-2" attributes="0"/>
- </Group>
- </Group>
- </DimensionLayout>
- <DimensionLayout dim="1">
- <Group type="103" groupAlignment="0" attributes="0">
- <Group type="102" alignment="0" attributes="0">
- <EmptySpace max="-2" attributes="0"/>
- <Component id="mainSplit" pref="428" max="32767" attributes="0"/>
- <EmptySpace type="unrelated" max="-2" attributes="0"/>
- <Group type="103" groupAlignment="0" max="-2" attributes="0">
- <Component id="host" alignment="0" min="-2" max="-2"
attributes="0"/>
- <Component id="openButton" alignment="0" max="32767"
attributes="0"/>
- <Group type="103" groupAlignment="3" attributes="0">
- <Component id="stdoutPort" alignment="3" min="-2"
max="-2" attributes="0"/>
- <Component id="stdinCheckBox" alignment="3" min="-2"
max="-2" attributes="0"/>
- <Component id="stdoutCheckBox" alignment="3" min="-2"
max="-2" attributes="0"/>
- <Component id="stdinPort" alignment="3" min="-2"
max="-2" attributes="0"/>
- <Component id="hostLabel" alignment="3" min="-2"
max="-2" attributes="0"/>
- </Group>
- </Group>
- <EmptySpace max="-2" attributes="0"/>
- </Group>
- </Group>
- </DimensionLayout>
- </Layout>
- <SubComponents>
- <Container class="javax.swing.JSplitPane" name="mainSplit">
- <Properties>
- <Property name="orientation" type="int" value="0"/>
- <Property name="toolTipText" type="java.lang.String" value=""/>
- </Properties>
-
- <Layout
class="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"/>
- <SubComponents>
- <Component class="javax.swing.JTextField" name="input">
- <Properties>
- <Property name="toolTipText" type="java.lang.String" value=""/>
- <Property name="enabled" type="boolean" value="false"/>
- </Properties>
- <Events>
- <EventHandler event="keyReleased"
listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent"
handler="inputKeyReleased"/>
- </Events>
- <Constraints>
- <Constraint
layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"
value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
- <JSplitPaneConstraints position="left"/>
- </Constraint>
- </Constraints>
- </Component>
- <Container class="javax.swing.JScrollPane" name="outputScrollPane">
- <AuxValues>
- <AuxValue name="autoScrollPane" type="java.lang.Boolean"
value="true"/>
- </AuxValues>
- <Constraints>
- <Constraint
layoutClass="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout"
value="org.netbeans.modules.form.compat2.layouts.support.JSplitPaneSupportLayout$JSplitPaneConstraintsDescription">
- <JSplitPaneConstraints position="right"/>
- </Constraint>
- </Constraints>
-
- <Layout
class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
- <SubComponents>
- <Component class="phpdbg.ui.JTerminalPane" name="output">
- </Component>
- </SubComponents>
- </Container>
- </SubComponents>
- </Container>
- <Component class="javax.swing.JTextField" name="host">
- <Properties>
- <Property name="text" type="java.lang.String" value="127.0.0.1"/>
- <Property name="toolTipText" type="java.lang.String" value="Set the
hostname, or IPv4 address of the machine running the phpdbg remote console
server"/>
- </Properties>
- </Component>
- <Component class="javax.swing.JTextField" name="stdoutPort">
- <Properties>
- <Property name="text" type="java.lang.String" value="8000"/>
- <Property name="toolTipText" type="java.lang.String" value=""/>
- </Properties>
- </Component>
- <Component class="javax.swing.JCheckBox" name="stdinCheckBox">
- <Properties>
- <Property name="selected" type="boolean" value="true"/>
- <Property name="text" type="java.lang.String" value="stdin:"/>
- <Property name="toolTipText" type="java.lang.String" value="Set the
port for stdin, or uncheck to disable stdin"/>
- </Properties>
- </Component>
- <Component class="javax.swing.JCheckBox" name="stdoutCheckBox">
- <Properties>
- <Property name="selected" type="boolean" value="true"/>
- <Property name="text" type="java.lang.String" value="stdout:"/>
- <Property name="toolTipText" type="java.lang.String" value="Set the
port for stdout, or unset to disable stdout"/>
- </Properties>
- </Component>
- <Component class="javax.swing.JButton" name="openButton">
- <Properties>
- <Property name="actionCommand" type="java.lang.String" value="open"/>
- <Property name="label" type="java.lang.String" value="open"/>
- </Properties>
- <Events>
- <EventHandler event="actionPerformed"
listener="java.awt.event.ActionListener"
parameters="java.awt.event.ActionEvent" handler="openButtonActionPerformed"/>
- </Events>
- </Component>
- <Component class="javax.swing.JTextField" name="stdinPort">
- <Properties>
- <Property name="text" type="java.lang.String" value="4000"/>
- <Property name="toolTipText" type="java.lang.String" value=""/>
- </Properties>
- </Component>
- <Component class="javax.swing.JLabel" name="hostLabel">
- <Properties>
- <Property name="text" type="java.lang.String" value="Hostname:"/>
- </Properties>
- </Component>
- </SubComponents>
-</Form>
diff --git a/tutorials/java/dist/phpdbg-ui.jar
b/tutorials/java/dist/phpdbg-ui.jar
index a2c3c75..725dad5 100644
Binary files a/tutorials/java/dist/phpdbg-ui.jar and
b/tutorials/java/dist/phpdbg-ui.jar differ
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
