This is an automated email from the ASF dual-hosted git repository. mklaehn pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 467254516cd5c56194022a68c3aa7bb683c525da Author: Martin Klähn <[email protected]> AuthorDate: Fri Feb 18 11:09:08 2022 +0100 Use the blessed modifier order in projects located in nbi projects --- .../src/org/netbeans/installer/utils/BrowserUtils.java | 6 +++--- .../installer/utils/helper/swing/NbiTreeTableModel.java | 6 +++--- .../org/netbeans/installer/utils/system/NativeUtils.java | 16 ++++++++-------- .../wizard/components/panels/ErrorMessagePanel.java | 2 +- .../infra/utils/comment/handlers/BlockFileHandler.java | 12 ++++++------ 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/nbi/engine/src/org/netbeans/installer/utils/BrowserUtils.java b/nbi/engine/src/org/netbeans/installer/utils/BrowserUtils.java index 92c5d0d..254684c 100644 --- a/nbi/engine/src/org/netbeans/installer/utils/BrowserUtils.java +++ b/nbi/engine/src/org/netbeans/installer/utils/BrowserUtils.java @@ -34,9 +34,9 @@ import javax.swing.event.HyperlinkListener; */ public class BrowserUtils { - private final static boolean isBrowseSupported; - private final static Method browseMethod; - private final static Object desktop; + private static final boolean isBrowseSupported; + private static final Method browseMethod; + private static final Object desktop; static { diff --git a/nbi/engine/src/org/netbeans/installer/utils/helper/swing/NbiTreeTableModel.java b/nbi/engine/src/org/netbeans/installer/utils/helper/swing/NbiTreeTableModel.java index 456acaf..2e121fb 100644 --- a/nbi/engine/src/org/netbeans/installer/utils/helper/swing/NbiTreeTableModel.java +++ b/nbi/engine/src/org/netbeans/installer/utils/helper/swing/NbiTreeTableModel.java @@ -52,7 +52,7 @@ public abstract class NbiTreeTableModel implements TableModel { public abstract int getTreeColumnIndex(); - final public TreeModel getTreeModel() { + public final TreeModel getTreeModel() { return treeModel; } @@ -62,7 +62,7 @@ public abstract class NbiTreeTableModel implements TableModel { addTreeModelListener(); } - final public JTree getTree() { + public final JTree getTree() { return tree; } @@ -81,7 +81,7 @@ public abstract class NbiTreeTableModel implements TableModel { } // partial TableModel implementation //////////////////////////////////////////// - final public int getRowCount() { + public final int getRowCount() { return tree.getRowCount(); } diff --git a/nbi/engine/src/org/netbeans/installer/utils/system/NativeUtils.java b/nbi/engine/src/org/netbeans/installer/utils/system/NativeUtils.java index 101ed4d..9fd820f 100644 --- a/nbi/engine/src/org/netbeans/installer/utils/system/NativeUtils.java +++ b/nbi/engine/src/org/netbeans/installer/utils/system/NativeUtils.java @@ -57,21 +57,21 @@ public abstract class NativeUtils { private static HashSet<File> forbiddenDeletingFiles = new HashSet<File>(); private static List <LauncherResource> uninstallerJVMs = new ArrayList <LauncherResource> (); private static Platform currentPlatform; - public final static String NATIVE_RESOURCE_SUFFIX = "native/"; // NOI18N - public final static String NATIVE_JNILIB_RESOURCE_SUFFIX = + public static final String NATIVE_RESOURCE_SUFFIX = "native/"; // NOI18N + public static final String NATIVE_JNILIB_RESOURCE_SUFFIX = NATIVE_RESOURCE_SUFFIX + "jnilib/"; // NOI18N - public final static String NATIVE_LAUNCHER_RESOURCE_SUFFIX = + public static final String NATIVE_LAUNCHER_RESOURCE_SUFFIX = NATIVE_RESOURCE_SUFFIX + "launcher/"; // NOI18N - public final static String NATIVE_CLEANER_RESOURCE_SUFFIX = + public static final String NATIVE_CLEANER_RESOURCE_SUFFIX = NATIVE_RESOURCE_SUFFIX + "cleaner/"; // NOI18N private static OnExitCleanerHandler cleanerHandler; protected abstract Platform getPlatform(); - final public Platform getCurrentPlatform() { + public final Platform getCurrentPlatform() { if (currentPlatform == null) { currentPlatform = getPlatform(); } @@ -295,7 +295,7 @@ public abstract class NativeUtils { return !(forbiddenDeletingFiles.contains(file)); } - public final static int FA_MODE_SET = 1; - public final static int FA_MODE_ADD = 2; - public final static int FA_MODE_REMOVE = 4; + public static final int FA_MODE_SET = 1; + public static final int FA_MODE_ADD = 2; + public static final int FA_MODE_REMOVE = 4; } diff --git a/nbi/engine/src/org/netbeans/installer/wizard/components/panels/ErrorMessagePanel.java b/nbi/engine/src/org/netbeans/installer/wizard/components/panels/ErrorMessagePanel.java index 0886ba9..57cda94 100644 --- a/nbi/engine/src/org/netbeans/installer/wizard/components/panels/ErrorMessagePanel.java +++ b/nbi/engine/src/org/netbeans/installer/wizard/components/panels/ErrorMessagePanel.java @@ -222,7 +222,7 @@ public class ErrorMessagePanel extends WizardPanel { return null; } - protected synchronized final void updateErrorMessage() { + protected final synchronized void updateErrorMessage() { String message; try { diff --git a/nbi/infra/utils/comment-correcter/src/org/netbeans/installer/infra/utils/comment/handlers/BlockFileHandler.java b/nbi/infra/utils/comment-correcter/src/org/netbeans/installer/infra/utils/comment/handlers/BlockFileHandler.java index 72c7045..38f166f 100644 --- a/nbi/infra/utils/comment-correcter/src/org/netbeans/installer/infra/utils/comment/handlers/BlockFileHandler.java +++ b/nbi/infra/utils/comment-correcter/src/org/netbeans/installer/infra/utils/comment/handlers/BlockFileHandler.java @@ -108,7 +108,7 @@ public abstract class BlockFileHandler implements FileHandler { /** * {@inheritDoc} */ - final public void load(final File file) throws IOException { + public final void load(final File file) throws IOException { if (file == null) { throw new IllegalArgumentException( "The 'file' parameter cannot be null."); // NOI18N @@ -120,7 +120,7 @@ public abstract class BlockFileHandler implements FileHandler { /** * {@inheritDoc} */ - final public void save(final File file) throws IOException { + public final void save(final File file) throws IOException { if (file == null) { throw new IllegalArgumentException( "The 'file' parameter cannot be null."); // NOI18N @@ -136,7 +136,7 @@ public abstract class BlockFileHandler implements FileHandler { /** * {@inheritDoc} */ - final public String getCurrentComment() { + public final String getCurrentComment() { if (contents == null) { throw new IllegalStateException( "The contents cache has not been intialized."); // NOI18N @@ -154,7 +154,7 @@ public abstract class BlockFileHandler implements FileHandler { /** * {@inheritDoc} */ - final public String getCorrectComment(final String text, final int lineLength) { + public final String getCorrectComment(final String text, final int lineLength) { return commentStart + Utils.reformat(text, commentPrefix, lineLength) + commentEnd + Utils.NL; @@ -163,7 +163,7 @@ public abstract class BlockFileHandler implements FileHandler { /** * {@inheritDoc} */ - final public void insertComment(final String text, final int lineLength) { + public final void insertComment(final String text, final int lineLength) { if (text == null) { throw new IllegalArgumentException( "The 'text' parameter cannot be null."); // NOI18N @@ -189,7 +189,7 @@ public abstract class BlockFileHandler implements FileHandler { /** * {@inheritDoc} */ - final public void updateComment(final String text, final int lineLength) { + public final void updateComment(final String text, final int lineLength) { if (text == null) { throw new IllegalArgumentException( "The 'text' parameter cannot be null."); // NOI18N --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
