From b297e0504c8a41cb336ab3739851c9edb9131e63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20SVENSSON?= Date: Sun, 1 Oct 2023 23:07:53 +0200 Subject: [PATCH] Format java files in o.e.osgi-supplement MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was achieved by running: eclipse -consolelog -nosplash -application org.eclipse.jdt.core.JavaCodeFormatter \ -config .settings/org.eclipse.jdt.core.prefs . -data `mktemp -d` Signed-off-by: Torbjörn SVENSSON --- .../osgi/framework/internal/reliablefile/ReliableFile.java | 4 ++-- .../src/org/eclipse/osgi/service/debug/DebugOptions.java | 2 +- .../src/org/eclipse/osgi/storagemanager/StorageManager.java | 2 +- .../supplement/src/org/eclipse/osgi/util/NLS.java | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFile.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFile.java index c76e8539d14..586031ac310 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFile.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/reliablefile/ReliableFile.java @@ -218,7 +218,7 @@ private static int[] getFileGenerations(File file) { try { int id = Integer.parseInt(candidateFile.substring(prefixLen)); list.add(Integer.valueOf(id)); - }catch (NumberFormatException e) {/*ignore*/ + } catch (NumberFormatException e) {/*ignore*/ } } } @@ -561,7 +561,7 @@ public static boolean exists(File file) { try { Integer.parseInt(candidateFile.substring(prefixLen)); return true; - }catch (NumberFormatException e) {/*ignore*/ + } catch (NumberFormatException e) {/*ignore*/ } } } diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugOptions.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugOptions.java index 26ee12ffc21..5eaf5000972 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugOptions.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/service/debug/DebugOptions.java @@ -133,7 +133,7 @@ public interface DebugOptions { * If debug is enabled then notifications will be sent to the * listeners which have options that have been changed, added or removed. *

- + * @param options the new set of options * @since 3.6 */ diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java index ae8137c5234..f7dcebcd891 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/storagemanager/StorageManager.java @@ -277,7 +277,7 @@ private int findOldestGeneration(String managedFile) { int generation = Integer.parseInt(file.substring(len)); if (generation > oldestGeneration) oldestGeneration = generation; - }catch (NumberFormatException e) { + } catch (NumberFormatException e) { continue; } } diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/NLS.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/NLS.java index f0ce26bda21..2895530f68b 100644 --- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/NLS.java +++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/util/NLS.java @@ -64,8 +64,7 @@ public abstract class NLS { private static String[] nlSuffixes; private static final String PROP_WARNINGS = "osgi.nls.warnings"; //$NON-NLS-1$ private static final String IGNORE = "ignore"; //$NON-NLS-1$ - private static final boolean ignoreWarnings = AccessController - .doPrivileged((PrivilegedAction) () -> IGNORE.equals(System.getProperty(PROP_WARNINGS))); + private static final boolean ignoreWarnings = AccessController.doPrivileged((PrivilegedAction) () -> IGNORE.equals(System.getProperty(PROP_WARNINGS))); /* * NOTE do not change the name of this field; it is set by the Framework using reflection