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 ed4851dd9ef436e9dc23aa30b6452a841d10de97 Author: Martin Klähn <[email protected]> AuthorDate: Fri Feb 18 11:10:00 2022 +0100 Use the blessed modifier order in projects located in harness projects --- .../modules/apisupport/jnlplauncher/Main.java | 4 ++-- .../nbjunit/src/org/netbeans/junit/NbTestCase.java | 24 +++++++++++----------- .../src/org/netbeans/junit/NbTestDecorator.java | 20 +++++++++--------- .../org/netbeans/junit/ParametricTestSuite.java | 2 +- .../src/org/netbeans/junit/MockServicesTest.java | 2 +- .../src/org/netbeans/insane/impl/RootTest.java | 2 +- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/harness/apisupport.harness/jnlp-src/org/netbeans/modules/apisupport/jnlplauncher/Main.java b/harness/apisupport.harness/jnlp-src/org/netbeans/modules/apisupport/jnlplauncher/Main.java index 33f5b2d..187dbcd 100644 --- a/harness/apisupport.harness/jnlp-src/org/netbeans/modules/apisupport/jnlplauncher/Main.java +++ b/harness/apisupport.harness/jnlp-src/org/netbeans/modules/apisupport/jnlplauncher/Main.java @@ -42,7 +42,7 @@ public class Main extends Object { /** Fixes value of netbeans.user property. */ - final static void fixNetBeansUser() { + static final void fixNetBeansUser() { String userDir = System.getProperty("netbeans.user"); // NOI18N if (userDir == null) { userDir = System.getProperty("jnlp.netbeans.user"); // NOI18N @@ -68,7 +68,7 @@ public class Main extends Object { * permissions. The jars besides the one containing this class * don't have to be signed with this. */ - final static void fixPolicy() { + static final void fixPolicy() { if (Boolean.getBoolean("netbeans.jnlp.fixPolicy")) { // NOI18N // Grant all the code all persmission Policy.setPolicy(new RuntimePolicy()); diff --git a/harness/nbjunit/src/org/netbeans/junit/NbTestCase.java b/harness/nbjunit/src/org/netbeans/junit/NbTestCase.java index 56738d1..12e7b39 100644 --- a/harness/nbjunit/src/org/netbeans/junit/NbTestCase.java +++ b/harness/nbjunit/src/org/netbeans/junit/NbTestCase.java @@ -631,7 +631,7 @@ public abstract class NbTestCase extends TestCase implements NbTest { * @param externalDiff instance of class implementing the {@link org.netbeans.junit.diff.Diff} interface, it has to be * already initialized, when passed in this assertFile function. */ - static public void assertFile(String message, String test, String pass, String diff, Diff externalDiff) { + public static void assertFile(String message, String test, String pass, String diff, Diff externalDiff) { Diff diffImpl = null == externalDiff ? Manager.getSystemDiff() : externalDiff; File diffFile = getDiffName(pass, null == diff ? null : new File(diff)); @@ -666,7 +666,7 @@ public abstract class NbTestCase extends TestCase implements NbTest { * @param externalDiff instance of class implementing the {@link org.netbeans.junit.diff.Diff} interface, it has to be * already initialized, when passed in this assertFile function. */ - static public void assertFile(String test, String pass, String diff, Diff externalDiff) { + public static void assertFile(String test, String pass, String diff, Diff externalDiff) { assertFile(null, test, pass, diff, externalDiff); } /** @@ -681,7 +681,7 @@ public abstract class NbTestCase extends TestCase implements NbTest { * directory. Constructed file name consists from the name of pass file (without extension and path) appended * by the '.diff'. */ - static public void assertFile(String message, String test, String pass, String diff) { + public static void assertFile(String message, String test, String pass, String diff) { assertFile(message, test, pass, diff, null); } /** @@ -695,7 +695,7 @@ public abstract class NbTestCase extends TestCase implements NbTest { * directory. Constructed file name consists from the name of pass file (without extension and path) appended * by the '.diff'. */ - static public void assertFile(String test, String pass, String diff) { + public static void assertFile(String test, String pass, String diff) { assertFile(null, test, pass, diff, null); } /** @@ -704,7 +704,7 @@ public abstract class NbTestCase extends TestCase implements NbTest { * @param pass second file to be compared, it should be so called 'golden' file, which defines the * correct content for the test-generated file. */ - static public void assertFile(String test, String pass) { + public static void assertFile(String test, String pass) { assertFile(null, test, pass, null, null); } @@ -724,7 +724,7 @@ public abstract class NbTestCase extends TestCase implements NbTest { * @param externalDiff instance of class implementing the {@link org.netbeans.junit.diff.Diff} interface, it has to be * already initialized, when passed in this assertFile function. */ - static public void assertFile(String message, File test, File pass, File diff, Diff externalDiff) { + public static void assertFile(String message, File test, File pass, File diff, Diff externalDiff) { Diff diffImpl = null == externalDiff ? Manager.getSystemDiff() : externalDiff; File diffFile = getDiffName(pass.getAbsolutePath(), diff); @@ -759,7 +759,7 @@ public abstract class NbTestCase extends TestCase implements NbTest { * @param externalDiff instance of class implementing the {@link org.netbeans.junit.diff.Diff} interface, it has to be * already initialized, when passed in this assertFile function. */ - static public void assertFile(File test, File pass, File diff, Diff externalDiff) { + public static void assertFile(File test, File pass, File diff, Diff externalDiff) { assertFile("Difference between " + test + " and " + pass, test, pass, diff, externalDiff); } /** @@ -774,7 +774,7 @@ public abstract class NbTestCase extends TestCase implements NbTest { * directory. Constructed file name consists from the name of pass file (without extension and path) appended * by the '.diff'. */ - static public void assertFile(String message, File test, File pass, File diff) { + public static void assertFile(String message, File test, File pass, File diff) { assertFile(message, test, pass, diff, null); } /** @@ -788,7 +788,7 @@ public abstract class NbTestCase extends TestCase implements NbTest { * directory. Constructed file name consists from the name of pass file (without extension and path) appended * by the '.diff'. */ - static public void assertFile(File test, File pass, File diff) { + public static void assertFile(File test, File pass, File diff) { assertFile("Difference between " + test + " and " + pass, test, pass, diff, null); } /** @@ -797,13 +797,13 @@ public abstract class NbTestCase extends TestCase implements NbTest { * @param pass second file to be compared, it should be so called 'golden' file, which defines the * correct content for the test-generated file. */ - static public void assertFile(File test, File pass) { + public static void assertFile(File test, File pass) { assertFile("Difference between " + test + " and " + pass, test, pass, null, null); } /** */ - static private File getDiffName(String pass, File diff) { + private static File getDiffName(String pass, File diff) { if (null == diff) { return null; } @@ -1314,7 +1314,7 @@ public abstract class NbTestCase extends TestCase implements NbTest { } // radix for new nbfsurl - private final static int radix = 16; + private static final int radix = 16; // new nbfsurl decoder - assumes the external form // begins with nbfs:// private static String convertNewNBFSURL(URL url) { diff --git a/harness/nbjunit/src/org/netbeans/junit/NbTestDecorator.java b/harness/nbjunit/src/org/netbeans/junit/NbTestDecorator.java index 9163e27..e1b0904 100644 --- a/harness/nbjunit/src/org/netbeans/junit/NbTestDecorator.java +++ b/harness/nbjunit/src/org/netbeans/junit/NbTestDecorator.java @@ -93,64 +93,64 @@ public class NbTestDecorator extends TestDecorator implements NbTest { /** for description, see this method in NbTestCase class */ - static public void assertFile(String message, String test, String pass, String diff, Diff externalDiff) { + public static void assertFile(String message, String test, String pass, String diff, Diff externalDiff) { NbTestCase.assertFile(message,test,pass,diff,externalDiff); } /** for description, see this method in NbTestCase class */ - static public void assertFile(String test, String pass, String diff, Diff externalDiff) { + public static void assertFile(String test, String pass, String diff, Diff externalDiff) { NbTestCase.assertFile(test, pass, diff, externalDiff); } /** for description, see this method in NbTestCase class */ - static public void assertFile(String message, String test, String pass, String diff) { + public static void assertFile(String message, String test, String pass, String diff) { NbTestCase.assertFile(message, test, pass, diff); } /** for description, see this method in NbTestCase class */ - static public void assertFile(String test, String pass, String diff) { + public static void assertFile(String test, String pass, String diff) { NbTestCase.assertFile(test, pass, diff); } /** for description, see this method in NbTestCase class */ - static public void assertFile(String test, String pass) { + public static void assertFile(String test, String pass) { NbTestCase.assertFile(test, pass); } /** for description, see this method in NbTestCase class */ - static public void assertFile(String message, File test, File pass, File diff, Diff externalDiff) { + public static void assertFile(String message, File test, File pass, File diff, Diff externalDiff) { NbTestCase.assertFile(message,test,pass,diff,externalDiff); } /** for description, see this method in NbTestCase class */ - static public void assertFile(File test, File pass, File diff, Diff externalDiff) { + public static void assertFile(File test, File pass, File diff, Diff externalDiff) { NbTestCase.assertFile(test, pass, diff, externalDiff); } /** for description, see this method in NbTestCase class */ - static public void assertFile(String message, File test, File pass, File diff) { + public static void assertFile(String message, File test, File pass, File diff) { NbTestCase.assertFile(message, test, pass, diff); } /** for description, see this method in NbTestCase class */ - static public void assertFile(File test, File pass, File diff) { + public static void assertFile(File test, File pass, File diff) { NbTestCase.assertFile(test,pass,diff); } /** for description, see this method in NbTestCase class */ - static public void assertFile(File test, File pass) { + public static void assertFile(File test, File pass) { NbTestCase.assertFile(test, pass); } diff --git a/harness/nbjunit/src/org/netbeans/junit/ParametricTestSuite.java b/harness/nbjunit/src/org/netbeans/junit/ParametricTestSuite.java index 684add2..3520862 100644 --- a/harness/nbjunit/src/org/netbeans/junit/ParametricTestSuite.java +++ b/harness/nbjunit/src/org/netbeans/junit/ParametricTestSuite.java @@ -54,7 +54,7 @@ public abstract class ParametricTestSuite extends MultiTestSuite{ * Factory method returns a new instance of a testcases. * Overrides the basic method so that it's needless any more. */ - final protected MultiTestCase nextTestCase(){ + protected final MultiTestCase nextTestCase(){ return null; } diff --git a/harness/nbjunit/test/unit/src/org/netbeans/junit/MockServicesTest.java b/harness/nbjunit/test/unit/src/org/netbeans/junit/MockServicesTest.java index ed28262..08b71ef 100644 --- a/harness/nbjunit/test/unit/src/org/netbeans/junit/MockServicesTest.java +++ b/harness/nbjunit/test/unit/src/org/netbeans/junit/MockServicesTest.java @@ -168,7 +168,7 @@ public abstract class MockServicesTest extends TestCase { } } - public static abstract class MockChoice6 implements Choice {} + public abstract static class MockChoice6 implements Choice {} /** * Check that service registrations are available from all threads, diff --git a/harness/o.n.insane/test/unit/src/org/netbeans/insane/impl/RootTest.java b/harness/o.n.insane/test/unit/src/org/netbeans/insane/impl/RootTest.java index b306e9f..325f978 100644 --- a/harness/o.n.insane/test/unit/src/org/netbeans/insane/impl/RootTest.java +++ b/harness/o.n.insane/test/unit/src/org/netbeans/insane/impl/RootTest.java @@ -50,7 +50,7 @@ public class RootTest { public static class ObjectWithField { - public final static String FIELD = "field"; + public static final String FIELD = "field"; } --------------------------------------------------------------------- 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
