Skip to content

JTextPane, JEditorPane, JTextArea, JTextField updates, implementations #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BobHanson merged 10 commits into from
Dec 29, 2018
Merged

JTextPane, JEditorPane, JTextArea, JTextField updates, implementations #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5b48017
JSComboBoxUI should not override inside(x,y)
Dec 21, 2018
2661842
JLayerPane issue when resizing pallette-depth frames
Dec 22, 2018
2651a82
working on j2sMenu
Dec 22, 2018
8ad6e74
update for SwingJS-site.zip
Dec 22, 2018
d44a239
Merge branch 'hanson1' of https://github.com/BobHanson/java2script.git
Dec 22, 2018
3f6583f
try again!
Dec 22, 2018
771449d
swing rewrite of use of uiClassID, now private to JSComponent.java.
Dec 25, 2018
611c20d
JTextPane, JEditPane preliminary support - test/Test_Editor.java
Dec 29, 2018
f6a316c
JEditorPane <div>....<br><div>
Dec 29, 2018
8ef5847
JEditorPane <div>....<br><div>
Dec 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/dist/swingjs/timestamp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20181220202217
20181228223849
Binary file modified sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20181220202217
20181228223849
10 changes: 5 additions & 5 deletions sources/net.sf.j2s.java.core/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
org.eclipse.jdt.core.compiler.problem.deadCode=warning
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecation=ignore
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.forbiddenReference=ignore
org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
Expand Down Expand Up @@ -55,7 +55,7 @@ org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariable
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
Expand All @@ -71,7 +71,7 @@ org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.terminalDeprecation=warning
org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
Expand Down
Binary file modified sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
84 changes: 0 additions & 84 deletions sources/net.sf.j2s.java.core/src/Test0.java
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions sources/net.sf.j2s.java.core/src/Test0_Applet.java
View file
Open in desktop

This file was deleted.

12 changes: 3 additions & 9 deletions sources/net.sf.j2s.java.core/src/java/applet/JSApplet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,14 @@
*/
package java.applet;

import java.awt.HeadlessException;
import java.net.MalformedURLException;
import java.net.URL;

import java.awt.Dimension;
import java.awt.HeadlessException;
import java.awt.Image;
import java.awt.JSPanel;
import java.awt.Panel;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Locale;

import swingjs.JSToolkit;
import swingjs.JSUtil;
import swingjs.api.js.HTML5Applet;

/**
* SwingJS note: This class is the original java.applet.Applet class.
* It is subclassed by JApplet. The replacement java.applet.Applet class
Expand Down
4 changes: 0 additions & 4 deletions sources/net.sf.j2s.java.core/src/java/awt/Canvas.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@
*/
package java.awt;

import java.awt.image.BufferStrategy;
import java.awt.peer.CanvasPeer;
import javax.accessibility.*;

/**
* A <code>Canvas</code> component represents a blank rectangular
* area of the screen onto which the application can draw or from
Expand Down
5 changes: 5 additions & 0 deletions sources/net.sf.j2s.java.core/src/java/awt/Color.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@ public class Color implements Paint /*, java.io.Serializable*/ {
*/
public final static Color black = new Color(0, 0, 0);

/**
* SwingJS The color almost black; signifies none for styles
*/
public final static Color none = new Color(0, 0, 1); // SwingJS

/**
* The color black. In the default sRGB space.
* @since 1.4
Expand Down
Loading