Skip to content

Commit 9e82a74

Browse files
hansonrhansonr
authored andcommitted
JEditorPane working, except for paste.
1 parent 7133732 commit 9e82a74

File tree

22 files changed

+1096
-235
lines changed

22 files changed

+1096
-235
lines changed
306 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20190817161814
1+
20190819235053
306 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20190817161814
1+
20190819235053
306 Bytes
Binary file not shown.

sources/net.sf.j2s.java.core/src/javax/swing/JTextPane.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,6 @@
8888
*/
8989
public class JTextPane extends JEditorPane {
9090

91-
92-
// TODO SwingJS -- JSTextPaneUI has not been implemented
93-
94-
9591
/**
9692
* Creates a new <code>JTextPane</code>. A new instance of
9793
* <code>StyledEditorKit</code> is

sources/net.sf.j2s.java.core/src/swingjs/api/js/DOMNode.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public static DOMNode setAttr(DOMNode node, String attr, Object val) {
124124
/**
125125
* @j2sNative
126126
*
127-
* node[attr] = (val == "TRUE" ? true : val == "FALSE" ? false : val);
127+
* attr && (node[attr] = (val == "TRUE" ? true : val == "FALSE" ? false : val));
128128
*
129129
*/
130130
return node;
@@ -153,9 +153,7 @@ public static DOMNode setAttrs(DOMNode node, Object... attr) {
153153
* @j2sNative
154154
*
155155
* for (var i = 0; i < attr.length;) {
156-
* var key = attr[i++];
157-
* var val = attr[i++];
158-
* key && (node[key] = val);
156+
* C$.setAttr(node, attr[i++],attr[i++]);
159157
* }
160158
*/
161159
return node;
@@ -166,9 +164,7 @@ public static DOMNode setStyles(DOMNode node, String... attr) {
166164
* @j2sNative
167165
*
168166
* if (node) for (var i = 0; i < attr.length;) {
169-
* //
170-
* node.style[attr[i++]] = attr[i++];
171-
* //
167+
* node.style[attr[i++]] = attr[i++];
172168
* }
173169
*
174170
*/

sources/net.sf.j2s.java.core/src/swingjs/plaf/JSComponentUI.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2940,6 +2940,9 @@ public FontMetrics getFontMetrics(Font font) {
29402940
return c.getFontMetrics(font);
29412941
}
29422942

2943+
/**
2944+
* Window has been disposed, or component has been removed.
2945+
*/
29432946
@Override
29442947
public void dispose() {
29452948
if (isUIDisabled)
@@ -3458,6 +3461,11 @@ public void clearPaintPath() {
34583461
*/
34593462
protected boolean modalBlocked;
34603463

3464+
/**
3465+
* JTextArea, JTextPane, and JEditorPane
3466+
*/
3467+
public boolean isTextView;
3468+
34613469

34623470

34633471
public boolean isModalBlocked() {

0 commit comments

Comments
 (0)