diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 7f6de5cc90..27e2e90abc 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -46,7 +46,7 @@ jobs:
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
- java-version: '21'
+ java-version: '25'
- name: checkstyle
working-directory: ./base/uk.ac.stfc.isis.ibex.client.tycho.parent
run: mvn checkstyle:check
@@ -68,7 +68,7 @@ jobs:
- uses: actions/setup-java@v5
with:
distribution: 'temurin'
- java-version: '21'
+ java-version: '25'
- uses: github/codeql-action/init@v4
with:
languages: ${{ matrix.language }}
diff --git a/base/uk.ac.stfc.isis.ibex.activemq/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.activemq/META-INF/MANIFEST.MF
index 8edba051e4..4191de928d 100644
--- a/base/uk.ac.stfc.isis.ibex.activemq/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.activemq/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Utils
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.activemq;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: uk.ac.stfc.isis.ibex.activemq.ActiveMQ
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.activemq,
uk.ac.stfc.isis.ibex.activemq.message
diff --git a/base/uk.ac.stfc.isis.ibex.alarm.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.alarm.tests/META-INF/MANIFEST.MF
index 8ce552f969..af7525f88d 100644
--- a/base/uk.ac.stfc.isis.ibex.alarm.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.alarm.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.alarm.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.alarm;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
org.hamcrest;bundle-version="1.1.0",
org.mockito.mockito-core;bundle-version="4.7.0",
diff --git a/base/uk.ac.stfc.isis.ibex.alarm/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.alarm/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.alarm/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.alarm/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.alarm/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.alarm/META-INF/MANIFEST.MF
index faad97be5a..89ec7f6864 100644
--- a/base/uk.ac.stfc.isis.ibex.alarm/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.alarm/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime,
uk.ac.stfc.isis.ibex.ui;bundle-version="1.0.0",
org.csstudio.alarm.beast.msghist;bundle-version="4.0.1",
wrapped.org.apache.activemq.activemq-all;bundle-version="5.18.6"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.alarm
Import-Package: javax.annotation;version="1.0.0";resolution:=optional,
javax.inject;version="1.0.0"
diff --git a/base/uk.ac.stfc.isis.ibex.alerts.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.alerts.tests/META-INF/MANIFEST.MF
index bb08554a75..03c84a45dd 100644
--- a/base/uk.ac.stfc.isis.ibex.alerts.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.alerts.tests/META-INF/MANIFEST.MF
@@ -10,5 +10,5 @@ Require-Bundle: org.junit;bundle-version="4.10.0",
net.bytebuddy.byte-buddy;bundle-version="1.12.13",
net.bytebuddy.byte-buddy-agent;bundle-version="1.12.13",
org.objenesis;bundle-version="3.2.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.alerts.tests
diff --git a/base/uk.ac.stfc.isis.ibex.alerts/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.alerts/META-INF/MANIFEST.MF
index dc30a46c3b..04d436c070 100644
--- a/base/uk.ac.stfc.isis.ibex.alerts/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.alerts/META-INF/MANIFEST.MF
@@ -12,5 +12,5 @@ Require-Bundle: org.eclipse.core.runtime,
uk.ac.stfc.isis.ibex.epics.switching
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.alerts
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.alerts
diff --git a/base/uk.ac.stfc.isis.ibex.banner/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.banner/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.banner/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.banner/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.banner/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.banner/META-INF/MANIFEST.MF
index 79f6605cf4..3037138a98 100644
--- a/base/uk.ac.stfc.isis.ibex.banner/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.banner/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
uk.ac.stfc.isis.ibex.epics.switching,
uk.ac.stfc.isis.ibex.configserver,
uk.ac.stfc.isis.ibex.epics
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.banner
Automatic-Module-Name: uk.ac.stfc.isis.ibex.banner
diff --git a/base/uk.ac.stfc.isis.ibex.beamstatus/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.beamstatus/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.beamstatus/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.beamstatus/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.beamstatus/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.beamstatus/META-INF/MANIFEST.MF
index e6d60cba26..9dbeef34fa 100644
--- a/base/uk.ac.stfc.isis.ibex.beamstatus/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.beamstatus/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: uk.ac.stfc.isis.ibex.model;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.instrument,
uk.ac.stfc.isis.ibex.epics.switching,
org.diirt.vtype;bundle-version="3.1.5"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.beamstatus
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: uk.ac.stfc.isis.ibex.beamstatus
diff --git a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
index bb18e5ef31..f48fc708ac 100644
--- a/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
+++ b/base/uk.ac.stfc.isis.ibex.client.tycho.parent/pom.xml
@@ -8,10 +8,10 @@
lifecycle-mapping
- 4.0.9
+ 5.0.2
https://oss.sonatype.org/content/groups/public/
- http://download.eclipse.org/releases/2024-12
- http://download.eclipse.org/eclipse/updates/4.34
+ http://download.eclipse.org/releases/2026-03
+ http://download.eclipse.org/eclipse/updates/4.39
UTF-8
@@ -118,40 +118,6 @@
-
-
-
-
- org.eclipse.m2e
- lifecycle-mapping
- 1.0.0
-
-
-
-
-
- org.eclipse.tycho
-
- tycho-packaging-plugin
-
-
- [0.20.0,)
-
-
- validate-version
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/base/uk.ac.stfc.isis.ibex.configserver.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.configserver.tests/META-INF/MANIFEST.MF
index a788250f1f..240b95dd76 100644
--- a/base/uk.ac.stfc.isis.ibex.configserver.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.configserver.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Config server tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.configserver.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.configserver;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.10.0",
uk.ac.stfc.isis.ibex.epics,
org.hamcrest,
diff --git a/base/uk.ac.stfc.isis.ibex.configserver/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.configserver/.settings/org.eclipse.jdt.core.prefs
index bfb698467f..5ff46eabf5 100644
--- a/base/uk.ac.stfc.isis.ibex.configserver/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.configserver/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.configserver/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.configserver/META-INF/MANIFEST.MF
index 430c7f20b0..141ba90294 100644
--- a/base/uk.ac.stfc.isis.ibex.configserver/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.configserver/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime,
com.google.gson,
uk.ac.stfc.isis.ibex.managermode,
uk.ac.stfc.isis.ibex.validators;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.configserver;
uses:="uk.ac.stfc.isis.ibex.epics.pv,
diff --git a/base/uk.ac.stfc.isis.ibex.configserver/src/uk/ac/stfc/isis/ibex/configserver/editing/EditableConfiguration.java b/base/uk.ac.stfc.isis.ibex.configserver/src/uk/ac/stfc/isis/ibex/configserver/editing/EditableConfiguration.java
index 45d02ff007..3cb4e345b6 100644
--- a/base/uk.ac.stfc.isis.ibex.configserver/src/uk/ac/stfc/isis/ibex/configserver/editing/EditableConfiguration.java
+++ b/base/uk.ac.stfc.isis.ibex.configserver/src/uk/ac/stfc/isis/ibex/configserver/editing/EditableConfiguration.java
@@ -237,7 +237,7 @@ public EditableConfiguration(
Collection selectedComponents = getComponentDetails(config.getComponents(), components);
editableComponents = new EditableComponents(selectedComponents, components);
- editableComponents.addPropertyChangeListener(evt -> updateComponents());
+ editableComponents.addPropertyChangeListener(_ -> updateComponents());
updateComponents();
setEnableSaveAsButton();
diff --git a/base/uk.ac.stfc.isis.ibex.dae.tests/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.dae.tests/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.dae.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.dae.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.dae.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.dae.tests/META-INF/MANIFEST.MF
index 41f444f877..308540e3f2 100644
--- a/base/uk.ac.stfc.isis.ibex.dae.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.dae.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.dae.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.dae;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.10.0",
org.hamcrest,
org.mockito.mockito-core;bundle-version="4.7.0",
diff --git a/base/uk.ac.stfc.isis.ibex.dae/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.dae/.settings/org.eclipse.jdt.core.prefs
index 7adc0fb9a0..086d5d7a8b 100644
--- a/base/uk.ac.stfc.isis.ibex.dae/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.dae/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.dae/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.dae/META-INF/MANIFEST.MF
index 65ca9785dc..88322f9ef0 100644
--- a/base/uk.ac.stfc.isis.ibex.dae/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.dae/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: uk.ac.stfc.isis.ibex.preferences;bundle-version="1.0.0",
org.w3c.dom.events;bundle-version="3.0.0",
org.w3c.dom.smil;bundle-version="1.0.1",
org.w3c.dom.svg;bundle-version="1.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.dae,
uk.ac.stfc.isis.ibex.dae.actions,
diff --git a/base/uk.ac.stfc.isis.ibex.dashboard/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.dashboard/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.dashboard/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.dashboard/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.dashboard/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.dashboard/META-INF/MANIFEST.MF
index f2b0b1c73a..f35452411c 100644
--- a/base/uk.ac.stfc.isis.ibex.dashboard/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.dashboard/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
uk.ac.stfc.isis.ibex.instrument;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.dae,
uk.ac.stfc.isis.ibex.epics.switching
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.dashboard
Automatic-Module-Name: uk.ac.stfc.isis.ibex.dashboard
diff --git a/base/uk.ac.stfc.isis.ibex.databases/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.databases/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.databases/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.databases/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.databases/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.databases/META-INF/MANIFEST.MF
index e772a07764..29ccb886bb 100644
--- a/base/uk.ac.stfc.isis.ibex.databases/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.databases/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
uk.ac.stfc.isis.ibex.preferences;bundle-version="1.0.0",
com.mysql.cj;bundle-version="8.0.32",
uk.ac.stfc.isis.ibex.logger;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.databases,
uk.ac.stfc.isis.ibex.databases.preferences
Bundle-ClassPath: .
diff --git a/base/uk.ac.stfc.isis.ibex.devicescreens.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.devicescreens.tests/META-INF/MANIFEST.MF
index b87e453330..f26efd988d 100644
--- a/base/uk.ac.stfc.isis.ibex.devicescreens.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.devicescreens.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.devicescreens.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.devicescreens;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
uk.ac.stfc.isis.ibex.epics,
org.hamcrest,
diff --git a/base/uk.ac.stfc.isis.ibex.devicescreens/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.devicescreens/META-INF/MANIFEST.MF
index 105d63a39e..d3c216937d 100644
--- a/base/uk.ac.stfc.isis.ibex.devicescreens/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.devicescreens/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: uk.ac.stfc.isis.ibex.epics;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.epics.switching;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.dae;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.jaxb;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.devicescreens,
uk.ac.stfc.isis.ibex.devicescreens.components,
diff --git a/base/uk.ac.stfc.isis.ibex.e4.client.product/ibex.product b/base/uk.ac.stfc.isis.ibex.e4.client.product/ibex.product
index 88d390b567..f4767847c8 100644
--- a/base/uk.ac.stfc.isis.ibex.e4.client.product/ibex.product
+++ b/base/uk.ac.stfc.isis.ibex.e4.client.product/ibex.product
@@ -43,7 +43,7 @@
- org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21
+ org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25
diff --git a/base/uk.ac.stfc.isis.ibex.e4.client/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.e4.client/META-INF/MANIFEST.MF
index 7826ca689e..5926140385 100644
--- a/base/uk.ac.stfc.isis.ibex.e4.client/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.e4.client/META-INF/MANIFEST.MF
@@ -36,7 +36,7 @@ Require-Bundle: uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher;bundle-version="1
uk.ac.stfc.isis.ibex.ui.moxas;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.ui.alerts;bundle-version="1.0.0"
Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-Vendor: ISIS
Automatic-Module-Name: uk.ac.stfc.isis.ibex.e4.client
diff --git a/base/uk.ac.stfc.isis.ibex.e4.product/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.e4.product/META-INF/MANIFEST.MF
index 6984c421bc..34c7fbd8ed 100644
--- a/base/uk.ac.stfc.isis.ibex.e4.product/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.e4.product/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
uk.ac.stfc.isis.ibex.epics,
uk.ac.stfc.isis.ibex.ui;bundle-version="1.0.0",
org.csstudio.security;bundle-version="1.1.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: uk.ac.stfc.isis.ibex.e4.product
Import-Package: uk.ac.stfc.isis.ibex.preferences
diff --git a/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/META-INF/MANIFEST.MF
index 120d4fb1d2..938fe6631d 100644
--- a/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/META-INF/MANIFEST.MF
@@ -35,7 +35,7 @@ Require-Bundle: jakarta.annotation-api;bundle-version="[1.3.5,1.3.5]",
org.eclipse.core.runtime;bundle-version="3.19.0",
uk.ac.stfc.isis.ibex.logger;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher,
uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher.views
Automatic-Module-Name: uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher
diff --git a/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/PerspectivesVisibleModel.java b/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/PerspectivesVisibleModel.java
index 4fa71f0816..a7a07aac5c 100644
--- a/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/PerspectivesVisibleModel.java
+++ b/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/PerspectivesVisibleModel.java
@@ -85,7 +85,7 @@ public PerspectivesVisibleModel(MApplication app, EPartService partService, EMod
writePerspectiveSettings = switchingWritableFactory.getSwitchableWritable(new CompressedCharWaveformChannel(),
InstrumentUtils.addPrefix(PERSPECTIVE_CONFIG_PV));
- ManagerModeModel.getInstance().addPropertyChangeListener(ManagerModeModel.IN_MANAGER_MODE_STR, event -> {
+ ManagerModeModel.getInstance().addPropertyChangeListener(ManagerModeModel.IN_MANAGER_MODE_STR, _ -> {
setRemoteInManager();
});
setRemoteInManager();
diff --git a/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/controls/AlarmButtonViewModel.java b/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/controls/AlarmButtonViewModel.java
index f0ded5641e..4b03124948 100644
--- a/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/controls/AlarmButtonViewModel.java
+++ b/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/controls/AlarmButtonViewModel.java
@@ -36,7 +36,7 @@ public AlarmButtonViewModel(final AlarmCounter alarmCounter, String buttonLabel)
flash = new FlashingButton(this, ALARM_ERROR_COLOR);
flash.setDefaultColour(DEFOCUSSED);
- alarmCounter.addPropertyChangeListener("alarmCount", ignored -> {
+ alarmCounter.addPropertyChangeListener("alarmCount", _ -> {
alarmCount = alarmCounter.getCount();
if (!active) {
alarmSeen = false;
diff --git a/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/controls/ScriptServerButtonViewModel.java b/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/controls/ScriptServerButtonViewModel.java
index 933eb4f3f9..08ac46eac2 100644
--- a/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/controls/ScriptServerButtonViewModel.java
+++ b/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/controls/ScriptServerButtonViewModel.java
@@ -32,7 +32,7 @@ public ScriptServerButtonViewModel(NicosModel model, String buttonLabel) {
flash = new FlashingButton(this, SCRIPT_BUTTON_COLOR);
label = buttonLabel;
- model.addPropertyChangeListener("scriptStatus", ignored -> {
+ model.addPropertyChangeListener("scriptStatus", _ -> {
status = model.getScriptStatus();
setButtonColor();
updateFlashing();
diff --git a/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/views/PerspectiveHidingDialog.java b/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/views/PerspectiveHidingDialog.java
index 946a2ff51e..f87e0bacd7 100644
--- a/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/views/PerspectiveHidingDialog.java
+++ b/base/uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher/src/uk/ac/stfc/isis/ibex/e4/ui/perspectiveswitcher/views/PerspectiveHidingDialog.java
@@ -67,7 +67,7 @@ protected Control createDialogArea(Composite parent) {
model = new PerspectivesVisibleModel(app, partService, modelService);
- model.addPropertyChangeListener("remoteErrors", event -> {
+ model.addPropertyChangeListener("remoteErrors", _ -> {
setRemoteErrors(model.getRemoteErrors());
});
setRemoteErrors(model.getRemoteErrors());
diff --git a/base/uk.ac.stfc.isis.ibex.e4.ui/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.e4.ui/META-INF/MANIFEST.MF
index 1f92c173f9..3646640844 100644
--- a/base/uk.ac.stfc.isis.ibex.e4.ui/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.e4.ui/META-INF/MANIFEST.MF
@@ -7,6 +7,6 @@ Require-Bundle: org.eclipse.jface;bundle-version="3.11.1",
org.eclipse.core.runtime;bundle-version="3.11.1",
javax.inject
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: org.eclipse.wb.swt
Automatic-Module-Name: uk.ac.stfc.isis.ibex.e4.ui
diff --git a/base/uk.ac.stfc.isis.ibex.epics.switching/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.epics.switching/META-INF/MANIFEST.MF
index a61ddfa5bf..f4304dbfa3 100644
--- a/base/uk.ac.stfc.isis.ibex.epics.switching/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.epics.switching/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.eclipse.core.runtime,
uk.ac.stfc.isis.ibex.epics,
uk.ac.stfc.isis.ibex.logger;bundle-version="1.0.0",
com.google.guava
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.epics.switching
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: uk.ac.stfc.isis.ibex.epics.switching
diff --git a/base/uk.ac.stfc.isis.ibex.epics.tests/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.epics.tests/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.epics.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.epics.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.epics.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.epics.tests/META-INF/MANIFEST.MF
index 60747e0bc9..ee616099e3 100644
--- a/base/uk.ac.stfc.isis.ibex.epics.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.epics.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests for EPICS plug-in
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.epics.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.epics;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: uk.ac.stfc.isis.ibex.epics.switching,
uk.ac.stfc.isis.ibex.instrument,
org.hamcrest,
diff --git a/base/uk.ac.stfc.isis.ibex.epics.tests/src/uk/ac/stfc/isis/ibex/epics/tests/writing/TransformingWritableTest.java b/base/uk.ac.stfc.isis.ibex.epics.tests/src/uk/ac/stfc/isis/ibex/epics/tests/writing/TransformingWritableTest.java
index bd33e22610..f9cae8a489 100644
--- a/base/uk.ac.stfc.isis.ibex.epics.tests/src/uk/ac/stfc/isis/ibex/epics/tests/writing/TransformingWritableTest.java
+++ b/base/uk.ac.stfc.isis.ibex.epics.tests/src/uk/ac/stfc/isis/ibex/epics/tests/writing/TransformingWritableTest.java
@@ -261,7 +261,7 @@ public void an_error_from_destination_writable_is_stored_in_last_error() {
// Arrange
StubWritable stubDestination = new StubWritable<>();
Exception exception = new Exception();
- Function badConverter = input -> null;
+ Function badConverter = _ -> null;
TransformingWritable forwardingWritable = new TransformingWritable(stubDestination, badConverter);
diff --git a/base/uk.ac.stfc.isis.ibex.epics/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.epics/.settings/org.eclipse.jdt.core.prefs
index 5db31272a1..c9c2096793 100644
--- a/base/uk.ac.stfc.isis.ibex.epics/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.epics/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.epics/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.epics/META-INF/MANIFEST.MF
index 5bd3460fd8..4d2a76d024 100644
--- a/base/uk.ac.stfc.isis.ibex.epics/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.epics/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Epics
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.epics
Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ClassPath: .,
resources/
Require-Bundle: uk.ac.stfc.isis.ibex.jaxb;bundle-version="1.0.0",
diff --git a/base/uk.ac.stfc.isis.ibex.epics/src/uk/ac/stfc/isis/ibex/epics/conversion/Compressor.java b/base/uk.ac.stfc.isis.ibex.epics/src/uk/ac/stfc/isis/ibex/epics/conversion/Compressor.java
index 6408bfa99e..921b4f50a6 100644
--- a/base/uk.ac.stfc.isis.ibex.epics/src/uk/ac/stfc/isis/ibex/epics/conversion/Compressor.java
+++ b/base/uk.ac.stfc.isis.ibex.epics/src/uk/ac/stfc/isis/ibex/epics/conversion/Compressor.java
@@ -33,25 +33,26 @@ public class Compressor implements Function {
@Override
public byte[] apply(byte[] value) throws ConversionException {
- final Deflater compressor = new Deflater();
- compressor.setInput(value);
- compressor.finish();
-
- ByteArrayOutputStream outputStream = new ByteArrayOutputStream(value.length);
-
- byte[] buffer = new byte[KB_IN_BYTES];
- while (!compressor.finished()) {
- int count = compressor.deflate(buffer);
- outputStream.write(buffer, 0, count);
- }
-
- compressor.end();
- try {
- outputStream.close();
- } catch (IOException e) {
- throw new ConversionException(e.getMessage());
+ try (Deflater compressor = new Deflater()) {
+ compressor.setInput(value);
+ compressor.finish();
+
+ ByteArrayOutputStream outputStream = new ByteArrayOutputStream(value.length);
+
+ byte[] buffer = new byte[KB_IN_BYTES];
+ while (!compressor.finished()) {
+ int count = compressor.deflate(buffer);
+ outputStream.write(buffer, 0, count);
+ }
+
+ compressor.end();
+ try {
+ outputStream.close();
+ } catch (IOException e) {
+ throw new ConversionException(e.getMessage());
+ }
+
+ return outputStream.toByteArray();
}
-
- return outputStream.toByteArray();
}
}
\ No newline at end of file
diff --git a/base/uk.ac.stfc.isis.ibex.epics/src/uk/ac/stfc/isis/ibex/epics/observing/ClosableObservable.java b/base/uk.ac.stfc.isis.ibex.epics/src/uk/ac/stfc/isis/ibex/epics/observing/ClosableObservable.java
index 84997f6be9..6984ea35f7 100644
--- a/base/uk.ac.stfc.isis.ibex.epics/src/uk/ac/stfc/isis/ibex/epics/observing/ClosableObservable.java
+++ b/base/uk.ac.stfc.isis.ibex.epics/src/uk/ac/stfc/isis/ibex/epics/observing/ClosableObservable.java
@@ -122,7 +122,7 @@ public void close() {
*/
protected void setValue(T value) {
this.value = Optional.ofNullable(value);
- this.value.ifPresent(val -> currentError = Optional.empty());
+ this.value.ifPresent(_ -> currentError = Optional.empty());
for (Observer observer : observers) {
logErrorsAndContinue(() -> this.value.ifPresent(observer::onValue));
diff --git a/base/uk.ac.stfc.isis.ibex.experimentdetails.tests/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.experimentdetails.tests/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.experimentdetails.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.experimentdetails.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.experimentdetails.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.experimentdetails.tests/META-INF/MANIFEST.MF
index 06c71bd7ef..f21a33c32a 100644
--- a/base/uk.ac.stfc.isis.ibex.experimentdetails.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.experimentdetails.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests for experiment details plug-in
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.experimentdetails.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.experimentdetails;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
org.hamcrest,
org.mockito.mockito-core;bundle-version="4.7.0",
diff --git a/base/uk.ac.stfc.isis.ibex.experimentdetails/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.experimentdetails/META-INF/MANIFEST.MF
index ae950282fb..d504aaae40 100644
--- a/base/uk.ac.stfc.isis.ibex.experimentdetails/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.experimentdetails/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.ui,
com.google.gson,
uk.ac.stfc.isis.ibex.epics,
uk.ac.stfc.isis.ibex.logger;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.experimentdetails,
uk.ac.stfc.isis.ibex.experimentdetails.database
Bundle-ActivationPolicy: lazy
diff --git a/base/uk.ac.stfc.isis.ibex.feature.base/feature.xml b/base/uk.ac.stfc.isis.ibex.feature.base/feature.xml
index 82e16f87b0..aa9c46aa0d 100644
--- a/base/uk.ac.stfc.isis.ibex.feature.base/feature.xml
+++ b/base/uk.ac.stfc.isis.ibex.feature.base/feature.xml
@@ -841,15 +841,15 @@
version="0.0.0"/>
diff --git a/base/uk.ac.stfc.isis.ibex.help/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.help/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.help/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.help/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.help/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.help/META-INF/MANIFEST.MF
index da0b04bc04..d4ef7d5439 100644
--- a/base/uk.ac.stfc.isis.ibex.help/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.help/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime,
uk.ac.stfc.isis.ibex.instrument,
uk.ac.stfc.isis.ibex.model,
uk.ac.stfc.isis.ibex.epics.switching
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.help
Automatic-Module-Name: uk.ac.stfc.isis.ibex.help
diff --git a/base/uk.ac.stfc.isis.ibex.instrument.status/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.instrument.status/META-INF/MANIFEST.MF
index b926f09fc3..2a3bff2de7 100644
--- a/base/uk.ac.stfc.isis.ibex.instrument.status/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.instrument.status/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.core.runtime,
uk.ac.stfc.isis.ibex.instrument;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.epics.switching,
uk.ac.stfc.isis.ibex.epics
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.instrument.status
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.instrument.status
diff --git a/base/uk.ac.stfc.isis.ibex.instrument.tests/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.instrument.tests/.settings/org.eclipse.jdt.core.prefs
index 7cecefac3e..86109af12f 100644
--- a/base/uk.ac.stfc.isis.ibex.instrument.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.instrument.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.instrument.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.instrument.tests/META-INF/MANIFEST.MF
index 09519a39e8..1a16060ac5 100644
--- a/base/uk.ac.stfc.isis.ibex.instrument.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.instrument.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.instrument.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.instrument;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: uk.ac.stfc.isis.ibex.instrument.status;bundle-version="1.0.0",
org.junit,
org.mockito.mockito-core;bundle-version="4.7.0",
diff --git a/base/uk.ac.stfc.isis.ibex.instrument/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.instrument/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.instrument/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.instrument/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.instrument/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.instrument/META-INF/MANIFEST.MF
index 73daaf7aa2..5b7e65ec7d 100644
--- a/base/uk.ac.stfc.isis.ibex.instrument/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.instrument/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Instrument
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.instrument;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.eclipse.ui,
uk.ac.stfc.isis.ibex.epics,
org.eclipse.core.runtime,
diff --git a/base/uk.ac.stfc.isis.ibex.jaxb/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.jaxb/META-INF/MANIFEST.MF
index 8f4ceb4aea..9062d0141b 100644
--- a/base/uk.ac.stfc.isis.ibex.jaxb/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.jaxb/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Utils
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.jaxb;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.jaxb
Bundle-ClassPath: .
diff --git a/base/uk.ac.stfc.isis.ibex.journal.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.journal.tests/META-INF/MANIFEST.MF
index 0a980633b5..22f76ac8c5 100644
--- a/base/uk.ac.stfc.isis.ibex.journal.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.journal.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.journal.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.journal;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
org.hamcrest,
org.mockito.mockito-core;bundle-version="4.7.0",
diff --git a/base/uk.ac.stfc.isis.ibex.journal/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.journal/META-INF/MANIFEST.MF
index bbe7bd1cfd..8d52854628 100644
--- a/base/uk.ac.stfc.isis.ibex.journal/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.journal/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.core.runtime,
com.ibm.icu,
com.google.guava,
uk.ac.stfc.isis.ibex.log;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.journal
Automatic-Module-Name: uk.ac.stfc.isis.ibex.journal
diff --git a/base/uk.ac.stfc.isis.ibex.journal/src/uk/ac/stfc/isis/ibex/journal/SearchNumber.java b/base/uk.ac.stfc.isis.ibex.journal/src/uk/ac/stfc/isis/ibex/journal/SearchNumber.java
index 05ea670d7a..a635c9c985 100644
--- a/base/uk.ac.stfc.isis.ibex.journal/src/uk/ac/stfc/isis/ibex/journal/SearchNumber.java
+++ b/base/uk.ac.stfc.isis.ibex.journal/src/uk/ac/stfc/isis/ibex/journal/SearchNumber.java
@@ -54,8 +54,8 @@ public String createWhereTemplate() {
ArrayList parts = new ArrayList();
- fromNumber.ifPresent(x -> parts.add(field.getSqlFieldName() + " >= ?"));
- toNumber.ifPresent(x -> parts.add(field.getSqlFieldName() + " <= ?"));
+ fromNumber.ifPresent(_ -> parts.add(field.getSqlFieldName() + " >= ?"));
+ toNumber.ifPresent(_ -> parts.add(field.getSqlFieldName() + " <= ?"));
query.append(String.join(" AND ", parts));
}
diff --git a/base/uk.ac.stfc.isis.ibex.journal/src/uk/ac/stfc/isis/ibex/journal/SearchTime.java b/base/uk.ac.stfc.isis.ibex.journal/src/uk/ac/stfc/isis/ibex/journal/SearchTime.java
index d4d60ac098..dec0c8ee3f 100644
--- a/base/uk.ac.stfc.isis.ibex.journal/src/uk/ac/stfc/isis/ibex/journal/SearchTime.java
+++ b/base/uk.ac.stfc.isis.ibex.journal/src/uk/ac/stfc/isis/ibex/journal/SearchTime.java
@@ -56,8 +56,8 @@ public String createWhereTemplate() {
ArrayList parts = new ArrayList();
- fromTime.ifPresent(x -> parts.add(field.getSqlFieldName() + " >= ?"));
- toTime.ifPresent(x -> parts.add(field.getSqlFieldName() + " <= ?"));
+ fromTime.ifPresent(_ -> parts.add(field.getSqlFieldName() + " >= ?"));
+ toTime.ifPresent(_ -> parts.add(field.getSqlFieldName() + " <= ?"));
query.append(String.join(" AND ", parts));
}
diff --git a/base/uk.ac.stfc.isis.ibex.log.tests/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.log.tests/.settings/org.eclipse.jdt.core.prefs
index 7cecefac3e..86109af12f 100644
--- a/base/uk.ac.stfc.isis.ibex.log.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.log.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.log.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.log.tests/META-INF/MANIFEST.MF
index f6e3a95546..a683b68949 100644
--- a/base/uk.ac.stfc.isis.ibex.log.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.log.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: uk.ac.stfc.isis.ibex.log.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.log;bundle-version="1.0.0"
Import-Package: org.apache.logging.log4j.core;version="2.24.1"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
org.mockito.mockito-core;bundle-version="4.7.0",
net.bytebuddy.byte-buddy;bundle-version="1.12.13",
diff --git a/base/uk.ac.stfc.isis.ibex.log/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.log/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.log/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.log/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.log/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.log/META-INF/MANIFEST.MF
index 7f0c38873c..fa0efd8dc7 100644
--- a/base/uk.ac.stfc.isis.ibex.log/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.log/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.ui,
org.hamcrest,
uk.ac.stfc.isis.ibex.ui,
wrapped.org.apache.activemq.activemq-all;bundle-version="5.18.6"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.log,
uk.ac.stfc.isis.ibex.log.message,
uk.ac.stfc.isis.ibex.log.preferences,
diff --git a/base/uk.ac.stfc.isis.ibex.logger.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.logger.tests/META-INF/MANIFEST.MF
index c6c898e9f5..56fb7b0ac1 100644
--- a/base/uk.ac.stfc.isis.ibex.logger.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.logger.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: LoggerTests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.logger.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.logger;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
org.hamcrest,
org.mockito.mockito-core;bundle-version="4.7.0",
diff --git a/base/uk.ac.stfc.isis.ibex.logger/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.logger/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..f85df38393 100644
--- a/base/uk.ac.stfc.isis.ibex.logger/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.logger/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,15 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=25
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.logger/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.logger/META-INF/MANIFEST.MF
index b5070c3919..075ab2472b 100644
--- a/base/uk.ac.stfc.isis.ibex.logger/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.logger/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui,
com.google.guava,
org.apache.logging.log4j.api;bundle-version="2.25.2";visibility:=reexport,
org.apache.logging.log4j.core;bundle-version="2.25.2";visibility:=reexport
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.logger
Automatic-Module-Name: uk.ac.stfc.isis.ibex.logger
diff --git a/base/uk.ac.stfc.isis.ibex.logger/src/uk/ac/stfc/isis/ibex/logger/IsisLog.java b/base/uk.ac.stfc.isis.ibex.logger/src/uk/ac/stfc/isis/ibex/logger/IsisLog.java
index e084780f1f..5b6825fc3c 100644
--- a/base/uk.ac.stfc.isis.ibex.logger/src/uk/ac/stfc/isis/ibex/logger/IsisLog.java
+++ b/base/uk.ac.stfc.isis.ibex.logger/src/uk/ac/stfc/isis/ibex/logger/IsisLog.java
@@ -146,7 +146,7 @@ public static void hookJavaLogger(final java.util.logging.Logger logger) {
}
logger.setUseParentHandlers(false);
- logger.setFilter(record -> true);
+ logger.setFilter(_ -> true);
logger.setLevel(java.util.logging.Level.INFO);
logger.addHandler(new java.util.logging.Handler() {
diff --git a/base/uk.ac.stfc.isis.ibex.logger/src/uk/ac/stfc/isis/ibex/logger/config/LoggingConfiguration.java b/base/uk.ac.stfc.isis.ibex.logger/src/uk/ac/stfc/isis/ibex/logger/config/LoggingConfiguration.java
index 62d8ca8e7d..d9aae1ca83 100644
--- a/base/uk.ac.stfc.isis.ibex.logger/src/uk/ac/stfc/isis/ibex/logger/config/LoggingConfiguration.java
+++ b/base/uk.ac.stfc.isis.ibex.logger/src/uk/ac/stfc/isis/ibex/logger/config/LoggingConfiguration.java
@@ -147,15 +147,15 @@ private static class Log4j2Configuration extends DefaultConfiguration {
int fileSizeInBytes = fileSizeKB * BYTES_PER_KB;
Layout layout = PatternLayout.newBuilder()
- .withPattern(patternLayout)
- .withConfiguration(this)
- .withAlwaysWriteExceptions(false)
- .withNoConsoleNoAnsi(false)
+ .setPattern(patternLayout)
+ .setConfiguration(this)
+ .setAlwaysWriteExceptions(false)
+ .setNoConsoleNoAnsi(false)
.build();
final TimeBasedTriggeringPolicy timeBasedTriggeringPolicy = TimeBasedTriggeringPolicy.newBuilder()
- .withInterval(1)
- .withModulate(false)
+ .setInterval(1)
+ .setModulate(false)
.build();
final SizeBasedTriggeringPolicy sizeBasedTriggeringPolicy = SizeBasedTriggeringPolicy
@@ -165,22 +165,22 @@ private static class Log4j2Configuration extends DefaultConfiguration {
sizeBasedTriggeringPolicy);
final DefaultRolloverStrategy strategy = DefaultRolloverStrategy.newBuilder()
- .withMax(Integer.toString(maxFiles))
- .withMin(Integer.toString(1))
- .withConfig(this)
+ .setMax(Integer.toString(maxFiles))
+ .setMin(Integer.toString(1))
+ .setConfig(this)
.build();
final Appender fileAppender = RollingFileAppender.newBuilder()
- .withFileName(filename)
- .withFilePattern(pattern)
- .withAppend(true)
+ .setFileName(filename)
+ .setFilePattern(pattern)
+ .setAppend(true)
.setName("isis-log-file-appender")
.setBufferedIo(true)
.setBufferSize(fileSizeInBytes)
.setImmediateFlush(true)
- .withPolicy(policy)
- .withStrategy(strategy)
+ .setPolicy(policy)
+ .setStrategy(strategy)
.setLayout(layout)
.setConfiguration(this)
.build();
diff --git a/base/uk.ac.stfc.isis.ibex.managermode.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.managermode.tests/META-INF/MANIFEST.MF
index a50c4667eb..8db4d774ba 100644
--- a/base/uk.ac.stfc.isis.ibex.managermode.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.managermode.tests/META-INF/MANIFEST.MF
@@ -10,5 +10,5 @@ Require-Bundle: org.junit;bundle-version="4.11.0",
net.bytebuddy.byte-buddy;bundle-version="1.12.13",
net.bytebuddy.byte-buddy-agent;bundle-version="1.12.13",
org.objenesis;bundle-version="3.2.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.managermode.tests
diff --git a/base/uk.ac.stfc.isis.ibex.managermode/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.managermode/META-INF/MANIFEST.MF
index 3b69e945fc..d51069f098 100644
--- a/base/uk.ac.stfc.isis.ibex.managermode/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.managermode/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Managermode
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.managermode
Bundle-Version: 1.0.0.qualifier
Export-Package: uk.ac.stfc.isis.ibex.managermode
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.managermode
Require-Bundle: uk.ac.stfc.isis.ibex.epics;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.epics.switching;bundle-version="1.0.0",
diff --git a/base/uk.ac.stfc.isis.ibex.model.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.model.tests/META-INF/MANIFEST.MF
index 7f7753b2c8..6be096140b 100644
--- a/base/uk.ac.stfc.isis.ibex.model.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.model.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Model Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.model.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.model;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
org.hamcrest,
org.mockito.mockito-core;bundle-version="4.7.0",
diff --git a/base/uk.ac.stfc.isis.ibex.model/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.model/META-INF/MANIFEST.MF
index 24d33f13bc..49650819a4 100644
--- a/base/uk.ac.stfc.isis.ibex.model/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.model/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Require-Bundle: org.eclipse.core.runtime,
uk.ac.stfc.isis.ibex.logger,
org.eclipse.ui;bundle-version="3.8.2",
com.google.guava
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.model
Bundle-ClassPath: .
Automatic-Module-Name: uk.ac.stfc.isis.ibex.model
diff --git a/base/uk.ac.stfc.isis.ibex.model/src/uk/ac/stfc/isis/ibex/model/DeferredPropertyChangeListener.java b/base/uk.ac.stfc.isis.ibex.model/src/uk/ac/stfc/isis/ibex/model/DeferredPropertyChangeListener.java
index 8c4bc2ccc8..4826ab2ba6 100644
--- a/base/uk.ac.stfc.isis.ibex.model/src/uk/ac/stfc/isis/ibex/model/DeferredPropertyChangeListener.java
+++ b/base/uk.ac.stfc.isis.ibex.model/src/uk/ac/stfc/isis/ibex/model/DeferredPropertyChangeListener.java
@@ -89,7 +89,7 @@ private void propertyChangeIfNeeded() {
@Override
public final void propertyChange(PropertyChangeEvent evt) {
final var key = new PropertyChangeEventProperties(evt.getSource(), evt.getPropertyName());
- batchedEvents.compute(key, (k, v) -> {
+ batchedEvents.compute(key, (_, v) -> {
if (v == null) {
return new BatchedPropertyChangeEvent(evt.getOldValue(), evt.getNewValue());
} else {
diff --git a/base/uk.ac.stfc.isis.ibex.motor/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.motor/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.motor/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.motor/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.motor/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.motor/META-INF/MANIFEST.MF
index c49f1ee027..7264ab2b18 100644
--- a/base/uk.ac.stfc.isis.ibex.motor/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.motor/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.ui,
uk.ac.stfc.isis.ibex.epics,
uk.ac.stfc.isis.ibex.epics.switching;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.logger
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.motor,
uk.ac.stfc.isis.ibex.motor.internal,
diff --git a/base/uk.ac.stfc.isis.ibex.nicos.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.nicos.tests/META-INF/MANIFEST.MF
index dd73addee0..7386d1bc17 100644
--- a/base/uk.ac.stfc.isis.ibex.nicos.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.nicos.tests/META-INF/MANIFEST.MF
@@ -11,5 +11,5 @@ Require-Bundle: org.junit;bundle-version="4.11.0",
net.bytebuddy.byte-buddy;bundle-version="1.12.13",
net.bytebuddy.byte-buddy-agent;bundle-version="1.12.13",
org.objenesis;bundle-version="3.2.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.nicos.tests
diff --git a/base/uk.ac.stfc.isis.ibex.nicos/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.nicos/META-INF/MANIFEST.MF
index ef2236d78a..7865b6d023 100644
--- a/base/uk.ac.stfc.isis.ibex.nicos/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.nicos/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Nicos
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.nicos;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: uk.ac.stfc.isis.ibex.nicos.Nicos
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.nicos,
uk.ac.stfc.isis.ibex.nicos.comms,
diff --git a/base/uk.ac.stfc.isis.ibex.opis.tests/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.opis.tests/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.opis.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.opis.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.opis.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.opis.tests/META-INF/MANIFEST.MF
index 8826e14935..0916136a13 100644
--- a/base/uk.ac.stfc.isis.ibex.opis.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.opis.tests/META-INF/MANIFEST.MF
@@ -8,5 +8,5 @@ Require-Bundle: org.junit;bundle-version="4.10.0",
org.hamcrest,
org.eclipse.persistence.moxy;bundle-version="2.7.6",
org.eclipse.persistence.asm;bundle-version="7.2.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.opis.tests
diff --git a/base/uk.ac.stfc.isis.ibex.opis/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.opis/.settings/org.eclipse.jdt.core.prefs
index 5db31272a1..c9c2096793 100644
--- a/base/uk.ac.stfc.isis.ibex.opis/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.opis/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.opis/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.opis/META-INF/MANIFEST.MF
index a9bf1250a1..a212cd08b7 100644
--- a/base/uk.ac.stfc.isis.ibex.opis/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.opis/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: uk.ac.stfc.isis.ibex.epics;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.jaxb;bundle-version="1.0.0",
org.csstudio.simplepv;bundle-version="1.0.0",
org.eclipse.gef;bundle-version="3.11.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.opis,
uk.ac.stfc.isis.ibex.opis.desc
diff --git a/base/uk.ac.stfc.isis.ibex.preferences/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.preferences/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.preferences/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.preferences/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.preferences/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.preferences/META-INF/MANIFEST.MF
index b4bdbff6c1..7f3bdccaea 100644
--- a/base/uk.ac.stfc.isis.ibex.preferences/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.preferences/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Preferences
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.preferences;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.preferences
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/base/uk.ac.stfc.isis.ibex.runcontrol.tests/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.runcontrol.tests/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.runcontrol.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.runcontrol.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.runcontrol.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.runcontrol.tests/META-INF/MANIFEST.MF
index ccaf9235df..2ce9b0a22e 100644
--- a/base/uk.ac.stfc.isis.ibex.runcontrol.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.runcontrol.tests/META-INF/MANIFEST.MF
@@ -10,5 +10,5 @@ Require-Bundle: org.junit;bundle-version="4.10.0",
net.bytebuddy.byte-buddy;bundle-version="1.12.13",
net.bytebuddy.byte-buddy-agent;bundle-version="1.12.13",
org.objenesis;bundle-version="3.2.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.runcontrol.tests
diff --git a/base/uk.ac.stfc.isis.ibex.runcontrol/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.runcontrol/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.runcontrol/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.runcontrol/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.runcontrol/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.runcontrol/META-INF/MANIFEST.MF
index e6cb5b1663..91dbcd8ba2 100644
--- a/base/uk.ac.stfc.isis.ibex.runcontrol/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.runcontrol/META-INF/MANIFEST.MF
@@ -12,5 +12,5 @@ Require-Bundle: org.eclipse.core.runtime,
uk.ac.stfc.isis.ibex.epics.switching
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.runcontrol
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.runcontrol
diff --git a/base/uk.ac.stfc.isis.ibex.scriptgenerator.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.scriptgenerator.tests/META-INF/MANIFEST.MF
index 999991b870..d81adc4560 100644
--- a/base/uk.ac.stfc.isis.ibex.scriptgenerator.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.scriptgenerator.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.scriptgenerator.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.scriptgenerator;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.hamcrest;bundle-version="2.2.0",
org.junit;bundle-version="4.13.2",
org.mockito.mockito-core;bundle-version="4.7.0",
diff --git a/base/uk.ac.stfc.isis.ibex.scriptgenerator.tests/src/uk/ac/stfc/isis/ibex/scriptgenerator/tests/DynamicScriptingModelAdapterTest.java b/base/uk.ac.stfc.isis.ibex.scriptgenerator.tests/src/uk/ac/stfc/isis/ibex/scriptgenerator/tests/DynamicScriptingModelAdapterTest.java
index 1a2e2f778f..912175e2ac 100644
--- a/base/uk.ac.stfc.isis.ibex.scriptgenerator.tests/src/uk/ac/stfc/isis/ibex/scriptgenerator/tests/DynamicScriptingModelAdapterTest.java
+++ b/base/uk.ac.stfc.isis.ibex.scriptgenerator.tests/src/uk/ac/stfc/isis/ibex/scriptgenerator/tests/DynamicScriptingModelAdapterTest.java
@@ -45,10 +45,10 @@ private void setUpScaffolding() {
private void setUpModelAdapter() {
modelAdapter = new DynamicScriptingModelAdapter(scriptGeneratorMockBuilder.getMockScriptGeneratorModel());
- modelAdapter.addPropertyChangeListener(DynamicScriptingProperties.NICOS_SCRIPT_GENERATED_PROPERTY, evt -> {
+ modelAdapter.addPropertyChangeListener(DynamicScriptingProperties.NICOS_SCRIPT_GENERATED_PROPERTY, _ -> {
scriptsGeneratedCount++;
});
- modelAdapter.addPropertyChangeListener(ScriptGeneratorProperties.SCRIPT_GENERATION_ERROR_PROPERTY, evt -> {
+ modelAdapter.addPropertyChangeListener(ScriptGeneratorProperties.SCRIPT_GENERATION_ERROR_PROPERTY, _ -> {
scriptGenerationErrorsCount++;
});
}
diff --git a/base/uk.ac.stfc.isis.ibex.scriptgenerator/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.scriptgenerator/META-INF/MANIFEST.MF
index 56817e9ec3..bd4f87a92b 100644
--- a/base/uk.ac.stfc.isis.ibex.scriptgenerator/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.scriptgenerator/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.runtime,
com.google.gson,
uk.ac.stfc.isis.ibex.nicos;bundle-version="1.0.0",
wrapped.net.sf.py4j.py4j;bundle-version="0.10.9"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.scriptgenerator,
uk.ac.stfc.isis.ibex.scriptgenerator.dynamicscripting,
diff --git a/base/uk.ac.stfc.isis.ibex.scriptgenerator/src/uk/ac/stfc/isis/ibex/scriptgenerator/ScriptGeneratorSingleton.java b/base/uk.ac.stfc.isis.ibex.scriptgenerator/src/uk/ac/stfc/isis/ibex/scriptgenerator/ScriptGeneratorSingleton.java
index 58f56e5af7..85b8629cd0 100644
--- a/base/uk.ac.stfc.isis.ibex.scriptgenerator/src/uk/ac/stfc/isis/ibex/scriptgenerator/ScriptGeneratorSingleton.java
+++ b/base/uk.ac.stfc.isis.ibex.scriptgenerator/src/uk/ac/stfc/isis/ibex/scriptgenerator/ScriptGeneratorSingleton.java
@@ -228,10 +228,10 @@ public void setUp() {
});
- scriptDefinitionLoader.addPropertyChangeListener("parameters", evt -> {
+ scriptDefinitionLoader.addPropertyChangeListener("parameters", _ -> {
setActionParameters(scriptDefinitionLoader.getParameters());
});
- this.scriptGeneratorTable.addPropertyChangeListener(ScriptGeneratorProperties.ACTIONS_PROPERTY, evt -> {
+ this.scriptGeneratorTable.addPropertyChangeListener(ScriptGeneratorProperties.ACTIONS_PROPERTY, _ -> {
// The table has changed so update the validity checks and time estimate
try {
refreshParameterValidityChecking();
diff --git a/base/uk.ac.stfc.isis.ibex.scriptgenerator/src/uk/ac/stfc/isis/ibex/scriptgenerator/table/ActionsTable.java b/base/uk.ac.stfc.isis.ibex.scriptgenerator/src/uk/ac/stfc/isis/ibex/scriptgenerator/table/ActionsTable.java
index 41c41b31c3..c35290ea03 100644
--- a/base/uk.ac.stfc.isis.ibex.scriptgenerator/src/uk/ac/stfc/isis/ibex/scriptgenerator/table/ActionsTable.java
+++ b/base/uk.ac.stfc.isis.ibex.scriptgenerator/src/uk/ac/stfc/isis/ibex/scriptgenerator/table/ActionsTable.java
@@ -110,7 +110,7 @@ private ScriptGeneratorAction createAction(Map para
}
// Create action and attach listeners
ScriptGeneratorAction newAction = new ScriptGeneratorAction(newParamsMap);
- newAction.addPropertyChangeListener(ScriptGeneratorProperties.VALUE_PROPERTY, evt -> {
+ newAction.addPropertyChangeListener(ScriptGeneratorProperties.VALUE_PROPERTY, _ -> {
firePropertyChange(ScriptGeneratorProperties.ACTIONS_PROPERTY, null, actions);
});
return newAction;
diff --git a/base/uk.ac.stfc.isis.ibex.synoptic.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.synoptic.tests/META-INF/MANIFEST.MF
index 0b3048dc16..ed1bb8262d 100644
--- a/base/uk.ac.stfc.isis.ibex.synoptic.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.synoptic.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.synoptic.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.synoptic;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.hamcrest;bundle-version="1.1.0",
org.junit,
org.mockito.mockito-core;bundle-version="4.7.0",
diff --git a/base/uk.ac.stfc.isis.ibex.synoptic/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.synoptic/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.synoptic/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.synoptic/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.synoptic/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.synoptic/META-INF/MANIFEST.MF
index 3599814661..434e1e6ca8 100644
--- a/base/uk.ac.stfc.isis.ibex.synoptic/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.synoptic/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: uk.ac.stfc.isis.ibex.epics,
com.google.gson;bundle-version="2.1.0",
com.google.guava,
uk.ac.stfc.isis.ibex.jaxb;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.synoptic,
uk.ac.stfc.isis.ibex.synoptic.internal,
diff --git a/base/uk.ac.stfc.isis.ibex.synoptic/src/uk/ac/stfc/isis/ibex/synoptic/SynopticWritable.java b/base/uk.ac.stfc.isis.ibex.synoptic/src/uk/ac/stfc/isis/ibex/synoptic/SynopticWritable.java
index 793c307e01..f8623a88ef 100644
--- a/base/uk.ac.stfc.isis.ibex.synoptic/src/uk/ac/stfc/isis/ibex/synoptic/SynopticWritable.java
+++ b/base/uk.ac.stfc.isis.ibex.synoptic/src/uk/ac/stfc/isis/ibex/synoptic/SynopticWritable.java
@@ -90,6 +90,6 @@ public UpdatedValue canSave() {
@Override
public void close() {
- destination.ifPresent(dest -> addOnCanWriteChangeListener(canWriteListener));
+ destination.ifPresent(_ -> addOnCanWriteChangeListener(canWriteListener));
}
}
diff --git a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target
index 99004b1f31..755d3edcbc 100644
--- a/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target
+++ b/base/uk.ac.stfc.isis.ibex.targetplatform/targetplatform.target
@@ -27,10 +27,9 @@
-
+
-
@@ -89,12 +88,17 @@
+
+
+
+
+
org.apache.logging.log4j
log4j-core
- 2.25.2
+ 2.26.0
jar
@@ -104,7 +108,7 @@
org.apache.logging.log4j
log4j-api
- 2.25.2
+ 2.26.0
jar
@@ -134,7 +138,7 @@
commons-codec
commons-codec
- 1.19.0
+ 1.22.0
jar
@@ -144,7 +148,7 @@
joda-time
joda-time
- 2.14.0
+ 2.14.2
jar
@@ -164,7 +168,7 @@
org.mockito
mockito-core
- 5.20.0
+ 5.23.0
jar
@@ -194,7 +198,7 @@
org.glassfish.tyrus.bundles
tyrus-standalone-client
- 2.2.0
+ 2.2.2
jar
@@ -204,7 +208,7 @@
com.google.code.gson
gson
- 2.13.2
+ 2.14.0
jar
@@ -254,7 +258,7 @@
com.google.guava
guava
- 33.5.0-jre
+ 33.6.0-jre
jar
@@ -269,11 +273,6 @@
-
-
-
-
-
linux
diff --git a/base/uk.ac.stfc.isis.ibex.targets.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.targets.tests/META-INF/MANIFEST.MF
index bf4e8b9a42..905d817f83 100644
--- a/base/uk.ac.stfc.isis.ibex.targets.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.targets.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.targets.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.targets;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.10.0",
org.hamcrest,
org.mockito.mockito-core;bundle-version="4.7.0",
diff --git a/base/uk.ac.stfc.isis.ibex.targets/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.targets/META-INF/MANIFEST.MF
index 870071fc27..4641fdc73d 100644
--- a/base/uk.ac.stfc.isis.ibex.targets/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.targets/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Activator: uk.ac.stfc.isis.ibex.targets.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.targets
Automatic-Module-Name: uk.ac.stfc.isis.ibex.targets
diff --git a/base/uk.ac.stfc.isis.ibex.ui.about/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.about/META-INF/MANIFEST.MF
index 4e7d07b27d..9c035e8705 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.about/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.about/META-INF/MANIFEST.MF
@@ -7,5 +7,5 @@ Export-Package: uk.ac.stfc.isis.ibex.ui.about
Bundle-Activator: uk.ac.stfc.isis.ibex.ui.about.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.about
diff --git a/base/uk.ac.stfc.isis.ibex.ui.alarm/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.alarm/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.alarm/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.alarm/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.alarm/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.alarm/META-INF/MANIFEST.MF
index 5a353f5982..10e393a6fa 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.alarm/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.alarm/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui,
org.hamcrest,
org.csstudio.alarm.beast.msghist;bundle-version="4.0.1",
org.csstudio.alarm.beast.ui.alarmtable;bundle-version="4.1.2"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.alarm
Import-Package: javax.annotation;version="1.0.0";resolution:=optional,
javax.inject;version="1.0.0"
diff --git a/base/uk.ac.stfc.isis.ibex.ui.alerts.tests/.project b/base/uk.ac.stfc.isis.ibex.ui.alerts.tests/.project
index ccdc23de8c..a40e13731c 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.alerts.tests/.project
+++ b/base/uk.ac.stfc.isis.ibex.ui.alerts.tests/.project
@@ -1,6 +1,6 @@
- uk.ac.stfc.isis.ibex.alerts.tests
+ uk.ac.stfc.isis.ibex.ui.alerts.tests
diff --git a/base/uk.ac.stfc.isis.ibex.ui.alerts.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.alerts.tests/META-INF/MANIFEST.MF
index 6694378832..4fb1bd6194 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.alerts.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.alerts.tests/META-INF/MANIFEST.MF
@@ -10,5 +10,5 @@ Require-Bundle: org.junit;bundle-version="4.10.0",
net.bytebuddy.byte-buddy;bundle-version="1.12.13",
net.bytebuddy.byte-buddy-agent;bundle-version="1.12.13",
org.objenesis;bundle-version="3.2.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.alerts.tests
diff --git a/base/uk.ac.stfc.isis.ibex.ui.alerts/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.alerts/META-INF/MANIFEST.MF
index 0d8db01c11..d18066d9d6 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.alerts/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.alerts/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.ui,
uk.ac.stfc.isis.ibex.ui.configserver;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.ui.widgets;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.alerts
Import-Package: uk.ac.stfc.isis.ibex.ui.blocks.groups,
uk.ac.stfc.isis.ibex.ui.widgets
diff --git a/base/uk.ac.stfc.isis.ibex.ui.alerts/src/uk/ac/stfc/isis/ibex/ui/alerts/AlertsViewModel.java b/base/uk.ac.stfc.isis.ibex.ui.alerts/src/uk/ac/stfc/isis/ibex/ui/alerts/AlertsViewModel.java
index 6c25ffc8f4..12cfe15c5c 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.alerts/src/uk/ac/stfc/isis/ibex/ui/alerts/AlertsViewModel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.alerts/src/uk/ac/stfc/isis/ibex/ui/alerts/AlertsViewModel.java
@@ -125,7 +125,7 @@ public class AlertsViewModel extends ErrorMessageProvider {
*/
public AlertsViewModel(final Displaying config, final AlertsServer alertsServer) {
setters = Collections.unmodifiableMap(config.getDisplayAlerts().stream()
- .collect(Collectors.toMap(alert -> alert, alert -> new AlertsSetter(alert.getName(), alertsServer), (v1, v2) -> v1)));
+ .collect(Collectors.toMap(alert -> alert, alert -> new AlertsSetter(alert.getName(), alertsServer), (v1, _) -> v1)));
topLevelSetters = new AlertsTopLevelSetter(alertsServer);
topLevelSource = config.getTopLevelAlertSettings();
resetTopLevelSettings(this);
diff --git a/base/uk.ac.stfc.isis.ibex.ui.alerts/src/uk/ac/stfc/isis/ibex/ui/alerts/dialogs/AlertsEditorPanel.java b/base/uk.ac.stfc.isis.ibex.ui.alerts/src/uk/ac/stfc/isis/ibex/ui/alerts/dialogs/AlertsEditorPanel.java
index 308fd0932f..8ab5108b46 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.alerts/src/uk/ac/stfc/isis/ibex/ui/alerts/dialogs/AlertsEditorPanel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.alerts/src/uk/ac/stfc/isis/ibex/ui/alerts/dialogs/AlertsEditorPanel.java
@@ -147,7 +147,7 @@ public AlertsEditorPanel(EditAlertsDialog dialog, Composite parent, int style, C
setModel(viewModel);
setAlertDetails(null);
- parent.addDisposeListener(e -> configServer.saveAs().removeOnCanWriteChangeListener(canWriteListener));
+ parent.addDisposeListener(_ -> configServer.saveAs().removeOnCanWriteChangeListener(canWriteListener));
}
/**
diff --git a/base/uk.ac.stfc.isis.ibex.ui.banner.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.banner.tests/META-INF/MANIFEST.MF
index ae331c8a1a..1e2e87d6e5 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.banner.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.banner.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.banner.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.ui.banner;bundle-version="1.0.0"
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.banner.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.13.0",
org.mockito.mockito-core;bundle-version="4.7.0",
net.bytebuddy.byte-buddy;bundle-version="1.12.13",
diff --git a/base/uk.ac.stfc.isis.ibex.ui.banner/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.banner/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.banner/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.banner/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.banner/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.banner/META-INF/MANIFEST.MF
index 06465de965..c1f42bc77e 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.banner/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.banner/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.ui,
uk.ac.stfc.isis.ibex.configserver,
uk.ac.stfc.isis.ibex.instrument.status;bundle-version="1.0.0",
jakarta.annotation-api;bundle-version="[1.3.5,1.3.5]"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.ui.banner.models,
uk.ac.stfc.isis.ibex.ui.banner.views;uses:="org.eclipse.ui,org.eclipse.ui.part,org.eclipse.swt.widgets"
diff --git a/base/uk.ac.stfc.isis.ibex.ui.banner/src/uk/ac/stfc/isis/ibex/ui/banner/widgets/StatusIndicatorPanel.java b/base/uk.ac.stfc.isis.ibex.ui.banner/src/uk/ac/stfc/isis/ibex/ui/banner/widgets/StatusIndicatorPanel.java
index 8c24105ca1..ad7d96d7cf 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.banner/src/uk/ac/stfc/isis/ibex/ui/banner/widgets/StatusIndicatorPanel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.banner/src/uk/ac/stfc/isis/ibex/ui/banner/widgets/StatusIndicatorPanel.java
@@ -53,7 +53,7 @@ public StatusIndicatorPanel(Composite parent, int style, ServerStatusViewModel m
overallStatusLabel.setText("");
overallStatusLabel.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
- new IBEXButton(this, SWT.NONE, e -> showDetailsDialog())
+ new IBEXButton(this, SWT.NONE, _ -> showDetailsDialog())
.text("Details")
.layoutData(IBEXButton.centerGrid);
diff --git a/base/uk.ac.stfc.isis.ibex.ui.beamstatus/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.beamstatus/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.beamstatus/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.beamstatus/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.beamstatus/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.beamstatus/META-INF/MANIFEST.MF
index 15c2c2b8c8..da1fa1cac3 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.beamstatus/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.beamstatus/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.ui,
jakarta.annotation-api;bundle-version="[1.3.5,1.3.5]",
uk.ac.stfc.isis.ibex.configserver,
uk.ac.stfc.isis.ibex.ui.widgets;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.ui.beamstatus.views
Import-Package: org.eclipse.wb.swt,
uk.ac.stfc.isis.ibex.configserver.configuration,
diff --git a/base/uk.ac.stfc.isis.ibex.ui.beamstatus/src/uk/ac/stfc/isis/ibex/ui/beamstatus/views/BeamGraphView.java b/base/uk.ac.stfc.isis.ibex.ui.beamstatus/src/uk/ac/stfc/isis/ibex/ui/beamstatus/views/BeamGraphView.java
index fbe8645760..86b793f1e9 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.beamstatus/src/uk/ac/stfc/isis/ibex/ui/beamstatus/views/BeamGraphView.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.beamstatus/src/uk/ac/stfc/isis/ibex/ui/beamstatus/views/BeamGraphView.java
@@ -202,7 +202,7 @@ private Composite createCompositeRow(final Composite parent) {
private void createButton(final Composite parent, final String name, final long timeDuration) {
- new IBEXButton(parent, SWT.RADIO, evt -> {
+ new IBEXButton(parent, SWT.RADIO, _ -> {
setTimeRange(timeDuration);
})
.layoutData(new RowData())
diff --git a/base/uk.ac.stfc.isis.ibex.ui.blocks.presentation/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.blocks.presentation/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.blocks.presentation/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.blocks.presentation/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.blocks.presentation/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.blocks.presentation/META-INF/MANIFEST.MF
index 4b1b1719ff..f27829fa63 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.blocks.presentation/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.blocks.presentation/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.databinding.beans;bundle-version="1.2.200",
uk.ac.stfc.isis.ibex.logger,
uk.ac.stfc.isis.ibex.configserver;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.ui.blocks.presentation
Bundle-ActivationPolicy: lazy
Bundle-Activator: uk.ac.stfc.isis.ibex.ui.blocks.presentation.Presenter
diff --git a/base/uk.ac.stfc.isis.ibex.ui.blocks.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.blocks.tests/META-INF/MANIFEST.MF
index b21255aa25..b0d58c2584 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.blocks.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.blocks.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.blocks.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.ui.blocks;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
org.mockito.mockito-core;bundle-version="4.7.0",
net.bytebuddy.byte-buddy;bundle-version="1.12.13",
diff --git a/base/uk.ac.stfc.isis.ibex.ui.blocks/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.blocks/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.blocks/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.blocks/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.blocks/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.blocks/META-INF/MANIFEST.MF
index 384f2253eb..61f8f0e593 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.blocks/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.blocks/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@ Require-Bundle: uk.ac.stfc.isis.ibex.logger,
uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher;bundle-version="1.0.0",
jakarta.annotation-api;bundle-version="[1.3.5,1.3.5]"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.ui.blocks,
uk.ac.stfc.isis.ibex.ui.blocks.groups,
uk.ac.stfc.isis.ibex.ui.blocks.views
diff --git a/base/uk.ac.stfc.isis.ibex.ui.configserver.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.configserver.tests/META-INF/MANIFEST.MF
index 0d08c5e88c..0b9507b650 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.configserver.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.configserver.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests for experiment details plug-in
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.configserver.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.ui.configserver;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
jakarta.annotation-api;bundle-version="[1.3.5,1.3.5]",
org.hamcrest,
diff --git a/base/uk.ac.stfc.isis.ibex.ui.configserver/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.configserver/.settings/org.eclipse.jdt.core.prefs
index bfb698467f..5ff46eabf5 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.configserver/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.configserver/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.configserver/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.configserver/META-INF/MANIFEST.MF
index 58557fafab..e3cd0a4dc2 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.configserver/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.configserver/META-INF/MANIFEST.MF
@@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.ui,
org.csstudio.csdata;bundle-version="3.2.0",
org.csstudio.ui.util;bundle-version="4.0.2",
uk.ac.stfc.isis.ibex.instrument
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.configserver
Import-Package: uk.ac.stfc.isis.ibex.ui.ioccontrol,
diff --git a/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/dialogs/ImportComponentDialog.java b/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/dialogs/ImportComponentDialog.java
index 04ce9d9f7f..535925d98a 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/dialogs/ImportComponentDialog.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/dialogs/ImportComponentDialog.java
@@ -223,7 +223,7 @@ private void createCustomGroup(Composite parent) {
Text text = new Text(group, SWT.BORDER);
text.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
- new IBEXButton(group, SWT.NONE, event -> {
+ new IBEXButton(group, SWT.NONE, _ -> {
importVariables.selectInstrument(text.getText());
})
.text("Select")
diff --git a/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/dialogs/SaveConfigDialog.java b/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/dialogs/SaveConfigDialog.java
index 2a57e40f80..910d8d5413 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/dialogs/SaveConfigDialog.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/dialogs/SaveConfigDialog.java
@@ -258,7 +258,7 @@ protected Control createDialogArea(Composite parent) {
if (isConfig) {
- btnAsComponent = new IBEXButton(composite, SWT.CHECK, evt -> {
+ btnAsComponent = new IBEXButton(composite, SWT.CHECK, _ -> {
updateConfigType();
update();
asComponentSelected = true;
diff --git a/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/DoubleListEditor.java b/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/DoubleListEditor.java
index 89b76ff36e..93d752beb2 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/DoubleListEditor.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/DoubleListEditor.java
@@ -133,8 +133,8 @@ public DoubleListEditor(Composite parent, int style, String observedProperty, bo
selectedItems = ViewerProperties.multipleSelection().observe(selectedViewer);
unselectedItems = ViewerProperties.multipleSelection().observe(unselectedViewer);
- selectedList.addListener(SWT.MouseDoubleClick, e -> listDoubleClick(unselect));
- unselectedList.addListener(SWT.MouseDoubleClick, e -> listDoubleClick(select));
+ selectedList.addListener(SWT.MouseDoubleClick, _ -> listDoubleClick(unselect));
+ unselectedList.addListener(SWT.MouseDoubleClick, _ -> listDoubleClick(select));
// Allow only one list to have a selection
clearUnselectedItems = new IListChangeListener() {
@@ -146,7 +146,7 @@ public void handleListChange(ListChangeEvent arg0) {
}
};
- selectedItems.addListChangeListener(e -> unselect.setEnabled(!selectedItems.isEmpty()));
+ selectedItems.addListChangeListener(_ -> unselect.setEnabled(!selectedItems.isEmpty()));
selectedItems.addListChangeListener(clearUnselectedItems);
clearSelectedItems = new IListChangeListener() {
@@ -158,14 +158,14 @@ public void handleListChange(ListChangeEvent arg0) {
}
};
- unselectedItems.addListChangeListener(e -> select.setEnabled(!unselectedItems.isEmpty()));
+ unselectedItems.addListChangeListener(_ -> select.setEnabled(!unselectedItems.isEmpty()));
unselectedItems.addListChangeListener(clearSelectedItems);
//Can not reorder if no selection or selected the top or bottom item
- selectedItems.addListChangeListener(e -> setUpDownEnabled(selectedList.getSelectionIndex()));
+ selectedItems.addListChangeListener(_ -> setUpDownEnabled(selectedList.getSelectionIndex()));
- btnUp.addListener(SWT.Selection, e -> swapSelectedItems(true));
- btnDown.addListener(SWT.Selection, e -> swapSelectedItems(false));
+ btnUp.addListener(SWT.Selection, _ -> swapSelectedItems(true));
+ btnDown.addListener(SWT.Selection, _ -> swapSelectedItems(false));
}
private void listDoubleClick(Button selectButton) {
diff --git a/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/blocks/BlockDetailsPanel.java b/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/blocks/BlockDetailsPanel.java
index 74d3fb20d2..8037c524f4 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/blocks/BlockDetailsPanel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/blocks/BlockDetailsPanel.java
@@ -90,7 +90,7 @@ public BlockDetailsPanel(Composite parent, int style, final BlockDetailsViewMode
gdPvAddress.minimumWidth = 380;
pvAddress.setLayoutData(gdPvAddress);
- btnPickPV = new IBEXButton(grpBlock, SWT.NONE, evt -> viewModel.openPvDialog())
+ btnPickPV = new IBEXButton(grpBlock, SWT.NONE, _ -> viewModel.openPvDialog())
.layoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false, 1, 1))
.text("Select PV")
.get();
diff --git a/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/macros/IocMacroDetailsPanel.java b/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/macros/IocMacroDetailsPanel.java
index f6876ba51b..fc9798eeb1 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/macros/IocMacroDetailsPanel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/macros/IocMacroDetailsPanel.java
@@ -68,7 +68,7 @@ public IocMacroDetailsPanel(Composite parent, int style) {
GridData gdAvailableMacrosTable = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
gdAvailableMacrosTable.widthHint = 428;
displayMacrosTable.setLayoutData(gdAvailableMacrosTable);
- displayMacrosTable.addSelectionChangedListener(arg0 -> setSelectedMacro(displayMacrosTable.firstSelectedRow()));
+ displayMacrosTable.addSelectionChangedListener(_ -> setSelectedMacro(displayMacrosTable.firstSelectedRow()));
Composite cmpSelectedPv = new Composite(this, SWT.NONE);
cmpSelectedPv.setLayout(new GridLayout(3, false));
diff --git a/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/pvs/IocPVsEditorPanel.java b/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/pvs/IocPVsEditorPanel.java
index 355ff70e26..61b09c70cf 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/pvs/IocPVsEditorPanel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/pvs/IocPVsEditorPanel.java
@@ -90,7 +90,7 @@ public void keyPressed(KeyEvent e) {
GridData gdBtnAdd = new GridData(SWT.RIGHT, SWT.CENTER, true, false, 1, 1);
gdBtnAdd.widthHint = 70;
- btnAdd = new IBEXButton(composite, SWT.NONE, evt -> {
+ btnAdd = new IBEXButton(composite, SWT.NONE, _ -> {
addPVValue(new PVDefaultValue(generateNewName(newPVName), "NEW_VALUE"));
})
.layoutData(gdBtnAdd)
@@ -101,7 +101,7 @@ public void keyPressed(KeyEvent e) {
GridData gdBtnCopy = new GridData(SWT.RIGHT, SWT.CENTER, true, false, 1, 1);
gdBtnCopy.widthHint = 70;
- btnCopy = new IBEXButton(composite, SWT.NONE, evt -> {
+ btnCopy = new IBEXButton(composite, SWT.NONE, _ -> {
copySelected();
})
.layoutData(gdBtnCopy)
@@ -113,7 +113,7 @@ public void keyPressed(KeyEvent e) {
GridData gdBtnRemove = new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1);
gdBtnRemove.widthHint = 70;
- btnRemove = new IBEXButton(composite, SWT.NONE, evt -> {
+ btnRemove = new IBEXButton(composite, SWT.NONE, _ -> {
removeSelectedPV();
})
.layoutData(gdBtnCopy)
diff --git a/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/pvs/PVSelectorPanel.java b/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/pvs/PVSelectorPanel.java
index 068fa2932e..d9a437973b 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/pvs/PVSelectorPanel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/pvs/PVSelectorPanel.java
@@ -165,7 +165,7 @@ public void actionPerformed(ActionEvent evt) {
Timer pvSearch = new Timer(pvSearchDelay, pvSearchTaskPerformer);
pvSearch.setRepeats(false); // Set timer to go off only once
- pvAddress.addModifyListener(e -> pvSearch.restart());
+ pvAddress.addModifyListener(_ -> pvSearch.restart());
}
/**
diff --git a/base/uk.ac.stfc.isis.ibex.ui.dae.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.dae.tests/META-INF/MANIFEST.MF
index 5920dbc0cb..ffa37023f2 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.dae.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.dae.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.dae.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.ui.dae;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
org.hamcrest,
org.mockito.mockito-core;bundle-version="4.7.0",
diff --git a/base/uk.ac.stfc.isis.ibex.ui.dae/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.dae/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.dae/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.dae/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.dae/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.dae/META-INF/MANIFEST.MF
index 3ad3094fa3..0cd93790cf 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.dae/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.dae/META-INF/MANIFEST.MF
@@ -32,7 +32,7 @@ Require-Bundle: uk.ac.stfc.isis.ibex.instrument;bundle-version="1.0.0",
javax.inject;bundle-version="1.0.0",
jakarta.annotation-api;bundle-version="[1.3.5,1.3.5]"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.ui.dae,
uk.ac.stfc.isis.ibex.ui.dae.detectordiagnostics,
uk.ac.stfc.isis.ibex.ui.dae.experimentsetup
diff --git a/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/detectordiagnostics/DetectorDiagnosticsTable.java b/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/detectordiagnostics/DetectorDiagnosticsTable.java
index f88b606ddf..eed7f907ae 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/detectordiagnostics/DetectorDiagnosticsTable.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/detectordiagnostics/DetectorDiagnosticsTable.java
@@ -63,7 +63,7 @@ protected void addColumns() {
public void bind(DetectorDiagnosticsViewModel model) {
(new DataBindingContext()).bindValue(WidgetProperties.enabled().observe(this), BeanProperties.value("diagnosticsEnabled").observe(model));
- model.addPropertyChangeListener("spectra", evt -> setRows(model.getSpectra()));
+ model.addPropertyChangeListener("spectra", _ -> setRows(model.getSpectra()));
model.startObserving();
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/timechannels/TimeChannelsPanel.java b/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/timechannels/TimeChannelsPanel.java
index 263ba3a3ee..abb248a3e1 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/timechannels/TimeChannelsPanel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/timechannels/TimeChannelsPanel.java
@@ -122,7 +122,7 @@ public TimeChannelsPanel(Composite parent, int style, PanelViewModel panelViewMo
timeRegimesPanel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
timeRegimesPanel.setLayout(new GridLayout(3, false));
- this.addDisposeListener(evt -> removeListeners());
+ this.addDisposeListener(_ -> removeListeners());
fillWidgetLists();
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/run/RunSummary.java b/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/run/RunSummary.java
index c77e544ee6..0f603d4d51 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/run/RunSummary.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/run/RunSummary.java
@@ -173,7 +173,7 @@ public void createPart(Composite parent) {
new Label(infoComposite, SWT.NONE);
new Label(infoComposite, SWT.NONE);
- btnDisplayTitle = new IBEXButton(infoComposite, SWT.CHECK, event -> {
+ btnDisplayTitle = new IBEXButton(infoComposite, SWT.CHECK, _ -> {
model.displayTitle().uncheckedSetValue(btnDisplayTitle.getSelection());
})
.text("Show Title and Users in Dataweb Dashboard Page")
diff --git a/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/spectraplots/SpectraPlotConfiguration.java b/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/spectraplots/SpectraPlotConfiguration.java
index ebcc5c239d..112a80ae81 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/spectraplots/SpectraPlotConfiguration.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/spectraplots/SpectraPlotConfiguration.java
@@ -53,7 +53,7 @@ public SpectraPlotConfiguration(int plotNumber) {
this.specPeriodStr = new PersistedLocalChannel(
getLocalPvName("PERIOD_STR"),
new StringChannel(),
- i -> { },
+ _ -> { },
() -> String.valueOf(preferences.getDouble(PERIOD_PREF_KEY, 1.))
);
diff --git a/base/uk.ac.stfc.isis.ibex.ui.dashboard/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.dashboard/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.dashboard/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.dashboard/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.dashboard/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.dashboard/META-INF/MANIFEST.MF
index 2b105d232d..1c96c1846d 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.dashboard/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.dashboard/META-INF/MANIFEST.MF
@@ -25,6 +25,6 @@ Require-Bundle: org.eclipse.ui,
uk.ac.stfc.isis.ibex.epics.switching,
org.apache.commons.lang
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.ui.dashboard.views
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.dashboard
diff --git a/base/uk.ac.stfc.isis.ibex.ui.devicescreens.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.devicescreens.tests/META-INF/MANIFEST.MF
index ef07d9a44c..542d952845 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.devicescreens.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.devicescreens.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.devicescreens.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.ui.devicescreens;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
uk.ac.stfc.isis.ibex.validators,
org.hamcrest,
diff --git a/base/uk.ac.stfc.isis.ibex.ui.devicescreens/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.devicescreens/META-INF/MANIFEST.MF
index cbf54dd26b..4f2b0559f6 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.devicescreens/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.devicescreens/META-INF/MANIFEST.MF
@@ -21,6 +21,6 @@ Require-Bundle: org.eclipse.ui,
uk.ac.stfc.isis.ibex.ui.widgets;bundle-version="1.0.0",
jakarta.annotation-api;bundle-version="[1.3.5,1.3.5]"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.ui.devicescreens
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.devicescreens
diff --git a/base/uk.ac.stfc.isis.ibex.ui.devicescreens/src/uk/ac/stfc/isis/ibex/ui/devicescreens/DeviceScreenListPanel.java b/base/uk.ac.stfc.isis.ibex.ui.devicescreens/src/uk/ac/stfc/isis/ibex/ui/devicescreens/DeviceScreenListPanel.java
index 5f0172a18f..dc2a07c87e 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.devicescreens/src/uk/ac/stfc/isis/ibex/ui/devicescreens/DeviceScreenListPanel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.devicescreens/src/uk/ac/stfc/isis/ibex/ui/devicescreens/DeviceScreenListPanel.java
@@ -78,7 +78,7 @@ public DeviceScreenListPanel(final Composite parent, int style, ViewDeviceScreen
GridLayout compositeLayout = new GridLayout(1, true);
this.setLayout(compositeLayout);
- new IBEXButton(this, SWT.NONE, event -> {
+ new IBEXButton(this, SWT.NONE, _ -> {
try {
configureDeviceScreensHandler.execute(new ExecutionEvent());
} catch (ExecutionException ex) {
diff --git a/base/uk.ac.stfc.isis.ibex.ui.experimentdetails.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.experimentdetails.tests/META-INF/MANIFEST.MF
index d65f915cc3..d6ce544c1d 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.experimentdetails.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.experimentdetails.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.experimentdetails.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.ui.experimentdetails;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
uk.ac.stfc.isis.ibex.validators,
org.hamcrest,
diff --git a/base/uk.ac.stfc.isis.ibex.ui.experimentdetails/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.experimentdetails/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.experimentdetails/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.experimentdetails/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.experimentdetails/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.experimentdetails/META-INF/MANIFEST.MF
index d7dbf22cc5..4beb007439 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.experimentdetails/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.experimentdetails/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Experimentdetails
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.experimentdetails;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: uk.ac.stfc.isis.ibex.ui;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.experimentdetails;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.model;bundle-version="1.0.0",
diff --git a/base/uk.ac.stfc.isis.ibex.ui.experimentdetails/src/uk/ac/stfc/isis/ibex/ui/experimentdetails/ExperimentDetailsPanel.java b/base/uk.ac.stfc.isis.ibex.ui.experimentdetails/src/uk/ac/stfc/isis/ibex/ui/experimentdetails/ExperimentDetailsPanel.java
index c9be8870d3..e0100e0c07 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.experimentdetails/src/uk/ac/stfc/isis/ibex/ui/experimentdetails/ExperimentDetailsPanel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.experimentdetails/src/uk/ac/stfc/isis/ibex/ui/experimentdetails/ExperimentDetailsPanel.java
@@ -122,7 +122,7 @@ private void makeExperimentDetailsPanel(Composite parent) {
rbNumberTextBox.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false, 1, 1));
rbNumberTextBox.setToolTip(RB_NUM_INPUT_TIP_MESSAGE);
- btnRBLookup = new IBEXButton(parent, SWT.NONE, event -> {
+ btnRBLookup = new IBEXButton(parent, SWT.NONE, _ -> {
RBLookupViewModel lookupViewModel = new RBLookupViewModel();
RBLookupDialog lookupDialog = new RBLookupDialog(shell, lookupViewModel);
if (lookupDialog.open() == Window.OK) {
@@ -146,14 +146,14 @@ private void makeExperimentDetailsPanel(Composite parent) {
userDetails.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
updateUserDetails();
- viewModel.model.addPropertyChangeListener(propertyChangeEvent -> {
+ viewModel.model.addPropertyChangeListener(_ -> {
updateUserDetails();
});
experimentTeamButtons = new Composite(parent, SWT.NONE);
experimentTeamButtons.setLayout(new GridLayout(1, false));
- btnAddUserDetails = new IBEXButton(experimentTeamButtons, SWT.NONE, event -> {
+ btnAddUserDetails = new IBEXButton(experimentTeamButtons, SWT.NONE, _ -> {
viewModel.model.addDefaultUser();
viewModel.model.sendUserDetails();
})
@@ -161,14 +161,14 @@ private void makeExperimentDetailsPanel(Composite parent) {
.layoutData(new GridData(SWT.LEFT, SWT.FILL, false, false))
.get();
- new IBEXButton(experimentTeamButtons, SWT.NONE, event -> {
+ new IBEXButton(experimentTeamButtons, SWT.NONE, _ -> {
viewModel.model.removeUsers(userDetails.selectedRows());
viewModel.model.sendUserDetails();
})
.text("Remove")
.layoutData(new GridData(SWT.LEFT, SWT.FILL, false, false));
- btnClearUserDetails = new IBEXButton(experimentTeamButtons, SWT.NONE, event -> {
+ btnClearUserDetails = new IBEXButton(experimentTeamButtons, SWT.NONE, _ -> {
viewModel.model.clearUserDetails();
viewModel.model.sendUserDetails();
})
@@ -176,14 +176,14 @@ private void makeExperimentDetailsPanel(Composite parent) {
.layoutData(new GridData(SWT.LEFT, SWT.FILL, false, false))
.get();
- btnSetRBNumber = new IBEXButton(experimentTeamButtons, SWT.NONE, event -> {
+ btnSetRBNumber = new IBEXButton(experimentTeamButtons, SWT.NONE, _ -> {
viewModel.model.sendUserDetails();
})
.text("Set")
.layoutData(new GridData(SWT.LEFT, SWT.FILL, false, false))
.get();
- btnDisplayTitle = new IBEXButton(experimentTeamButtons, SWT.CHECK, event -> {
+ btnDisplayTitle = new IBEXButton(experimentTeamButtons, SWT.CHECK, _ -> {
viewModel.displayTitle.uncheckedSetValue(btnDisplayTitle.getSelection());
})
.text("Show Title and Users in Dataweb Dashboard Page")
diff --git a/base/uk.ac.stfc.isis.ibex.ui.experimentdetails/src/uk/ac/stfc/isis/ibex/ui/experimentdetails/ExperimentDetailsViewModel.java b/base/uk.ac.stfc.isis.ibex.ui.experimentdetails/src/uk/ac/stfc/isis/ibex/ui/experimentdetails/ExperimentDetailsViewModel.java
index 775b5532b4..be64ddcc5a 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.experimentdetails/src/uk/ac/stfc/isis/ibex/ui/experimentdetails/ExperimentDetailsViewModel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.experimentdetails/src/uk/ac/stfc/isis/ibex/ui/experimentdetails/ExperimentDetailsViewModel.java
@@ -56,7 +56,7 @@ public ExperimentDetailsViewModel(ObservableExperimentDetailsModel model) {
this.model = model;
displayTitle = new BooleanWritableObservableAdapter(model.displayTitleSetter(), model.displayTitle());
rbNumber = new StringWritableObservableAdapter(model.rbNumberSetter(), model.rbNumber());
- model.addPropertyChangeListener("userDetails", event -> {
+ model.addPropertyChangeListener("userDetails", _ -> {
setUserDetailsWarningVisible();
});
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.graphing.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.graphing.tests/META-INF/MANIFEST.MF
index 03e429b623..fe780235ea 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.graphing.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.graphing.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.graphing.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.ui.graphing;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.mockito.mockito-core;bundle-version="4.7.0",
org.junit,
net.bytebuddy.byte-buddy;bundle-version="1.12.13",
diff --git a/base/uk.ac.stfc.isis.ibex.ui.graphing/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.graphing/META-INF/MANIFEST.MF
index ec3ca51657..2dfc3d53dd 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.graphing/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.graphing/META-INF/MANIFEST.MF
@@ -22,8 +22,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.e4.ui.workbench,
org.eclipse.e4.core.contexts;bundle-version="1.8.400",
wrapped.net.sf.py4j.py4j;bundle-version="0.10.9",
- org.glassfish.tyrus.bundles.tyrus-standalone-client;bundle-version="2.2.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+ wrapped.org.glassfish.tyrus.bundles.tyrus-standalone-client;bundle-version="2.2.2"
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.ui.graphing
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.graphing
diff --git a/base/uk.ac.stfc.isis.ibex.ui.graphing/src/uk/ac/stfc/isis/ibex/ui/graphing/websocketview/MatplotlibAllFiguresView.java b/base/uk.ac.stfc.isis.ibex.ui.graphing/src/uk/ac/stfc/isis/ibex/ui/graphing/websocketview/MatplotlibAllFiguresView.java
index 4397d17bf1..d87b88b9ee 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.graphing/src/uk/ac/stfc/isis/ibex/ui/graphing/websocketview/MatplotlibAllFiguresView.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.graphing/src/uk/ac/stfc/isis/ibex/ui/graphing/websocketview/MatplotlibAllFiguresView.java
@@ -51,9 +51,9 @@ public synchronized void createComposite(final Composite parent, final MPerspect
this.parent = parent;
recreateFigures();
figuresChangedListener = getFigures()
- .addUiThreadPropertyChangeListener(evt -> recreateFigures());
+ .addUiThreadPropertyChangeListener(_ -> recreateFigures());
urlListener = getConnectionUrl()
- .addUiThreadPropertyChangeListener(evt -> recreateFigures());
+ .addUiThreadPropertyChangeListener(_ -> recreateFigures());
thisPerspectiveId = perspective.getElementId();
currentPerspectiveId = thisPerspectiveId;
diff --git a/base/uk.ac.stfc.isis.ibex.ui.graphing/src/uk/ac/stfc/isis/ibex/ui/graphing/websocketview/MatplotlibFigure.java b/base/uk.ac.stfc.isis.ibex.ui.graphing/src/uk/ac/stfc/isis/ibex/ui/graphing/websocketview/MatplotlibFigure.java
index b4e26fe5d8..cc20b184eb 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.graphing/src/uk/ac/stfc/isis/ibex/ui/graphing/websocketview/MatplotlibFigure.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.graphing/src/uk/ac/stfc/isis/ibex/ui/graphing/websocketview/MatplotlibFigure.java
@@ -180,7 +180,7 @@ public void mouseUp(MouseEvent e) {
}
});
cursorTypeListener = viewModel.getCursorType()
- .addUiThreadPropertyChangeListener(e -> {
+ .addUiThreadPropertyChangeListener(_ -> {
if (!container.isDisposed()) {
if (MatplotlibCursorType.CROSSHAIR.equals(viewModel.getCursorType().getValue())) {
container.setCursor(zoomCursor);
@@ -193,7 +193,7 @@ public void mouseUp(MouseEvent e) {
}
});
canvasListener = viewModel.getCanvasData()
- .addUiThreadPropertyChangeListener(e -> {
+ .addUiThreadPropertyChangeListener(_ -> {
drawImage(viewModel.getCanvasData().getValue().image());
});
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.graphing/src/uk/ac/stfc/isis/ibex/ui/graphing/websocketview/MatplotlibToolbar.java b/base/uk.ac.stfc.isis.ibex.ui.graphing/src/uk/ac/stfc/isis/ibex/ui/graphing/websocketview/MatplotlibToolbar.java
index 86687beead..dd76cd0e43 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.graphing/src/uk/ac/stfc/isis/ibex/ui/graphing/websocketview/MatplotlibToolbar.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.graphing/src/uk/ac/stfc/isis/ibex/ui/graphing/websocketview/MatplotlibToolbar.java
@@ -51,15 +51,15 @@ public MatplotlibToolbar(MatplotlibFigureViewModel viewModel, Composite containe
this.viewModel = viewModel;
homeButton = new MatplotlibButton(viewModel.getHomeButtonState(), toolBar,
- SelectionListener.widgetSelectedAdapter(e -> viewModel.navigatePlot(MatplotlibButtonType.HOME)), HOME_ICON, "Reset original view");
+ SelectionListener.widgetSelectedAdapter(_ -> viewModel.navigatePlot(MatplotlibButtonType.HOME)), HOME_ICON, "Reset original view");
homeButton.getButton().setToolTipText(homeButton.getDescription());
backButton = new MatplotlibButton(viewModel.getBackButtonState(), toolBar,
- SelectionListener.widgetSelectedAdapter(e -> viewModel.navigatePlot(MatplotlibButtonType.BACK)), BACK_ICON, "Back to previous view");
+ SelectionListener.widgetSelectedAdapter(_ -> viewModel.navigatePlot(MatplotlibButtonType.BACK)), BACK_ICON, "Back to previous view");
backButton.getButton().setToolTipText(backButton.getDescription());
forwardButton = new MatplotlibButton(viewModel.getForwardButtonState(), toolBar,
- SelectionListener.widgetSelectedAdapter(e -> viewModel.navigatePlot(MatplotlibButtonType.FORWARD)), FORWARD_ICON, "Forward to next view");
+ SelectionListener.widgetSelectedAdapter(_ -> viewModel.navigatePlot(MatplotlibButtonType.FORWARD)), FORWARD_ICON, "Forward to next view");
forwardButton.getButton().setToolTipText(forwardButton.getDescription());
// This is used, but only to be added to the toolbar.
@@ -67,11 +67,11 @@ public MatplotlibToolbar(MatplotlibFigureViewModel viewModel, Composite containe
var separator = new ToolItem(toolBar, SWT.SEPARATOR);
panButton = new MatplotlibButton(viewModel.getPanButtonState(), toolBar,
- SelectionListener.widgetSelectedAdapter(e -> viewModel.navigatePlot(MatplotlibButtonType.PAN)), PAN_ACTIVE, PAN_INACTIVE, "Pan");
+ SelectionListener.widgetSelectedAdapter(_ -> viewModel.navigatePlot(MatplotlibButtonType.PAN)), PAN_ACTIVE, PAN_INACTIVE, "Pan");
panButton.getButton().setToolTipText(panButton.getDescription());
zoomButton = new MatplotlibButton(viewModel.getZoomButtonState(), toolBar,
- SelectionListener.widgetSelectedAdapter(e -> viewModel.navigatePlot(MatplotlibButtonType.ZOOM)), ZOOM_ACTIVE, ZOOM_INACTIVE, "Zoom");
+ SelectionListener.widgetSelectedAdapter(_ -> viewModel.navigatePlot(MatplotlibButtonType.ZOOM)), ZOOM_ACTIVE, ZOOM_INACTIVE, "Zoom");
zoomButton.getButton().setToolTipText(zoomButton.getDescription());
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.help/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.help/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.help/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.help/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.help/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.help/META-INF/MANIFEST.MF
index 39c449f869..63b452b8d3 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.help/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.help/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.e4.core.di.annotations,
uk.ac.stfc.isis.ibex.logger;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.ui.help
Import-Package: com.google.common.io
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.help
diff --git a/base/uk.ac.stfc.isis.ibex.ui.ioccontrol.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.ioccontrol.tests/META-INF/MANIFEST.MF
index ef4113e1be..7fcef3428c 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.ioccontrol.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.ioccontrol.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.ioccontrol.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.ui.ioccontrol;bundle-version="1.0.0"
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.ioccontrol.tests
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.13.0",
org.mockito.mockito-core;bundle-version="4.7.0",
net.bytebuddy.byte-buddy;bundle-version="1.12.13",
diff --git a/base/uk.ac.stfc.isis.ibex.ui.ioccontrol/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.ioccontrol/META-INF/MANIFEST.MF
index b95ebd703a..9500b0f192 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.ioccontrol/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.ioccontrol/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.ui,
jakarta.annotation-api;bundle-version="[1.3.5,1.3.5]",
uk.ac.stfc.isis.ibex.ui.widgets;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.logger;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.ui.ioccontrol
Bundle-ClassPath: .
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.ioccontrol
diff --git a/base/uk.ac.stfc.isis.ibex.ui.journalviewer.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.journalviewer.tests/META-INF/MANIFEST.MF
index 257e62cb89..5ec8b2521e 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.journalviewer.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.journalviewer.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.journalviewer.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.ui.journalviewer;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
org.hamcrest,
org.mockito.mockito-core;bundle-version="4.7.0",
diff --git a/base/uk.ac.stfc.isis.ibex.ui.journalviewer/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.journalviewer/META-INF/MANIFEST.MF
index 13421f4455..ecdfa01566 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.journalviewer/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.journalviewer/META-INF/MANIFEST.MF
@@ -16,5 +16,5 @@ Require-Bundle: org.eclipse.ui,
uk.ac.stfc.isis.ibex.ui.widgets,
uk.ac.stfc.isis.ibex.validators;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.journalviewer
diff --git a/base/uk.ac.stfc.isis.ibex.ui.journalviewer/src/uk/ac/stfc/isis/ibex/ui/journalviewer/JournalViewerView.java b/base/uk.ac.stfc.isis.ibex.ui.journalviewer/src/uk/ac/stfc/isis/ibex/ui/journalviewer/JournalViewerView.java
index 2285734c57..ccbcb644bf 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.journalviewer/src/uk/ac/stfc/isis/ibex/ui/journalviewer/JournalViewerView.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.journalviewer/src/uk/ac/stfc/isis/ibex/ui/journalviewer/JournalViewerView.java
@@ -148,18 +148,18 @@ public void createPartControl(final Composite parent) {
lblResultsData.width = 180;
lblResults.setLayoutData(lblResultsData);
- btnFirstPage = new IBEXButton(basicControls, SWT.NONE, event -> {
+ btnFirstPage = new IBEXButton(basicControls, SWT.NONE, _ -> {
setProgressIndicatorsVisible(true);
- model.firstPage().thenAccept(ignored -> setProgressIndicatorsVisible(false));
+ model.firstPage().thenAccept(_ -> setProgressIndicatorsVisible(false));
})
.text("<<")
.tooltip("Go to the first page.")
.layoutData(IBEXButton.defaultRow)
.get();
- btnPrevPage = new IBEXButton(basicControls, SWT.NONE, event -> {
+ btnPrevPage = new IBEXButton(basicControls, SWT.NONE, _ -> {
setProgressIndicatorsVisible(true);
- model.prevPage().thenAccept(ignored -> setProgressIndicatorsVisible(false));
+ model.prevPage().thenAccept(_ -> setProgressIndicatorsVisible(false));
})
.text("< Prev")
.tooltip("Go to the previous page.")
@@ -172,28 +172,28 @@ public void createPartControl(final Composite parent) {
textPageNumber.setLayoutData(textPageNumberData);
textPageNumber.setTextLimit(9);
- btnNextPage = new IBEXButton(basicControls, SWT.NONE, event -> {
+ btnNextPage = new IBEXButton(basicControls, SWT.NONE, _ -> {
setProgressIndicatorsVisible(true);
- model.nextPage().thenAccept(ignored -> setProgressIndicatorsVisible(false));
+ model.nextPage().thenAccept(_ -> setProgressIndicatorsVisible(false));
})
.text("Next >")
.tooltip("Go to the next page.")
.layoutData(IBEXButton.defaultRow)
.get();
- btnLastPage = new IBEXButton(basicControls, SWT.NONE, event -> {
+ btnLastPage = new IBEXButton(basicControls, SWT.NONE, _ -> {
setProgressIndicatorsVisible(true);
- model.lastPage().thenAccept(ignored -> setProgressIndicatorsVisible(false));
+ model.lastPage().thenAccept(_ -> setProgressIndicatorsVisible(false));
})
.text(">>")
.tooltip("Go to the last page.")
.layoutData(IBEXButton.defaultRow)
.get();
- new IBEXButton(basicControls, SWT.NONE, event -> {
+ new IBEXButton(basicControls, SWT.NONE, _ -> {
resetPageNumber();
setProgressIndicatorsVisible(true);
- model.setPageNumber(1).thenAccept(ignored -> setProgressIndicatorsVisible(false));
+ model.setPageNumber(1).thenAccept(_ -> setProgressIndicatorsVisible(false));
})
.text("Refresh")
.tooltip("Refresh the journal.")
@@ -208,18 +208,18 @@ public void createPartControl(final Composite parent) {
RowLayout rlFilterControl = new RowLayout(SWT.HORIZONTAL);
searchInput.setLayout(rlFilterControl);
- btnSearch = new IBEXButton(searchControls, SWT.NONE, event -> search())
+ btnSearch = new IBEXButton(searchControls, SWT.NONE, _ -> search())
.text("Search")
.tooltip("Search the journal.")
.layoutData(new RowData(80, SWT.DEFAULT))
.get();
- new IBEXButton(searchControls, SWT.NONE, event -> {
+ new IBEXButton(searchControls, SWT.NONE, _ -> {
resetPageNumber();
searchInput.clearInput();
model.resetActiveSearch();
setProgressIndicatorsVisible(true);
- model.setPageNumber(1).thenAccept(ignored -> setProgressIndicatorsVisible(false));
+ model.setPageNumber(1).thenAccept(_ -> setProgressIndicatorsVisible(false));
})
.text("Clear")
.tooltip("Clear the search.")
@@ -245,7 +245,7 @@ public void createPartControl(final Composite parent) {
public void widgetSelected(SelectionEvent e) {
setProgressIndicatorsVisible(true);
model.setFieldSelected(property, checkbox.getSelection())
- .thenAccept(ignored -> setProgressIndicatorsVisible(false));
+ .thenAccept(_ -> setProgressIndicatorsVisible(false));
}
});
}
@@ -282,7 +282,7 @@ protected SelectionAdapter getColumnSelectionAdapter(final TableColumn column, f
public void widgetSelected(SelectionEvent e) {
JournalField field = JournalField.getFieldFromFriendlyName(column.getText());
setProgressIndicatorsVisible(true);
- model.sortBy(field).thenAccept(ignored -> setProgressIndicatorsVisible(false));
+ model.sortBy(field).thenAccept(_ -> setProgressIndicatorsVisible(false));
}
};
}
@@ -325,7 +325,7 @@ private void search() {
model.setActiveSearch(search);
setProgressIndicatorsVisible(true);
- model.setPageNumber(1).thenAccept(ignored -> setProgressIndicatorsVisible(false));
+ model.setPageNumber(1).thenAccept(_ -> setProgressIndicatorsVisible(false));
}
/**
@@ -393,16 +393,16 @@ private void bind() {
if (e.detail == SWT.TRAVERSE_RETURN) {
setProgressIndicatorsVisible(true);
model.goToPage(Integer.parseInt(textPageNumber.getText()))
- .thenAccept(ignored -> setProgressIndicatorsVisible(false));
+ .thenAccept(_ -> setProgressIndicatorsVisible(false));
}
textPageNumber.selectAll();
});
- textPageNumber.addListener(SWT.FocusIn, e -> {
+ textPageNumber.addListener(SWT.FocusIn, _ -> {
textPageNumber.selectAll();
});
- model.addPropertyChangeListener("runs", e -> DISPLAY.asyncExec(() -> {
+ model.addPropertyChangeListener("runs", _ -> DISPLAY.asyncExec(() -> {
setProgressIndicatorsVisible(true);
journalTable.updateTableColumns();
updateSortIndicator();
diff --git a/base/uk.ac.stfc.isis.ibex.ui.log/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.log/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.log/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.log/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.log/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.log/META-INF/MANIFEST.MF
index a6cf0bedad..23d687eeb0 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.log/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.log/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.ui,
jakarta.annotation-api;bundle-version="[1.3.5,1.3.5]",
uk.ac.stfc.isis.ibex.ui.widgets
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.ui.log.filter,
uk.ac.stfc.isis.ibex.ui.log.widgets
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.log
diff --git a/base/uk.ac.stfc.isis.ibex.ui.logger/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.logger/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.logger/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.logger/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.logger/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.logger/META-INF/MANIFEST.MF
index 54270c1eb6..69309fdc3e 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.logger/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.logger/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: uk.ac.stfc.isis.ibex.ui.logger.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.swt
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.ui.logger
Import-Package: org.eclipse.core.databinding,
diff --git a/base/uk.ac.stfc.isis.ibex.ui.logplotter.tests/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.logplotter.tests/.settings/org.eclipse.jdt.core.prefs
index 7cecefac3e..86109af12f 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.logplotter.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.logplotter.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.logplotter.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.logplotter.tests/META-INF/MANIFEST.MF
index 7201d9b694..73c5177787 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.logplotter.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.logplotter.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.logplotter.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.ui.logplotter;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/base/uk.ac.stfc.isis.ibex.ui.logplotter/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.logplotter/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.logplotter/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.logplotter/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.logplotter/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.logplotter/META-INF/MANIFEST.MF
index 97664931a5..dbcb4fed60 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.logplotter/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.logplotter/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.ui,
org.hamcrest,
org.csstudio.csdata;bundle-version="3.2.0",
uk.ac.stfc.isis.ibex.ui.widgets;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.ui.logplotter
Import-Package: com.google.common.base,
diff --git a/base/uk.ac.stfc.isis.ibex.ui.mainmenu.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.mainmenu.tests/META-INF/MANIFEST.MF
index 2ebe5cb8b5..91b9db3ee7 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.mainmenu.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.mainmenu.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.mainmenu.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.ui.mainmenu;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
jakarta.annotation-api;bundle-version="[1.3.5,1.3.5]",
org.hamcrest
diff --git a/base/uk.ac.stfc.isis.ibex.ui.mainmenu/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.mainmenu/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.mainmenu/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.mainmenu/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.mainmenu/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.mainmenu/META-INF/MANIFEST.MF
index cf1291f69d..561c8c6e46 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.mainmenu/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.mainmenu/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jface.databinding;bundle-version="1.9.0",
org.apache.commons.lang,
uk.ac.stfc.isis.ibex.ui
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Import-Package: uk.ac.stfc.isis.ibex.epics.switching,
uk.ac.stfc.isis.ibex.model,
diff --git a/base/uk.ac.stfc.isis.ibex.ui.motor.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.motor.tests/META-INF/MANIFEST.MF
index fa11d590df..7a4251f406 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.motor.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.motor.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.motor.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.ui.motor;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit,
org.hamcrest,
org.mockito.mockito-core;bundle-version="4.7.0",
diff --git a/base/uk.ac.stfc.isis.ibex.ui.motor/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.motor/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.motor/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.motor/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.motor/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.motor/META-INF/MANIFEST.MF
index 36e5db4a39..bc2b07f7c4 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.motor/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.motor/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Motor
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.motor;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: uk.ac.stfc.isis.ibex.preferences,
uk.ac.stfc.isis.ibex.ui;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.motor;bundle-version="1.0.0",
diff --git a/base/uk.ac.stfc.isis.ibex.ui.motor/src/uk/ac/stfc/isis/ibex/ui/motor/views/MinimalMotionIndicator.java b/base/uk.ac.stfc.isis.ibex.ui.motor/src/uk/ac/stfc/isis/ibex/ui/motor/views/MinimalMotionIndicator.java
index e431fa4242..66e5ecd39a 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.motor/src/uk/ac/stfc/isis/ibex/ui/motor/views/MinimalMotionIndicator.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.motor/src/uk/ac/stfc/isis/ibex/ui/motor/views/MinimalMotionIndicator.java
@@ -111,17 +111,17 @@ public MinimalMotionIndicator(Composite parent, int style) {
*/
public void setMotor(final Motor motor) {
setArrows(motor);
- motor.addUiThreadPropertyChangeListener("direction", evt -> setArrows(motor));
- motor.addUiThreadPropertyChangeListener("moving", evt -> setArrows(motor));
+ motor.addUiThreadPropertyChangeListener("direction", _ -> setArrows(motor));
+ motor.addUiThreadPropertyChangeListener("moving", _ -> setArrows(motor));
enableHome(motor.getAtHome());
- motor.addUiThreadPropertyChangeListener("atHome", evt -> enableHome(motor.getAtHome()));
+ motor.addUiThreadPropertyChangeListener("atHome", _ -> enableHome(motor.getAtHome()));
setLowerLimit(motor.getAtLowerLimitSwtich());
- motor.addUiThreadPropertyChangeListener("atLowerLimitSwitch", evt -> setLowerLimit(motor.getAtLowerLimitSwtich()));
+ motor.addUiThreadPropertyChangeListener("atLowerLimitSwitch", _ -> setLowerLimit(motor.getAtLowerLimitSwtich()));
setUpperLimit(motor.getAtUpperLimitSwitch());
- motor.addUiThreadPropertyChangeListener("atUpperLimitSwitch", evt -> setUpperLimit(motor.getAtUpperLimitSwitch()));
+ motor.addUiThreadPropertyChangeListener("atUpperLimitSwitch", _ -> setUpperLimit(motor.getAtUpperLimitSwitch()));
}
@Override
diff --git a/base/uk.ac.stfc.isis.ibex.ui.motor/src/uk/ac/stfc/isis/ibex/ui/motor/views/MinimalMotorView.java b/base/uk.ac.stfc.isis.ibex.ui.motor/src/uk/ac/stfc/isis/ibex/ui/motor/views/MinimalMotorView.java
index 1488019c73..bb5e40290c 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.motor/src/uk/ac/stfc/isis/ibex/ui/motor/views/MinimalMotorView.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.motor/src/uk/ac/stfc/isis/ibex/ui/motor/views/MinimalMotorView.java
@@ -79,9 +79,9 @@ public MinimalMotorView(Composite parent, int style, MinimalMotorViewModel minim
setActiveView(minimalMotorViewModel.isAdvancedMinimalMotorView());
final var activeViewListener = minimalMotorViewModel.addUiThreadPropertyChangeListener("advancedMinimalMotorView",
- event -> setActiveView(minimalMotorViewModel.isAdvancedMinimalMotorView()));
+ _ -> setActiveView(minimalMotorViewModel.isAdvancedMinimalMotorView()));
- addDisposeListener(disposeEvent -> minimalMotorViewModel.removePropertyChangeListener("advancedMinimalMotorView", activeViewListener));
+ addDisposeListener(_ -> minimalMotorViewModel.removePropertyChangeListener("advancedMinimalMotorView", activeViewListener));
bind();
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.motor/src/uk/ac/stfc/isis/ibex/ui/motor/views/MinimalMotorViewModel.java b/base/uk.ac.stfc.isis.ibex.ui.motor/src/uk/ac/stfc/isis/ibex/ui/motor/views/MinimalMotorViewModel.java
index 894bffb0f0..4e718b6c44 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.motor/src/uk/ac/stfc/isis/ibex/ui/motor/views/MinimalMotorViewModel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.motor/src/uk/ac/stfc/isis/ibex/ui/motor/views/MinimalMotorViewModel.java
@@ -373,17 +373,17 @@ public void propertyChange(PropertyChangeEvent evt) {
}
});
- motor.addPropertyChangeListener("setpoint", evt -> setSetpoint(formatForMotorDisplay("SP", motor.getSetpoint())));
- motor.addPropertyChangeListener("value", evt -> setValue(formatForMotorDisplay("Val", motor.getValue())));
+ motor.addPropertyChangeListener("setpoint", _ -> setSetpoint(formatForMotorDisplay("SP", motor.getSetpoint())));
+ motor.addPropertyChangeListener("value", _ -> setValue(formatForMotorDisplay("Val", motor.getValue())));
- motor.addPropertyChangeListener("lowerLimit", evt -> setLowLimit(formatForMotorDisplay("Lo", motor.getLowerLimit())));
- motor.addPropertyChangeListener("upperLimit", evt -> setHighLimit(formatForMotorDisplay("Hi", motor.getUpperLimit())));
+ motor.addPropertyChangeListener("lowerLimit", _ -> setLowLimit(formatForMotorDisplay("Lo", motor.getLowerLimit())));
+ motor.addPropertyChangeListener("upperLimit", _ -> setHighLimit(formatForMotorDisplay("Hi", motor.getUpperLimit())));
- motor.addPropertyChangeListener("offset", evt -> setOffset(formatForMotorDisplay("Off", motor.getOffset())));
- motor.addPropertyChangeListener("error", evt -> setError(formatForMotorDisplay("Err", motor.getError())));
+ motor.addPropertyChangeListener("offset", _ -> setOffset(formatForMotorDisplay("Off", motor.getOffset())));
+ motor.addPropertyChangeListener("error", _ -> setError(formatForMotorDisplay("Err", motor.getError())));
- motor.addPropertyChangeListener("usingEncoder", evt -> setUsingEncoder(motor.getUsingEncoder()));
- motor.addPropertyChangeListener("energised", evt -> setEnergised(motor.getEnergised()));
+ motor.addPropertyChangeListener("usingEncoder", _ -> setUsingEncoder(motor.getUsingEncoder()));
+ motor.addPropertyChangeListener("energised", _ -> setEnergised(motor.getEnergised()));
motor.addPropertyChangeListener("enabled", new PropertyChangeListener() {
@Override
@@ -394,7 +394,7 @@ public void propertyChange(PropertyChangeEvent event) {
}
});
- motor.addPropertyChangeListener("withinTolerance", event -> setBorderColor(chooseBorderColor()));
+ motor.addPropertyChangeListener("withinTolerance", _ -> setBorderColor(chooseBorderColor()));
}
private Color chooseBorderColor() {
diff --git a/base/uk.ac.stfc.isis.ibex.ui.motor/src/uk/ac/stfc/isis/ibex/ui/motor/views/MotorInfoAdvView.java b/base/uk.ac.stfc.isis.ibex.ui.motor/src/uk/ac/stfc/isis/ibex/ui/motor/views/MotorInfoAdvView.java
index da885dd41a..acec09c0de 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.motor/src/uk/ac/stfc/isis/ibex/ui/motor/views/MotorInfoAdvView.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.motor/src/uk/ac/stfc/isis/ibex/ui/motor/views/MotorInfoAdvView.java
@@ -92,12 +92,12 @@ public MotorInfoAdvView(Composite parent, int style, MinimalMotorViewModel minim
encoderStatus = new BooleanImageLabel(iconContainer, ENCODER_ENABLED, ENCODER_DISABLED, "Using the encoder", "Not using an encoder");
encoderStatus.setIsEnabled(minimalMotorViewModel.getUsingEncoder());
minimalMotorViewModel.addUiThreadPropertyChangeListener("usingEncoder",
- evt -> encoderStatus.setIsEnabled(minimalMotorViewModel.getUsingEncoder()));
+ _ -> encoderStatus.setIsEnabled(minimalMotorViewModel.getUsingEncoder()));
energisedStatus = new BooleanImageLabel(iconContainer, ENERGISED_ENABLED, ENERGISED_DISABLED, "Motor energised", "Motor not energised");
energisedStatus.setIsEnabled(minimalMotorViewModel.getEnergised());
minimalMotorViewModel.addUiThreadPropertyChangeListener("energised",
- evt -> energisedStatus.setIsEnabled(minimalMotorViewModel.getEnergised()));
+ _ -> energisedStatus.setIsEnabled(minimalMotorViewModel.getEnergised()));
setMouseListeners();
diff --git a/base/uk.ac.stfc.isis.ibex.ui.moxas/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.moxas/META-INF/MANIFEST.MF
index dc9b8f0b8f..f23fd515e7 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.moxas/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.moxas/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.moxas;singleton:=true
Bundle-Version: 1.0.0.qualifier
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.moxas
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.eclipse.ui;bundle-version="3.201.200",
org.eclipse.core.databinding;bundle-version="1.4.1",
org.eclipse.core.databinding.beans;bundle-version="1.2.200",
diff --git a/base/uk.ac.stfc.isis.ibex.ui.nicos.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.nicos.tests/META-INF/MANIFEST.MF
index c1b4f69af0..b70e5cac3c 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.nicos.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.nicos.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.nicos.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.ui.nicos;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit,
org.hamcrest,
org.mockito.mockito-core;bundle-version="4.7.0",
diff --git a/base/uk.ac.stfc.isis.ibex.ui.nicos/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.nicos/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.nicos/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.nicos/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.nicos/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.nicos/META-INF/MANIFEST.MF
index f6887b51a9..f4a28abdb2 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.nicos/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.nicos/META-INF/MANIFEST.MF
@@ -16,5 +16,5 @@ Require-Bundle: org.eclipse.ui,
uk.ac.stfc.isis.ibex.ui.widgets,
com.google.guava,
jakarta.annotation-api;bundle-version="[1.3.5,1.3.5]"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.nicos
diff --git a/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/NicosControlButtonPanel.java b/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/NicosControlButtonPanel.java
index 5848eb033e..77277c6f26 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/NicosControlButtonPanel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/NicosControlButtonPanel.java
@@ -91,7 +91,7 @@ private void bind() {
bindingContext.bindValue(WidgetProperties.enabled().observe(btnStop),
BeanProperties.value("enableButtons").observe(statusModel));
- btnTogglePause.addListener(SWT.Selection, e -> statusModel.toggleExecution());
- btnStop.addListener(SWT.Selection, e -> statusModel.stopExecution());
+ btnTogglePause.addListener(SWT.Selection, _ -> statusModel.toggleExecution());
+ btnStop.addListener(SWT.Selection, _ -> statusModel.stopExecution());
}
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/NicosOutputContainer.java b/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/NicosOutputContainer.java
index 0e3ddf43e5..1c271938a0 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/NicosOutputContainer.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/NicosOutputContainer.java
@@ -38,6 +38,6 @@ public void createOutputContainer(Composite parent) {
bindingContext.bindValue(WidgetProperties.text().observe(txtOutput),
BeanProperties.value("log").observe(outputLogViewModel));
- txtOutput.addListener(SWT.Modify, e -> txtOutput.setTopIndex(txtOutput.getLineCount() - 1));
+ txtOutput.addListener(SWT.Modify, _ -> txtOutput.setTopIndex(txtOutput.getLineCount() - 1));
}
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/NicosQueueContainer.java b/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/NicosQueueContainer.java
index 2bd7effd61..9df677ed8f 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/NicosQueueContainer.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/NicosQueueContainer.java
@@ -144,10 +144,10 @@ protected ColumnComparator comparator() {
queuedScriptsViewer.viewer().setInput(BeanProperties.list("queuedScripts").observe(model));
- queuedScriptsViewer.viewer().addDoubleClickListener(e ->
+ queuedScriptsViewer.viewer().addDoubleClickListener(_ ->
(new EditScriptDialog(shell, queueScriptViewModel)).open());
- queuedScriptsViewer.addSelectionChangedListener(e ->
+ queuedScriptsViewer.addSelectionChangedListener(_ ->
queueScriptViewModel.setSelectedScript(queuedScriptsViewer.firstSelectedRow()));
createQueuedScriptMenu(queuedScriptsViewer.viewer());
@@ -181,18 +181,18 @@ protected ColumnComparator comparator() {
btnDequeueScript.setText("Dequeue Selected Script");
btnDequeueScript.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
- btnCreateScript.addListener(SWT.Selection, e -> (new QueueScriptDialog(shell, queueScriptViewModel)).open());
- btnDequeueScript.addListener(SWT.Selection, e -> queueScriptViewModel.dequeueScript());
+ btnCreateScript.addListener(SWT.Selection, _ -> (new QueueScriptDialog(shell, queueScriptViewModel)).open());
+ btnDequeueScript.addListener(SWT.Selection, _ -> queueScriptViewModel.dequeueScript());
bindingContext.bindValue(WidgetProperties.enabled().observe(btnDequeueScript),
BeanProperties.value("dequeueButtonEnabled").observe(queueScriptViewModel));
- btnScriptUp.addListener(SWT.Selection, e -> queueScriptViewModel.moveScript(true));
+ btnScriptUp.addListener(SWT.Selection, _ -> queueScriptViewModel.moveScript(true));
bindingContext.bindValue(WidgetProperties.enabled().observe(btnScriptUp),
BeanProperties.value("upButtonEnabled").observe(queueScriptViewModel));
- btnScriptDown.addListener(SWT.Selection, e -> queueScriptViewModel.moveScript(false));
+ btnScriptDown.addListener(SWT.Selection, _ -> queueScriptViewModel.moveScript(false));
bindingContext.bindValue(WidgetProperties.enabled().observe(btnScriptDown),
BeanProperties.value("downButtonEnabled").observe(queueScriptViewModel));
diff --git a/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/dialogs/EditScriptDialog.java b/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/dialogs/EditScriptDialog.java
index 4b87c9e2b5..5cbc3e228f 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/dialogs/EditScriptDialog.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/dialogs/EditScriptDialog.java
@@ -49,7 +49,7 @@ protected void createButtonsForButtonBar(Composite parent) {
actionButton = createButton(parent, IDialogConstants.OK_ID, "Update", false);
actionButton.setImage(ResourceManager.getPluginImage("uk.ac.stfc.isis.ibex.ui.alarm", "icons/refresh.png"));
- actionButton.addListener(SWT.Selection, e -> model.updateScript(script));
+ actionButton.addListener(SWT.Selection, _ -> model.updateScript(script));
bindingContext.bindValue(WidgetProperties.enabled().observe(actionButton),
BeanProperties.value("updateButtonEnabled").observe(model));
diff --git a/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/dialogs/QueueScriptDialog.java b/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/dialogs/QueueScriptDialog.java
index 470a44dad9..e03920c5aa 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/dialogs/QueueScriptDialog.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/dialogs/QueueScriptDialog.java
@@ -55,7 +55,7 @@ public QueueScriptDialog(Shell parentShell, QueueScriptViewModel model) {
protected void createButtonsForButtonBar(Composite parent) {
queueBtn = createButton(parent, IDialogConstants.OK_ID, "Queue", false);
queueBtn.setImage(ResourceManager.getPluginImage("uk.ac.stfc.isis.ibex.ui.dae", "icons/play.png"));
- queueBtn.addListener(SWT.Selection, e -> model.queueScript());
+ queueBtn.addListener(SWT.Selection, _ -> model.queueScript());
super.createButtonsForButtonBar(parent);
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/dialogs/QueuedScriptToolbar.java b/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/dialogs/QueuedScriptToolbar.java
index 02a7872a9c..8c7ca05615 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/dialogs/QueuedScriptToolbar.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/dialogs/QueuedScriptToolbar.java
@@ -34,11 +34,11 @@ private ToolItem createToolItem(String tooltip, String icon, Consumer act
*/
public QueuedScriptToolbar(Composite parent, QueuedScript script, boolean writePermission) {
toolbar = new ToolBar(parent, SWT.FLAT | SWT.WRAP | SWT.LEFT);
- ToolItem loadScript = createToolItem("Load Script", "open_folder.png", e ->
+ ToolItem loadScript = createToolItem("Load Script", "open_folder.png", _ ->
(new LoadScriptAction(parent.getShell(), script)).execute());
loadScript.setEnabled(writePermission);
- createToolItem("Save Script", "save.png", e ->
+ createToolItem("Save Script", "save.png", _ ->
(new SaveScriptAction(parent.getShell(), script)).execute());
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/models/OutputLogViewModel.java b/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/models/OutputLogViewModel.java
index 9b371c4582..6a663c011e 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/models/OutputLogViewModel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/models/OutputLogViewModel.java
@@ -20,7 +20,7 @@ public class OutputLogViewModel extends ModelObject {
* the NicosModel to observe
*/
public OutputLogViewModel(final NicosModel model) {
- model.addPropertyChangeListener("logEntries", e -> appendLog(model.getLogEntries()));
+ model.addPropertyChangeListener("logEntries", _ -> appendLog(model.getLogEntries()));
}
private void appendLog(List log) {
diff --git a/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/models/QueueScriptViewModel.java b/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/models/QueueScriptViewModel.java
index e0f5d6475b..ec0f8c763e 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/models/QueueScriptViewModel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/models/QueueScriptViewModel.java
@@ -55,7 +55,7 @@ public QueueScriptViewModel(NicosModel model) {
this.model = model;
this.scriptToSend = new QueuedScript();
- model.addPropertyChangeListener("queuedScripts", e -> updateButtonEnablement());
+ model.addPropertyChangeListener("queuedScripts", _ -> updateButtonEnablement());
}
/**
diff --git a/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/models/ScriptStatusViewModel.java b/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/models/ScriptStatusViewModel.java
index 5369661b26..1b42215bba 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/models/ScriptStatusViewModel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.nicos/src/uk/ac/stfc/isis/ibex/ui/nicos/models/ScriptStatusViewModel.java
@@ -60,13 +60,13 @@ public class ScriptStatusViewModel extends ModelObject {
public ScriptStatusViewModel(final NicosModel model) {
this.model = model;
- model.addPropertyChangeListener("lineNumber", e ->
+ model.addPropertyChangeListener("lineNumber", _ ->
setCombinedScriptInfo(model.getLineNumber(), model.getScriptStatus(), model.getScriptName()));
- model.addPropertyChangeListener("scriptStatus", e ->
+ model.addPropertyChangeListener("scriptStatus", _ ->
setCombinedScriptInfo(model.getLineNumber(), model.getScriptStatus(), model.getScriptName()));
- model.addPropertyChangeListener("scriptName", e ->
+ model.addPropertyChangeListener("scriptName", _ ->
setCombinedScriptInfo(model.getLineNumber(), model.getScriptStatus(), model.getScriptName()));
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.reflectometry/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.reflectometry/META-INF/MANIFEST.MF
index 1d0eaec893..a42cc6ca22 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.reflectometry/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.reflectometry/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Reflectometry
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.reflectometry;singleton:=true
Bundle-Version: 1.0.0.qualifier
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.reflectometry
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: uk.ac.stfc.isis.ibex.ui;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.instrument;bundle-version="1.0.0",
org.eclipse.ui;bundle-version="3.113.0",
diff --git a/base/uk.ac.stfc.isis.ibex.ui.runcontrol.tests/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.runcontrol.tests/.settings/org.eclipse.jdt.core.prefs
index 7cecefac3e..86109af12f 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.runcontrol.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.runcontrol.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.runcontrol.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.runcontrol.tests/META-INF/MANIFEST.MF
index e3b5632721..be1f23b4c2 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.runcontrol.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.runcontrol.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.runcontrol.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.ui.runcontrol;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit,
jakarta.annotation-api;bundle-version="[1.3.5,1.3.5]",
org.hamcrest,
diff --git a/base/uk.ac.stfc.isis.ibex.ui.runcontrol/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.runcontrol/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.runcontrol/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.runcontrol/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.runcontrol/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.runcontrol/META-INF/MANIFEST.MF
index bc21e2b89f..38eb356cd2 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.runcontrol/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.runcontrol/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Require-Bundle: org.eclipse.ui,
uk.ac.stfc.isis.ibex.ui.configserver;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.ui.widgets;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.runcontrol
Import-Package: uk.ac.stfc.isis.ibex.ui.blocks.groups,
uk.ac.stfc.isis.ibex.ui.widgets
diff --git a/base/uk.ac.stfc.isis.ibex.ui.runcontrol/src/uk/ac/stfc/isis/ibex/ui/runcontrol/dialogs/RunControlEditorPanel.java b/base/uk.ac.stfc.isis.ibex.ui.runcontrol/src/uk/ac/stfc/isis/ibex/ui/runcontrol/dialogs/RunControlEditorPanel.java
index fecd3b893d..6f375aead1 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.runcontrol/src/uk/ac/stfc/isis/ibex/ui/runcontrol/dialogs/RunControlEditorPanel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.runcontrol/src/uk/ac/stfc/isis/ibex/ui/runcontrol/dialogs/RunControlEditorPanel.java
@@ -203,7 +203,7 @@ public void widgetSelected(SelectionEvent e) {
setModel(viewModel);
setBlock(null);
- parent.addDisposeListener(e -> configServer.saveAs().removeOnCanWriteChangeListener(canWriteListener));
+ parent.addDisposeListener(_ -> configServer.saveAs().removeOnCanWriteChangeListener(canWriteListener));
}
private void setModel(RunControlViewModel viewModel) {
diff --git a/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/META-INF/MANIFEST.MF
index 983b61a768..481fd5ff39 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Scriptgenerator
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.scriptgenerator;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: uk.ac.stfc.isis.ibex.scriptgenerator,
org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/src/uk/ac/stfc/isis/ibex/ui/scriptgenerator/views/ScriptGeneratorHelpMenuItems.java b/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/src/uk/ac/stfc/isis/ibex/ui/scriptgenerator/views/ScriptGeneratorHelpMenuItems.java
index a735652404..58c2e08e1c 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/src/uk/ac/stfc/isis/ibex/ui/scriptgenerator/views/ScriptGeneratorHelpMenuItems.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/src/uk/ac/stfc/isis/ibex/ui/scriptgenerator/views/ScriptGeneratorHelpMenuItems.java
@@ -69,7 +69,7 @@ private void setUpOpenManualButtonItem(Menu helpMenu) {
private void setUpOpenManualButtonWithUrl(MenuItem openManualItem, URL url) {
openManualItem.setEnabled(true);
openManualItem.setToolTipText(url.toString());
- openManualItem.addListener(SWT.Selection, e1 -> {
+ openManualItem.addListener(SWT.Selection, _ -> {
try {
IWebBrowser browser = PlatformUI.getWorkbench().getBrowserSupport().getExternalBrowser();
browser.openURL(url);
@@ -87,7 +87,7 @@ private void setUpOpenManualButtonWithoutUrl(MenuItem openManualItem) {
private void setUpAboutButtonItem(Menu helpMenu) {
var aboutItem = new MenuItem(helpMenu, SWT.PUSH);
aboutItem.setText("About");
- aboutItem.addListener(SWT.Selection, e2 -> {
+ aboutItem.addListener(SWT.Selection, _ -> {
displayAbout();
});
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/src/uk/ac/stfc/isis/ibex/ui/scriptgenerator/views/ScriptGeneratorNicosViewModel.java b/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/src/uk/ac/stfc/isis/ibex/ui/scriptgenerator/views/ScriptGeneratorNicosViewModel.java
index 1d3a743c3a..ce07e27226 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/src/uk/ac/stfc/isis/ibex/ui/scriptgenerator/views/ScriptGeneratorNicosViewModel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/src/uk/ac/stfc/isis/ibex/ui/scriptgenerator/views/ScriptGeneratorNicosViewModel.java
@@ -68,7 +68,7 @@ public void bindControls(Button runButton, Button pauseButton, Button stopButton
bindPauseButton(pauseButton);
bindStopButton(stopButton);
formatButtonsBasedOnStatus(dynamicScriptingManager.getDynamicScriptingStatus());
- nicosModel.addUiThreadPropertyChangeListener(e -> updateButtonEnablement());
+ nicosModel.addUiThreadPropertyChangeListener(_ -> updateButtonEnablement());
}
/**
@@ -85,21 +85,21 @@ public void propertyChange(PropertyChangeEvent evt) {
private void bindRunButton(Button runButton) {
this.runButton = runButton;
- runButton.addListener(SWT.Selection, e -> {
+ runButton.addListener(SWT.Selection, _ -> {
playScript();
});
}
private void bindPauseButton(Button pauseButton) {
this.pauseButton = pauseButton;
- pauseButton.addListener(SWT.Selection, e -> {
+ pauseButton.addListener(SWT.Selection, _ -> {
pauseScript();
});
}
private void bindStopButton(Button stopButton) {
this.stopButton = stopButton;
- stopButton.addListener(SWT.Selection, e -> {
+ stopButton.addListener(SWT.Selection, _ -> {
stopScript();
});
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/src/uk/ac/stfc/isis/ibex/ui/scriptgenerator/views/ScriptGeneratorView.java b/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/src/uk/ac/stfc/isis/ibex/ui/scriptgenerator/views/ScriptGeneratorView.java
index 34e6ca2ecb..fe6a534209 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/src/uk/ac/stfc/isis/ibex/ui/scriptgenerator/views/ScriptGeneratorView.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/src/uk/ac/stfc/isis/ibex/ui/scriptgenerator/views/ScriptGeneratorView.java
@@ -232,7 +232,7 @@ private void makeCenteredMessage(Composite parent, String message) {
final FontDescriptor largeDescriptor = FontDescriptor.createFrom(messageLabel.getFont()).setHeight(16);
final Font largeFont = largeDescriptor.createFont(Display.getDefault());
messageLabel.setFont(largeFont);
- messageLabel.addDisposeListener(e -> largeFont.dispose()); // Need to dispose of new font's resources
+ messageLabel.addDisposeListener(_ -> largeFont.dispose()); // Need to dispose of new font's resources
messageLabel.setText(message);
parent.layout();
@@ -361,7 +361,7 @@ private void makeToggleInvalidPauseSkip(Composite parent) {
actionsControlsGrp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
// Pause
- new IBEXButton(actionsControlsGrp, SWT.RADIO, event -> {
+ new IBEXButton(actionsControlsGrp, SWT.RADIO, _ -> {
ScriptGeneratorSettingsSingleton.getInstance().setSkipEnabled(false); //sets skipEnabled to false, causing Pause on invalid actions during run of script
})
.text(Constants.CHECKBOX_TITLE_INVALID_PAUSE)
@@ -369,7 +369,7 @@ private void makeToggleInvalidPauseSkip(Composite parent) {
.selected(!Constants.INVALID_SKIP_DEFAULT);
// Skip
- new IBEXButton(actionsControlsGrp, SWT.RADIO, event -> {
+ new IBEXButton(actionsControlsGrp, SWT.RADIO, _ -> {
ScriptGeneratorSettingsSingleton.getInstance().setSkipEnabled(true); //sets skipEnabled to true, skipping over invalid actions during run of script
})
.text(Constants.CHECKBOX_TITLE_INVALID_SKIP)
@@ -390,21 +390,21 @@ private void makeTableRowControlButtons(Composite parent) {
actionsControlsGrp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
// Make buttons for insert new/delete/duplicate actions
- btnAddAction = new IBEXButton(actionsControlsGrp, SWT.NONE, event -> {
+ btnAddAction = new IBEXButton(actionsControlsGrp, SWT.NONE, _ -> {
scriptGeneratorViewModel.addEmptyAction();
})
.text(Constants.BUTTON_TITLE_ADD_ROW_TO_END)
.tooltip(Constants.BUTTON_TOOLTIP_ADD_ROW_TO_END)
.layoutData(IBEXButton.expandingGrid)
.get();
- btnInsertAction = new IBEXButton(actionsControlsGrp, SWT.NONE, event -> {
+ btnInsertAction = new IBEXButton(actionsControlsGrp, SWT.NONE, _ -> {
scriptGeneratorViewModel.insertEmptyAction(table.getSelectionIndex() + 1);
})
.text(Constants.BUTTON_TITLE_INSERT_ROW_BELOW)
.tooltip(Constants.BUTTON_TOOLTIP_INSERT_ROW_BELOW)
.layoutData(IBEXButton.expandingGrid)
.get();
- new IBEXButton(actionsControlsGrp, SWT.NONE, event -> {
+ new IBEXButton(actionsControlsGrp, SWT.NONE, _ -> {
scriptGeneratorViewModel.clearAction();
})
.text(Constants.BUTTON_TITLE_DELETE_ROWS)
@@ -425,21 +425,21 @@ private void makeScriptSaveLoadButtons(Composite parent) {
generateButtonsGrp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
// Buttons to generate a script
- generateScriptButton = new IBEXButton(generateButtonsGrp, SWT.NONE, event -> {
+ generateScriptButton = new IBEXButton(generateButtonsGrp, SWT.NONE, _ -> {
scriptGeneratorViewModel.generateScriptToCurrentFilepath();
})
.text(Constants.BUTTON_TITLE_SAVE)
.tooltip(Constants.BUTTON_TITLE_SAVE)
.layoutData(IBEXButton.expandingGrid)
.get();
- generateScriptAsButton = new IBEXButton(generateButtonsGrp, SWT.NONE, event -> {
+ generateScriptAsButton = new IBEXButton(generateButtonsGrp, SWT.NONE, _ -> {
scriptGeneratorViewModel.generateScript();
})
.text(Constants.BUTTON_TITLE_SAVE_AS)
.tooltip(Constants.BUTTON_TITLE_SAVE_AS)
.layoutData(IBEXButton.expandingGrid)
.get();
- new IBEXButton(generateButtonsGrp, SWT.NONE, event -> {
+ new IBEXButton(generateButtonsGrp, SWT.NONE, _ -> {
scriptGeneratorViewModel.loadParameterValues();
})
.text(Constants.BUTTON_TITLE_LOAD)
@@ -498,7 +498,7 @@ private void makeRunAndFinishTime(Composite parent) {
final Font estimateFont = boldDescriptor.createFont(Display.getDefault());
estimateText.setFont(estimateFont);
estimateText.setText("Total estimated run time: 0 seconds");
- estimateText.addDisposeListener(e -> estimateFont.dispose()); // Need to dispose of new font's resources
+ estimateText.addDisposeListener(_ -> estimateFont.dispose()); // Need to dispose of new font's resources
// Label for the expected finish time
expectedFinishText = new Label(scriptTimeGrp, SWT.BOTTOM);
@@ -506,7 +506,7 @@ private void makeRunAndFinishTime(Composite parent) {
final Font expectedFinishFont = boldDescriptor.createFont(Display.getDefault());
expectedFinishText.setFont(expectedFinishFont);
expectedFinishText.setText("Expected Finish Time: 00:00:00");
- expectedFinishText.addDisposeListener(e -> expectedFinishFont.dispose()); // Need to dispose of new font's
+ expectedFinishText.addDisposeListener(_ -> expectedFinishFont.dispose()); // Need to dispose of new font's
// resources
}
@@ -532,14 +532,14 @@ private void makeTableAndUpDownButtons(Composite parent) {
moveComposite.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false));
// Make buttons to move an action up and down the list
- btnMoveActionUp = new IBEXButton(moveComposite, SWT.NONE, event -> {
+ btnMoveActionUp = new IBEXButton(moveComposite, SWT.NONE, _ -> {
scriptGeneratorViewModel.moveActionUp(table.selectedRows());
})
.image(Constants.IMAGE_UP_ARROW)
.tooltip("Move selected row up")
.layoutData(IBEXButton.compactGrid)
.get();
- btnMoveActionDown = new IBEXButton(moveComposite, SWT.NONE, event -> {
+ btnMoveActionDown = new IBEXButton(moveComposite, SWT.NONE, _ -> {
scriptGeneratorViewModel.moveActionDown(table.selectedRows());
})
.image(Constants.IMAGE_DOWN_ARROW)
@@ -685,7 +685,7 @@ private void bind(ComboViewer scriptDefinitionSelector) {
scriptGeneratorViewModel.bindActionProperties(table);
- table.addSelectionChangedListener(event -> scriptGeneratorViewModel.setSelected(table.selectedRows()));
+ table.addSelectionChangedListener(_ -> scriptGeneratorViewModel.setSelected(table.selectedRows()));
bindingContext.bindValue(WidgetProperties.text().observe(parametersFileText),
BeanProperties.value("parametersFile").observe(scriptGeneratorViewModel));
@@ -775,7 +775,7 @@ public void onScriptDefinitionChange(ScriptGeneratorViewModel viewModel,
globalParamTextCurrent.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 5, 1));
globalParamTextCurrent.setEnabled(true);
final int index = paramIndex;
- globalParamTextCurrent.addListener(SWT.Modify, e -> {
+ globalParamTextCurrent.addListener(SWT.Modify, _ -> {
viewModel.updateGlobalParams(index, globalParamTextCurrent.getText());
});
globalParamTextCurrent.setText(paramVal);
diff --git a/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/src/uk/ac/stfc/isis/ibex/ui/scriptgenerator/views/ScriptGeneratorViewModel.java b/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/src/uk/ac/stfc/isis/ibex/ui/scriptgenerator/views/ScriptGeneratorViewModel.java
index f202dd631d..d95671b803 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/src/uk/ac/stfc/isis/ibex/ui/scriptgenerator/views/ScriptGeneratorViewModel.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.scriptgenerator/src/uk/ac/stfc/isis/ibex/ui/scriptgenerator/views/ScriptGeneratorViewModel.java
@@ -198,11 +198,11 @@ public ScriptGeneratorSingleton setUpModel() {
});
// Listen for model threading errors and display to the user if there is one
// Model is responsible for logging it
- scriptGeneratorModel.addPropertyChangeListener(ScriptGeneratorProperties.THREAD_ERROR_PROPERTY, evt -> {
+ scriptGeneratorModel.addPropertyChangeListener(ScriptGeneratorProperties.THREAD_ERROR_PROPERTY, _ -> {
dispatchErrorMessage("Error", "Generating or parameter validity checking error. Threading issue.");
});
scriptGeneratorModel.addPropertyChangeListener(ScriptGeneratorProperties.SCRIPT_GENERATION_ERROR_PROPERTY,
- evt -> {
+ _ -> {
LOG.info("Generation error");
dispatchErrorMessage("Error", "Error when generating a script, are your parameters valid?");
});
@@ -480,7 +480,7 @@ protected void bindActionProperties(ActionsViewTable viewTable) {
this.scriptGeneratorModel.getScriptGeneratorTable()
.addPropertyChangeListener(ScriptGeneratorProperties.ACTIONS_PROPERTY, actionChangeListener);
this.scriptGeneratorModel.getScriptGeneratorTable()
- .addPropertyChangeListener(ScriptGeneratorProperties.ACTIONS_PROPERTY, evt -> {
+ .addPropertyChangeListener(ScriptGeneratorProperties.ACTIONS_PROPERTY, _ -> {
updateParametersFileModifiedStatus();
});
this.scriptGeneratorModel.removePropertyChangeListener(
@@ -1015,7 +1015,7 @@ private String getScriptGenActionToolTipText(Object action) {
*/
protected void addActionParamPropertyListener(ActionsViewTable viewTable) {
scriptGeneratorModel.getScriptGeneratorTable().addPropertyChangeListener("actionParameters",
- e -> Constants.DISPLAY.asyncExec(() -> {
+ _ -> Constants.DISPLAY.asyncExec(() -> {
if (!viewTable.isDisposed()) {
viewTable.updateTableColumns();
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.scripting.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.scripting.tests/META-INF/MANIFEST.MF
index b4ededc64c..b42079b209 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.scripting.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.scripting.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.scripting.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.ui.scripting;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
org.eclipse.equinox.preferences,
org.hamcrest,
diff --git a/base/uk.ac.stfc.isis.ibex.ui.scripting/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.scripting/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.scripting/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.scripting/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.scripting/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.scripting/META-INF/MANIFEST.MF
index e94c99923a..08a3c73062 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.scripting/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.scripting/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-Name: Scripting
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.scripting;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: uk.ac.stfc.isis.ibex.ui.scripting.Consoles
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.ui.scripting
Require-Bundle: jakarta.annotation-api;bundle-version="[1.3.5,1.3.5]",
diff --git a/base/uk.ac.stfc.isis.ibex.ui.scripting/src/uk/ac/stfc/isis/ibex/ui/scripting/ConsoleLengthMonitor.java b/base/uk.ac.stfc.isis.ibex.ui.scripting/src/uk/ac/stfc/isis/ibex/ui/scripting/ConsoleLengthMonitor.java
index ab680d51b1..dae182b188 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.scripting/src/uk/ac/stfc/isis/ibex/ui/scripting/ConsoleLengthMonitor.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.scripting/src/uk/ac/stfc/isis/ibex/ui/scripting/ConsoleLengthMonitor.java
@@ -60,7 +60,7 @@ public void mouseDown(MouseEvent e) {
Consoles.getDefault().addConsoleLengthListener(this::updateButtonText);
// When this widget gets disposed, remove the listener
- button.addDisposeListener(e_ignored -> Consoles.getDefault().removeConsoleLengthListener(this::updateButtonText));
+ button.addDisposeListener(_ -> Consoles.getDefault().removeConsoleLengthListener(this::updateButtonText));
return button;
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.scripting/src/uk/ac/stfc/isis/ibex/ui/scripting/Consoles.java b/base/uk.ac.stfc.isis.ibex.ui.scripting/src/uk/ac/stfc/isis/ibex/ui/scripting/Consoles.java
index 2135f7d825..ec380c41d0 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.scripting/src/uk/ac/stfc/isis/ibex/ui/scripting/Consoles.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.scripting/src/uk/ac/stfc/isis/ibex/ui/scripting/Consoles.java
@@ -165,7 +165,7 @@ public void run() {
IToolBarManager tbm = view.getViewSite().getActionBars().getToolBarManager();
IContributionItem[] items = tbm.getItems();
// Add our "Open Console" action
- GenieOpenConsoleAction openConsoleAction = new GenieOpenConsoleAction();
+ GenieOpenConsoleAction openConsoleAction = new GenieOpenConsoleAction(view);
tbm.insertBefore(CLEAR_CONSOLE_ID, openConsoleAction);
// Console view icons that are not required. We are removing OpenConsoleAction so that we can add our Action
diff --git a/base/uk.ac.stfc.isis.ibex.ui.scripting/src/uk/ac/stfc/isis/ibex/ui/scripting/ConsolesCountMonitor.java b/base/uk.ac.stfc.isis.ibex.ui.scripting/src/uk/ac/stfc/isis/ibex/ui/scripting/ConsolesCountMonitor.java
index 05e00cfb4e..68299d0756 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.scripting/src/uk/ac/stfc/isis/ibex/ui/scripting/ConsolesCountMonitor.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.scripting/src/uk/ac/stfc/isis/ibex/ui/scripting/ConsolesCountMonitor.java
@@ -35,7 +35,7 @@ protected Control createControl(Composite parent) {
Consoles.getDefault().addConsoleCountListener(this::updateLabelText);
// When this widget gets disposed, remove the listener
- label.addDisposeListener(e_ignored -> Consoles.getDefault().removeConsoleCountListener(this::updateLabelText));
+ label.addDisposeListener(_ -> Consoles.getDefault().removeConsoleCountListener(this::updateLabelText));
return label;
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.scripting/src/uk/ac/stfc/isis/ibex/ui/scripting/GenieOpenConsoleAction.java b/base/uk.ac.stfc.isis.ibex.ui.scripting/src/uk/ac/stfc/isis/ibex/ui/scripting/GenieOpenConsoleAction.java
index bcf482f0f9..66e6fec472 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.scripting/src/uk/ac/stfc/isis/ibex/ui/scripting/GenieOpenConsoleAction.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.scripting/src/uk/ac/stfc/isis/ibex/ui/scripting/GenieOpenConsoleAction.java
@@ -14,6 +14,7 @@
import org.eclipse.ui.console.IConsoleFactory;
import org.eclipse.ui.internal.console.ConsoleFactoryExtension;
import org.eclipse.ui.internal.console.ConsoleManager;
+import org.eclipse.ui.internal.console.ConsoleView;
import org.eclipse.ui.internal.console.OpenConsoleAction;
/**
@@ -33,9 +34,10 @@ public class GenieOpenConsoleAction extends OpenConsoleAction {
/**
* Initialise factory extensions.
+ * @param consoleView the console view
*/
- public GenieOpenConsoleAction() {
- super();
+ public GenieOpenConsoleAction(ConsoleView consoleView) {
+ super(consoleView);
fFactoryExtensions = getFactories();
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.synoptic.editor.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.synoptic.editor.tests/META-INF/MANIFEST.MF
index dcc3461d53..c0b024dd1e 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.synoptic.editor.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.synoptic.editor.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.synoptic.editor.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.ui.synoptic.editor;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
jakarta.annotation-api;bundle-version="[1.3.5,1.3.5]",
org.hamcrest,
diff --git a/base/uk.ac.stfc.isis.ibex.ui.synoptic.editor/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.synoptic.editor/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.synoptic.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.synoptic.editor/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.synoptic.editor/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.synoptic.editor/META-INF/MANIFEST.MF
index bca8db8de6..485b5785e7 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.synoptic.editor/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.synoptic.editor/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.ui,
uk.ac.stfc.isis.ibex.logger,
uk.ac.stfc.isis.ibex.ui.widgets,
org.eclipse.e4.ui.model.workbench
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.e4.core.di.annotations,
org.eclipse.e4.ui.di,
diff --git a/base/uk.ac.stfc.isis.ibex.ui.synoptic.editor/src/uk/ac/stfc/isis/ibex/ui/synoptic/editor/validators/ComponentValidator.java b/base/uk.ac.stfc.isis.ibex.ui.synoptic.editor/src/uk/ac/stfc/isis/ibex/ui/synoptic/editor/validators/ComponentValidator.java
index ad05a61247..3173e4442b 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.synoptic.editor/src/uk/ac/stfc/isis/ibex/ui/synoptic/editor/validators/ComponentValidator.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.synoptic.editor/src/uk/ac/stfc/isis/ibex/ui/synoptic/editor/validators/ComponentValidator.java
@@ -92,7 +92,7 @@ public void propertyChange(PropertyChangeEvent evt) {
private void addPVListener(PV pv) {
SynopticPvValidator pvValid = new SynopticPvValidator(pv);
validators.put(System.identityHashCode(pv), pvValid);
- pv.addPropertyChangeListener((PropertyChangeEvent evt) -> duplicatePVNameValidator.checkForDuplicatePVs(component.pvs()));
+ pv.addPropertyChangeListener(_ -> duplicatePVNameValidator.checkForDuplicatePVs(component.pvs()));
pvValid.addPropertyChangeListener("error", errorListener);
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.synoptic/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.synoptic/.settings/org.eclipse.jdt.core.prefs
index bfb698467f..5ff46eabf5 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.synoptic/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.synoptic/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.synoptic/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.synoptic/META-INF/MANIFEST.MF
index d1546fdc2d..f5d2d088d4 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.synoptic/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.synoptic/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.ui,
uk.ac.stfc.isis.ibex.epics;bundle-version="1.0.0",
javax.inject;bundle-version="1.0.0",
jakarta.annotation-api;bundle-version="[1.3.5,1.3.5]"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: uk.ac.stfc.isis.ibex.ui.synoptic,
uk.ac.stfc.isis.ibex.ui.synoptic.component,
uk.ac.stfc.isis.ibex.ui.synoptic.views,
diff --git a/base/uk.ac.stfc.isis.ibex.ui.targets/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.targets/META-INF/MANIFEST.MF
index 41e2728767..0a48d82590 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.targets/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.targets/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui,
uk.ac.stfc.isis.ibex.logger,
uk.ac.stfc.isis.ibex.instrument,
org.csstudio.opibuilder;bundle-version="5.1.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.ui.targets
Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.targets
diff --git a/base/uk.ac.stfc.isis.ibex.ui.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.tests/META-INF/MANIFEST.MF
index 40f9085814..28cd62f957 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.ui;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit;bundle-version="4.11.0",
org.hamcrest,
org.mockito.mockito-core;bundle-version="4.7.0",
diff --git a/base/uk.ac.stfc.isis.ibex.ui.weblinks/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui.weblinks/.settings/org.eclipse.jdt.core.prefs
index 34e62c26b5..c0956998a7 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.weblinks/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui.weblinks/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui.weblinks/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.weblinks/META-INF/MANIFEST.MF
index 1e06f0fe61..88baeec6c3 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.weblinks/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.weblinks/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Weblinks
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.weblinks;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: uk.ac.stfc.isis.ibex.ui;bundle-version="1.0.0",
uk.ac.stfc.isis.ibex.instrument;bundle-version="1.0.0",
org.eclipse.ui;bundle-version="3.8.2",
diff --git a/base/uk.ac.stfc.isis.ibex.ui.widgets.epics/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.widgets.epics/META-INF/MANIFEST.MF
index d6edd37e66..91f9b8fc1b 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.widgets.epics/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.widgets.epics/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Widgets
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.widgets.epics
Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.core.runtime;bundle-version="3.7.0",
uk.ac.stfc.isis.ibex.ui;bundle-version="1.0.0",
diff --git a/base/uk.ac.stfc.isis.ibex.ui.widgets/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui.widgets/META-INF/MANIFEST.MF
index 6a0165e1bf..6bf3865cdc 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.widgets/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui.widgets/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Widgets
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.ui.widgets
Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.core.runtime;bundle-version="3.7.0",
uk.ac.stfc.isis.ibex.ui;bundle-version="1.0.0",
diff --git a/base/uk.ac.stfc.isis.ibex.ui.widgets/src/uk/ac/stfc/isis/ibex/ui/widgets/CheckboxLabelProvider.java b/base/uk.ac.stfc.isis.ibex.ui.widgets/src/uk/ac/stfc/isis/ibex/ui/widgets/CheckboxLabelProvider.java
index 6f435a2c07..957681fd4a 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.widgets/src/uk/ac/stfc/isis/ibex/ui/widgets/CheckboxLabelProvider.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.widgets/src/uk/ac/stfc/isis/ibex/ui/widgets/CheckboxLabelProvider.java
@@ -88,7 +88,7 @@ public CheckboxLabelProvider(IObservableMap[] stateProperties) {
super(stateProperties);
for (IObservableMap attributeMap : stateProperties) {
- attributeMap.addMapChangeListener(event -> {
+ attributeMap.addMapChangeListener(_ -> {
updateCheckboxListenerUpdateFlags(attributeMap);
});
}
diff --git a/base/uk.ac.stfc.isis.ibex.ui.widgets/src/uk/ac/stfc/isis/ibex/ui/widgets/buttons/IBEXButton.java b/base/uk.ac.stfc.isis.ibex.ui.widgets/src/uk/ac/stfc/isis/ibex/ui/widgets/buttons/IBEXButton.java
index 314d6f7cdc..1eaf500e75 100644
--- a/base/uk.ac.stfc.isis.ibex.ui.widgets/src/uk/ac/stfc/isis/ibex/ui/widgets/buttons/IBEXButton.java
+++ b/base/uk.ac.stfc.isis.ibex.ui.widgets/src/uk/ac/stfc/isis/ibex/ui/widgets/buttons/IBEXButton.java
@@ -142,7 +142,7 @@ public IBEXButton layoutData(Object layoutData) {
* @return IBEXButton
*/
public IBEXButton link(String url) {
- this.button.addListener(SWT.Selection, e -> {
+ this.button.addListener(SWT.Selection, _ -> {
try {
PlatformUI.getWorkbench().getBrowserSupport().getExternalBrowser().openURL(new URI(url).toURL());
} catch (PartInitException | MalformedURLException | URISyntaxException ex) {
@@ -167,7 +167,7 @@ private IBEXButton action(Action action) {
bindingContext.bindValue(WidgetProperties.enabled().observe(this.button),
BeanProperties.value("canExecute").observe(action));
- this.listener(SWT.Selection, event -> {
+ this.listener(SWT.Selection, _ -> {
action.execute();
});
diff --git a/base/uk.ac.stfc.isis.ibex.ui/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.ui/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.ui/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.ui/META-INF/MANIFEST.MF
index 27edfd3bb7..131a16b61c 100644
--- a/base/uk.ac.stfc.isis.ibex.ui/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.ui/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.ui,
jakarta.annotation-api;bundle-version="[1.3.5,1.3.5]",
org.apache.commons.lang,
uk.ac.stfc.isis.ibex.logger;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Export-Package: org.eclipse.wb.swt,
org.mihalis.opal,
org.mihalis.opal.breadcrumb,
diff --git a/base/uk.ac.stfc.isis.ibex.ui/src/uk/ac/stfc/isis/ibex/ui/WaitFor.java b/base/uk.ac.stfc.isis.ibex.ui/src/uk/ac/stfc/isis/ibex/ui/WaitFor.java
index bf2968496d..40b7baf11d 100644
--- a/base/uk.ac.stfc.isis.ibex.ui/src/uk/ac/stfc/isis/ibex/ui/WaitFor.java
+++ b/base/uk.ac.stfc.isis.ibex.ui/src/uk/ac/stfc/isis/ibex/ui/WaitFor.java
@@ -81,7 +81,7 @@ private void configure() {
try {
Waiting waiter = (Waiting) element.createExecutableExtension("class");
waiters.add(waiter);
- waiter.addPropertyChangeListener("isWaiting", evt -> updateWait());
+ waiter.addPropertyChangeListener("isWaiting", _ -> updateWait());
} catch (CoreException e) {
LoggerUtils.logErrorWithStackTrace(LOG,
String.format("Error while configuring WaitFor: %s", e.getMessage()), e);
diff --git a/base/uk.ac.stfc.isis.ibex.validators.tests/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.validators.tests/.settings/org.eclipse.jdt.core.prefs
index f4d933e4eb..ee0138a023 100644
--- a/base/uk.ac.stfc.isis.ibex.validators.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.validators.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.validators.tests/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.validators.tests/META-INF/MANIFEST.MF
index d473115560..f934d88be0 100644
--- a/base/uk.ac.stfc.isis.ibex.validators.tests/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.validators.tests/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Tests
Bundle-SymbolicName: uk.ac.stfc.isis.ibex.validators.tests
Bundle-Version: 1.0.0.qualifier
Fragment-Host: uk.ac.stfc.isis.ibex.validators;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Require-Bundle: org.junit,
jakarta.annotation-api;bundle-version="[1.3.5,1.3.5]",
org.hamcrest
diff --git a/base/uk.ac.stfc.isis.ibex.validators/.settings/org.eclipse.jdt.core.prefs b/base/uk.ac.stfc.isis.ibex.validators/.settings/org.eclipse.jdt.core.prefs
index bfb698467f..5ff46eabf5 100644
--- a/base/uk.ac.stfc.isis.ibex.validators/.settings/org.eclipse.jdt.core.prefs
+++ b/base/uk.ac.stfc.isis.ibex.validators/.settings/org.eclipse.jdt.core.prefs
@@ -1,12 +1,12 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=25
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=25
diff --git a/base/uk.ac.stfc.isis.ibex.validators/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.ibex.validators/META-INF/MANIFEST.MF
index ca7b0fed2c..9fc88b351b 100644
--- a/base/uk.ac.stfc.isis.ibex.validators/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.ibex.validators/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.core.runtime,
uk.ac.stfc.isis.ibex.instrument;bundle-version="1.0.0",
org.eclipse.core.databinding;bundle-version="1.7.0",
uk.ac.stfc.isis.ibex.jaxb;bundle-version="1.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Export-Package: uk.ac.stfc.isis.ibex.validators;uses:="org.osgi.framework"
Automatic-Module-Name: uk.ac.stfc.isis.ibex.validators
diff --git a/base/uk.ac.stfc.isis.scriptgenerator.client.product/scriptgenerator.product b/base/uk.ac.stfc.isis.scriptgenerator.client.product/scriptgenerator.product
index 7d9bd0627b..e5b94d73d1 100644
--- a/base/uk.ac.stfc.isis.scriptgenerator.client.product/scriptgenerator.product
+++ b/base/uk.ac.stfc.isis.scriptgenerator.client.product/scriptgenerator.product
@@ -35,7 +35,7 @@
- org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21
+ org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-25
diff --git a/base/uk.ac.stfc.isis.scriptgenerator.client/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.scriptgenerator.client/META-INF/MANIFEST.MF
index a64a1ed9f6..0c25452311 100644
--- a/base/uk.ac.stfc.isis.scriptgenerator.client/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.scriptgenerator.client/META-INF/MANIFEST.MF
@@ -6,6 +6,6 @@ Bundle-Version: 1.0.0.qualifier
Require-Bundle: uk.ac.stfc.isis.ibex.ui.scriptgenerator,
uk.ac.stfc.isis.scriptgenerator.product
Bundle-ManifestVersion: 2
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-Vendor: ISIS
Automatic-Module-Name: uk.ac.stfc.isis.ibex.scriptgenerator.client
diff --git a/base/uk.ac.stfc.isis.scriptgenerator.feature.base/feature.xml b/base/uk.ac.stfc.isis.scriptgenerator.feature.base/feature.xml
index a650520dc6..3968476553 100644
--- a/base/uk.ac.stfc.isis.scriptgenerator.feature.base/feature.xml
+++ b/base/uk.ac.stfc.isis.scriptgenerator.feature.base/feature.xml
@@ -148,10 +148,6 @@
id="org.hamcrest"
version="0.0.0"/>
-
-
@@ -248,10 +244,6 @@
id="org.apache.commons.io"
version="0.0.0"/>
-
-
diff --git a/base/uk.ac.stfc.isis.scriptgenerator.product/META-INF/MANIFEST.MF b/base/uk.ac.stfc.isis.scriptgenerator.product/META-INF/MANIFEST.MF
index 87cb859df2..c8b7cc13e7 100644
--- a/base/uk.ac.stfc.isis.scriptgenerator.product/META-INF/MANIFEST.MF
+++ b/base/uk.ac.stfc.isis.scriptgenerator.product/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: CSS ISIS
Bundle-SymbolicName: uk.ac.stfc.isis.scriptgenerator.product;singleton:=true
Bundle-Version: 1.0.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-RequiredExecutionEnvironment: JavaSE-25
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: uk.ac.stfc.isis.ibex.scriptgenerator.product
Require-Bundle: org.eclipse.ui;bundle-version="3.111.0",
diff --git a/base/uk.ac.stfc.isis.scriptgenerator.tycho.parent/pom.xml b/base/uk.ac.stfc.isis.scriptgenerator.tycho.parent/pom.xml
index bc7636d13d..bf20084349 100644
--- a/base/uk.ac.stfc.isis.scriptgenerator.tycho.parent/pom.xml
+++ b/base/uk.ac.stfc.isis.scriptgenerator.tycho.parent/pom.xml
@@ -7,10 +7,10 @@
pom
- 4.0.9
+ 5.0.2
https://oss.sonatype.org/content/groups/public/
- http://download.eclipse.org/releases/2024-09
- http://download.eclipse.org/eclipse/updates/4.33
+ http://download.eclipse.org/releases/2026-03
+ http://download.eclipse.org/eclipse/updates/4.39
UTF-8
@@ -107,40 +107,6 @@
-
-
-
-
- org.eclipse.m2e
- lifecycle-mapping
- 1.0.0
-
-
-
-
-
- org.eclipse.tycho
-
- tycho-packaging-plugin
-
-
- [0.20.0,)
-
-
- validate-version
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/build/build.bat b/build/build.bat
index a9da7f68d7..7dd4f5f6a1 100644
--- a/build/build.bat
+++ b/build/build.bat
@@ -2,7 +2,7 @@ setlocal
cd /d %~dp0
REM We bundle our own JRE with the client, this is where it is
-set "JRELOCATION=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\ibex_client_jdk-21.0.9+10"
+set "JRELOCATION=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\ibex_client_jdk-25.0.3+9"
set "LOCAL_JRE_LOCATION=%~dp0jdk"
set "TARGET_DIR=%3"
diff --git a/build/build_script_generator.bat b/build/build_script_generator.bat
index 7effcba64b..a735c08d53 100644
--- a/build/build_script_generator.bat
+++ b/build/build_script_generator.bat
@@ -2,7 +2,7 @@ setlocal
cd /d %~dp0
REM We bundle our own JRE with the client, this is where it is
-set "JRELOCATION=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\ibex_client_jdk-21.0.6+7"
+set "JRELOCATION=\\isis.cclrc.ac.uk\inst$\Kits$\CompGroup\ICP\ibex_client_jdk-25.0.3+9"
set "LOCAL_JRE_LOCATION=%~dp0\jdk"
set "TARGET_DIR=%2"
if "%TARGET_DIR%" == "" (
diff --git a/build/copy_in_maven.bat b/build/copy_in_maven.bat
index 1f15ab4cf2..562ce430d6 100644
--- a/build/copy_in_maven.bat
+++ b/build/copy_in_maven.bat
@@ -1,5 +1,5 @@
@echo COPY_IN_MAVEN: Mirroring from local ISIS share
-robocopy "\\isis.cclrc.ac.uk\inst$\kits$\CompGroup\ICP\Binaries\maven-3.9.11" "%~dp0maven" /MT /NP /NFL /NDL /MIR /R:2 /LOG:"%~dp0ICP_Binaries_maven.log"
+robocopy "\\isis.cclrc.ac.uk\inst$\kits$\CompGroup\ICP\Binaries\maven-3.9.15" "%~dp0maven" /MT /NP /NFL /NDL /MIR /R:2 /LOG:"%~dp0ICP_Binaries_maven.log"
set errcode=%ERRORLEVEL%
if %errcode% GEQ 4 (
type "%~dp0ICP_Binaries_maven.log"