Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 8 additions & 0 deletions java/.mvn/extensions.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<extensions>
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>${tycho-version}</version>
</extension>
</extensions>
1 change: 1 addition & 0 deletions java/.mvn/maven.config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-Dtycho-version=5.0.2
16 changes: 0 additions & 16 deletions java/org.eclipse.set.browser.cef.win32/pom.xml

This file was deleted.

16 changes: 0 additions & 16 deletions java/org.eclipse.set.browser.lib/pom.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
<target name="org.eclipse.set.browser.releng.target" sequenceNumber="1656422776">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.sdk.feature.group" version="4.36.0.v20250528-2229"/>
<unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
<repository location="https://download.eclipse.org/releases/2025-06/"/>
<unit id="org.eclipse.sdk.feature.group" version="4.38.0.v20251201-1407"/>
<unit id="org.apache.commons.commons-io" version="2.21.0"/>
<unit id="org.apache.felix.scr" version="2.2.14"/>
<repository location="https://download.eclipse.org/releases/2025-12/"/>
</location>
</locations>
</target>
</target>
16 changes: 0 additions & 16 deletions java/org.eclipse.set.browser.releng.target/pom.xml

This file was deleted.

16 changes: 0 additions & 16 deletions java/org.eclipse.set.browser/pom.xml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -1232,13 +1234,13 @@ private void createPopup(final long windowInfo, final long client,
@SuppressWarnings("hiding")
private CompletableFuture<Void> 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)
Expand Down Expand Up @@ -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<Integer> close = open -> {
final int r = open == SWT.OK || open == SWT.YES ? 1 : 0;
Expand Down
17 changes: 5 additions & 12 deletions pom.xml → java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
<packaging>pom</packaging>

<properties>
<tycho-version>5.0.2</tycho-version>
<!-- <tycho-version>5.0.2</tycho-version> -->
<deploy-plugin-version>3.1.4</deploy-plugin-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>yyyyMMdd_HHmmssZ</maven.build.timestamp.format>
</properties>

<modules>
<module>java/org.eclipse.set.browser</module>
<module>java/org.eclipse.set.browser.lib</module>
<module>java/org.eclipse.set.browser.cef.win32</module>
<module>java/org.eclipse.set.browser.releng.target</module>
<module>org.eclipse.set.browser</module>
<module>org.eclipse.set.browser.lib</module>
<module>org.eclipse.set.browser.cef.win32</module>
<module>org.eclipse.set.browser.releng.target</module>
</modules>

<profiles>
Expand Down Expand Up @@ -114,13 +114,6 @@
<artifactId>tycho-source-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>feature-source</id>
<phase>package</phase>
<goals>
<goal>feature-source</goal>
</goals>
</execution>
<execution>
<id>plugin-source</id>
<goals>
Expand Down
Loading