From 81f39087a2f23fce6aa498d9a3238bbcbc580873 Mon Sep 17 00:00:00 2001 From: ISISBuildServer Date: Fri, 9 Aug 2024 17:33:25 +0000 Subject: [PATCH 1/2] Update version to 15.0.0. --- base/uk.ac.stfc.isis.ibex.e4.client/META-INF/MANIFEST.MF | 2 +- base/uk.ac.stfc.isis.ibex.e4.client/pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 e73868b27a..dae371de98 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 @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Eclipse-BundleShape: dir Bundle-SymbolicName: uk.ac.stfc.isis.ibex.e4.client;singleton:=true Bundle-Name: IBEX -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 15.0.0 Require-Bundle: uk.ac.stfc.isis.ibex.e4.ui.perspectiveswitcher;bundle-version="1.0.0", uk.ac.stfc.isis.ibex.ui.dashboard;bundle-version="1.0.0", uk.ac.stfc.isis.ibex.ui.beamstatus;bundle-version="1.0.0", diff --git a/base/uk.ac.stfc.isis.ibex.e4.client/pom.xml b/base/uk.ac.stfc.isis.ibex.e4.client/pom.xml index eddafddd4e..d2e42579f8 100644 --- a/base/uk.ac.stfc.isis.ibex.e4.client/pom.xml +++ b/base/uk.ac.stfc.isis.ibex.e4.client/pom.xml @@ -8,4 +8,5 @@ ../uk.ac.stfc.isis.ibex.client.tycho.parent uk.ac.stfc.isis.ibex.client.tycho.parent + 15.0.0 \ No newline at end of file From 51765f074fec9a52f94f0196a1e9ef4dc736e4f1 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Wed, 13 Nov 2024 19:46:24 +0000 Subject: [PATCH 2/2] ON ERROR RESUME NEXT --- .../dae/experimentsetup/DaeExperimentSetupTableViewer.java | 7 ++++++- .../isis/ibex/ui/dae/experimentsetup/ExperimentSetup.java | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/DaeExperimentSetupTableViewer.java b/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/DaeExperimentSetupTableViewer.java index 3532bc9841..ef489c8938 100644 --- a/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/DaeExperimentSetupTableViewer.java +++ b/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/DaeExperimentSetupTableViewer.java @@ -163,7 +163,12 @@ private void tryToChangeBackgroundWhenTextChanged() { * The index for the cell. */ private void ifCellValueDifferentFromCachedValueThenChangeLabel(ViewerCell cell, int rowIndexCoefficient) { - String cachedValue = cachedValues.get(cell.getVisualIndex() + rowIndexCoefficient); + String cachedValue; + try { + cachedValue = cachedValues.get(cell.getVisualIndex() + rowIndexCoefficient); + } catch (IndexOutOfBoundsException e) { + cachedValue = ""; + } if (cachedValue.equals(cell.getText())) { cell.setBackground(panelViewModel.getColour("white")); diff --git a/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/ExperimentSetup.java b/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/ExperimentSetup.java index f72b6dcdd7..ffcbedb801 100644 --- a/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/ExperimentSetup.java +++ b/base/uk.ac.stfc.isis.ibex.ui.dae/src/uk/ac/stfc/isis/ibex/ui/dae/experimentsetup/ExperimentSetup.java @@ -49,6 +49,7 @@ import uk.ac.stfc.isis.ibex.epics.adapters.UpdatedObservableAdapter; import uk.ac.stfc.isis.ibex.instrument.Instrument; import uk.ac.stfc.isis.ibex.logger.IsisLog; +import uk.ac.stfc.isis.ibex.logger.LoggerUtils; import uk.ac.stfc.isis.ibex.ui.UIUtils; import uk.ac.stfc.isis.ibex.ui.dae.DaeUI; import uk.ac.stfc.isis.ibex.ui.dae.DaeViewModel; @@ -124,7 +125,7 @@ public void widgetSelected(SelectionEvent e) { applyChangesToUI(); } catch (Exception err) { // Top level error handler. Catch anything and log it, and bring up an error dialog informing the user of the error. - IsisLog.getLogger(this.getClass()).error(err); + LoggerUtils.logErrorWithStackTrace(IsisLog.getLogger(this.getClass()), err.getMessage(), err); MessageDialog.openError(parent.getShell(), "Internal IBEX Error", "Please report this error to the IBEX team.\n\nException was: " + err.getMessage()); }