Skip to content

July 14-28 work #176

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 23 commits into from
Jul 28, 2020
Merged

July 14-28 work #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
35b2851
Unsafe fix
Jul 14, 2020
543633f
CompletableFuture
Jul 14, 2020
d7f830d
AsyncFileChooser save should clear ok,cancel
Jul 16, 2020
cb69f70
AsyncFileChooser save should clear ok,cancel
Jul 16, 2020
3d19260
AsyncFileChooser save should clear ok,cancel
Jul 16, 2020
1f2922e
GraphicsConfiguration fix for STABLE BufferedImage;Character.toString(c)
Jul 19, 2020
bcf3b0a
GraphicsConfiguration fix for STABLE BufferedImage;Character.toString(c)
Jul 19, 2020
c7c1236
fix for Assets path without file://
Jul 22, 2020
9e8f5ec
fix for Component JPanel minimumSize (1,1)
Jul 22, 2020
7d68baf
JSPanelUI defaulting to min size 1x1 from NullComponentUI
Jul 23, 2020
9822123
BufferedImage update for both graphics and buffer use
Jul 23, 2020
bc577fd
JSSplitPane dividerColor; did not work
Jul 23, 2020
3de58dd
Test update
Jul 23, 2020
9a4b9fe
SwingJS-site.zip update
Jul 23, 2020
cdc875d
Must invalidate even if not visible after a text change
Jul 26, 2020
333859d
JSSlider fixes to avoid unnecessary caught early exception
Jul 26, 2020
0a625cb
Test_Array doublecheck of a[--i] *=
Jul 26, 2020
ce82cd4
SwingJS-site.zip update
Jul 26, 2020
7216b21
Adds FileSystemView and File.list(), File.listFiles()
Jul 28, 2020
9a04df3
Adds JSSplitPaneUI.getDivider()
Jul 28, 2020
e5b4842
fixes innerClass[].getClass().getName() returning "." not "$"
Jul 28, 2020
1f84f4d
SwingJS-site.zip update
Jul 28, 2020
0da73ce
Merge pull request #175 from BobHanson/hanson1
BobHanson Jul 28, 2020
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 @@
20200713172416
20200728062204
Binary file modified sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/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.9/timestamp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20200713172416
20200728062204
Binary file modified sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
View file
Open in desktop
Binary file not shown.
13 changes: 4 additions & 9 deletions sources/net.sf.j2s.java.core/src/java/awt/Component.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2475,12 +2475,10 @@ public Dimension minimumSize() {
* Avoid grabbing the lock if a reasonable cached size value is available.
*/
Dimension dim = minSize;
if (dim == null || !(isMinimumSizeSet() || isValid())) {
if (dim == null || !isMinimumSizeSet() && !isValid()) {
// synchronized (getTreeLock()) {
minSize =
// (peer != null) ?
// peer.minimumSize() :
size();
// SwingJS: NullComponentPeer would have returned (1,1)
minSize = (peer == null ? size() : new Dimension(1,1));
dim = minSize;
// }
}
Expand Down Expand Up @@ -2538,10 +2536,7 @@ public Dimension getMaximumSize() {
}

protected Dimension getMaxSizeComp() {
if (isMaximumSizeSet()) {
return new Dimension(maxSize);
}
return new Dimension(Short.MAX_VALUE, Short.MAX_VALUE);
return (isMaximumSizeSet() ? maxSize : new Dimension(Short.MAX_VALUE, Short.MAX_VALUE));
}

/**
Expand Down
8 changes: 5 additions & 3 deletions sources/net.sf.j2s.java.core/src/java/awt/GraphicsConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,11 @@ public BufferedImage createCompatibleImage(int width, int height,
}


protected BufferedImage newBufferedImage(ColorModel cm, WritableRaster wr,
boolean alphaPremultiplied, Hashtable<?, ?> properties) {
return new BufferedImage(cm, wr, alphaPremultiplied, properties);
protected BufferedImage newBufferedImage(ColorModel cm, WritableRaster wr, boolean alphaPremultiplied,
Hashtable<?, ?> properties) {
BufferedImage bi = new BufferedImage(cm, wr, alphaPremultiplied, properties);
bi.getRaster().秘setStable(true);
return bi;
}

/**
Expand Down
Loading