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 bb307804df485caa7517bc7b0d1eb853afa243bb Author: Martin Klähn <[email protected]> AuthorDate: Fri Feb 18 11:10:27 2022 +0100 Use the blessed modifier order in projects located in contrib projects --- .../modules/cordova/platforms/ios/IOSPlatform.java | 2 +- .../grailsproject/SourceCategoriesGrails11.java | 4 ++-- .../grailsproject/SourceCategoriesGrails301.java | 4 ++-- .../commands/GrailsCommandChooser.java | 4 ++-- .../ui/wizards/impl/GrailsTargetChooserPanel.java | 2 +- .../framework/HibernateWebModuleExtender.java | 2 +- .../modules/j2ee/jboss4/ide/JBOutputSupport.java | 2 +- .../modules/j2ee/jboss4/ide/JBStartRunnable.java | 22 +++++++++++----------- .../j2ee/weblogic9/WLConnectionSupport.java | 4 ++-- .../websvc/metro/model/MetroConfigLoader.java | 4 ++-- .../wsitconf/api/DesignerListenerProvider.java | 2 +- .../websvc/wsitconf/api/DevDefaultsProvider.java | 2 +- .../refactoring/WSITRefactoringPlugin.java | 2 +- .../wsitconf/wsdlmodelext/RMDeliveryAssurance.java | 4 ++-- .../wsitconf/wsdlmodelext/RMSequenceBinding.java | 4 ++-- .../wsitconf/wsdlmodelext/WSITModelSupport.java | 2 +- .../wsitmodelext/versioning/ConfigVersion.java | 2 +- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/contrib/cordova.platforms.ios/src/org/netbeans/modules/cordova/platforms/ios/IOSPlatform.java b/contrib/cordova.platforms.ios/src/org/netbeans/modules/cordova/platforms/ios/IOSPlatform.java index 1aa99a7..21c3201 100644 --- a/contrib/cordova.platforms.ios/src/org/netbeans/modules/cordova/platforms/ios/IOSPlatform.java +++ b/contrib/cordova.platforms.ios/src/org/netbeans/modules/cordova/platforms/ios/IOSPlatform.java @@ -54,7 +54,7 @@ public class IOSPlatform implements MobilePlatform { private boolean isReady = false; - private transient final java.beans.PropertyChangeSupport propertyChangeSupport = new java.beans.PropertyChangeSupport(this); + private final transient java.beans.PropertyChangeSupport propertyChangeSupport = new java.beans.PropertyChangeSupport(this); private String sdkLocation; private SDK DEFAULT = new IOSSDK("Simulator - iOS 6.0", "iphonesimulator6.0"); // NOI18N diff --git a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails11.java b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails11.java index 603f8bd..f3254f0 100644 --- a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails11.java +++ b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails11.java @@ -29,8 +29,8 @@ import org.netbeans.modules.groovy.grails.api.GrailsPlatform; */ public class SourceCategoriesGrails11 implements SourceCategoriesInterface { - static public final GrailsPlatform.Version MIN_VERSION = GrailsPlatform.Version.VERSION_DEFAULT; - static private final Map<SourceCategoryType, SourceCategory> SOURCE_CATEGORIES + public static final GrailsPlatform.Version MIN_VERSION = GrailsPlatform.Version.VERSION_DEFAULT; + private static final Map<SourceCategoryType, SourceCategory> SOURCE_CATEGORIES = new HashMap<>(); static { diff --git a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails301.java b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails301.java index 5625a41..88b8228 100644 --- a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails301.java +++ b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails301.java @@ -29,9 +29,9 @@ import org.netbeans.modules.groovy.grails.api.GrailsPlatform; */ public class SourceCategoriesGrails301 implements SourceCategoriesInterface { - static public final GrailsPlatform.Version MIN_VERSION = GrailsPlatform.Version.valueOf("3.0.1"); + public static final GrailsPlatform.Version MIN_VERSION = GrailsPlatform.Version.valueOf("3.0.1"); - static private final Map<SourceCategoryType, SourceCategory> SOURCE_CATEGORIES + private static final Map<SourceCategoryType, SourceCategory> SOURCE_CATEGORIES = new HashMap<>(); static { diff --git a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.java b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.java index ba588d9..7339c86 100644 --- a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.java +++ b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.java @@ -60,7 +60,7 @@ import org.openide.util.NbBundle; public final class GrailsCommandChooser extends JPanel { - private final static Object NO_TASK_ITEM = getMessage("GrailsCommandChooser.no.matching.task"); + private static final Object NO_TASK_ITEM = getMessage("GrailsCommandChooser.no.matching.task"); /** Remember checkbox state per IDE sessions. */ private static boolean debug; @@ -577,7 +577,7 @@ public final class GrailsCommandChooser extends JPanel { private javax.swing.JComboBox taskParametersComboBox; // End of variables declaration//GEN-END:variables - final static class Filter { + static final class Filter { private final String filter; private final List<GrailsCommand> tasks; diff --git a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanel.java b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanel.java index b027528..ad7238b 100644 --- a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanel.java +++ b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanel.java @@ -325,7 +325,7 @@ public final class GrailsTargetChooserPanel implements WizardDescriptor.Panel<Wi * @param extension extension of created file * @return localized error message or null if all right */ - final public static String canUseFileName(FileObject targetFolder, String folderName, String newObjectName, String extension) { + public static final String canUseFileName(FileObject targetFolder, String folderName, String newObjectName, String extension) { String newObjectNameToDisplay = newObjectName; if (newObjectName != null) { newObjectName = newObjectName.replace('.', '/'); // NOI18N diff --git a/contrib/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateWebModuleExtender.java b/contrib/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateWebModuleExtender.java index 6741511..80ef6b9 100644 --- a/contrib/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateWebModuleExtender.java +++ b/contrib/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateWebModuleExtender.java @@ -57,7 +57,7 @@ import org.openide.util.HelpCtx; public class HibernateWebModuleExtender extends WebModuleExtender { private HibernateConfigurationPanel configPanel = null; - private final static String DEFAULT_CONFIG_FILENAME = "hibernate.cfg"; + private static final String DEFAULT_CONFIG_FILENAME = "hibernate.cfg"; private final String dialect = "hibernate.dialect"; private final String driver = "hibernate.connection.driver_class"; private final String url = "hibernate.connection.url"; diff --git a/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JBOutputSupport.java b/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JBOutputSupport.java index ee713fd..f5244fa 100644 --- a/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JBOutputSupport.java +++ b/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JBOutputSupport.java @@ -86,7 +86,7 @@ public final class JBOutputSupport { this.props = props; } - public synchronized static JBOutputSupport getInstance(InstanceProperties props, boolean create) { + public static synchronized JBOutputSupport getInstance(InstanceProperties props, boolean create) { JBOutputSupport instance = INSTANCE_CACHE.get(props); if (instance == null && create) { instance = new JBOutputSupport(props); diff --git a/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JBStartRunnable.java b/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JBStartRunnable.java index 5832cd6..a65dd2a 100644 --- a/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JBStartRunnable.java +++ b/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JBStartRunnable.java @@ -64,35 +64,35 @@ class JBStartRunnable implements Runnable { private static final int START_TIMEOUT = 300000; - private final static String CONF_FILE_NAME = + private static final String CONF_FILE_NAME = "run.conf.bat"; // NOI18N - private final static String RUN_FILE_NAME = + private static final String RUN_FILE_NAME = "run.bat"; // NOI18N - private final static String JBOSS_HOME + private static final String JBOSS_HOME = "JBOSS_HOME"; // NOI18N - private final static String STARTUP_SH = File.separator + + private static final String STARTUP_SH = File.separator + "bin" + File.separator + "run.sh"; // NOI18N - private final static String STANDALONE_SH = File.separator + + private static final String STANDALONE_SH = File.separator + "bin" + File.separator + "standalone.sh"; // NOI18N - private final static String STARTUP_BAT = File.separator + + private static final String STARTUP_BAT = File.separator + "bin" + File.separator + RUN_FILE_NAME; // NOI18N - private final static String STANDALONE_BAT = File.separator + + private static final String STANDALONE_BAT = File.separator + "bin" + File.separator + "standalone.bat"; // NOI18N - private final static String CONF_BAT = File.separator + + private static final String CONF_BAT = File.separator + "bin" + File.separator + CONF_FILE_NAME; // NOI18N - private final static String JAVA_OPTS = "JAVA_OPTS";// NOI18N + private static final String JAVA_OPTS = "JAVA_OPTS";// NOI18N - private final static Pattern IF_JAVA_OPTS_PATTERN = + private static final Pattern IF_JAVA_OPTS_PATTERN = Pattern.compile(".*if(\\s+not)?\\s+(\"x%"+JAVA_OPTS+ "%\"\\s+==\\s+\"x\")\\s+.*", // NOI18N Pattern.DOTALL); - private final static String NEW_IF_CONDITION_STRING = + private static final String NEW_IF_CONDITION_STRING = "\"xx\" == \"x\""; // NOI18N private static final SpecificationVersion diff --git a/contrib/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/WLConnectionSupport.java b/contrib/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/WLConnectionSupport.java index d58d3cd..a02fc74 100644 --- a/contrib/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/WLConnectionSupport.java +++ b/contrib/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/WLConnectionSupport.java @@ -175,7 +175,7 @@ public final class WLConnectionSupport { } - public static abstract class JMXRuntimeAction<T> implements JMXAction<T> { + public abstract static class JMXRuntimeAction<T> implements JMXAction<T> { public abstract T call(MBeanServerConnection connection, ObjectName service) throws Exception; @@ -192,7 +192,7 @@ public final class WLConnectionSupport { } } - public static abstract class JMXEditAction<T> implements JMXAction<T> { + public abstract static class JMXEditAction<T> implements JMXAction<T> { public abstract T call(MBeanServerConnection connection, ObjectName service) throws Exception; diff --git a/contrib/websvc.metro.model/src/org/netbeans/modules/websvc/metro/model/MetroConfigLoader.java b/contrib/websvc.metro.model/src/org/netbeans/modules/websvc/metro/model/MetroConfigLoader.java index fd848a8..dbccb1e 100644 --- a/contrib/websvc.metro.model/src/org/netbeans/modules/websvc/metro/model/MetroConfigLoader.java +++ b/contrib/websvc.metro.model/src/org/netbeans/modules/websvc/metro/model/MetroConfigLoader.java @@ -56,8 +56,8 @@ import org.openide.util.Exceptions; */ public class MetroConfigLoader { - public final static String CFG_FILE_NAME="metro.xml"; - public final static String DEFAULT_TUBELINE_NAME="default"; + public static final String CFG_FILE_NAME="metro.xml"; + public static final String DEFAULT_TUBELINE_NAME="default"; private JAXBContext jaxbContext = null; private ObjectFactory objFactory = null; diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/api/DesignerListenerProvider.java b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/api/DesignerListenerProvider.java index f1e4c09..27237b5 100644 --- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/api/DesignerListenerProvider.java +++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/api/DesignerListenerProvider.java @@ -34,7 +34,7 @@ public final class DesignerListenerProvider { private static List<WeakReference<PropertyChangeListener>> listeners = new ArrayList<WeakReference<PropertyChangeListener>>(); - public static synchronized final void registerListener(PropertyChangeListener pcl) { + public static final synchronized void registerListener(PropertyChangeListener pcl) { if (pcl == null) throw new IllegalArgumentException("Cannot pass nulls here!"); listeners.add(new WeakReference(pcl)); } diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/api/DevDefaultsProvider.java b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/api/DevDefaultsProvider.java index 1cd2e25..7b3940b 100644 --- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/api/DevDefaultsProvider.java +++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/api/DevDefaultsProvider.java @@ -44,7 +44,7 @@ public final class DevDefaultsProvider extends Object { * Sets up the server environment by creating proper keystores if required, and * filling proper keys into them */ - public synchronized final void fillDefaultsToServer(String serverID) { + public final synchronized void fillDefaultsToServer(String serverID) { DefaultSettings.fillDefaultsToServer(serverID); } diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/refactoring/WSITRefactoringPlugin.java b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/refactoring/WSITRefactoringPlugin.java index 602a87f..6a8ff19 100644 --- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/refactoring/WSITRefactoringPlugin.java +++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/refactoring/WSITRefactoringPlugin.java @@ -228,7 +228,7 @@ abstract class WSITRefactoringPlugin<T extends AbstractRefactoring> extends Java } } - protected static abstract class AbstractRefactoringElement extends SimpleRefactoringElementImplementation { + protected abstract static class AbstractRefactoringElement extends SimpleRefactoringElementImplementation { protected final WSDLModel model; protected final FileObject file; diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/RMDeliveryAssurance.java b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/RMDeliveryAssurance.java index cb28341..70ad1f9 100644 --- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/RMDeliveryAssurance.java +++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/RMDeliveryAssurance.java @@ -66,11 +66,11 @@ public enum RMDeliveryAssurance { }, /*AT_MOST_ONCE*/; - public final static RMDeliveryAssurance getDefault() { + public static final RMDeliveryAssurance getDefault() { return EXACTLY_ONCE; } - public final static RMDeliveryAssurance getValue(ConfigVersion cfgVersion, Binding b) { + public static final RMDeliveryAssurance getValue(ConfigVersion cfgVersion, Binding b) { if (ConfigVersion.CONFIG_1_0.equals(cfgVersion)) { if (RMModelHelper.isAllowDuplicates(b)) { return AT_LEAST_ONCE; diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/RMSequenceBinding.java b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/RMSequenceBinding.java index 3d51ffa..6e43f64 100644 --- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/RMSequenceBinding.java +++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/RMSequenceBinding.java @@ -45,11 +45,11 @@ public enum RMSequenceBinding { } }; - public final static RMSequenceBinding getDefault() { + public static final RMSequenceBinding getDefault() { return SECURED_TOKEN; } - public final static RMSequenceBinding getValue(ConfigVersion cfgVersion, Binding b) { + public static final RMSequenceBinding getValue(ConfigVersion cfgVersion, Binding b) { if (!ConfigVersion.CONFIG_1_0.equals(cfgVersion)) { if (RMModelHelper.getInstance(cfgVersion).isSequenceBinding(b, SECURED_TRANSPORT)) { return SECURED_TRANSPORT; diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/WSITModelSupport.java b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/WSITModelSupport.java index 56db2b5..f8fa6cd 100644 --- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/WSITModelSupport.java +++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/WSITModelSupport.java @@ -676,7 +676,7 @@ public class WSITModelSupport { save(model); } - public synchronized static void save(WSDLModel model) { + public static synchronized void save(WSDLModel model) { Set<FileObject> traversedModels = new HashSet(); save(model, traversedModels); } diff --git a/contrib/websvc.wsitmodelext/src/org/netbeans/modules/websvc/wsitmodelext/versioning/ConfigVersion.java b/contrib/websvc.wsitmodelext/src/org/netbeans/modules/websvc/wsitmodelext/versioning/ConfigVersion.java index 0b5ce03..b2f2a3b 100644 --- a/contrib/websvc.wsitmodelext/src/org/netbeans/modules/websvc/wsitmodelext/versioning/ConfigVersion.java +++ b/contrib/websvc.wsitmodelext/src/org/netbeans/modules/websvc/wsitmodelext/versioning/ConfigVersion.java @@ -54,7 +54,7 @@ public enum ConfigVersion { return NbBundle.getMessage(ConfigVersion.class, this.name()); } - public final static ConfigVersion getDefault() { + public static final ConfigVersion getDefault() { return CONFIG_2_0; } --------------------------------------------------------------------- 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
