diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d063bcce..8e07011c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -118,9 +118,11 @@ jobs:
path: java/org.eclipse.set.browser.lib/res/
- name: Build
+ working-directory: java
run: mvn -T 1.5C -B clean verify
- name: Publish
+ working-directory: java
run: mvn -T 1.5C -B deploy -DaltDeploymentRepository=set-github::https://maven.pkg.github.com/${{ github.repository }}
if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')
env:
diff --git a/java/.mvn/extensions.xml b/java/.mvn/extensions.xml
new file mode 100644
index 00000000..9294fc41
--- /dev/null
+++ b/java/.mvn/extensions.xml
@@ -0,0 +1,8 @@
+
+
+
+ org.eclipse.tycho
+ tycho-build
+ ${tycho-version}
+
+
\ No newline at end of file
diff --git a/java/.mvn/maven.config b/java/.mvn/maven.config
new file mode 100644
index 00000000..a3c944e4
--- /dev/null
+++ b/java/.mvn/maven.config
@@ -0,0 +1 @@
+-Dtycho-version=5.0.2
\ No newline at end of file
diff --git a/java/org.eclipse.set.browser.cef.win32/pom.xml b/java/org.eclipse.set.browser.cef.win32/pom.xml
deleted file mode 100644
index 81f7175e..00000000
--- a/java/org.eclipse.set.browser.cef.win32/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- 4.0.0
-
- org.eclipse.set
- org.eclipse.set.browser.cef.win32
- eclipse-plugin
-
-
- ../..
- org.eclipse.set
- org.eclipse.set.browser.releng.parent
- 2.6.0-SNAPSHOT
-
-
\ No newline at end of file
diff --git a/java/org.eclipse.set.browser.lib/pom.xml b/java/org.eclipse.set.browser.lib/pom.xml
deleted file mode 100644
index ab8aba0f..00000000
--- a/java/org.eclipse.set.browser.lib/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- 4.0.0
-
- org.eclipse.set
- org.eclipse.set.browser.lib
- eclipse-plugin
-
-
- ../..
- org.eclipse.set
- org.eclipse.set.browser.releng.parent
- 2.6.0-SNAPSHOT
-
-
\ No newline at end of file
diff --git a/java/org.eclipse.set.browser.releng.target/org.eclipse.set.browser.releng.target.target b/java/org.eclipse.set.browser.releng.target/org.eclipse.set.browser.releng.target.target
index 3afafe9f..6a8b14b9 100644
--- a/java/org.eclipse.set.browser.releng.target/org.eclipse.set.browser.releng.target.target
+++ b/java/org.eclipse.set.browser.releng.target/org.eclipse.set.browser.releng.target.target
@@ -3,9 +3,10 @@
-
-
-
+
+
+
+
-
+
\ No newline at end of file
diff --git a/java/org.eclipse.set.browser.releng.target/pom.xml b/java/org.eclipse.set.browser.releng.target/pom.xml
deleted file mode 100644
index b84793a8..00000000
--- a/java/org.eclipse.set.browser.releng.target/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- 4.0.0
-
- org.eclipse.set
- org.eclipse.set.browser.releng.target
- eclipse-target-definition
-
-
- ../..
- org.eclipse.set
- org.eclipse.set.browser.releng.parent
- 2.6.0-SNAPSHOT
-
-
\ No newline at end of file
diff --git a/java/org.eclipse.set.browser/pom.xml b/java/org.eclipse.set.browser/pom.xml
deleted file mode 100644
index ef4183e8..00000000
--- a/java/org.eclipse.set.browser/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
- 4.0.0
-
- org.eclipse.set
- org.eclipse.set.browser
- eclipse-plugin
-
-
- ../..
- org.eclipse.set
- org.eclipse.set.browser.releng.parent
- 2.6.0-SNAPSHOT
-
-
\ No newline at end of file
diff --git a/java/org.eclipse.set.browser/src/org/eclipse/set/browser/cef/Chromium.java b/java/org.eclipse.set.browser/src/org/eclipse/set/browser/cef/Chromium.java
index a6163c4f..c4ad5ca0 100644
--- a/java/org.eclipse.set.browser/src/org/eclipse/set/browser/cef/Chromium.java
+++ b/java/org.eclipse.set.browser/src/org/eclipse/set/browser/cef/Chromium.java
@@ -71,6 +71,7 @@
import org.eclipse.swt.internal.C;
import org.eclipse.swt.internal.Callback;
import org.eclipse.swt.internal.DPIUtil;
+import org.eclipse.swt.internal.Win32DPIUtils;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
@@ -590,8 +591,9 @@ public void on_after_created(final long browser_id) {
if (event.size != null && !event.size.equals(new Point(0, 0))) {
final Point size = event.size;
- chromium.getShell().setSize(
- chromium.getShell().computeSize(size.x, size.y));
+ chromium.getShell()
+ .setSize(chromium.getShell()
+ .computeSize(size.x, size.y));
}
for (final VisibilityWindowListener listener : visibilityWindowListeners) {
@@ -1232,13 +1234,13 @@ private void createPopup(final long windowInfo, final long client,
@SuppressWarnings("hiding")
private CompletableFuture doSetUrl(final String url,
final String postData, final String[] headers) {
- return enableProgress.thenRun(() -> {
- doSetUrlPost(browser, url, postData, headers);
- });
+ return enableProgress
+ .thenRun(() -> doSetUrlPost(browser, url, postData, headers));
}
private Point getChromiumSize() {
- return DPIUtil.autoScaleUp(chromium.getSize());
+ return Win32DPIUtils.pointToPixelAsSize(chromium.getSize(),
+ DPIUtil.getDeviceZoom());
}
private Object mapType(final int type, final String value)
@@ -1282,18 +1284,18 @@ private void openJsDialog(final int dialog_type, final String title,
final long callback) {
int style = SWT.ICON_WORKING;
switch (dialog_type) {
- case ChromiumLib.JSDIALOGTYPE_ALERT:
- style = SWT.ICON_INFORMATION;
- break;
- case ChromiumLib.JSDIALOGTYPE_CONFIRM:
- style = SWT.ICON_WARNING;
- break;
- case ChromiumLib.JSDIALOGTYPE_PROMPT:
- style = SWT.ICON_QUESTION | SWT.YES | SWT.NO;
- break;
- default:
- style = SWT.ICON_QUESTION;
- break;
+ case ChromiumLib.JSDIALOGTYPE_ALERT:
+ style = SWT.ICON_INFORMATION;
+ break;
+ case ChromiumLib.JSDIALOGTYPE_CONFIRM:
+ style = SWT.ICON_WARNING;
+ break;
+ case ChromiumLib.JSDIALOGTYPE_PROMPT:
+ style = SWT.ICON_QUESTION | SWT.YES | SWT.NO;
+ break;
+ default:
+ style = SWT.ICON_QUESTION;
+ break;
}
final Consumer close = open -> {
final int r = open == SWT.OK || open == SWT.YES ? 1 : 0;
diff --git a/pom.xml b/java/pom.xml
similarity index 90%
rename from pom.xml
rename to java/pom.xml
index 476db874..b02628ed 100644
--- a/pom.xml
+++ b/java/pom.xml
@@ -8,17 +8,17 @@
pom
- 5.0.2
+
3.1.4
UTF-8
yyyyMMdd_HHmmssZ
- java/org.eclipse.set.browser
- java/org.eclipse.set.browser.lib
- java/org.eclipse.set.browser.cef.win32
- java/org.eclipse.set.browser.releng.target
+ org.eclipse.set.browser
+ org.eclipse.set.browser.lib
+ org.eclipse.set.browser.cef.win32
+ org.eclipse.set.browser.releng.target
@@ -114,13 +114,6 @@
tycho-source-plugin
${tycho-version}
-
- feature-source
- package
-
- feature-source
-
-
plugin-source