com php-src: updates for java app ... delicious ...: tutorials/java/dist/phpdbg-ui.jar tutorials/java/nbproject/private/private.properties
tutorials/java/src/phpdbg/ui/JConsole.form tutorials/java/src/phpdbg/ui/JConsole.java tutorials/java/src/phpdbg/ui/JTerminalPane.java
tutorials/java/src/phpdbg/ui/logo-small.png
| From: | Bob Weinand | Date: | Fri, 29 Nov 2013 22:03:08 +0000 |
| Subject: | com php-src: updates for java app ... delicious ...: tutorials/java/dist/phpdbg-ui.jar tutorials/java/nbproject/private/private.properties tutorials/java/src/phpdbg/ui/JConsole.form tutorials/java/src/phpdbg/ui/JConsole.java tutorials/java/src/phpdbg/ui/JTerminalPane.java tutorials/java/src/phpdbg/ui/logo-small.png |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75339@lists.php.net to get a copy of this message | ||
Commit: c94ae50063d7edeb972011c7c9713a57266e19c9
Author: krakjoe <joe.watkins@live.co.uk> Fri, 29 Nov 2013 22:03:08 +0000
Parents: 8c28d94a4e7f80bf2f3ae6abcee8e540bbf08bb3
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c94ae50063d7edeb972011c7c9713a57266e19c9
Log:
updates for java app ... delicious ....
Changed paths:
M tutorials/java/dist/phpdbg-ui.jar
M tutorials/java/nbproject/private/private.properties
M tutorials/java/src/phpdbg/ui/JConsole.form
M tutorials/java/src/phpdbg/ui/JConsole.java
M tutorials/java/src/phpdbg/ui/JTerminalPane.java
A tutorials/java/src/phpdbg/ui/logo-small.png
Diff:
diff --git a/tutorials/java/dist/phpdbg-ui.jar b/tutorials/java/dist/phpdbg-ui.jar
index 8bd1f95..bc4c39c 100644
Binary files a/tutorials/java/dist/phpdbg-ui.jar and b/tutorials/java/dist/phpdbg-ui.jar differ
diff --git a/tutorials/java/nbproject/private/private.properties
b/tutorials/java/nbproject/private/private.properties
index 5d050e3..9595bd6 100644
--- a/tutorials/java/nbproject/private/private.properties
+++ b/tutorials/java/nbproject/private/private.properties
@@ -1,4 +1,3 @@
-application.args=127.0.0.1 4000
compile.on.save=true
do.depend=false
do.jar=true
diff --git a/tutorials/java/src/phpdbg/ui/JConsole.form b/tutorials/java/src/phpdbg/ui/JConsole.form
index 7b3d916..fb2e622 100644
--- a/tutorials/java/src/phpdbg/ui/JConsole.form
+++ b/tutorials/java/src/phpdbg/ui/JConsole.form
@@ -22,8 +22,8 @@
<Properties>
<Property name="defaultCloseOperation" type="int"
value="2"/>
<Property name="title" type="java.lang.String" value="phpdbg
jui"/>
- <Property name="modalityType" type="java.awt.Dialog$ModalityType"
editor="org.netbeans.modules.form.editors.EnumEditor">
- <Value id="TOOLKIT_MODAL"/>
+ <Property name="iconImage" type="java.awt.Image"
editor="org.netbeans.modules.form..ComponentChooserEditor">
+ <ComponentRef name="default"/>
</Property>
</Properties>
<SyntheticProperties>
diff --git a/tutorials/java/src/phpdbg/ui/JConsole.java b/tutorials/java/src/phpdbg/ui/JConsole.java
index 74f4040..60001d3 100644
--- a/tutorials/java/src/phpdbg/ui/JConsole.java
+++ b/tutorials/java/src/phpdbg/ui/JConsole.java
@@ -7,6 +7,7 @@ import static java.awt.event.KeyEvent.VK_UP;
import java.io..IOException;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.imageio.ImageIO;
import javax.swing.JOptionPane;
import javax.swing.JScrollPane;
import javax.swing.JTextField;
@@ -68,7 +69,6 @@ public class JConsole extends javax.swing.JDialog {
setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
setTitle("phpdbg jui");
- setModalityType(java.awt.Dialog.ModalityType.TOOLKIT_MODAL);
host.setText("127.0.0.1");
host.setToolTipText("Set the hostname, or IPv4 address of the machine running the
phpdbg remote console server");
diff --git a/tutorials/java/src/phpdbg/ui/JTerminalPane.java
b/tutorials/java/src/phpdbg/ui/JTerminalPane.java
index 8462a6e..c616d2a 100644
--- a/tutorials/java/src/phpdbg/ui/JTerminalPane.java
+++ b/tutorials/java/src/phpdbg/ui/JTerminalPane.java
@@ -13,6 +13,10 @@ package phpdbg.ui;
import javax.swing.*;
import javax.swing.text.*;
import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.io.IOException;
+import javax.imageio.ImageIO;
public class JTerminalPane extends JTextPane {
@@ -32,22 +36,44 @@ public class JTerminalPane extends JTextPane {
private static final Color B_Yellow = Color.getHSBColor( 0.167f, 1.000f, 1.000f );
private static final Color B_Cyan = Color.getHSBColor( 0.500f, 1.000f, 1.000f );
private static final Color B_White = Color.getHSBColor( 0.000f, 0.000f, 1.000f );
- private static final Color cReset = Color.getHSBColor( 0.000f, 0.000f, 0.000f );
+ private static final Color cReset = Color.getHSBColor( 0.000f, 0.000f, 1.000f );
private Color colorCurrent = cReset;
private String remaining = "";
public JTerminalPane() {
super();
+ setOpaque(false);
+ setBackground(new Color(0, 0, 0, 0));
+ }
+
+ @Override public void paintComponent(Graphics g) {
+ g.setColor(Color.BLACK);
+ g.fillRect(0, 0, getWidth(), getHeight());
+
+ try {
+ Image image = ImageIO.read(
+ JTerminalPane.class.getResource("logo-small.png"));
+
+ g.drawImage(
+ image,
+ getWidth() - image.getWidth(this) - 10,
+ getHeight() - image.getHeight(this) - 10,
+ image.getWidth(this), image.getHeight(this), this);
+
+ } catch (IOException | NullPointerException | IllegalArgumentException ex) {}
+
+ super.paintComponent(g);
}
public void append(Color c, String s) {
StyleContext sc = StyleContext.getDefaultStyleContext();
AttributeSet aset = sc.addAttribute(
SimpleAttributeSet.EMPTY, StyleConstants.Foreground, c);
- setCaretPosition(getDocument().getLength());
setCharacterAttributes(aset, false);
replaceSelection(s);
+ setCaretPosition(
+ (getDocument().getLength() > 0) ? (getDocument().getLength() - 1) : 0);
}
public void appendANSI(String s) {
diff --git a/tutorials/java/src/phpdbg/ui/logo-small.png
b/tutorials/java/src/phpdbg/ui/logo-small.png
new file mode 100644
index 0000000..1792379
Binary files /dev/null and b/tutorials/java/src/phpdbg/ui/logo-small.png differ