You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by mk...@apache.org on 2022/02/18 14:49:10 UTC
[netbeans] 14/17: Use the blessed modifier order in projects located in enterprise projects
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 8ea4656f9b489c10cca75d9732b4313c85860fa1
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Fri Feb 18 11:11:34 2022 +0100
Use the blessed modifier order in projects located in enterprise projects
---
.../web/webmodule/WebModuleExtenderBridge.java | 2 +-
.../modules/glassfish/common/CreateDomain.java | 20 +++++++-------
.../glassfish/common/GlassfishInstance.java | 4 +--
.../common/GlassfishInstanceProvider.java | 32 +++++++++++-----------
.../modules/glassfish/common/LogViewMgr.java | 8 +++---
.../common/nodes/Hk2ApplicationsChildren.java | 2 +-
.../modules/glassfish/common/nodes/Hk2Cookie.java | 2 +-
.../common/nodes/Hk2ResourceContainers.java | 2 +-
.../common/nodes/Hk2ResourcesChildren.java | 2 +-
.../glassfish/common/nodes/Hk2WSChildren.java | 2 +-
.../glassfish/common/parser/TreeParser.java | 2 +-
.../modules/glassfish/common/ui/BasePanel.java | 4 +--
.../modules/glassfish/common/utils/Util.java | 4 +--
.../wizards/AddDomainLocationVisualPanel.java | 2 +-
.../modules/glassfish/spi/ExecSupport.java | 2 +-
.../modules/glassfish/spi/ServerUtilities.java | 4 +--
.../eecommon/api/ConfigureProfilerHelper.java | 2 +-
.../glassfish/eecommon/api/DomainEditor.java | 30 ++++++++++----------
.../eecommon/api/FindJSPServletHelper.java | 6 ++--
.../eecommon/api/JDBCDriverDeployHelper.java | 8 +++---
.../modules/glassfish/eecommon/api/Utils.java | 2 +-
.../glassfish/eecommon/api/VerifierSupport.java | 6 ++--
.../eecommon/api/config/DescriptorListener.java | 2 +-
.../api/config/GlassfishConfiguration.java | 4 +--
.../glassfish/javaee/FindJSPServletImpl.java | 6 ++--
.../glassfish/javaee/JDBCDriverDeployerImpl.java | 6 ++--
.../javaee/JavaEEServerModuleFactory.java | 4 +--
.../glassfish/javaee/ModuleConfigurationImpl.java | 2 +-
.../glassfish/javaee/db/ResourcesHelper.java | 4 +--
.../modules/glassfish/javaee/db/VendorNameMgr.java | 10 +++----
.../glassfish/javaee/ide/Hk2TargetModuleID.java | 2 +-
.../javaee/ide/MonitorProgressObject.java | 2 +-
.../tooling/admin/response/RestResponseParser.java | 2 +-
.../admin/response/RestXMLResponseParser.java | 2 +-
.../glassfish/tooling/server/ServerStatus.java | 2 +-
.../tooling/server/parser/TreeParser.java | 2 +-
.../ejbjar/project/ui/EjbContainerChildren.java | 2 +-
.../j2ee/ejbjar/project/ui/ServerResourceNode.java | 4 +--
.../j2ee/clientproject/AppClientProject.java | 6 ++--
.../classpath/ClassPathSupportCallbackImpl.java | 2 +-
.../ui/customizer/AppClientProjectProperties.java | 2 +-
.../modules/j2ee/ddloaders/app/EarDataObject.java | 2 +-
.../j2ee/ddloaders/common/DD2beansDataObject.java | 2 +-
.../modules/j2ee/ddloaders/web/DDDataObject.java | 2 +-
.../ui/customizer/EarProjectProperties.java | 6 ++--
.../ui/wizards/PanelModuleDetection.java | 2 +-
.../j2ee/ejbcore/action/UseDatabaseGenerator.java | 2 +-
.../methodcontroller/AbstractMethodController.java | 8 +++---
.../methodcontroller/EntityMethodController.java | 8 +++---
.../ejb/wizard/MultiTargetChooserPanel.java | 2 +-
.../logicalview/ejb/action/AddMethodActions.java | 2 +-
.../ejb/action/GoToSourceActionGroup.java | 10 +++----
.../ui/logicalview/ejb/entity/EntityChildren.java | 8 +++---
.../logicalview/ejb/session/SessionChildren.java | 8 +++---
.../modules/j2ee/ejbjarproject/EjbJarProject.java | 10 +++----
.../classpath/ClassPathSupportCallbackImpl.java | 2 +-
.../ui/customizer/EjbJarProjectProperties.java | 2 +-
.../modules/j2ee/ejbverification/TestBase.java | 2 +-
.../org/netbeans/modules/j2ee/sun/api/Asenv.java | 2 +-
.../j2ee/sun/api/ServerLocationManager.java | 6 ++--
.../sun/api/restricted/ResourceConfigurator.java | 10 +++----
.../j2ee/sun/api/restricted/ResourceUtils.java | 10 +++----
.../modules/j2ee/sun/ide/editors/ChoiceEditor.java | 4 +--
.../modules/j2ee/sun/ide/editors/EditorUtils.java | 4 +--
.../ide/editors/NameValuePairsPropertyEditor.java | 2 +-
.../ide/sunresources/beans/BaseResourceNode.java | 4 +--
.../sunresources/beans/ConnPoolBeanBeanInfo.java | 2 +-
.../sunresources/beans/DataSourceBeanBeanInfo.java | 2 +-
.../ide/sunresources/beans/JMSBeanBeanInfo.java | 2 +-
.../beans/JavaMailSessionBeanBeanInfo.java | 2 +-
.../beans/PersistenceManagerBeanBeanInfo.java | 2 +-
.../resourcesloader/SunResourceDataObject.java | 4 +--
.../sun/ide/sunresources/wizards/PMFWizard.java | 2 +-
.../ide/sunresources/wizards/PropertiesTable.java | 2 +-
.../sun/share/serverresources/BaseResource.java | 2 +-
.../modules/j2ee/sun/dd/api/DDProvider.java | 16 +++++------
.../multiview/BaseSectionNodeInnerPanel.java | 2 +-
.../j2ee/deployment/impl/ServerRegistry.java | 4 +--
.../modules/j2ee/deployment/impl/TargetServer.java | 2 +-
.../impl/ui/wizard/AddServerInstanceWizard.java | 16 +++++------
.../deployment/execution/ServerExecutorTest.java | 2 +-
.../beanvalidation/ConstraintPanelVisual.java | 8 +++---
.../logicalview/AbstractLogicalViewProvider.java | 4 +--
.../api/ant/ui/wizard/J2eeVersionWarningPanel.java | 22 +++++++--------
.../specs/support/spi/JpaProviderFactory.java | 2 +-
.../wildfly/customizer/WildflyTabVisualPanel.java | 4 +--
.../javaee/wildfly/ide/WildflyOutputSupport.java | 2 +-
.../javaee/wildfly/ide/WildflyStartRunnable.java | 18 ++++++------
.../modules/maven/j2ee/ProjectHookImpl.java | 2 +-
.../modules/maven/jaxws/MavenJAXWSSupportImpl.java | 4 +--
.../org/netbeans/modules/maven/jaxws/WSUtils.java | 4 +--
.../modules/payara/common/CreateDomain.java | 10 +++----
.../netbeans/modules/payara/common/LogViewMgr.java | 8 +++---
.../modules/payara/common/PayaraInstance.java | 4 +--
.../payara/common/PayaraInstanceProvider.java | 16 +++++------
.../common/nodes/Hk2ApplicationsChildren.java | 2 +-
.../modules/payara/common/nodes/Hk2Cookie.java | 2 +-
.../payara/common/nodes/Hk2ResourceContainers.java | 2 +-
.../payara/common/nodes/Hk2ResourcesChildren.java | 2 +-
.../modules/payara/common/nodes/Hk2WSChildren.java | 2 +-
.../modules/payara/common/parser/TreeParser.java | 2 +-
.../modules/payara/common/ui/BasePanel.java | 4 +--
.../netbeans/modules/payara/common/utils/Util.java | 4 +--
.../wizards/AddDomainLocationVisualPanel.java | 2 +-
.../netbeans/modules/payara/spi/ExecSupport.java | 2 +-
.../modules/payara/spi/ServerUtilities.java | 2 +-
.../eecommon/api/ConfigureProfilerHelper.java | 2 +-
.../modules/payara/eecommon/api/DomainEditor.java | 28 +++++++++----------
.../payara/eecommon/api/FindJSPServletHelper.java | 6 ++--
.../eecommon/api/JDBCDriverDeployHelper.java | 8 +++---
.../modules/payara/eecommon/api/Utils.java | 2 +-
.../payara/eecommon/api/VerifierSupport.java | 6 ++--
.../eecommon/api/config/DescriptorListener.java | 2 +-
.../eecommon/api/config/PayaraConfiguration.java | 4 +--
.../eecommon/dd/loader/PayaraDDProvider.java | 16 +++++------
.../payara/jakartaee/FindJSPServletImpl.java | 6 ++--
.../payara/jakartaee/JDBCDriverDeployerImpl.java | 6 ++--
.../jakartaee/JavaEEServerModuleFactory.java | 4 +--
.../payara/jakartaee/ModuleConfigurationImpl.java | 2 +-
.../payara/jakartaee/db/ResourcesHelper.java | 4 +--
.../payara/jakartaee/ide/Hk2TargetModuleID.java | 2 +-
.../jakartaee/ide/MonitorProgressObject.java | 2 +-
.../tooling/admin/response/RestResponseParser.java | 2 +-
.../admin/response/RestXMLResponseParser.java | 2 +-
.../modules/payara/tooling/data/JDKVersion.java | 8 +++---
.../payara/tooling/server/ServerStatus.java | 2 +-
.../payara/tooling/server/parser/TreeParser.java | 2 +-
.../modules/profiler/j2ee/WebProjectUtils.java | 2 +-
.../spring/webmvc/editor/BeanCodeGenerator.java | 8 +++---
.../tomcat5/ui/wizard/AddInstanceIterator.java | 10 +++----
.../web/beans/analysis/WebBeansAnalysisTask.java | 2 +-
.../web/beans/completion/BeansCompletionItem.java | 2 +-
.../modules/web/client/rest/wizard/HtmlPanel.java | 4 +--
.../modules/web/client/rest/wizard/RestPanel.java | 12 ++++----
.../web/core/syntax/SimplifiedJspServlet.java | 2 +-
.../modules/web/core/syntax/SyntaxElement.java | 4 +--
.../web/core/syntax/completion/AttrSupports.java | 2 +-
.../syntax/completion/JspCompletionProvider.java | 2 +-
.../web/core/syntax/parser/JspSyntaxElement.java | 4 +--
.../src/org/netbeans/test/lib/BasicTokensTest.java | 2 +-
.../org/netbeans/test/syntax/CompletionTest.java | 8 +++---
.../web/core/syntax/ContextJspServletGenTest.java | 4 +--
.../modules/web/core/jsploader/JspDataObject.java | 20 +++++++-------
.../org/netbeans/modules/web/wizards/DDTable.java | 2 +-
.../modules/web/wizards/InitParamPanel.java | 6 ++--
.../netbeans/modules/web/wizards/MappingPanel.java | 10 +++----
.../web/freeform/WebFreeformProperties.java | 16 +++++------
.../editor/facelets/DefaultFaceletLibraries.java | 2 +-
.../web/jsf/navigation/graph/SceneSerializer.java | 4 +--
.../graph/layout/TreeGraphLayoutUtility.java | 4 +--
.../web/jsf/api/editor/JSFEditorUtilities.java | 6 ++--
.../modules/web/jsf/api/facesmodel/JSFVersion.java | 4 +--
.../modules/web/jsf/editor/JsfPopupAction.java | 4 +--
.../impl/facesmodel/JSFConfigComponentImpl.java | 2 +-
.../web/jsf/impl/metamodel/ComponentImpl.java | 2 +-
.../web/jsf/impl/metamodel/JsfModelImpl.java | 2 +-
.../web/jsf/impl/metamodel/ManagedBeanImpl.java | 2 +-
.../web/jsf/impl/metamodel/ObjectProviders.java | 4 +--
.../web/jsf/palette/items/FromEntityBase.java | 2 +-
.../modules/web/jsf/refactoring/Occurrences.java | 2 +-
.../web/jsf/wizards/TemplateClientPanelVisual.java | 2 +-
.../netbeans/modules/web/jsps/parserapi/Node.java | 2 +-
.../modules/web/monitor/server/MonitorFilter.java | 22 +++++++--------
.../web/monitor/server/MonitorRequestWrapper.java | 4 +--
.../modules/web/monitor/server/NotifyUtil.java | 4 +--
.../modules/web/monitor/client/ClientDisplay.java | 2 +-
.../modules/web/monitor/client/ContextDisplay.java | 2 +-
.../modules/web/monitor/client/Controller.java | 20 +++++++-------
.../modules/web/monitor/client/CookieDisplay.java | 2 +-
.../modules/web/monitor/client/DataDisplay.java | 24 ++++++++--------
.../modules/web/monitor/client/EditPanel.java | 8 +++---
.../web/monitor/client/EditPanelCookies.java | 2 +-
.../web/monitor/client/EditPanelHeaders.java | 2 +-
.../modules/web/monitor/client/EditPanelQuery.java | 2 +-
.../web/monitor/client/EditPanelRequest.java | 2 +-
.../web/monitor/client/EditPanelServer.java | 2 +-
.../modules/web/monitor/client/HeaderDisplay.java | 2 +-
.../web/monitor/client/NameValueCellEditor.java | 2 +-
.../web/monitor/client/ReplaySendXMLServlet.java | 2 +-
.../modules/web/monitor/client/RequestDisplay.java | 2 +-
.../modules/web/monitor/client/SessionDisplay.java | 2 +-
.../web/monitor/client/TransactionView.java | 6 ++--
.../netbeans/modules/web/monitor/client/Util.java | 2 +-
.../modules/web/monitor/data/ClientData.java | 4 +--
.../web/monitor/data/ContextAttributes.java | 6 ++--
.../modules/web/monitor/data/ContextData.java | 8 +++---
.../modules/web/monitor/data/CookieIn.java | 4 +--
.../modules/web/monitor/data/CookieOut.java | 4 +--
.../modules/web/monitor/data/CookiesData.java | 8 +++---
.../modules/web/monitor/data/DispatchData.java | 22 +++++++--------
.../modules/web/monitor/data/Dispatches.java | 6 ++--
.../modules/web/monitor/data/EngineData.java | 4 +--
.../netbeans/modules/web/monitor/data/Headers.java | 6 ++--
.../modules/web/monitor/data/MonitorData.java | 24 ++++++++--------
.../netbeans/modules/web/monitor/data/Param.java | 4 +--
.../web/monitor/data/RequestAttributesIn.java | 6 ++--
.../web/monitor/data/RequestAttributesOut.java | 6 ++--
.../modules/web/monitor/data/RequestData.java | 22 +++++++--------
.../modules/web/monitor/data/ServletData.java | 6 ++--
.../modules/web/monitor/data/SessionData.java | 8 +++---
.../modules/web/monitor/data/SessionIn.java | 6 ++--
.../modules/web/monitor/data/SessionOut.java | 6 ++--
.../classpath/ClassPathSupportCallbackImpl.java | 4 +--
.../web/project/jaxws/WebProjectJAXWSSupport.java | 4 +--
.../modules/web/project/ui/DocBaseNodeFactory.java | 2 +-
.../ui/customizer/WebProjectProperties.java | 2 +-
.../editor/StrutsConfigHyperlinkProvider.java | 2 +-
.../web/struts/editor/StrutsEditorUtilities.java | 2 +-
.../multiview/PortTypeOperationPanel.java | 2 +-
.../customization/model/CustomizationTest.java | 2 +-
.../modules/websvc/design/view/WsitWidget.java | 2 +-
.../websvc/design/view/widget/ButtonWidget.java | 4 +--
.../design/view/widget/ImageLabelWidget.java | 2 +-
.../websvc/design/view/widget/TableWidget.java | 2 +-
.../websvc/design/javamodel/ServiceModelTest.java | 2 +-
.../editor/hints/WebServicesHintsProvider.java | 2 +-
.../jaxws/catalog/impl/CatalogComponentImpl.java | 2 +-
.../modules/websvc/manager/util/ManagerUtil.java | 4 +--
.../modules/websvc/project/WebServiceAccessor.java | 2 +-
.../websvc/rest/client/RESTExplorerPanel.java | 2 +-
.../websvc/rest/codegen/ResourceJavaScript.java | 2 +-
221 files changed, 567 insertions(+), 567 deletions(-)
diff --git a/enterprise/api.web.webmodule/src/org/netbeans/modules/web/webmodule/WebModuleExtenderBridge.java b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/webmodule/WebModuleExtenderBridge.java
index bd779f3..fb4205c 100644
--- a/enterprise/api.web.webmodule/src/org/netbeans/modules/web/webmodule/WebModuleExtenderBridge.java
+++ b/enterprise/api.web.webmodule/src/org/netbeans/modules/web/webmodule/WebModuleExtenderBridge.java
@@ -169,7 +169,7 @@ public class WebModuleExtenderBridge extends WebModuleExtender {
* An empty framework configuration panel to which WebModuleExtenderBridge will delegate
* when the framework doesn't have a framework configuration panel.
*/
- private final static class EmptyConfigPanel extends EmptyPanel implements FrameworkConfigurationPanel {
+ private static final class EmptyConfigPanel extends EmptyPanel implements FrameworkConfigurationPanel {
@Override
public Component getComponent() {
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/CreateDomain.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/CreateDomain.java
index c68d0b7..5158194 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/CreateDomain.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/CreateDomain.java
@@ -49,11 +49,11 @@ import org.openide.windows.InputOutput;
public class CreateDomain extends Thread {
static final String PORTBASE = "portbase"; // NOI18N
- final private String uname;
- final private String pword;
- final private File platformLocation;
- final private Map<String, String> map;
- final private Map<String, String> ip;
+ private final String uname;
+ private final String pword;
+ private final File platformLocation;
+ private final Map<String, String> map;
+ private final Map<String, String> ip;
private GlassfishInstanceProvider gip;
private boolean register;
private final String installRootKey;
@@ -73,7 +73,7 @@ public class CreateDomain extends Thread {
computePorts(ip,map, useDefaultPorts);
}
- static private void computePorts(Map<String, String> ip, Map<String, String> createProps, boolean useDefaultPorts) {
+ private static void computePorts(Map<String, String> ip, Map<String, String> createProps, boolean useDefaultPorts) {
int portBase = 8900;
int kicker = ((new Date()).toString() + ip.get(GlassfishModule.DOMAINS_FOLDER_ATTR)+ip.get(GlassfishModule.DOMAIN_NAME_ATTR)).hashCode() % 40000;
kicker = kicker < 0 ? -kicker : kicker;
@@ -229,8 +229,8 @@ public class CreateDomain extends Thread {
static class PDCancel implements Cancellable {
- final private Process p;
- final private String dirname;
+ private final Process p;
+ private final String dirname;
private boolean notFired = true;
PDCancel(Process p, String newDirName) {
@@ -238,12 +238,12 @@ public class CreateDomain extends Thread {
this.dirname = newDirName;
}
- synchronized public boolean isNotFired() {
+ public synchronized boolean isNotFired() {
return notFired;
}
@Override
- synchronized public boolean cancel() {
+ public synchronized boolean cancel() {
notFired = false;
p.destroy();
File domainDir = new File(dirname);
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstance.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstance.java
index 11136bc..9f8ca43 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstance.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstance.java
@@ -714,7 +714,7 @@ public class GlassfishInstance implements ServerInstanceImplementation,
private transient volatile Process process;
/** Configuration changes listener watching <code>domain.xml</code> file. */
- private transient final DomainXMLChangeListener domainXMLListener;
+ private final transient DomainXMLChangeListener domainXMLListener;
private transient InstanceContent ic;
private transient Lookup localLookup;
@@ -726,7 +726,7 @@ public class GlassfishInstance implements ServerInstanceImplementation,
currentFactories = Collections.emptyList();
/** GlassFish server support API for this instance. */
- private transient final CommonServerSupport commonSupport;
+ private final transient CommonServerSupport commonSupport;
// API instance
private ServerInstance commonInstance;
private GlassfishInstanceProvider instanceProvider;
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java
index b79dbdb..8b1d8fc 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/GlassfishInstanceProvider.java
@@ -60,7 +60,7 @@ public final class GlassfishInstanceProvider implements ServerInstanceProvider,
private static final String AUTOINSTANCECOPIED = "autoinstance-copied"; // NOI18N
- private volatile static GlassfishInstanceProvider glassFishProvider;
+ private static volatile GlassfishInstanceProvider glassFishProvider;
public static final String EE6_DEPLOYER_FRAGMENT = "deployer:gfv3ee6"; // NOI18N
public static final String EE8_DEPLOYER_FRAGMENT = "deployer:gfv5ee8"; // NOI18N
@@ -69,16 +69,16 @@ public final class GlassfishInstanceProvider implements ServerInstanceProvider,
public static final String JAKARTAEE91_DEPLOYER_FRAGMENT = "deployer:gfv610ee9";
public static final String EE6WC_DEPLOYER_FRAGMENT = "deployer:gfv3ee6wc"; // NOI18N
public static final String PRELUDE_DEPLOYER_FRAGMENT = "deployer:gfv3"; // NOI18N
- static private String EE6_INSTANCES_PATH = "/GlassFishEE6/Instances"; // NOI18N
- static private String EE8_INSTANCES_PATH = "/GlassFishEE8/Instances"; // NOI18N
- static private String EE9_INSTANCES_PATH = "/GlassFishEE9/Instances"; // NOI18N
- static private String JAKARTAEE8_INSTANCES_PATH = "/GlassFishJakartaEE8/Instances"; // NOI18N
- static private String JAKARTAEE9_INSTANCES_PATH = "/GlassFishJakartaEE9/Instances"; // NOI18N
+ private static String EE6_INSTANCES_PATH = "/GlassFishEE6/Instances"; // NOI18N
+ private static String EE8_INSTANCES_PATH = "/GlassFishEE8/Instances"; // NOI18N
+ private static String EE9_INSTANCES_PATH = "/GlassFishEE9/Instances"; // NOI18N
+ private static String JAKARTAEE8_INSTANCES_PATH = "/GlassFishJakartaEE8/Instances"; // NOI18N
+ private static String JAKARTAEE9_INSTANCES_PATH = "/GlassFishJakartaEE9/Instances"; // NOI18N
// static private String JAKARTAEE91_INSTANCES_PATH = "/GlassFishJakartaEE91/Instances"; // NOI18N
- static private String EE6WC_INSTANCES_PATH = "/GlassFishEE6WC/Instances"; // NOI18N
+ private static String EE6WC_INSTANCES_PATH = "/GlassFishEE6WC/Instances"; // NOI18N
- static public String PRELUDE_DEFAULT_NAME = "GlassFish_v3_Prelude"; //NOI18N
- static public String EE6WC_DEFAULT_NAME = "GlassFish_Server_3.1"; // NOI18N
+ public static String PRELUDE_DEFAULT_NAME = "GlassFish_v3_Prelude"; //NOI18N
+ public static String EE6WC_DEFAULT_NAME = "GlassFish_Server_3.1"; // NOI18N
// GlassFish Tooling SDK configuration should be done before any server
// instance is created and used.
@@ -127,13 +127,13 @@ public final class GlassfishInstanceProvider implements ServerInstanceProvider,
private static final Set<String> activeDisplayNames = Collections.synchronizedSet(new HashSet<String>());
private final ChangeSupport support = new ChangeSupport(this);
- final private String[] instancesDirNames;
- final private String displayName;
- final private String[] uriFragments;
- final private boolean needsJdk6;
- final private List<String> noPasswordOptions;
- final private CommandFactory cf;
- final private Lookup.Result<RegisteredDDCatalog> lookupResult = Lookups.forPath(Util.GF_LOOKUP_PATH).lookupResult(RegisteredDDCatalog.class);
+ private final String[] instancesDirNames;
+ private final String displayName;
+ private final String[] uriFragments;
+ private final boolean needsJdk6;
+ private final List<String> noPasswordOptions;
+ private final CommandFactory cf;
+ private final Lookup.Result<RegisteredDDCatalog> lookupResult = Lookups.forPath(Util.GF_LOOKUP_PATH).lookupResult(RegisteredDDCatalog.class);
@SuppressWarnings("LeakingThisInConstructor")
private GlassfishInstanceProvider(
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/LogViewMgr.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/LogViewMgr.java
index 707b948..9cb3c86 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/LogViewMgr.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/LogViewMgr.java
@@ -704,7 +704,7 @@ public class LogViewMgr {
}
- private static abstract class StateFilter implements Filter {
+ private abstract static class StateFilter implements Filter {
protected String message;
@@ -1051,7 +1051,7 @@ public class LogViewMgr {
return newIO;
}
- static public void displayOutput(GlassfishInstance instance, Lookup lookup) {
+ public static void displayOutput(GlassfishInstance instance, Lookup lookup) {
String uri = instance.getProperty(GlassfishModule.URL_ATTR);
if (null != uri && (uri.contains("gfv3ee6wc") || uri.contains("localhost"))) {
FetchLog log = getServerLogStream(instance);
@@ -1065,7 +1065,7 @@ public class LogViewMgr {
}
}
- static private List<Recognizer> getRecognizers(Collection<? extends RecognizerCookie> cookies) {
+ private static List<Recognizer> getRecognizers(Collection<? extends RecognizerCookie> cookies) {
List<Recognizer> recognizers;
if(!cookies.isEmpty()) {
recognizers = new LinkedList<Recognizer>();
@@ -1192,7 +1192,7 @@ public class LogViewMgr {
* cerated one when no log fetcher was found.
* @throws IOException
*/
- static private FetchLog getServerLogStream(
+ private static FetchLog getServerLogStream(
final GlassfishInstance instance) {
FetchLog log;
FetchLog deadLog = null;
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ApplicationsChildren.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ApplicationsChildren.java
index 00a2b0c..fd2ce6a 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ApplicationsChildren.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ApplicationsChildren.java
@@ -41,7 +41,7 @@ import org.openide.util.RequestProcessor;
public class Hk2ApplicationsChildren extends Children.Keys<Object> implements Refreshable {
private Lookup lookup;
- private final static Node WAIT_NODE = Hk2ItemNode.createWaitNode();
+ private static final Node WAIT_NODE = Hk2ItemNode.createWaitNode();
Hk2ApplicationsChildren(Lookup lookup) {
this.lookup = lookup;
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2Cookie.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2Cookie.java
index 408e692..5abd18d 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2Cookie.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2Cookie.java
@@ -76,7 +76,7 @@ public class Hk2Cookie {
/**
* Common node cookie.
*/
- private static abstract class Cookie {
+ private abstract static class Cookie {
/** Task status. */
volatile WeakReference<Future<ResultString>> status;
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourceContainers.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourceContainers.java
index 0d54a95..87a6e8f 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourceContainers.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourceContainers.java
@@ -36,7 +36,7 @@ import org.netbeans.modules.glassfish.spi.GlassfishModule;
public class Hk2ResourceContainers extends Children.Keys<Object> implements Refreshable {
private Lookup lookup;
- private final static Node WAIT_NODE = Hk2ItemNode.createWaitNode();
+ private static final Node WAIT_NODE = Hk2ItemNode.createWaitNode();
Hk2ResourceContainers(Lookup lookup) {
this.lookup = lookup;
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourcesChildren.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourcesChildren.java
index d4819ed..0f5e04e 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourcesChildren.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2ResourcesChildren.java
@@ -47,7 +47,7 @@ public class Hk2ResourcesChildren extends Children.Keys<Object> implements Refre
private Lookup lookup;
private String type;
- private final static Node WAIT_NODE = Hk2ItemNode.createWaitNode();
+ private static final Node WAIT_NODE = Hk2ItemNode.createWaitNode();
Hk2ResourcesChildren(Lookup lookup, String type) {
this.lookup = lookup;
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2WSChildren.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2WSChildren.java
index ee614bb..817c883 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2WSChildren.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/nodes/Hk2WSChildren.java
@@ -40,7 +40,7 @@ import org.openide.util.RequestProcessor;
public class Hk2WSChildren extends Children.Keys<Object> implements Refreshable {
private Lookup lookup;
- private final static Node WAIT_NODE = Hk2ItemNode.createWaitNode();
+ private static final Node WAIT_NODE = Hk2ItemNode.createWaitNode();
Hk2WSChildren(Lookup lookup) {
this.lookup = lookup;
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/parser/TreeParser.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/parser/TreeParser.java
index bd17964..66b8e59 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/parser/TreeParser.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/parser/TreeParser.java
@@ -199,7 +199,7 @@ public final class TreeParser extends DefaultHandler {
return source;
}
- public static abstract class NodeReader {
+ public abstract static class NodeReader {
public void readAttributes(String qname, Attributes attributes) throws SAXException {
}
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/BasePanel.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/BasePanel.java
index 58444f5..a6ff97a 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/BasePanel.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/ui/BasePanel.java
@@ -258,9 +258,9 @@ public abstract class BasePanel extends JPanel {
}
}
- static abstract class DataTableModel extends AbstractTableModel {
+ abstract static class DataTableModel extends AbstractTableModel {
- abstract public Map<String, String> getData();
+ public abstract Map<String, String> getData();
private String[][] rowData;
private String pushPrefix;
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/utils/Util.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/utils/Util.java
index 673e700..40387f3 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/utils/Util.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/utils/Util.java
@@ -277,7 +277,7 @@ public final class Util {
}
- static public String computeTarget(Map<String, String> ip) {
+ public static String computeTarget(Map<String, String> ip) {
String retVal = null;
String url = ip.get(GlassfishModule.URL_ATTR);
if (null != url) {
@@ -292,7 +292,7 @@ public final class Util {
return retVal;
}
- static public boolean isDefaultOrServerTarget(Map<String, String> ip) {
+ public static boolean isDefaultOrServerTarget(Map<String, String> ip) {
String target = Util.computeTarget(ip);
return null == target || "server".equals(target);
}
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddDomainLocationVisualPanel.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddDomainLocationVisualPanel.java
index 510c120..05c86bb 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddDomainLocationVisualPanel.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/common/wizards/AddDomainLocationVisualPanel.java
@@ -53,7 +53,7 @@ import org.openide.util.NbBundle;
*/
public class AddDomainLocationVisualPanel extends javax.swing.JPanel {
- private transient final List<ChangeListener> listeners;
+ private final transient List<ChangeListener> listeners;
/** IP addresses selection content. */
Set<? extends InetAddress> ips;
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ExecSupport.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ExecSupport.java
index 8620de3..2b9b4ed 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ExecSupport.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ExecSupport.java
@@ -79,7 +79,7 @@ public class ExecSupport {
}
/** This thread simply reads from given Reader and writes read chars to given Writer. */
- static public class OutputCopier extends Thread {
+ public static class OutputCopier extends Thread {
final Writer os;
final Reader is;
/** while set to false at streams that writes to the OutputWindow it must be
diff --git a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java
index 431d249..1e5b28d 100644
--- a/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java
+++ b/enterprise/glassfish.common/src/org/netbeans/modules/glassfish/spi/ServerUtilities.java
@@ -55,7 +55,7 @@ public final class ServerUtilities {
public static final String GFV3_LIB_DIR_NAME = "lib"; // NOI18N
public static final String GFV3_VERSION_MATCHER = "(?:-[0-9bSNAPHOT]+(?:\\.[0-9]+(?:_[0-9]+|)|).*|).jar"; // NOI18N
public static final String GFV3_JAR_MATCHER = "glassfish" + GFV3_VERSION_MATCHER; // NOI18N
- static public final String PROP_FIRST_RUN = "first_run";
+ public static final String PROP_FIRST_RUN = "first_run";
private GlassfishInstanceProvider gip;
private GlassfishWizardProvider gwp;
@@ -284,7 +284,7 @@ public final class ServerUtilities {
* @param gfRoot the name of the directory to check against.
* @return true if the directory appears to be the root of a TP2 installation.
*/
- static public boolean isTP2(String gfRoot) {
+ public static boolean isTP2(String gfRoot) {
return ServerUtilities.getJarName(gfRoot, ServerUtilities.GFV3_JAR_MATCHER).getName().indexOf("-tp-2-") > -1; // NOI18N
}
diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ConfigureProfilerHelper.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ConfigureProfilerHelper.java
index 949d566..502b1f9 100644
--- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ConfigureProfilerHelper.java
+++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ConfigureProfilerHelper.java
@@ -37,7 +37,7 @@ public class ConfigureProfilerHelper {
// replaces the AS_JAVA item in asenv.bat/conf
- static public boolean modifyAsEnvScriptFile( File irf, String targetJavaHomePath) {
+ public static boolean modifyAsEnvScriptFile( File irf, String targetJavaHomePath) {
String ext = (isUnix() ? "conf" : "bat");
//File irf = ((SunDeploymentManagerInterface)dm).getPlatformRoot();
diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/DomainEditor.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/DomainEditor.java
index 0a0acd3..854d1f1 100644
--- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/DomainEditor.java
+++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/DomainEditor.java
@@ -78,21 +78,21 @@ public class DomainEditor {
private static String CONST_SID = "SID"; // NOI18N
private static String CONST_SERVER_NAME = "serverName"; // NOI18N
private static String CONST_DRIVER_CLASS = "driverClass"; // NOI18N
- static private String CONST_NAME = "name"; // NOI18N
- static private String CONST_VALUE = "value"; // NOI18N
- static private String CONST_DS_CLASS = "datasource-classname"; // NOI18N
- static private String CONST_RES_TYPE = "res-type"; // NOI18N
- static private String CONST_JVM_OPTIONS = "jvm-options"; // NOI18N
- static private String CONST_DERBY_CONN_ATTRS = "connectionAttributes"; // NOI18N
- static private String CONST_JNDINAME = "jndi-name"; // NOI18N
- static private String CONST_PROP = "property"; // NOI18N
- static private String CONST_POOLNAME = "pool-name"; // NOI18N
- static private String CONST_ENABLED = "enabled"; // NOI18N
- static private String CONST_OBJTYPE = "object-type"; // NOI18N
- static private String CONST_JDBC = "jdbc-resource"; // NOI18N
- static private String CONST_CP = "jdbc-connection-pool"; // NOI18N
- static private String CONST_AO = "admin-object-resource"; // NOI18N
- static private String XML_ENTITY = "<?xml version=\"1.0\" encoding=\"{0}\"?>";
+ private static String CONST_NAME = "name"; // NOI18N
+ private static String CONST_VALUE = "value"; // NOI18N
+ private static String CONST_DS_CLASS = "datasource-classname"; // NOI18N
+ private static String CONST_RES_TYPE = "res-type"; // NOI18N
+ private static String CONST_JVM_OPTIONS = "jvm-options"; // NOI18N
+ private static String CONST_DERBY_CONN_ATTRS = "connectionAttributes"; // NOI18N
+ private static String CONST_JNDINAME = "jndi-name"; // NOI18N
+ private static String CONST_PROP = "property"; // NOI18N
+ private static String CONST_POOLNAME = "pool-name"; // NOI18N
+ private static String CONST_ENABLED = "enabled"; // NOI18N
+ private static String CONST_OBJTYPE = "object-type"; // NOI18N
+ private static String CONST_JDBC = "jdbc-resource"; // NOI18N
+ private static String CONST_CP = "jdbc-connection-pool"; // NOI18N
+ private static String CONST_AO = "admin-object-resource"; // NOI18N
+ private static String XML_ENTITY = "<?xml version=\"1.0\" encoding=\"{0}\"?>";
private String dmLoc;
private String dmName;
diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/FindJSPServletHelper.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/FindJSPServletHelper.java
index 5fdf095..be581e8 100644
--- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/FindJSPServletHelper.java
+++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/FindJSPServletHelper.java
@@ -29,7 +29,7 @@ public class FindJSPServletHelper {
private FindJSPServletHelper() {
}
- static public String getServletResourcePath(String moduleContextPath, String jspResourcePath) {
+ public static String getServletResourcePath(String moduleContextPath, String jspResourcePath) {
Parameters.notWhitespace("jspResourcePath", jspResourcePath);
String s = getServletPackageName(jspResourcePath) + '/' +
getServletClassName(jspResourcePath) + ".java";// NOI18N
@@ -38,7 +38,7 @@ public class FindJSPServletHelper {
// After Apace donation, should use org.apache.jasper utilities in
// JspUtil and JspCompilationContext
- static private String getServletPackageName(String jspUri) {
+ private static String getServletPackageName(String jspUri) {
String jspBasePackageName = "org/apache/jsp";//NOI18N
int iSep = jspUri.lastIndexOf('/');
String packageName = (iSep > 0) ? jspUri.substring(0, iSep) : "";//NOI18N
@@ -51,7 +51,7 @@ public class FindJSPServletHelper {
// After Apace donation, should use org.apache.jasper utilities in
// JspUtil and JspCompilationContext
- static private String getServletClassName(String jspUri) {
+ private static String getServletClassName(String jspUri) {
int iSep = jspUri.lastIndexOf('/') + 1;
String className = jspUri.substring(iSep);
StringBuilder modClassName = new StringBuilder("");//NOI18N
diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/JDBCDriverDeployHelper.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/JDBCDriverDeployHelper.java
index aae3dce..e0843f8 100644
--- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/JDBCDriverDeployHelper.java
+++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/JDBCDriverDeployHelper.java
@@ -60,7 +60,7 @@ import org.openide.util.Parameters;
public class JDBCDriverDeployHelper {
- static public ProgressObject getProgressObject(File driverLoc, List listOfURLS) {
+ public static ProgressObject getProgressObject(File driverLoc, List listOfURLS) {
return new JDBCDriversProgressObject(driverLoc, listOfURLS);
}
@@ -70,7 +70,7 @@ public class JDBCDriverDeployHelper {
* @param drivers Target ULR list where to add drivers.
* @param jdbcDrivers JDBC drivers to be searched for URLs.
*/
- static private void addDriversURLs(List<URL> drivers, JDBCDriver[] jdbcDrivers) {
+ private static void addDriversURLs(List<URL> drivers, JDBCDriver[] jdbcDrivers) {
for (JDBCDriver jdbcDriver : jdbcDrivers) {
URL[] allUrls = jdbcDriver.getURLs();
for (int i = 0; i < allUrls.length; i++) {
@@ -98,7 +98,7 @@ public class JDBCDriverDeployHelper {
* @param datasources Server data sources from server resources files.
* @return List of JDBC drivers URLs to be deployed.
*/
- static public List<URL> getMissingDrivers(File[] driverLocs, Set<Datasource> datasources) {
+ public static List<URL> getMissingDrivers(File[] driverLocs, Set<Datasource> datasources) {
List<URL> drivers = new ArrayList<URL>();
for (Datasource datasource : datasources) {
String className = datasource.getDriverClassName();
@@ -149,7 +149,7 @@ public class JDBCDriverDeployHelper {
return drivers;
}
- static private class JDBCDriversProgressObject implements ProgressObject, Runnable {
+ private static class JDBCDriversProgressObject implements ProgressObject, Runnable {
private final ProgressEventSupport eventSupport;
private final File driverLoc;
diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/Utils.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/Utils.java
index 6b4953e..24204cf 100644
--- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/Utils.java
+++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/Utils.java
@@ -82,7 +82,7 @@ public final class Utils {
return result;
}
- public final static int strCompareTo(String one, String two) {
+ public static final int strCompareTo(String one, String two) {
int result;
if(one == null) {
diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/VerifierSupport.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/VerifierSupport.java
index f778f26..0de7bb6 100644
--- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/VerifierSupport.java
+++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/VerifierSupport.java
@@ -93,9 +93,9 @@ public class VerifierSupport extends TopComponent {
String _archiveName;
- final static int FAIL = 0;
- final static int WARN = 1;
- final static int ALL = 2;
+ static final int FAIL = 0;
+ static final int WARN = 1;
+ static final int ALL = 2;
static String allString = NbBundle.getMessage(VerifierSupport.class,"All_Results"); // NOI18N
static String failString = NbBundle.getMessage(VerifierSupport.class,"Failures_Only"); //NOI18N
diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/DescriptorListener.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/DescriptorListener.java
index 697c857..eab1179 100644
--- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/DescriptorListener.java
+++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/DescriptorListener.java
@@ -670,7 +670,7 @@ public class DescriptorListener implements PropertyChangeListener {
Object sourceDD, Object oldValue, Object newValue);
}
- public static abstract class AbstractBeanVisitor implements BeanVisitor {
+ public abstract static class AbstractBeanVisitor implements BeanVisitor {
public void beanCreated(GlassfishConfiguration config, String xpath,
CommonDDBean sourceDD, CommonDDBean newDD) {
}
diff --git a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfiguration.java b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfiguration.java
index 350a5f3..1808fcd 100644
--- a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfiguration.java
+++ b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/config/GlassfishConfiguration.java
@@ -619,7 +619,7 @@ public abstract class GlassfishConfiguration implements
return J2EEBaseVersion.getVersion(module.getType(), module.getModuleVersion());
}
- final public org.netbeans.modules.j2ee.dd.api.common.RootInterface getStandardRootDD() {
+ public final org.netbeans.modules.j2ee.dd.api.common.RootInterface getStandardRootDD() {
org.netbeans.modules.j2ee.dd.api.common.RootInterface stdRootDD = null;
J2eeModuleHelper j2eeModuleHelper = J2eeModuleHelper.getSunDDModuleHelper(module.getType());
if(j2eeModuleHelper != null) {
@@ -628,7 +628,7 @@ public abstract class GlassfishConfiguration implements
return stdRootDD;
}
- final public org.netbeans.modules.j2ee.dd.api.webservices.Webservices getWebServicesRootDD() {
+ public final org.netbeans.modules.j2ee.dd.api.webservices.Webservices getWebServicesRootDD() {
org.netbeans.modules.j2ee.dd.api.webservices.Webservices wsRootDD = null;
J2eeModuleHelper j2eeModuleHelper = J2eeModuleHelper.getSunDDModuleHelper(module.getType());
if(j2eeModuleHelper != null) {
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/FindJSPServletImpl.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/FindJSPServletImpl.java
index b03927a..66108fe 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/FindJSPServletImpl.java
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/FindJSPServletImpl.java
@@ -36,9 +36,9 @@ import org.netbeans.modules.j2ee.deployment.plugins.spi.FindJSPServlet;
class FindJSPServletImpl implements FindJSPServlet {
- final private String domainDir;
- final private String domain;
- final private GlassfishModule commonSupport;
+ private final String domainDir;
+ private final String domain;
+ private final GlassfishModule commonSupport;
public FindJSPServletImpl(Hk2DeploymentManager dm, Hk2OptionalFactory aThis) {
commonSupport = dm.getCommonServerSupport();
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JDBCDriverDeployerImpl.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JDBCDriverDeployerImpl.java
index d0672bc..0064352 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JDBCDriverDeployerImpl.java
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JDBCDriverDeployerImpl.java
@@ -38,9 +38,9 @@ import org.openide.util.RequestProcessor;
public class JDBCDriverDeployerImpl implements JDBCDriverDeployer {
- final private File driverLoc;
- final private GlassfishModule commonSupport;
- final private boolean isLocal;
+ private final File driverLoc;
+ private final GlassfishModule commonSupport;
+ private final boolean isLocal;
private Hk2DeploymentManager dm;
public JDBCDriverDeployerImpl(Hk2DeploymentManager dm, OptionalDeploymentManagerFactory odmf) {
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEServerModuleFactory.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEServerModuleFactory.java
index 30a8d9f..4578d81 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEServerModuleFactory.java
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/JavaEEServerModuleFactory.java
@@ -303,7 +303,7 @@ public class JavaEEServerModuleFactory implements GlassfishModuleFactory {
return addLibrary(name, CLASS_LIBRARY_TYPE, libraryList, docList, displayName, description);
}
- private synchronized static boolean addLibrary(String name, String libType, List<URL> libraryList, List<URL> docList, String displayName,
+ private static synchronized boolean addLibrary(String name, String libType, List<URL> libraryList, List<URL> docList, String displayName,
String description) {
LibraryManager lmgr = LibraryManager.getDefault();
@@ -426,7 +426,7 @@ public class JavaEEServerModuleFactory implements GlassfishModuleFactory {
static class InitializeLibrary implements PropertyChangeListener {
- final private LibraryManager lmgr;
+ private final LibraryManager lmgr;
private String name;
private Map<String, List<URL>> content;
private final String libType;
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ModuleConfigurationImpl.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ModuleConfigurationImpl.java
index ef29a9d..295d32c 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ModuleConfigurationImpl.java
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ModuleConfigurationImpl.java
@@ -72,7 +72,7 @@ public class ModuleConfigurationImpl implements
}
}
- static public ModuleConfigurationImpl get(J2eeModule j2eemodule) {
+ public static ModuleConfigurationImpl get(J2eeModule j2eemodule) {
synchronized (configs) {
return configs.get(j2eemodule);
}
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/ResourcesHelper.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/ResourcesHelper.java
index 7bfd8e9..80d9cdb 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/ResourcesHelper.java
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/ResourcesHelper.java
@@ -88,7 +88,7 @@ public class ResourcesHelper {
});
}
- static private J2eeModuleProvider getProvider(Project project) {
+ private static J2eeModuleProvider getProvider(Project project) {
J2eeModuleProvider provider = null;
if (project != null) {
org.openide.util.Lookup lookup = project.getLookup();
@@ -97,7 +97,7 @@ public class ResourcesHelper {
return provider;
}
- static private void registerSampleResource(GlassfishModule commonSupport) {
+ private static void registerSampleResource(GlassfishModule commonSupport) {
String sample_poolname = "SamplePool"; //NOI18N
String sample_jdbc = "jdbc/sample"; //NOI18N
String sample_classname = "org.apache.derby.jdbc.ClientDataSource"; //NOI18N
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/VendorNameMgr.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/VendorNameMgr.java
index 2b15805..94ad384 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/VendorNameMgr.java
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/db/VendorNameMgr.java
@@ -30,12 +30,12 @@ import java.util.Map.Entry;
*/
public class VendorNameMgr {
- private final static char BLANK = ' ';
- private final static char DOT = '.';
- private final static char [] ILLEGAL_FILENAME_CHARS = {'/', '\\', ':', '*', '?', '"', '<', '>', '|', ',', '=', ';' };
+ private static final char BLANK = ' ';
+ private static final char DOT = '.';
+ private static final char [] ILLEGAL_FILENAME_CHARS = {'/', '\\', ':', '*', '?', '"', '<', '>', '|', ',', '=', ';' };
- private final static String ILLEGAL_CHARS_PATTERN = "[/\\:*\"<>|,=; \\.]"; // NOI18N
- private final static String REPLACEMENT_PATTERN = "_"; // NOI18N
+ private static final String ILLEGAL_CHARS_PATTERN = "[/\\:*\"<>|,=; \\.]"; // NOI18N
+ private static final String REPLACEMENT_PATTERN = "_"; // NOI18N
/**
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2TargetModuleID.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2TargetModuleID.java
index 353b49c..8b9616b 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2TargetModuleID.java
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/Hk2TargetModuleID.java
@@ -40,7 +40,7 @@ public class Hk2TargetModuleID implements TargetModuleID {
private final String location;
private TargetModuleID parent;
private final Vector<TargetModuleID> children;
- final static private Map<String,Hk2TargetModuleID> knownModules =
+ private static final Map<String,Hk2TargetModuleID> knownModules =
new HashMap<String,Hk2TargetModuleID>();
private Hk2TargetModuleID(Hk2Target target, String docBaseURI, String contextPath, String location) {
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/MonitorProgressObject.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/MonitorProgressObject.java
index e9b1cba..73fffa1 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/MonitorProgressObject.java
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/ide/MonitorProgressObject.java
@@ -199,7 +199,7 @@ public class MonitorProgressObject
}
}
- static final private String[] TYPES = {"web", "ejb"};
+ private static final String[] TYPES = {"web", "ejb"};
private TargetModuleID[] createModuleIdTree(Hk2TargetModuleID moduleId)
throws InterruptedException, ExecutionException, TimeoutException {
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestResponseParser.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestResponseParser.java
index eb03226..a959be8 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestResponseParser.java
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestResponseParser.java
@@ -25,7 +25,7 @@ import java.io.InputStream;
* <p>
* @author Tomas Kraus, Peter Benedikovic
*/
-abstract public class RestResponseParser implements ResponseParser {
+public abstract class RestResponseParser implements ResponseParser {
@Override
public abstract RestActionReport parse(InputStream in);
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestXMLResponseParser.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestXMLResponseParser.java
index 1f80a1b..f896fc7 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestXMLResponseParser.java
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/admin/response/RestXMLResponseParser.java
@@ -193,7 +193,7 @@ public class RestXMLResponseParser extends RestResponseParser {
}
- static private class RestXMLResponseFilter implements EventFilter {
+ private static class RestXMLResponseFilter implements EventFilter {
@Override
public boolean accept(XMLEvent event) {
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerStatus.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerStatus.java
index f8a97b5..04096f8 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerStatus.java
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/ServerStatus.java
@@ -464,7 +464,7 @@ public class ServerStatus implements Closeable {
/**
* Common individual server status check task.
*/
- private static abstract class Task implements TaskStateListener {
+ private abstract static class Task implements TaskStateListener {
////////////////////////////////////////////////////////////////////////
// Static methods //
diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/TreeParser.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/TreeParser.java
index a90d44e..433621d 100644
--- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/TreeParser.java
+++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/server/parser/TreeParser.java
@@ -278,7 +278,7 @@ public final class TreeParser extends DefaultHandler {
return super.resolveEntity(string, string1);
}
- public static abstract class NodeListener {
+ public abstract static class NodeListener {
public void readAttributes(String qname, Attributes attributes) throws
SAXException {
diff --git a/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/EjbContainerChildren.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/EjbContainerChildren.java
index ae11541..21149b9 100644
--- a/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/EjbContainerChildren.java
+++ b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/EjbContainerChildren.java
@@ -192,7 +192,7 @@ public class EjbContainerChildren extends Children.Keys<EjbContainerChildren.Key
updateKeys();
}
- final static class Key {
+ static final class Key {
public static final Key SCANNING = new Key(null, null, null, null, false);
private enum EjbType { SESSION, ENTITY, MESSAGE_DRIVEN }
diff --git a/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/ServerResourceNode.java b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/ServerResourceNode.java
index 45f268e..35fbec8 100644
--- a/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/ServerResourceNode.java
+++ b/enterprise/j2ee.api.ejbmodule/src/org/netbeans/modules/j2ee/ejbjar/project/ui/ServerResourceNode.java
@@ -190,7 +190,7 @@ public class ServerResourceNode extends FilterNode {
// return Lookups.singleton(DataFolder.find(projectFolder));
// }
- final private class ProjectDirectoryListener extends FileChangeAdapter {
+ private final class ProjectDirectoryListener extends FileChangeAdapter {
public void fileDeleted(FileEvent fe) {
if (isWatchedFile(getFileName(fe)))
@@ -225,7 +225,7 @@ public class ServerResourceNode extends FilterNode {
}
}
- final private static class VisibilityQueryDataFilter implements ChangeListener, ChangeableDataFilter {
+ private static final class VisibilityQueryDataFilter implements ChangeListener, ChangeableDataFilter {
private EventListenerList ell = new EventListenerList();
diff --git a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java
index 3d1ea54..989b684 100644
--- a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java
+++ b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/AppClientProject.java
@@ -817,8 +817,8 @@ public final class AppClientProject implements Project, FileChangeListener {
this.helper = helper;
}
- transient private final UpdateHelper helper;
- transient private boolean isArchive = false;
+ private final transient UpdateHelper helper;
+ private transient boolean isArchive = false;
// List of primarily supported templates
@@ -884,7 +884,7 @@ public final class AppClientProject implements Project, FileChangeListener {
return retVal;
}
- transient private boolean checked = false;
+ private transient boolean checked = false;
private void checkEnvironment() {
if (!checked) {
diff --git a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/classpath/ClassPathSupportCallbackImpl.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/classpath/ClassPathSupportCallbackImpl.java
index bd19eed..170aa30 100644
--- a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/classpath/ClassPathSupportCallbackImpl.java
+++ b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/classpath/ClassPathSupportCallbackImpl.java
@@ -43,7 +43,7 @@ import org.w3c.dom.NodeList;
*/
public class ClassPathSupportCallbackImpl implements ClassPathSupport.Callback {
- public final static String ELEMENT_INCLUDED_LIBRARIES = "included-library"; // NOI18N
+ public static final String ELEMENT_INCLUDED_LIBRARIES = "included-library"; // NOI18N
public static final String INCLUDE_IN_DEPLOYMENT = "includeInDeployment";
// private static final String ATTR_FILES = "files"; //NOI18N
diff --git a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java
index 89e3d70..789ee90 100644
--- a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java
+++ b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/AppClientProjectProperties.java
@@ -86,7 +86,7 @@ import org.openide.util.*;
/**
* @author Petr Hrebejk
*/
-final public class AppClientProjectProperties {
+public final class AppClientProjectProperties {
//Hotfix of the issue #70058
//Should be removed when the StoreGroup SPI will be extended to allow false default value in ToggleButtonModel
diff --git a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataObject.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataObject.java
index 5689567..fdcea0c 100644
--- a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataObject.java
+++ b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/EarDataObject.java
@@ -81,7 +81,7 @@ public class EarDataObject extends DD2beansDataObject
implements DDChangeListener, ApplicationProxy.OutputProvider, FileChangeListener, ChangeListener {
private Application ejbJar;
private FileObject srcRoots[];
- private final static RequestProcessor RP2 = new RequestProcessor(); // NOI18N
+ private static final RequestProcessor RP2 = new RequestProcessor(); // NOI18N
private static final long serialVersionUID = 8857563089355069362L;
diff --git a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/DD2beansDataObject.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/DD2beansDataObject.java
index 9c060b6..5b8079e 100644
--- a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/DD2beansDataObject.java
+++ b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/common/DD2beansDataObject.java
@@ -45,7 +45,7 @@ public abstract class DD2beansDataObject extends XMLJ2eeDataObject implements or
private static final int DELAY_FOR_TIMER=200;
/** Private request processor for parsing and text generating tasks */
- protected final static RequestProcessor RP = new RequestProcessor("XML Parsing"); //NOI18N
+ protected static final RequestProcessor RP = new RequestProcessor("XML Parsing"); //NOI18N
private final RequestProcessor.Task generationTask;
// constructor settings
private String prefixMark;
diff --git a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataObject.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataObject.java
index 6961718..eff0f1b 100644
--- a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataObject.java
+++ b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/web/DDDataObject.java
@@ -77,7 +77,7 @@ public class DDDataObject extends DDMultiViewDataObject
implements DDChangeListener, ChangeListener, PropertyChangeListener {
private transient WebApp webApp;
private transient FileObject srcRoots[];
- protected transient final static RequestProcessor RP = new RequestProcessor("XML Parsing"); // NOI18N
+ protected static final transient RequestProcessor RP = new RequestProcessor("XML Parsing"); // NOI18N
protected boolean changedFromUI;
private static final long serialVersionUID = 8857563089355069362L;
diff --git a/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java
index ce9c0f7..6d10378 100644
--- a/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java
+++ b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/EarProjectProperties.java
@@ -492,7 +492,7 @@ public final class EarProjectProperties {
}
}
- static private void removeItemFromAppDD(EarProject project, Application dd, ClassPathSupport.Item item) {
+ private static void removeItemFromAppDD(EarProject project, Application dd, ClassPathSupport.Item item) {
String pathInEAR = getCompletePathInArchive(project, item);
Module m = searchForModule(dd, pathInEAR);
if (null != m) {
@@ -821,7 +821,7 @@ public final class EarProjectProperties {
return projects;
}
- static public List getSortedSubprojectsList(EarProject project) {
+ public static List getSortedSubprojectsList(EarProject project) {
List<Project> subprojects = new ArrayList<Project>();
addSubprojects( project, subprojects ); // Find the projects recursively
String[] displayNames = new String[subprojects.size()];
@@ -837,7 +837,7 @@ public final class EarProjectProperties {
/** Gets all subprojects recursively
*/
- static private void addSubprojects( Project project, List<Project> result ) {
+ private static void addSubprojects( Project project, List<Project> result ) {
SubprojectProvider spp = project.getLookup().lookup( SubprojectProvider.class );
if ( spp == null ) {
diff --git a/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/PanelModuleDetection.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/PanelModuleDetection.java
index 8b009f5..54dcd15 100644
--- a/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/PanelModuleDetection.java
+++ b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/wizards/PanelModuleDetection.java
@@ -32,7 +32,7 @@ import org.openide.util.HelpCtx;
*
* @author Martin Krauskopf
*/
-final public class PanelModuleDetection implements WizardDescriptor.Panel, WizardDescriptor.FinishablePanel, ChangeListener {
+public final class PanelModuleDetection implements WizardDescriptor.Panel, WizardDescriptor.FinishablePanel, ChangeListener {
private WizardDescriptor wizardDescriptor;
private PanelModuleDetectionVisual component;
diff --git a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java
index 23b1d6a..fa27462 100644
--- a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java
+++ b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/action/UseDatabaseGenerator.java
@@ -69,7 +69,7 @@ import org.openide.util.NbBundle.Messages;
*/
public final class UseDatabaseGenerator {
- private final static Logger LOGGER = Logger.getLogger(UseDatabaseGenerator.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(UseDatabaseGenerator.class.getName());
public UseDatabaseGenerator() {
}
diff --git a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/AbstractMethodController.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/AbstractMethodController.java
index 1d3d6c5..2a4cfbd 100644
--- a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/AbstractMethodController.java
+++ b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/AbstractMethodController.java
@@ -59,10 +59,10 @@ import org.openide.util.Exceptions;
*/
public abstract class AbstractMethodController extends EjbMethodController {
- private final static int LOCAL = 0;
- private final static int REMOTE = 1;
- private final static int LOCAL_HOME = 2;
- private final static int REMOTE_HOME = 3;
+ private static final int LOCAL = 0;
+ private static final int REMOTE = 1;
+ private static final int LOCAL_HOME = 2;
+ private static final int REMOTE_HOME = 3;
private final String ejbClass;
private final MetadataModel<EjbJarMetadata> model;
diff --git a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityMethodController.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityMethodController.java
index f902e9f..b134722 100644
--- a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityMethodController.java
+++ b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/methodcontroller/EntityMethodController.java
@@ -52,10 +52,10 @@ import org.openide.util.Exceptions;
*/
public final class EntityMethodController extends AbstractMethodController {
- private final static int IDX_ABSTRACT_SCHEMA_NAME = 0;
- private final static int IDX_PERSISTENCE_TYPE = 1;
- private final static int IDX_LOCAL_HOME = 2;
- private final static int IDX_HOME = 3;
+ private static final int IDX_ABSTRACT_SCHEMA_NAME = 0;
+ private static final int IDX_PERSISTENCE_TYPE = 1;
+ private static final int IDX_LOCAL_HOME = 2;
+ private static final int IDX_HOME = 3;
private final MetadataModel<EjbJarMetadata> metadataModel;
private final String ejbClass;
diff --git a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/MultiTargetChooserPanel.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/MultiTargetChooserPanel.java
index 531a4b1..e2942a0 100644
--- a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/MultiTargetChooserPanel.java
+++ b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ejb/wizard/MultiTargetChooserPanel.java
@@ -361,7 +361,7 @@ public final class MultiTargetChooserPanel implements WizardDescriptor.Panel, Ch
* @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/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddMethodActions.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddMethodActions.java
index 8574ca1..211d0e2 100644
--- a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddMethodActions.java
+++ b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/AddMethodActions.java
@@ -47,7 +47,7 @@ import org.openide.util.RequestProcessor;
*/
public class AddMethodActions implements CodeGenerator {
- public static abstract class AbstractFactory implements CodeGenerator.Factory {
+ public abstract static class AbstractFactory implements CodeGenerator.Factory {
private AbstractAddMethodStrategy strategy;
diff --git a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/GoToSourceActionGroup.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/GoToSourceActionGroup.java
index 1a2ce7c..7916fad 100644
--- a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/GoToSourceActionGroup.java
+++ b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/action/GoToSourceActionGroup.java
@@ -47,11 +47,11 @@ import org.openide.util.NbBundle;
*/
public class GoToSourceActionGroup extends EJBActionGroup {
- private final static int EJB_CLASS = 0;
- private final static int REMOTE = 1;
- private final static int LOCAL = 2;
- private final static int HOME = 3;
- private final static int LOCAL_HOME = 4;
+ private static final int EJB_CLASS = 0;
+ private static final int REMOTE = 1;
+ private static final int LOCAL = 2;
+ private static final int HOME = 3;
+ private static final int LOCAL_HOME = 4;
public String getName() {
return NbBundle.getMessage(GoToSourceActionGroup.class, "LBL_GoToSourceGroup");
diff --git a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityChildren.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityChildren.java
index bf76cda..6084697 100644
--- a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityChildren.java
+++ b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/entity/EntityChildren.java
@@ -50,9 +50,9 @@ import org.openide.util.RequestProcessor;
public final class EntityChildren extends Children.Keys<EntityChildren.KEY> implements PropertyChangeListener {
// indexes into fields with results for model query
- private final static int REMOTE = 0;
- private final static int LOCAL = 1;
- private final static int CMP = 2;
+ private static final int REMOTE = 0;
+ private static final int LOCAL = 1;
+ private static final int CMP = 2;
protected enum KEY { REMOTE, LOCAL, CMP_FIELDS }
@@ -62,7 +62,7 @@ public final class EntityChildren extends Children.Keys<EntityChildren.KEY> impl
private final EntityMethodController controller;
private final Entity model; // EJB 2.1
- private final static RequestProcessor RP = new RequestProcessor(SessionChildren.class.getName(), 5);
+ private static final RequestProcessor RP = new RequestProcessor(SessionChildren.class.getName(), 5);
public EntityChildren(EjbViewController ejbViewController) throws IOException {
this.cpInfo = ejbViewController.getClasspathInfo();
diff --git a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionChildren.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionChildren.java
index 872689a..863e159 100644
--- a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionChildren.java
+++ b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/ui/logicalview/ejb/session/SessionChildren.java
@@ -50,9 +50,9 @@ import org.openide.util.WeakListeners;
public final class SessionChildren extends Children.Keys<SessionChildren.Key> implements PropertyChangeListener {
// indexes into fields with results for model query
- private final static int REMOTE = 0;
- private final static int LOCAL = 1;
- private final static int BEAN = 2;
+ private static final int REMOTE = 0;
+ private static final int LOCAL = 1;
+ private static final int BEAN = 2;
public enum Key {REMOTE, LOCAL, BEAN};
@@ -60,7 +60,7 @@ public final class SessionChildren extends Children.Keys<SessionChildren.Key> im
private final String ejbClass;
private final EjbJar ejbModule;
private final SessionMethodController controller;
- private final static RequestProcessor RP = new RequestProcessor(SessionChildren.class.getName(), 5);
+ private static final RequestProcessor RP = new RequestProcessor(SessionChildren.class.getName(), 5);
public SessionChildren(EjbViewController ejbViewController) {
this.cpInfo = ejbViewController.getClasspathInfo();
diff --git a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProject.java b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProject.java
index 41861e8..637f86b 100644
--- a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProject.java
+++ b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/EjbJarProject.java
@@ -1523,11 +1523,11 @@ public class EjbJarProject implements Project, FileChangeListener {
};
private final class RecommendedTemplatesImpl implements RecommendedTemplates, PrivilegedTemplates {
- transient private boolean isEE5 = false;
- transient private boolean isEE6Plus = false;//if project support ee6 full version or above
- transient private boolean checked = false;
- transient private boolean isArchive = false;
- transient private UpdateHelper helper = null;
+ private transient boolean isEE5 = false;
+ private transient boolean isEE6Plus = false;//if project support ee6 full version or above
+ private transient boolean checked = false;
+ private transient boolean isArchive = false;
+ private transient UpdateHelper helper = null;
RecommendedTemplatesImpl(UpdateHelper helper) {
this.helper = helper;
diff --git a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/classpath/ClassPathSupportCallbackImpl.java b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/classpath/ClassPathSupportCallbackImpl.java
index 54cf734..b3b13dd 100644
--- a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/classpath/ClassPathSupportCallbackImpl.java
+++ b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/classpath/ClassPathSupportCallbackImpl.java
@@ -44,7 +44,7 @@ import org.openide.xml.XMLUtil;
*/
public class ClassPathSupportCallbackImpl implements ClassPathSupport.Callback {
- public final static String ELEMENT_INCLUDED_LIBRARIES = "included-library"; // NOI18N
+ public static final String ELEMENT_INCLUDED_LIBRARIES = "included-library"; // NOI18N
private static String[] ejbjarElemOrder = new String[] { "name", "minimum-ant-version", "explicit-platform", "use-manifest", "included-library", "web-services", "source-roots", "test-roots" }; //NOI18N
diff --git a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java
index c793432..35415e0 100644
--- a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java
+++ b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/EjbJarProjectProperties.java
@@ -97,7 +97,7 @@ import org.openide.util.Parameters;
* @author Chris Webster
* @author Andrei Badea
*/
-final public class EjbJarProjectProperties {
+public final class EjbJarProjectProperties {
// Special properties of the project
public static final String EJB_PROJECT_NAME = "j2ee.ejbjarproject.name"; // NOI18N
diff --git a/enterprise/j2ee.ejbverification/test/unit/src/org/netbeans/modules/j2ee/ejbverification/TestBase.java b/enterprise/j2ee.ejbverification/test/unit/src/org/netbeans/modules/j2ee/ejbverification/TestBase.java
index 672a515..955a145 100644
--- a/enterprise/j2ee.ejbverification/test/unit/src/org/netbeans/modules/j2ee/ejbverification/TestBase.java
+++ b/enterprise/j2ee.ejbverification/test/unit/src/org/netbeans/modules/j2ee/ejbverification/TestBase.java
@@ -347,7 +347,7 @@ public class TestBase extends NbTestCase {
}
}
- protected static abstract class TestModule {
+ protected abstract static class TestModule {
protected final FileObject projectDir;
protected final FileObject[] sources;
diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/api/Asenv.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/api/Asenv.java
index b2e20bb..9c9aca1 100644
--- a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/api/Asenv.java
+++ b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/api/Asenv.java
@@ -36,7 +36,7 @@ import org.openide.util.Utilities;
*/
public class Asenv {
- transient private final java.util.Properties props = new java.util.Properties();
+ private final transient java.util.Properties props = new java.util.Properties();
/**
* key for path to jdk stored in asenv file
diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/api/ServerLocationManager.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/api/ServerLocationManager.java
index ad832f3..c76606d 100644
--- a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/api/ServerLocationManager.java
+++ b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/api/ServerLocationManager.java
@@ -141,7 +141,7 @@ public class ServerLocationManager {
* may return null if no platform is available...
**/
- static public File getLatestPlatformLocation(){
+ public static File getLatestPlatformLocation(){
Iterator i = serverLocationAndClassLoaderMap.entrySet().iterator();
File ret =null;
while (i.hasNext()){
@@ -180,7 +180,7 @@ public class ServerLocationManager {
return data.serverOnlyClassLoader;
}
- public synchronized static DeploymentFactory getDeploymentFactory(File platformLocation) {
+ public static synchronized DeploymentFactory getDeploymentFactory(File platformLocation) {
CacheData data =(CacheData) serverLocationAndClassLoaderMap.get(platformLocation.getAbsolutePath());
if (data==null){// try to initialize it
getNetBeansAndServerClassLoader(platformLocation);
@@ -193,7 +193,7 @@ public class ServerLocationManager {
}
- public synchronized static ClassLoader getNetBeansAndServerClassLoader(File platformLocation) {
+ public static synchronized ClassLoader getNetBeansAndServerClassLoader(File platformLocation) {
CacheData data =(CacheData) serverLocationAndClassLoaderMap.get(platformLocation.getAbsolutePath());
if (data==null){
if (!isGoodAppServerLocation(platformLocation)){
diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/api/restricted/ResourceConfigurator.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/api/restricted/ResourceConfigurator.java
index feacd66..a92ca07 100644
--- a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/api/restricted/ResourceConfigurator.java
+++ b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/api/restricted/ResourceConfigurator.java
@@ -80,12 +80,12 @@ public class ResourceConfigurator implements ResourceConfiguratorInterface {
public static final String __SunResourceExt = "sun-resource"; // NOI18N
- private final static char BLANK = ' ';
- private final static char DOT = '.';
- private final static char[] ILLEGAL_FILENAME_CHARS = {'/', '\\', ':', '*', '?', '"', '<', '>', '|', ',', '=', ';' };
+ private static final char BLANK = ' ';
+ private static final char DOT = '.';
+ private static final char[] ILLEGAL_FILENAME_CHARS = {'/', '\\', ':', '*', '?', '"', '<', '>', '|', ',', '=', ';' };
// private final static char[] ILLEGAL_RESOURCE_NAME_CHARS = {':', '*', '?', '"', '<', '>', '|', ',' };
- private final static char REPLACEMENT_CHAR = '_';
- private final static char DASH = '-';
+ private static final char REPLACEMENT_CHAR = '_';
+ private static final char DASH = '-';
private static final String DATAFILE = "org/netbeans/modules/j2ee/sun/sunresources/beans/CPWizard.xml"; // NOI18N
diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/api/restricted/ResourceUtils.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/api/restricted/ResourceUtils.java
index c7dff6e..b4faba2 100644
--- a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/api/restricted/ResourceUtils.java
+++ b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/api/restricted/ResourceUtils.java
@@ -2100,9 +2100,9 @@ public class ResourceUtils implements WizardConstants{
}
}
- private final static char BLANK = ' ';
- private final static char DOT = '.';
- private final static char REPLACEMENT_CHAR = '_';
- private final static char[] ILLEGAL_FILENAME_CHARS = {'/', '\\', ':', '*', '?', '"', '<', '>', '|', ',' };
- private final static char[] ILLEGAL_RESOURCE_NAME_CHARS = {':', '*', '?', '"', '<', '>', '|', ',' };
+ private static final char BLANK = ' ';
+ private static final char DOT = '.';
+ private static final char REPLACEMENT_CHAR = '_';
+ private static final char[] ILLEGAL_FILENAME_CHARS = {'/', '\\', ':', '*', '?', '"', '<', '>', '|', ',' };
+ private static final char[] ILLEGAL_RESOURCE_NAME_CHARS = {':', '*', '?', '"', '<', '>', '|', ',' };
}
diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/editors/ChoiceEditor.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/editors/ChoiceEditor.java
index 883d770..0074a30 100644
--- a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/editors/ChoiceEditor.java
+++ b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/editors/ChoiceEditor.java
@@ -25,7 +25,7 @@ import java.beans.PropertyEditorSupport;
import org.openide.util.NbBundle;
import org.openide.explorer.propertysheet.editors.EnhancedPropertyEditor;
-abstract public class ChoiceEditor extends PropertyEditorSupport implements EnhancedPropertyEditor {
+public abstract class ChoiceEditor extends PropertyEditorSupport implements EnhancedPropertyEditor {
public String curr_Sel;
@@ -73,7 +73,7 @@ abstract public class ChoiceEditor extends PropertyEditorSupport implements Enha
}
@Override
- abstract public String[] getTags();
+ public abstract String[] getTags();
public Component getInPlaceCustomEditor() {
return null;
diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/editors/EditorUtils.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/editors/EditorUtils.java
index ea06aeb..9596346 100644
--- a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/editors/EditorUtils.java
+++ b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/editors/EditorUtils.java
@@ -34,7 +34,7 @@ public class EditorUtils {
public EditorUtils() {
}
- static public boolean isValidInt0(String str){
+ public static boolean isValidInt0(String str){
int val;
//represents 0 - MAX_INT range
try
@@ -52,7 +52,7 @@ public class EditorUtils {
return true;
}
- static public boolean isValidLong(String str){
+ public static boolean isValidLong(String str){
//represents -ve , 0 +ve range represented by Long
try
{
diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/editors/NameValuePairsPropertyEditor.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/editors/NameValuePairsPropertyEditor.java
index 26a0082..765ab5f 100644
--- a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/editors/NameValuePairsPropertyEditor.java
+++ b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/editors/NameValuePairsPropertyEditor.java
@@ -72,7 +72,7 @@ public class NameValuePairsPropertyEditor extends java.beans.PropertyEditorSuppo
//// protected DDTablePanel panel = null;
- static protected String[] requiredToolTips = {
+ protected static String[] requiredToolTips = {
bundle.getString("tipParamName"), //NOI18N
bundle.getString("tipParamValue")}; //NOI18N
//bundle.getString("tipParamDescription")}; //NOI18N
diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/BaseResourceNode.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/BaseResourceNode.java
index bdb54bd..1069f7e 100644
--- a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/BaseResourceNode.java
+++ b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/BaseResourceNode.java
@@ -53,8 +53,8 @@ public abstract class BaseResourceNode extends DataNode implements java.beans.Pr
return (SunResourceDataObject)getDataObject();
}
- abstract public Resources getBeanGraph();
+ public abstract Resources getBeanGraph();
- abstract public void propertyChange(java.beans.PropertyChangeEvent evt);
+ public abstract void propertyChange(java.beans.PropertyChangeEvent evt);
}
diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/ConnPoolBeanBeanInfo.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/ConnPoolBeanBeanInfo.java
index de65766..5492840 100644
--- a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/ConnPoolBeanBeanInfo.java
+++ b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/ConnPoolBeanBeanInfo.java
@@ -30,7 +30,7 @@ import org.openide.util.Exceptions;
public class ConnPoolBeanBeanInfo extends SimpleBeanInfo {
- static private String getLabel(String key){
+ private static String getLabel(String key){
return NbBundle.getMessage(ConnPoolBean.class, key);
}
diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/DataSourceBeanBeanInfo.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/DataSourceBeanBeanInfo.java
index 163939c..07e10ad 100644
--- a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/DataSourceBeanBeanInfo.java
+++ b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/DataSourceBeanBeanInfo.java
@@ -25,7 +25,7 @@ import org.openide.util.Exceptions;
public class DataSourceBeanBeanInfo extends SimpleBeanInfo {
- static private String getLabel(String key){
+ private static String getLabel(String key){
return NbBundle.getMessage(DataSourceBean.class,key);
}
diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/JMSBeanBeanInfo.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/JMSBeanBeanInfo.java
index b735064..e17cf90 100644
--- a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/JMSBeanBeanInfo.java
+++ b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/JMSBeanBeanInfo.java
@@ -26,7 +26,7 @@ import org.netbeans.modules.j2ee.sun.ide.editors.BooleanEditor;
public class JMSBeanBeanInfo extends SimpleBeanInfo {
- static private String getLabel(String key){
+ private static String getLabel(String key){
return NbBundle.getMessage(JMSBean.class,key);
}
diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/JavaMailSessionBeanBeanInfo.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/JavaMailSessionBeanBeanInfo.java
index 9cba544..c7cbd0e 100644
--- a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/JavaMailSessionBeanBeanInfo.java
+++ b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/JavaMailSessionBeanBeanInfo.java
@@ -25,7 +25,7 @@ import org.openide.util.Exceptions;
public class JavaMailSessionBeanBeanInfo extends SimpleBeanInfo {
- static private String getLabel(String key){
+ private static String getLabel(String key){
return NbBundle.getMessage(JavaMailSessionBean.class,key);
}
diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/PersistenceManagerBeanBeanInfo.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/PersistenceManagerBeanBeanInfo.java
index ef2310d..a5fb85f 100644
--- a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/PersistenceManagerBeanBeanInfo.java
+++ b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/beans/PersistenceManagerBeanBeanInfo.java
@@ -25,7 +25,7 @@ import org.netbeans.modules.j2ee.sun.ide.editors.BooleanEditor;
public class PersistenceManagerBeanBeanInfo extends SimpleBeanInfo {
- static private String getLabel(String key){
+ private static String getLabel(String key){
return NbBundle.getMessage(PersistenceManagerBean.class,key);
}
diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/resourcesloader/SunResourceDataObject.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/resourcesloader/SunResourceDataObject.java
index f38ddec..d24c30c 100644
--- a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/resourcesloader/SunResourceDataObject.java
+++ b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/resourcesloader/SunResourceDataObject.java
@@ -80,8 +80,8 @@ public class SunResourceDataObject extends XMLDataObject implements FileChangeLi
private static String MAIL = "mail-resource"; //NOI18N
private static String JMS = "jms-resource"; //NOI18N
- transient private ValidateXMLCookie validateCookie = null;
- transient private CheckXMLCookie checkCookie = null;
+ private transient ValidateXMLCookie validateCookie = null;
+ private transient CheckXMLCookie checkCookie = null;
ConnPoolBean cpBean = null;
DataSourceBean dsBean = null;
diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/PMFWizard.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/PMFWizard.java
index 716dca3..0e0feb4 100644
--- a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/PMFWizard.java
+++ b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/PMFWizard.java
@@ -113,7 +113,7 @@ public final class PMFWizard implements WizardDescriptor.InstantiatingIterator,
return tempPanels;
}
- static private String CONST_ADD_PROPERTY = "LBL_AddProperty"; // NOI18N
+ private static String CONST_ADD_PROPERTY = "LBL_AddProperty"; // NOI18N
private String[] createSteps() {
String[] tempSteps = null;
diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/PropertiesTable.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/PropertiesTable.java
index 4b5630e..9b5fe41 100644
--- a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/PropertiesTable.java
+++ b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/ide/sunresources/wizards/PropertiesTable.java
@@ -33,7 +33,7 @@ import javax.swing.table.TableCellRenderer;
class PropertiesTable extends JTable {
- private final static int margin = 6;
+ private static final int margin = 6;
private boolean fontChanged = true;
private int newHeight = 23;
diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/share/serverresources/BaseResource.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/share/serverresources/BaseResource.java
index ee2ae1d..e6c0c05 100644
--- a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/share/serverresources/BaseResource.java
+++ b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/share/serverresources/BaseResource.java
@@ -44,7 +44,7 @@ public class BaseResource extends Object implements java.io.Serializable {
protected String description;
protected NameValuePair[] extraParams;
- transient protected PropertyChangeSupport propertySupport;
+ protected transient PropertyChangeSupport propertySupport;
/** Creates a new instance of BaseResource */
public BaseResource() {
diff --git a/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/api/DDProvider.java b/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/api/DDProvider.java
index 8117fd4..df652b1 100644
--- a/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/api/DDProvider.java
+++ b/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/api/DDProvider.java
@@ -188,7 +188,7 @@ public final class DDProvider {
}
}
- final private Map<Object, RootInterface> ddMap = new WeakHashMap<Object, RootInterface>();
+ private final Map<Object, RootInterface> ddMap = new WeakHashMap<Object, RootInterface>();
private Map<FileObject, DDProviderDataObject> dObjMap = new WeakHashMap<FileObject, DDProviderDataObject>();
/** This method retrieves the root of the XML DOM for a sun-*
@@ -338,12 +338,12 @@ public final class DDProvider {
}
}
- final private static Map<Class, Map<String, VersionInfo>> apiToVersionMap = new HashMap<Class, Map<String, VersionInfo>>(11);
- final private static Map<String, VersionInfo> sunWebAppVersionMap = new HashMap<String, VersionInfo>(11);
- final private static Map<String, VersionInfo> sunEjbJarVersionMap = new HashMap<String, VersionInfo>(11);
- final private static Map<String, VersionInfo> sunApplicationVersionMap = new HashMap<String, VersionInfo>(11);
- final private static Map<String, VersionInfo> sunAppClientVersionMap = new HashMap<String, VersionInfo>(11);
- final private static Map<String, VersionInfo> sunResourcesVersionMap = new HashMap<String, VersionInfo>(11);
+ private static final Map<Class, Map<String, VersionInfo>> apiToVersionMap = new HashMap<Class, Map<String, VersionInfo>>(11);
+ private static final Map<String, VersionInfo> sunWebAppVersionMap = new HashMap<String, VersionInfo>(11);
+ private static final Map<String, VersionInfo> sunEjbJarVersionMap = new HashMap<String, VersionInfo>(11);
+ private static final Map<String, VersionInfo> sunApplicationVersionMap = new HashMap<String, VersionInfo>(11);
+ private static final Map<String, VersionInfo> sunAppClientVersionMap = new HashMap<String, VersionInfo>(11);
+ private static final Map<String, VersionInfo> sunResourcesVersionMap = new HashMap<String, VersionInfo>(11);
static {
sunWebAppVersionMap.put(SunWebApp.VERSION_2_3_0, new VersionInfo(
@@ -1009,7 +1009,7 @@ public final class DDProvider {
/* Maps DOCTYPE to { version, proxy class, impl class, dtd path } info.
*/
- final private static Map<String, DocTypeInfo> publicIdToInfoMap = new HashMap<String, DocTypeInfo>(37);
+ private static final Map<String, DocTypeInfo> publicIdToInfoMap = new HashMap<String, DocTypeInfo>(37);
static {
publicIdToInfoMap.put(DTDRegistry.SUN_EJBJAR_211_DTD_PUBLIC_ID, new DocTypeInfo(
diff --git a/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/ddloaders/multiview/BaseSectionNodeInnerPanel.java b/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/ddloaders/multiview/BaseSectionNodeInnerPanel.java
index fa7b052..cd1beca 100644
--- a/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/ddloaders/multiview/BaseSectionNodeInnerPanel.java
+++ b/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/ddloaders/multiview/BaseSectionNodeInnerPanel.java
@@ -104,7 +104,7 @@ public class BaseSectionNodeInnerPanel extends SectionNodeInnerPanel {
* needs to be scaled upwards (IZ 115372). There is probably a better way
* to do this, but this works for now.
*/
- private volatile static int scaledMaxWidth = 0;
+ private static volatile int scaledMaxWidth = 0;
protected int getScaledMaxWidth() {
int smw = scaledMaxWidth;
diff --git a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerRegistry.java b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerRegistry.java
index a2d701f..ba49a5b 100644
--- a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerRegistry.java
+++ b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerRegistry.java
@@ -67,7 +67,7 @@ public final class ServerRegistry implements java.io.Serializable {
public static final String SERVER_NAME = "serverName"; //NOI18N
private static ServerRegistry instance = null;
- public synchronized static ServerRegistry getInstance() {
+ public static synchronized ServerRegistry getInstance() {
if(instance == null) instance = new ServerRegistry();
return instance;
@@ -78,7 +78,7 @@ public final class ServerRegistry implements java.io.Serializable {
/** Utility method that returns true if the ServerRegistry was initialized
* during the current IDE session and false otherwise.
*/
- public synchronized static boolean wasInitialized () {
+ public static synchronized boolean wasInitialized () {
return instance != null && instance.servers != null && instance.instances != null;
}
private transient Map<String, Server> servers = null;
diff --git a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/TargetServer.java b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/TargetServer.java
index f967324..98b7902 100644
--- a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/TargetServer.java
+++ b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/TargetServer.java
@@ -988,7 +988,7 @@ public class TargetServer {
}
}
- public static abstract class DeploymentContextAccessor {
+ public abstract static class DeploymentContextAccessor {
private static volatile DeploymentContextAccessor accessor;
diff --git a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ui/wizard/AddServerInstanceWizard.java b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ui/wizard/AddServerInstanceWizard.java
index 4189f27..b2df1b5 100644
--- a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ui/wizard/AddServerInstanceWizard.java
+++ b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ui/wizard/AddServerInstanceWizard.java
@@ -43,15 +43,15 @@ import org.openide.util.NbBundle;
* @author Andrei Badea
*/
public class AddServerInstanceWizard extends WizardDescriptor {
- public final static String PROP_DISPLAY_NAME = "ServInstWizard_displayName"; // NOI18N
- public final static String PROP_SERVER = "ServInstWizard_server"; // NOI18N
+ public static final String PROP_DISPLAY_NAME = "ServInstWizard_displayName"; // NOI18N
+ public static final String PROP_SERVER = "ServInstWizard_server"; // NOI18N
- private final static String PROP_AUTO_WIZARD_STYLE = WizardDescriptor.PROP_AUTO_WIZARD_STYLE; // NOI18N
- private final static String PROP_CONTENT_DISPLAYED = WizardDescriptor.PROP_CONTENT_DISPLAYED; // NOI18N
- private final static String PROP_CONTENT_NUMBERED = WizardDescriptor.PROP_CONTENT_NUMBERED; // NOI18N
- private final static String PROP_CONTENT_DATA = WizardDescriptor.PROP_CONTENT_DATA; // NOI18N
- private final static String PROP_CONTENT_SELECTED_INDEX = WizardDescriptor.PROP_CONTENT_SELECTED_INDEX; // NOI18N
- private final static String PROP_ERROR_MESSAGE = WizardDescriptor.PROP_ERROR_MESSAGE; // NOI18N
+ private static final String PROP_AUTO_WIZARD_STYLE = WizardDescriptor.PROP_AUTO_WIZARD_STYLE; // NOI18N
+ private static final String PROP_CONTENT_DISPLAYED = WizardDescriptor.PROP_CONTENT_DISPLAYED; // NOI18N
+ private static final String PROP_CONTENT_NUMBERED = WizardDescriptor.PROP_CONTENT_NUMBERED; // NOI18N
+ private static final String PROP_CONTENT_DATA = WizardDescriptor.PROP_CONTENT_DATA; // NOI18N
+ private static final String PROP_CONTENT_SELECTED_INDEX = WizardDescriptor.PROP_CONTENT_SELECTED_INDEX; // NOI18N
+ private static final String PROP_ERROR_MESSAGE = WizardDescriptor.PROP_ERROR_MESSAGE; // NOI18N
private AddServerInstanceWizardIterator iterator;
private ServerChooserPanel chooser;
diff --git a/enterprise/j2eeserver/test/unit/src/org/netbeans/modules/j2ee/deployment/execution/ServerExecutorTest.java b/enterprise/j2eeserver/test/unit/src/org/netbeans/modules/j2ee/deployment/execution/ServerExecutorTest.java
index b395ac9..045393c 100644
--- a/enterprise/j2eeserver/test/unit/src/org/netbeans/modules/j2ee/deployment/execution/ServerExecutorTest.java
+++ b/enterprise/j2eeserver/test/unit/src/org/netbeans/modules/j2ee/deployment/execution/ServerExecutorTest.java
@@ -44,7 +44,7 @@ public class ServerExecutorTest extends NbTestCase {
public void testNothing() {
}
- static private LocalFileSystem wfs;
+ private static LocalFileSystem wfs;
static FileSystem getWorkFileSystem() {
if (wfs != null)
return wfs;
diff --git a/enterprise/javaee.beanvalidation/src/org/netbeans/modules/javaee/beanvalidation/ConstraintPanelVisual.java b/enterprise/javaee.beanvalidation/src/org/netbeans/modules/javaee/beanvalidation/ConstraintPanelVisual.java
index 1dcc722..39e571a 100644
--- a/enterprise/javaee.beanvalidation/src/org/netbeans/modules/javaee/beanvalidation/ConstraintPanelVisual.java
+++ b/enterprise/javaee.beanvalidation/src/org/netbeans/modules/javaee/beanvalidation/ConstraintPanelVisual.java
@@ -43,10 +43,10 @@ import org.openide.util.NbBundle;
public class ConstraintPanelVisual extends javax.swing.JPanel implements DocumentListener{
private TemplateWizard wizard;
- private final static String VALIDATOR = "Validator"; //NOI18N
- private final static String METHOD = "METHOD"; //NOI18N
- private final static String FIELD = "FIELD"; //NOI18N
- private final static String ANNOTATION_TYPE = "ANNOTATION_TYPE"; //NOI18N
+ private static final String VALIDATOR = "Validator"; //NOI18N
+ private static final String METHOD = "METHOD"; //NOI18N
+ private static final String FIELD = "FIELD"; //NOI18N
+ private static final String ANNOTATION_TYPE = "ANNOTATION_TYPE"; //NOI18N
private final List<String> targetElements = new ArrayList<String>();
/** Creates new form ConstraintPanelVisual */
diff --git a/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/logicalview/AbstractLogicalViewProvider.java b/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/logicalview/AbstractLogicalViewProvider.java
index a82800a..7877dea 100644
--- a/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/logicalview/AbstractLogicalViewProvider.java
+++ b/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/logicalview/AbstractLogicalViewProvider.java
@@ -414,7 +414,7 @@ public abstract class AbstractLogicalViewProvider implements LogicalViewProvider
return ProjectProblems.isBroken(project);
}
- abstract public String[] getBreakableProperties();
+ public abstract String[] getBreakableProperties();
public String[] getPlatformProperties() {
return new String[] {JAVA_PLATFORM};
@@ -479,7 +479,7 @@ public abstract class AbstractLogicalViewProvider implements LogicalViewProvider
return deployOnSaveSupported;
}
- abstract protected void setServerInstance(final Project project, final UpdateHelper helper, final String serverInstanceID);
+ protected abstract void setServerInstance(final Project project, final UpdateHelper helper, final String serverInstanceID);
/** Filter node containin additional features for the J2SE physical
diff --git a/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/J2eeVersionWarningPanel.java b/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/J2eeVersionWarningPanel.java
index cc83f99..08a2997 100644
--- a/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/J2eeVersionWarningPanel.java
+++ b/enterprise/javaee.project/src/org/netbeans/modules/javaee/project/api/ant/ui/wizard/J2eeVersionWarningPanel.java
@@ -37,19 +37,19 @@ import org.openide.util.NbBundle;
*/
final class J2eeVersionWarningPanel extends javax.swing.JPanel {
- public final static String WARN_SET_JDK_15 = "warnSetJdk15"; // NOI18N
- public final static String WARN_SET_JDK_6 = "warnSetJdk6"; // NOI18N
- public final static String WARN_SET_JDK_7 = "warnSetJdk7"; // NOI18N
- public final static String WARN_SET_JDK_8 = "warnSetJdk8"; // NOI18N
+ public static final String WARN_SET_JDK_15 = "warnSetJdk15"; // NOI18N
+ public static final String WARN_SET_JDK_6 = "warnSetJdk6"; // NOI18N
+ public static final String WARN_SET_JDK_7 = "warnSetJdk7"; // NOI18N
+ public static final String WARN_SET_JDK_8 = "warnSetJdk8"; // NOI18N
- public final static String WARN_SET_SOURCE_LEVEL_15 = "warnSetSourceLevel15"; // NOI18N
- public final static String WARN_SET_SOURCE_LEVEL_6 = "warnSetSourceLevel6"; // NOI18N
- public final static String WARN_SET_SOURCE_LEVEL_7 = "warnSetSourceLevel7"; // NOI18N
- public final static String WARN_SET_SOURCE_LEVEL_8 = "warnSetSourceLevel8";
+ public static final String WARN_SET_SOURCE_LEVEL_15 = "warnSetSourceLevel15"; // NOI18N
+ public static final String WARN_SET_SOURCE_LEVEL_6 = "warnSetSourceLevel6"; // NOI18N
+ public static final String WARN_SET_SOURCE_LEVEL_7 = "warnSetSourceLevel7"; // NOI18N
+ public static final String WARN_SET_SOURCE_LEVEL_8 = "warnSetSourceLevel8";
- public final static String WARN_JDK_6_REQUIRED = "warnJdk6Required"; // NOI18N
- public final static String WARN_JDK_7_REQUIRED = "warnJdk7Required"; // NOI18N
- public final static String WARN_JDK_8_REQUIRED = "warnJdk8Required"; // NOI18N
+ public static final String WARN_JDK_6_REQUIRED = "warnJdk6Required"; // NOI18N
+ public static final String WARN_JDK_7_REQUIRED = "warnJdk7Required"; // NOI18N
+ public static final String WARN_JDK_8_REQUIRED = "warnJdk8Required"; // NOI18N
private String warningType;
diff --git a/enterprise/javaee.specs.support/src/org/netbeans/modules/javaee/specs/support/spi/JpaProviderFactory.java b/enterprise/javaee.specs.support/src/org/netbeans/modules/javaee/specs/support/spi/JpaProviderFactory.java
index 5a2781d..1e6d1dc 100644
--- a/enterprise/javaee.specs.support/src/org/netbeans/modules/javaee/specs/support/spi/JpaProviderFactory.java
+++ b/enterprise/javaee.specs.support/src/org/netbeans/modules/javaee/specs/support/spi/JpaProviderFactory.java
@@ -62,7 +62,7 @@ public final class JpaProviderFactory {
});
}
- public static abstract class Accessor {
+ public abstract static class Accessor {
private static volatile Accessor accessor;
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.java
index a747063..e82c0d5 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.java
@@ -41,8 +41,8 @@ public final class WildflyTabVisualPanel extends JPanel {
* use this handle to do so.
*/
- transient private final WildFlyProperties targetData;
- transient private final WildflyDeploymentManager dm;
+ private final transient WildFlyProperties targetData;
+ private final transient WildflyDeploymentManager dm;
/**
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyOutputSupport.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyOutputSupport.java
index f181295..f2bd369 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyOutputSupport.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyOutputSupport.java
@@ -113,7 +113,7 @@ public final class WildflyOutputSupport {
this.props = props;
}
- public synchronized static WildflyOutputSupport getInstance(InstanceProperties props, boolean create) {
+ public static synchronized WildflyOutputSupport getInstance(InstanceProperties props, boolean create) {
WildflyOutputSupport instance = INSTANCE_CACHE.get(props);
if (instance == null && create) {
instance = new WildflyOutputSupport(props);
diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartRunnable.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartRunnable.java
index e813b9d..27f3bb5 100644
--- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartRunnable.java
+++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/ide/WildflyStartRunnable.java
@@ -67,24 +67,24 @@ class WildflyStartRunnable implements Runnable {
private static final int START_TIMEOUT = 300000;
- private final static String CONF_FILE_NAME = "standalone.conf.bat"; // NOI18N
+ private static final String CONF_FILE_NAME = "standalone.conf.bat"; // NOI18N
- private final static String RUN_FILE_NAME = "run.bat"; // NOI18N
+ private static final String RUN_FILE_NAME = "run.bat"; // NOI18N
- private final static String JBOSS_HOME = "JBOSS_HOME";// NOI18N
- private final static String STANDALONE_SH = separatorChar + "bin" + separatorChar + "standalone.sh";// NOI18N
- private final static String STANDALONE_BAT = separatorChar + "bin" + separatorChar + "standalone.bat";// NOI18N
+ private static final String JBOSS_HOME = "JBOSS_HOME";// NOI18N
+ private static final String STANDALONE_SH = separatorChar + "bin" + separatorChar + "standalone.sh";// NOI18N
+ private static final String STANDALONE_BAT = separatorChar + "bin" + separatorChar + "standalone.bat";// NOI18N
- private final static String CONF_BAT = separatorChar + "bin" + separatorChar + CONF_FILE_NAME;// NOI18N
+ private static final String CONF_BAT = separatorChar + "bin" + separatorChar + 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 JDK_18 = new SpecificationVersion("1.8");
diff --git a/enterprise/maven.j2ee/src/org/netbeans/modules/maven/j2ee/ProjectHookImpl.java b/enterprise/maven.j2ee/src/org/netbeans/modules/maven/j2ee/ProjectHookImpl.java
index 7c413d4..838fedb 100644
--- a/enterprise/maven.j2ee/src/org/netbeans/modules/maven/j2ee/ProjectHookImpl.java
+++ b/enterprise/maven.j2ee/src/org/netbeans/modules/maven/j2ee/ProjectHookImpl.java
@@ -57,7 +57,7 @@ import org.openide.windows.WindowSystemListener;
})
public class ProjectHookImpl extends ProjectOpenedHook {
- private final static RequestProcessor RP = new RequestProcessor(ProjectHookImpl.class);
+ private static final RequestProcessor RP = new RequestProcessor(ProjectHookImpl.class);
private final Project project;
private PreferenceChangeListener preferencesListener;
diff --git a/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/MavenJAXWSSupportImpl.java b/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/MavenJAXWSSupportImpl.java
index c8fa566..15bc1bd 100644
--- a/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/MavenJAXWSSupportImpl.java
+++ b/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/MavenJAXWSSupportImpl.java
@@ -54,9 +54,9 @@ public class MavenJAXWSSupportImpl implements JAXWSLightSupportImpl {
/** Path for catalog file. */
public static final String CATALOG_PATH = "src/jax-ws-catalog.xml"; //NOI18N
- private final static String SERVLET_CLASS_NAME =
+ private static final String SERVLET_CLASS_NAME =
"com.sun.xml.ws.transport.http.servlet.WSServlet"; //NOI18N
- private final static String SERVLET_LISTENER =
+ private static final String SERVLET_LISTENER =
"com.sun.xml.ws.transport.http.servlet.WSServletContextListener"; //NOI18N
/** Constructor.
*
diff --git a/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/WSUtils.java b/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/WSUtils.java
index 541c773..69a4cd3 100644
--- a/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/WSUtils.java
+++ b/enterprise/maven.jaxws/src/org/netbeans/modules/maven/jaxws/WSUtils.java
@@ -86,9 +86,9 @@ import org.openide.util.NbBundle;
public class WSUtils {
private static final String GENERATE_NON_JSR109 = "generate_nonjsr109"; //NOI18N
- private final static String SERVLET_CLASS_NAME =
+ private static final String SERVLET_CLASS_NAME =
"com.sun.xml.ws.transport.http.servlet.WSServlet"; //NOI18N
- private final static String SERVLET_LISTENER =
+ private static final String SERVLET_LISTENER =
"com.sun.xml.ws.transport.http.servlet.WSServletContextListener"; //NOI18N
/** downloads XML resources from source URI to target folder
* (USAGE : this method can download a wsdl file and all wsdl/XML schemas,
diff --git a/enterprise/payara.common/src/org/netbeans/modules/payara/common/CreateDomain.java b/enterprise/payara.common/src/org/netbeans/modules/payara/common/CreateDomain.java
index 92f56fe..a2f2e4f 100644
--- a/enterprise/payara.common/src/org/netbeans/modules/payara/common/CreateDomain.java
+++ b/enterprise/payara.common/src/org/netbeans/modules/payara/common/CreateDomain.java
@@ -76,7 +76,7 @@ public class CreateDomain extends Thread {
computePorts(instanceProperties,map, useDefaultPorts);
}
- static private void computePorts(Map<String, String> ip, Map<String, String> createProps, boolean useDefaultPorts) {
+ private static void computePorts(Map<String, String> ip, Map<String, String> createProps, boolean useDefaultPorts) {
int portBase = 8900;
int kicker = ((new Date()).toString() + ip.get(PayaraModule.DOMAINS_FOLDER_ATTR)+ip.get(PayaraModule.DOMAIN_NAME_ATTR)).hashCode() % 40000;
kicker = kicker < 0 ? -kicker : kicker;
@@ -234,8 +234,8 @@ public class CreateDomain extends Thread {
static class PDCancel implements Cancellable {
- final private Process p;
- final private String dirname;
+ private final Process p;
+ private final String dirname;
private boolean notFired = true;
PDCancel(Process p, String newDirName) {
@@ -243,12 +243,12 @@ public class CreateDomain extends Thread {
this.dirname = newDirName;
}
- synchronized public boolean isNotFired() {
+ public synchronized boolean isNotFired() {
return notFired;
}
@Override
- synchronized public boolean cancel() {
+ public synchronized boolean cancel() {
notFired = false;
p.destroy();
File domainDir = new File(dirname);
diff --git a/enterprise/payara.common/src/org/netbeans/modules/payara/common/LogViewMgr.java b/enterprise/payara.common/src/org/netbeans/modules/payara/common/LogViewMgr.java
index 74384b1..4eb7f85 100644
--- a/enterprise/payara.common/src/org/netbeans/modules/payara/common/LogViewMgr.java
+++ b/enterprise/payara.common/src/org/netbeans/modules/payara/common/LogViewMgr.java
@@ -682,7 +682,7 @@ public class LogViewMgr {
}
- private static abstract class StateFilter implements Filter {
+ private abstract static class StateFilter implements Filter {
protected String message;
@@ -1029,7 +1029,7 @@ public class LogViewMgr {
return newIO;
}
- static public void displayOutput(PayaraInstance instance, Lookup lookup) {
+ public static void displayOutput(PayaraInstance instance, Lookup lookup) {
String uri = instance.getProperty(PayaraModule.URL_ATTR);
if (null != uri && (uri.contains("pfv3ee6wc") || uri.contains("localhost"))) {
FetchLog log = getServerLogStream(instance);
@@ -1043,7 +1043,7 @@ public class LogViewMgr {
}
}
- static private List<Recognizer> getRecognizers(Collection<? extends RecognizerCookie> cookies) {
+ private static List<Recognizer> getRecognizers(Collection<? extends RecognizerCookie> cookies) {
List<Recognizer> recognizers;
if(!cookies.isEmpty()) {
recognizers = new LinkedList<Recognizer>();
@@ -1170,7 +1170,7 @@ public class LogViewMgr {
* cerated one when no log fetcher was found.
* @throws IOException
*/
- static private FetchLog getServerLogStream(
+ private static FetchLog getServerLogStream(
final PayaraInstance instance) {
FetchLog log;
FetchLog deadLog = null;
diff --git a/enterprise/payara.common/src/org/netbeans/modules/payara/common/PayaraInstance.java b/enterprise/payara.common/src/org/netbeans/modules/payara/common/PayaraInstance.java
index 84f45ac..877af17 100644
--- a/enterprise/payara.common/src/org/netbeans/modules/payara/common/PayaraInstance.java
+++ b/enterprise/payara.common/src/org/netbeans/modules/payara/common/PayaraInstance.java
@@ -752,7 +752,7 @@ public class PayaraInstance implements ServerInstanceImplementation,
private transient volatile Process process;
/** Configuration changes listener watching <code>domain.xml</code> file. */
- private transient final DomainXMLChangeListener domainXMLListener;
+ private final transient DomainXMLChangeListener domainXMLListener;
private transient InstanceContent ic;
private transient Lookup localLookup;
@@ -763,7 +763,7 @@ public class PayaraInstance implements ServerInstanceImplementation,
currentFactories = Collections.emptyList();
/** Payara server support API for this instance. */
- private transient final CommonServerSupport commonSupport;
+ private final transient CommonServerSupport commonSupport;
// API instance
private ServerInstance commonInstance;
private PayaraInstanceProvider instanceProvider;
diff --git a/enterprise/payara.common/src/org/netbeans/modules/payara/common/PayaraInstanceProvider.java b/enterprise/payara.common/src/org/netbeans/modules/payara/common/PayaraInstanceProvider.java
index 2c5fdff..cd9b824 100644
--- a/enterprise/payara.common/src/org/netbeans/modules/payara/common/PayaraInstanceProvider.java
+++ b/enterprise/payara.common/src/org/netbeans/modules/payara/common/PayaraInstanceProvider.java
@@ -62,7 +62,7 @@ public final class PayaraInstanceProvider implements ServerInstanceProvider, Loo
private static final String AUTOINSTANCECOPIED = "autoinstance-copied"; // NOI18N
- private volatile static PayaraInstanceProvider payaraProvider;
+ private static volatile PayaraInstanceProvider payaraProvider;
public static final String EE6_DEPLOYER_FRAGMENT = "deployer:pfv3ee6"; // NOI18N
public static final String EE6WC_DEPLOYER_FRAGMENT = "deployer:pfv3ee6wc"; // NOI18N
@@ -111,13 +111,13 @@ public final class PayaraInstanceProvider implements ServerInstanceProvider, Loo
private final ChangeSupport support = new ChangeSupport(this);
- final private String[] instancesDirNames;
- final private String displayName;
- final private String[] uriFragments;
- final private boolean needsJdk6;
- final private List<String> noPasswordOptions;
- final private CommandFactory cf;
- final private Lookup.Result<RegisteredDDCatalog> lookupResult = Lookups.forPath(Util.PF_LOOKUP_PATH).lookupResult(RegisteredDDCatalog.class);
+ private final String[] instancesDirNames;
+ private final String displayName;
+ private final String[] uriFragments;
+ private final boolean needsJdk6;
+ private final List<String> noPasswordOptions;
+ private final CommandFactory cf;
+ private final Lookup.Result<RegisteredDDCatalog> lookupResult = Lookups.forPath(Util.PF_LOOKUP_PATH).lookupResult(RegisteredDDCatalog.class);
@SuppressWarnings("LeakingThisInConstructor")
private PayaraInstanceProvider(
diff --git a/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2ApplicationsChildren.java b/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2ApplicationsChildren.java
index ee18ad4..cae1085 100644
--- a/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2ApplicationsChildren.java
+++ b/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2ApplicationsChildren.java
@@ -41,7 +41,7 @@ import org.openide.util.RequestProcessor;
public class Hk2ApplicationsChildren extends Children.Keys<Object> implements Refreshable {
private Lookup lookup;
- private final static Node WAIT_NODE = Hk2ItemNode.createWaitNode();
+ private static final Node WAIT_NODE = Hk2ItemNode.createWaitNode();
Hk2ApplicationsChildren(Lookup lookup) {
this.lookup = lookup;
diff --git a/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2Cookie.java b/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2Cookie.java
index 21a0b16..f3b5ef6 100644
--- a/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2Cookie.java
+++ b/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2Cookie.java
@@ -87,7 +87,7 @@ public class Hk2Cookie {
/**
* Common node cookie.
*/
- protected static abstract class Cookie {
+ protected abstract static class Cookie {
/** Task status. */
protected volatile WeakReference<Future<ResultString>> status;
diff --git a/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2ResourceContainers.java b/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2ResourceContainers.java
index 58a6e1d..f925d64 100644
--- a/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2ResourceContainers.java
+++ b/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2ResourceContainers.java
@@ -35,7 +35,7 @@ import org.netbeans.modules.payara.spi.PayaraModule;
public class Hk2ResourceContainers extends Children.Keys<Object> implements Refreshable {
private Lookup lookup;
- private final static Node WAIT_NODE = Hk2ItemNode.createWaitNode();
+ private static final Node WAIT_NODE = Hk2ItemNode.createWaitNode();
Hk2ResourceContainers(Lookup lookup) {
this.lookup = lookup;
diff --git a/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2ResourcesChildren.java b/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2ResourcesChildren.java
index 08a0e7e..101fc1f 100644
--- a/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2ResourcesChildren.java
+++ b/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2ResourcesChildren.java
@@ -52,7 +52,7 @@ public class Hk2ResourcesChildren extends Children.Keys<Object> implements Refre
private Lookup lookup;
private String type;
- private final static Node WAIT_NODE = Hk2ItemNode.createWaitNode();
+ private static final Node WAIT_NODE = Hk2ItemNode.createWaitNode();
Hk2ResourcesChildren(Lookup lookup, String type) {
this.lookup = lookup;
diff --git a/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2WSChildren.java b/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2WSChildren.java
index 85320c1..1220793 100644
--- a/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2WSChildren.java
+++ b/enterprise/payara.common/src/org/netbeans/modules/payara/common/nodes/Hk2WSChildren.java
@@ -40,7 +40,7 @@ import org.openide.util.RequestProcessor;
public class Hk2WSChildren extends Children.Keys<Object> implements Refreshable {
private Lookup lookup;
- private final static Node WAIT_NODE = Hk2ItemNode.createWaitNode();
+ private static final Node WAIT_NODE = Hk2ItemNode.createWaitNode();
Hk2WSChildren(Lookup lookup) {
this.lookup = lookup;
diff --git a/enterprise/payara.common/src/org/netbeans/modules/payara/common/parser/TreeParser.java b/enterprise/payara.common/src/org/netbeans/modules/payara/common/parser/TreeParser.java
index b67c931..d17e3a1 100644
--- a/enterprise/payara.common/src/org/netbeans/modules/payara/common/parser/TreeParser.java
+++ b/enterprise/payara.common/src/org/netbeans/modules/payara/common/parser/TreeParser.java
@@ -195,7 +195,7 @@ public final class TreeParser extends DefaultHandler {
return source;
}
- public static abstract class NodeReader {
+ public abstract static class NodeReader {
public void readAttributes(String qname, Attributes attributes) throws SAXException {
}
diff --git a/enterprise/payara.common/src/org/netbeans/modules/payara/common/ui/BasePanel.java b/enterprise/payara.common/src/org/netbeans/modules/payara/common/ui/BasePanel.java
index fc85dfe..331ad35 100644
--- a/enterprise/payara.common/src/org/netbeans/modules/payara/common/ui/BasePanel.java
+++ b/enterprise/payara.common/src/org/netbeans/modules/payara/common/ui/BasePanel.java
@@ -257,9 +257,9 @@ public abstract class BasePanel extends JPanel {
}
}
- static abstract class DataTableModel extends AbstractTableModel {
+ abstract static class DataTableModel extends AbstractTableModel {
- abstract public Map<String, String> getData();
+ public abstract Map<String, String> getData();
private String[][] rowData;
private String pushPrefix;
diff --git a/enterprise/payara.common/src/org/netbeans/modules/payara/common/utils/Util.java b/enterprise/payara.common/src/org/netbeans/modules/payara/common/utils/Util.java
index f362e01..fe8b819 100644
--- a/enterprise/payara.common/src/org/netbeans/modules/payara/common/utils/Util.java
+++ b/enterprise/payara.common/src/org/netbeans/modules/payara/common/utils/Util.java
@@ -277,7 +277,7 @@ public final class Util {
}
- static public String computeTarget(Map<String, String> ip) {
+ public static String computeTarget(Map<String, String> ip) {
String retVal = null;
String url = ip.get(PayaraModule.URL_ATTR);
if (null != url) {
@@ -292,7 +292,7 @@ public final class Util {
return retVal;
}
- static public boolean isDefaultOrServerTarget(Map<String, String> ip) {
+ public static boolean isDefaultOrServerTarget(Map<String, String> ip) {
String target = Util.computeTarget(ip);
return null == target || "server".equals(target);
}
diff --git a/enterprise/payara.common/src/org/netbeans/modules/payara/common/wizards/AddDomainLocationVisualPanel.java b/enterprise/payara.common/src/org/netbeans/modules/payara/common/wizards/AddDomainLocationVisualPanel.java
index 8b385f4..182604e 100644
--- a/enterprise/payara.common/src/org/netbeans/modules/payara/common/wizards/AddDomainLocationVisualPanel.java
+++ b/enterprise/payara.common/src/org/netbeans/modules/payara/common/wizards/AddDomainLocationVisualPanel.java
@@ -53,7 +53,7 @@ import org.openide.util.NbBundle;
*/
public class AddDomainLocationVisualPanel extends javax.swing.JPanel {
- private transient final List<ChangeListener> listeners;
+ private final transient List<ChangeListener> listeners;
/** IP addresses selection content. */
Set<? extends InetAddress> ips;
diff --git a/enterprise/payara.common/src/org/netbeans/modules/payara/spi/ExecSupport.java b/enterprise/payara.common/src/org/netbeans/modules/payara/spi/ExecSupport.java
index 70766da..f00a530 100644
--- a/enterprise/payara.common/src/org/netbeans/modules/payara/spi/ExecSupport.java
+++ b/enterprise/payara.common/src/org/netbeans/modules/payara/spi/ExecSupport.java
@@ -79,7 +79,7 @@ public class ExecSupport {
}
/** This thread simply reads from given Reader and writes read chars to given Writer. */
- static public class OutputCopier extends Thread {
+ public static class OutputCopier extends Thread {
final Writer os;
final Reader is;
/** while set to false at streams that writes to the OutputWindow it must be
diff --git a/enterprise/payara.common/src/org/netbeans/modules/payara/spi/ServerUtilities.java b/enterprise/payara.common/src/org/netbeans/modules/payara/spi/ServerUtilities.java
index d106d1e..f606f27 100644
--- a/enterprise/payara.common/src/org/netbeans/modules/payara/spi/ServerUtilities.java
+++ b/enterprise/payara.common/src/org/netbeans/modules/payara/spi/ServerUtilities.java
@@ -259,7 +259,7 @@ public final class ServerUtilities {
* @param gfRoot the name of the directory to check against.
* @return true if the directory appears to be the root of a TP2 installation.
*/
- static public boolean isTP2(String gfRoot) {
+ public static boolean isTP2(String gfRoot) {
return ServerUtilities.getJarName(gfRoot, ServerUtilities.GF_JAR_MATCHER).getName().indexOf("-tp-2-") > -1; // NOI18N
}
diff --git a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/ConfigureProfilerHelper.java b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/ConfigureProfilerHelper.java
index b49a2ac..64ae734 100644
--- a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/ConfigureProfilerHelper.java
+++ b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/ConfigureProfilerHelper.java
@@ -37,7 +37,7 @@ public class ConfigureProfilerHelper {
// replaces the AS_JAVA item in asenv.bat/conf
- static public boolean modifyAsEnvScriptFile( File irf, String targetJavaHomePath) {
+ public static boolean modifyAsEnvScriptFile( File irf, String targetJavaHomePath) {
String ext = (isUnix() ? "conf" : "bat");
//File irf = ((SunDeploymentManagerInterface)dm).getPlatformRoot();
diff --git a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/DomainEditor.java b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/DomainEditor.java
index 73ba9bd..b27374f 100644
--- a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/DomainEditor.java
+++ b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/DomainEditor.java
@@ -77,20 +77,20 @@ public class DomainEditor {
private static String CONST_SID = "SID"; // NOI18N
private static String CONST_SERVER_NAME = "serverName"; // NOI18N
private static String CONST_DRIVER_CLASS = "driverClass"; // NOI18N
- static private String CONST_NAME = "name"; // NOI18N
- static private String CONST_VALUE = "value"; // NOI18N
- static private String CONST_DS_CLASS = "datasource-classname"; // NOI18N
- static private String CONST_RES_TYPE = "res-type"; // NOI18N
- static private String CONST_JVM_OPTIONS = "jvm-options"; // NOI18N
- static private String CONST_JNDINAME = "jndi-name"; // NOI18N
- static private String CONST_PROP = "property"; // NOI18N
- static private String CONST_POOLNAME = "pool-name"; // NOI18N
- static private String CONST_ENABLED = "enabled"; // NOI18N
- static private String CONST_OBJTYPE = "object-type"; // NOI18N
- static private String CONST_JDBC = "jdbc-resource"; // NOI18N
- static private String CONST_CP = "jdbc-connection-pool"; // NOI18N
- static private String CONST_AO = "admin-object-resource"; // NOI18N
- static private String XML_ENTITY = "<?xml version=\"1.0\" encoding=\"{0}\"?>";
+ private static String CONST_NAME = "name"; // NOI18N
+ private static String CONST_VALUE = "value"; // NOI18N
+ private static String CONST_DS_CLASS = "datasource-classname"; // NOI18N
+ private static String CONST_RES_TYPE = "res-type"; // NOI18N
+ private static String CONST_JVM_OPTIONS = "jvm-options"; // NOI18N
+ private static String CONST_JNDINAME = "jndi-name"; // NOI18N
+ private static String CONST_PROP = "property"; // NOI18N
+ private static String CONST_POOLNAME = "pool-name"; // NOI18N
+ private static String CONST_ENABLED = "enabled"; // NOI18N
+ private static String CONST_OBJTYPE = "object-type"; // NOI18N
+ private static String CONST_JDBC = "jdbc-resource"; // NOI18N
+ private static String CONST_CP = "jdbc-connection-pool"; // NOI18N
+ private static String CONST_AO = "admin-object-resource"; // NOI18N
+ private static String XML_ENTITY = "<?xml version=\"1.0\" encoding=\"{0}\"?>";
private String dmLoc;
private String dmName;
diff --git a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/FindJSPServletHelper.java b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/FindJSPServletHelper.java
index 1795895..ce0ffb4 100644
--- a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/FindJSPServletHelper.java
+++ b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/FindJSPServletHelper.java
@@ -29,7 +29,7 @@ public class FindJSPServletHelper {
private FindJSPServletHelper() {
}
- static public String getServletResourcePath(String moduleContextPath, String jspResourcePath) {
+ public static String getServletResourcePath(String moduleContextPath, String jspResourcePath) {
Parameters.notWhitespace("jspResourcePath", jspResourcePath);
String s = getServletPackageName(jspResourcePath) + '/' +
getServletClassName(jspResourcePath) + ".java";// NOI18N
@@ -38,7 +38,7 @@ public class FindJSPServletHelper {
// After Apace donation, should use org.apache.jasper utilities in
// JspUtil and JspCompilationContext
- static private String getServletPackageName(String jspUri) {
+ private static String getServletPackageName(String jspUri) {
String jspBasePackageName = "org/apache/jsp";//NOI18N
int iSep = jspUri.lastIndexOf('/');
String packageName = (iSep > 0) ? jspUri.substring(0, iSep) : "";//NOI18N
@@ -51,7 +51,7 @@ public class FindJSPServletHelper {
// After Apace donation, should use org.apache.jasper utilities in
// JspUtil and JspCompilationContext
- static private String getServletClassName(String jspUri) {
+ private static String getServletClassName(String jspUri) {
int iSep = jspUri.lastIndexOf('/') + 1;
String className = jspUri.substring(iSep);
StringBuilder modClassName = new StringBuilder("");//NOI18N
diff --git a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/JDBCDriverDeployHelper.java b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/JDBCDriverDeployHelper.java
index b8cb407..fa24df1 100644
--- a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/JDBCDriverDeployHelper.java
+++ b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/JDBCDriverDeployHelper.java
@@ -56,7 +56,7 @@ import org.openide.util.NbBundle;
public class JDBCDriverDeployHelper {
- static public ProgressObject getProgressObject(File driverLoc, List listOfURLS) {
+ public static ProgressObject getProgressObject(File driverLoc, List listOfURLS) {
return new JDBCDriversProgressObject(driverLoc, listOfURLS);
}
@@ -66,7 +66,7 @@ public class JDBCDriverDeployHelper {
* @param drivers Target ULR list where to add drivers.
* @param jdbcDrivers JDBC drivers to be searched for URLs.
*/
- static private void addDriversURLs(List<URL> drivers, JDBCDriver[] jdbcDrivers) {
+ private static void addDriversURLs(List<URL> drivers, JDBCDriver[] jdbcDrivers) {
for (JDBCDriver jdbcDriver : jdbcDrivers) {
URL[] allUrls = jdbcDriver.getURLs();
for (int i = 0; i < allUrls.length; i++) {
@@ -94,7 +94,7 @@ public class JDBCDriverDeployHelper {
* @param datasources Server data sources from server resources files.
* @return List of JDBC drivers URLs to be deployed.
*/
- static public List<URL> getMissingDrivers(File[] driverLocs, Set<Datasource> datasources) {
+ public static List<URL> getMissingDrivers(File[] driverLocs, Set<Datasource> datasources) {
List<URL> drivers = new ArrayList<URL>();
for (Datasource datasource : datasources) {
String className = datasource.getDriverClassName();
@@ -145,7 +145,7 @@ public class JDBCDriverDeployHelper {
return drivers;
}
- static private class JDBCDriversProgressObject implements ProgressObject, Runnable {
+ private static class JDBCDriversProgressObject implements ProgressObject, Runnable {
private final ProgressEventSupport eventSupport;
private final File driverLoc;
diff --git a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/Utils.java b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/Utils.java
index 514f861..d018cbf 100644
--- a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/Utils.java
+++ b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/Utils.java
@@ -80,7 +80,7 @@ public final class Utils {
return result;
}
- public final static int strCompareTo(String one, String two) {
+ public static final int strCompareTo(String one, String two) {
int result;
if(one == null) {
diff --git a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/VerifierSupport.java b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/VerifierSupport.java
index 30abecb..76be0ca 100644
--- a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/VerifierSupport.java
+++ b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/VerifierSupport.java
@@ -93,9 +93,9 @@ public class VerifierSupport extends TopComponent {
String _archiveName;
- final static int FAIL = 0;
- final static int WARN = 1;
- final static int ALL = 2;
+ static final int FAIL = 0;
+ static final int WARN = 1;
+ static final int ALL = 2;
static String allString = NbBundle.getMessage(VerifierSupport.class,"All_Results"); // NOI18N
static String failString = NbBundle.getMessage(VerifierSupport.class,"Failures_Only"); //NOI18N
diff --git a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/config/DescriptorListener.java b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/config/DescriptorListener.java
index 5a64c2b..f53635a 100644
--- a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/config/DescriptorListener.java
+++ b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/config/DescriptorListener.java
@@ -669,7 +669,7 @@ public class DescriptorListener implements PropertyChangeListener {
Object sourceDD, Object oldValue, Object newValue);
}
- public static abstract class AbstractBeanVisitor implements BeanVisitor {
+ public abstract static class AbstractBeanVisitor implements BeanVisitor {
public void beanCreated(PayaraConfiguration config, String xpath,
CommonDDBean sourceDD, CommonDDBean newDD) {
}
diff --git a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/config/PayaraConfiguration.java b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/config/PayaraConfiguration.java
index 373ef7a..1cda8cf 100644
--- a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/config/PayaraConfiguration.java
+++ b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/config/PayaraConfiguration.java
@@ -598,7 +598,7 @@ public abstract class PayaraConfiguration implements
return J2EEBaseVersion.getVersion(module.getType(), module.getModuleVersion());
}
- final public org.netbeans.modules.j2ee.dd.api.common.RootInterface getStandardRootDD() {
+ public final org.netbeans.modules.j2ee.dd.api.common.RootInterface getStandardRootDD() {
org.netbeans.modules.j2ee.dd.api.common.RootInterface stdRootDD = null;
J2eeModuleHelper j2eeModuleHelper = J2eeModuleHelper.getSunDDModuleHelper(module.getType());
if(j2eeModuleHelper != null) {
@@ -607,7 +607,7 @@ public abstract class PayaraConfiguration implements
return stdRootDD;
}
- final public Webservices getWebServicesRootDD() {
+ public final Webservices getWebServicesRootDD() {
Webservices wsRootDD = null;
J2eeModuleHelper j2eeModuleHelper = J2eeModuleHelper.getSunDDModuleHelper(module.getType());
if(j2eeModuleHelper != null) {
diff --git a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/dd/loader/PayaraDDProvider.java b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/dd/loader/PayaraDDProvider.java
index c5a4365..5d26df0 100644
--- a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/dd/loader/PayaraDDProvider.java
+++ b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/dd/loader/PayaraDDProvider.java
@@ -196,7 +196,7 @@ public final class PayaraDDProvider {
}
}
- final private Map<Object, RootInterface> ddMap = new WeakHashMap<>();
+ private final Map<Object, RootInterface> ddMap = new WeakHashMap<>();
private Map<FileObject, DDProviderDataObject> dObjMap = new WeakHashMap<>();
/**
@@ -342,12 +342,12 @@ public final class PayaraDDProvider {
}
}
- final private static Map<Class, Map<String, VersionInfo>> apiToVersionMap = new HashMap<Class, Map<String, VersionInfo>>(11);
- final private static Map<String, VersionInfo> sunWebAppVersionMap = new HashMap<String, VersionInfo>(11);
- final private static Map<String, VersionInfo> sunEjbJarVersionMap = new HashMap<String, VersionInfo>(11);
- final private static Map<String, VersionInfo> sunApplicationVersionMap = new HashMap<String, VersionInfo>(11);
- final private static Map<String, VersionInfo> sunAppClientVersionMap = new HashMap<String, VersionInfo>(11);
- final private static Map<String, VersionInfo> sunResourcesVersionMap = new HashMap<String, VersionInfo>(11);
+ private static final Map<Class, Map<String, VersionInfo>> apiToVersionMap = new HashMap<Class, Map<String, VersionInfo>>(11);
+ private static final Map<String, VersionInfo> sunWebAppVersionMap = new HashMap<String, VersionInfo>(11);
+ private static final Map<String, VersionInfo> sunEjbJarVersionMap = new HashMap<String, VersionInfo>(11);
+ private static final Map<String, VersionInfo> sunApplicationVersionMap = new HashMap<String, VersionInfo>(11);
+ private static final Map<String, VersionInfo> sunAppClientVersionMap = new HashMap<String, VersionInfo>(11);
+ private static final Map<String, VersionInfo> sunResourcesVersionMap = new HashMap<String, VersionInfo>(11);
static {
sunWebAppVersionMap.put(SunWebApp.VERSION_2_3_0, new VersionInfo(
@@ -1005,7 +1005,7 @@ public final class PayaraDDProvider {
/* Maps DOCTYPE to { version, proxy class, impl class, dtd path } info.
*/
- final private static Map<String, DocTypeInfo> publicIdToInfoMap = new HashMap<String, DocTypeInfo>(37);
+ private static final Map<String, DocTypeInfo> publicIdToInfoMap = new HashMap<String, DocTypeInfo>(37);
static {
diff --git a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/FindJSPServletImpl.java b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/FindJSPServletImpl.java
index b0ca9e3..26947f7 100644
--- a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/FindJSPServletImpl.java
+++ b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/FindJSPServletImpl.java
@@ -36,9 +36,9 @@ import org.netbeans.modules.j2ee.deployment.plugins.spi.FindJSPServlet;
class FindJSPServletImpl implements FindJSPServlet {
- final private String domainDir;
- final private String domain;
- final private PayaraModule commonSupport;
+ private final String domainDir;
+ private final String domain;
+ private final PayaraModule commonSupport;
public FindJSPServletImpl(Hk2DeploymentManager dm, Hk2OptionalFactory aThis) {
commonSupport = dm.getCommonServerSupport();
diff --git a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/JDBCDriverDeployerImpl.java b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/JDBCDriverDeployerImpl.java
index bca689a..b6301a7 100644
--- a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/JDBCDriverDeployerImpl.java
+++ b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/JDBCDriverDeployerImpl.java
@@ -38,9 +38,9 @@ import org.openide.util.RequestProcessor;
public class JDBCDriverDeployerImpl implements JDBCDriverDeployer {
- final private File driverLoc;
- final private PayaraModule commonSupport;
- final private boolean isLocal;
+ private final File driverLoc;
+ private final PayaraModule commonSupport;
+ private final boolean isLocal;
private Hk2DeploymentManager dm;
public JDBCDriverDeployerImpl(Hk2DeploymentManager dm, OptionalDeploymentManagerFactory odmf) {
diff --git a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/JavaEEServerModuleFactory.java b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/JavaEEServerModuleFactory.java
index 266b182..8eec38e 100644
--- a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/JavaEEServerModuleFactory.java
+++ b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/JavaEEServerModuleFactory.java
@@ -226,7 +226,7 @@ public class JavaEEServerModuleFactory implements PayaraModuleFactory {
return addLibrary(name, CLASS_LIBRARY_TYPE, libraryList, docList, displayName, description);
}
- private synchronized static boolean addLibrary(
+ private static synchronized boolean addLibrary(
String name, String libType, List<URL> libraryList,
List<URL> docList, String displayName, String description) {
LibraryManager lmgr = LibraryManager.getDefault();
@@ -346,7 +346,7 @@ public class JavaEEServerModuleFactory implements PayaraModuleFactory {
static class InitializeLibrary implements PropertyChangeListener {
- final private LibraryManager lmgr;
+ private final LibraryManager lmgr;
private String name;
private Map<String, List<URL>> content;
private final String libType;
diff --git a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/ModuleConfigurationImpl.java b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/ModuleConfigurationImpl.java
index ca06792..c0f8145 100644
--- a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/ModuleConfigurationImpl.java
+++ b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/ModuleConfigurationImpl.java
@@ -72,7 +72,7 @@ public class ModuleConfigurationImpl implements
}
}
- static public ModuleConfigurationImpl get(J2eeModule j2eemodule) {
+ public static ModuleConfigurationImpl get(J2eeModule j2eemodule) {
synchronized (configs) {
return configs.get(j2eemodule);
}
diff --git a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/db/ResourcesHelper.java b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/db/ResourcesHelper.java
index 791c9b5..2409e34 100644
--- a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/db/ResourcesHelper.java
+++ b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/db/ResourcesHelper.java
@@ -90,7 +90,7 @@ public class ResourcesHelper {
});
}
- static private J2eeModuleProvider getProvider(Project project) {
+ private static J2eeModuleProvider getProvider(Project project) {
J2eeModuleProvider provider = null;
if (project != null) {
org.openide.util.Lookup lookup = project.getLookup();
@@ -99,7 +99,7 @@ public class ResourcesHelper {
return provider;
}
- static private void registerSampleResource(PayaraModule commonSupport) {
+ private static void registerSampleResource(PayaraModule commonSupport) {
String sample_poolname = "H2Pool"; //NOI18N
String sample_jdbc = "jdbc/__default"; //NOI18N
String sample_classname = "org.h2.jdbcx.JdbcDataSource"; //NOI18N
diff --git a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/ide/Hk2TargetModuleID.java b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/ide/Hk2TargetModuleID.java
index 393a3a1..cd3819b 100644
--- a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/ide/Hk2TargetModuleID.java
+++ b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/ide/Hk2TargetModuleID.java
@@ -40,7 +40,7 @@ public class Hk2TargetModuleID implements TargetModuleID {
private final String location;
private TargetModuleID parent;
private final Vector<TargetModuleID> children;
- final static private Map<String,Hk2TargetModuleID> knownModules =
+ private static final Map<String,Hk2TargetModuleID> knownModules =
new HashMap<String,Hk2TargetModuleID>();
private Hk2TargetModuleID(Hk2Target target, String docBaseURI, String contextPath, String location) {
diff --git a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/ide/MonitorProgressObject.java b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/ide/MonitorProgressObject.java
index 179a02c..dfe4415 100644
--- a/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/ide/MonitorProgressObject.java
+++ b/enterprise/payara.jakartaee/src/org/netbeans/modules/payara/jakartaee/ide/MonitorProgressObject.java
@@ -195,7 +195,7 @@ public class MonitorProgressObject
}
}
- static final private String[] TYPES = {"web", "ejb"};
+ private static final String[] TYPES = {"web", "ejb"};
private TargetModuleID[] createModuleIdTree(Hk2TargetModuleID moduleId)
throws InterruptedException, ExecutionException, TimeoutException {
diff --git a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/admin/response/RestResponseParser.java b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/admin/response/RestResponseParser.java
index 10b4541..429df5a 100644
--- a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/admin/response/RestResponseParser.java
+++ b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/admin/response/RestResponseParser.java
@@ -25,7 +25,7 @@ import java.io.InputStream;
* <p>
* @author Tomas Kraus, Peter Benedikovic
*/
-abstract public class RestResponseParser implements ResponseParser {
+public abstract class RestResponseParser implements ResponseParser {
@Override
public abstract RestActionReport parse(InputStream in);
diff --git a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/admin/response/RestXMLResponseParser.java b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/admin/response/RestXMLResponseParser.java
index 9d7cd91..9d93650 100644
--- a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/admin/response/RestXMLResponseParser.java
+++ b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/admin/response/RestXMLResponseParser.java
@@ -193,7 +193,7 @@ public class RestXMLResponseParser extends RestResponseParser {
}
- static private class RestXMLResponseFilter implements EventFilter {
+ private static class RestXMLResponseFilter implements EventFilter {
@Override
public boolean accept(XMLEvent event) {
diff --git a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/JDKVersion.java b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/JDKVersion.java
index a6f96f8..a0dc61a 100644
--- a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/JDKVersion.java
+++ b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/JDKVersion.java
@@ -52,10 +52,10 @@ public final class JDKVersion {
*/
private final Optional<String> vm;
- private final static int MAJOR_INDEX = 0;
- private final static int MINOR_INDEX = 1;
- private final static int SUBMINOR_INDEX = 2;
- private final static int UPDATE_INDEX = 3;
+ private static final int MAJOR_INDEX = 0;
+ private static final int MINOR_INDEX = 1;
+ private static final int SUBMINOR_INDEX = 2;
+ private static final int UPDATE_INDEX = 3;
private static JDKVersion IDE_JDK_VERSION;
diff --git a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/ServerStatus.java b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/ServerStatus.java
index 94d38d1..abe1ea7 100644
--- a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/ServerStatus.java
+++ b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/ServerStatus.java
@@ -461,7 +461,7 @@ public class ServerStatus implements Closeable {
/**
* Common individual server status check task.
*/
- private static abstract class Task implements TaskStateListener {
+ private abstract static class Task implements TaskStateListener {
////////////////////////////////////////////////////////////////////////
// Static methods //
diff --git a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/parser/TreeParser.java b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/parser/TreeParser.java
index fa34fb9..446ada4 100644
--- a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/parser/TreeParser.java
+++ b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/server/parser/TreeParser.java
@@ -278,7 +278,7 @@ public final class TreeParser extends DefaultHandler {
return super.resolveEntity(string, string1);
}
- public static abstract class NodeListener {
+ public abstract static class NodeListener {
public void readAttributes(String qname, Attributes attributes) throws
SAXException {
diff --git a/enterprise/profiler.j2ee/src/org/netbeans/modules/profiler/j2ee/WebProjectUtils.java b/enterprise/profiler.j2ee/src/org/netbeans/modules/profiler/j2ee/WebProjectUtils.java
index 3da2f5d..b339866 100644
--- a/enterprise/profiler.j2ee/src/org/netbeans/modules/profiler/j2ee/WebProjectUtils.java
+++ b/enterprise/profiler.j2ee/src/org/netbeans/modules/profiler/j2ee/WebProjectUtils.java
@@ -67,7 +67,7 @@ import org.openide.util.Lookup;
})
public class WebProjectUtils {
//~ Static fields/initializers -----------------------------------------------------------------------------------------------
- final private static Logger LOGGER = Logger.getLogger(WebProjectUtils.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(WebProjectUtils.class.getName());
private static final Map<ClientUtils.SourceCodeSelection, String> jspClass2NameMap = new HashMap<ClientUtils.SourceCodeSelection, String>();
private static final String[][] jspServletMethods = new String[][] {
diff --git a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/editor/BeanCodeGenerator.java b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/editor/BeanCodeGenerator.java
index 8439d18..28e0019 100644
--- a/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/editor/BeanCodeGenerator.java
+++ b/enterprise/spring.webmvc/src/org/netbeans/modules/spring/webmvc/editor/BeanCodeGenerator.java
@@ -55,10 +55,10 @@ import org.openide.util.NbBundle;
*/
public class BeanCodeGenerator implements CodeGenerator {
- private final static String BEANS_END_TAG = "</beans>"; //NOI18N
- private final static String CONTEXT_CONFIG_LOCATION = "contextConfigLocation"; //NOI18N
- private final static String DISPATCHER_SERVLET_NAME = "dispatcher-servlet"; //NOI18N
- private final static String JAVA_MIME = "text/x-java"; //NOI18N
+ private static final String BEANS_END_TAG = "</beans>"; //NOI18N
+ private static final String CONTEXT_CONFIG_LOCATION = "contextConfigLocation"; //NOI18N
+ private static final String DISPATCHER_SERVLET_NAME = "dispatcher-servlet"; //NOI18N
+ private static final String JAVA_MIME = "text/x-java"; //NOI18N
private Document document;
private FileObject fileObject;
diff --git a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/ui/wizard/AddInstanceIterator.java b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/ui/wizard/AddInstanceIterator.java
index 8b50aaa..7767aee 100644
--- a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/ui/wizard/AddInstanceIterator.java
+++ b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/ui/wizard/AddInstanceIterator.java
@@ -52,12 +52,12 @@ import org.netbeans.modules.tomcat5.util.TomcatUsers;
*/
public class AddInstanceIterator implements WizardDescriptor.InstantiatingIterator {
- public final static String PROP_ERROR_MESSAGE = WizardDescriptor.PROP_ERROR_MESSAGE; // NOI18N
- private final static String PROP_CONTENT_DATA = WizardDescriptor.PROP_CONTENT_DATA; // NOI18N
- private final static String PROP_CONTENT_SELECTED_INDEX = WizardDescriptor.PROP_CONTENT_SELECTED_INDEX; // NOI18N
- private final static String PROP_DISPLAY_NAME = "ServInstWizard_displayName"; // NOI18N
+ public static final String PROP_ERROR_MESSAGE = WizardDescriptor.PROP_ERROR_MESSAGE; // NOI18N
+ private static final String PROP_CONTENT_DATA = WizardDescriptor.PROP_CONTENT_DATA; // NOI18N
+ private static final String PROP_CONTENT_SELECTED_INDEX = WizardDescriptor.PROP_CONTENT_SELECTED_INDEX; // NOI18N
+ private static final String PROP_DISPLAY_NAME = "ServInstWizard_displayName"; // NOI18N
- private final static String[] CONTENT_DATA = new String[] {
+ private static final String[] CONTENT_DATA = new String[] {
NbBundle.getMessage(AddInstanceIterator.class, "LBL_InstallationAndLoginDetails") };
private WizardDescriptor wizard;
diff --git a/enterprise/web.beans/src/org/netbeans/modules/web/beans/analysis/WebBeansAnalysisTask.java b/enterprise/web.beans/src/org/netbeans/modules/web/beans/analysis/WebBeansAnalysisTask.java
index 30219df..f9afbc0 100644
--- a/enterprise/web.beans/src/org/netbeans/modules/web/beans/analysis/WebBeansAnalysisTask.java
+++ b/enterprise/web.beans/src/org/netbeans/modules/web/beans/analysis/WebBeansAnalysisTask.java
@@ -59,7 +59,7 @@ import org.netbeans.spi.editor.hints.ErrorDescription;
*/
public class WebBeansAnalysisTask extends AbstractAnalysisTask {
- private final static Logger LOG = Logger.getLogger(
+ private static final Logger LOG = Logger.getLogger(
WebBeansAnalysisTask.class.getName());
public WebBeansAnalysisTask( CdiEditorAwareJavaSourceTaskFactory factory ){
diff --git a/enterprise/web.beans/src/org/netbeans/modules/web/beans/completion/BeansCompletionItem.java b/enterprise/web.beans/src/org/netbeans/modules/web/beans/completion/BeansCompletionItem.java
index da03434..3c24bc5 100644
--- a/enterprise/web.beans/src/org/netbeans/modules/web/beans/completion/BeansCompletionItem.java
+++ b/enterprise/web.beans/src/org/netbeans/modules/web/beans/completion/BeansCompletionItem.java
@@ -216,7 +216,7 @@ public abstract class BeansCompletionItem implements CompletionItem {
return substituteText(component, substOffset, component.getCaret().getDot() - substOffset, false);
}
- abstract private static class BeansXmlCompletionItem extends BeansCompletionItem {
+ private abstract static class BeansXmlCompletionItem extends BeansCompletionItem {
/////////
protected int substitutionOffset;
diff --git a/enterprise/web.client.rest/src/org/netbeans/modules/web/client/rest/wizard/HtmlPanel.java b/enterprise/web.client.rest/src/org/netbeans/modules/web/client/rest/wizard/HtmlPanel.java
index f4798c0..2f32fe6 100644
--- a/enterprise/web.client.rest/src/org/netbeans/modules/web/client/rest/wizard/HtmlPanel.java
+++ b/enterprise/web.client.rest/src/org/netbeans/modules/web/client/rest/wizard/HtmlPanel.java
@@ -38,8 +38,8 @@ public class HtmlPanel implements Panel<WizardDescriptor> {
public static final String HTML_FILE = "html-file"; // NOI18N
- final static String PROP_DOCUMENT_BASE ="document_base"; // NOI18N
- final static String PUBLIC_HTML ="public_html"; // NOI18N
+ static final String PROP_DOCUMENT_BASE ="document_base"; // NOI18N
+ static final String PUBLIC_HTML ="public_html"; // NOI18N
HtmlPanel(WizardDescriptor descriptor){
myDescriptor = descriptor;
diff --git a/enterprise/web.client.rest/src/org/netbeans/modules/web/client/rest/wizard/RestPanel.java b/enterprise/web.client.rest/src/org/netbeans/modules/web/client/rest/wizard/RestPanel.java
index b25217a..ac6aea7 100644
--- a/enterprise/web.client.rest/src/org/netbeans/modules/web/client/rest/wizard/RestPanel.java
+++ b/enterprise/web.client.rest/src/org/netbeans/modules/web/client/rest/wizard/RestPanel.java
@@ -52,12 +52,12 @@ public class RestPanel implements WizardDescriptor.FinishablePanel<WizardDescrip
private String myDisplayName;
}
- public final static String FILE_NAME = "js-file-name"; // NOI18N
- public final static String ADD_BACKBONE = "backbone"; // NOI18N
- public final static String EXISTED_BACKBONE ="existed-backbone"; // NOI18N
- public final static String EXISTED_UNDERSCORE ="existed-underscore"; // NOI18N
- public final static String EXISTED_JQUERY ="existed-jquery"; // NOI18N
- public final static String UI ="ui"; // NOI18N
+ public static final String FILE_NAME = "js-file-name"; // NOI18N
+ public static final String ADD_BACKBONE = "backbone"; // NOI18N
+ public static final String EXISTED_BACKBONE ="existed-backbone"; // NOI18N
+ public static final String EXISTED_UNDERSCORE ="existed-underscore"; // NOI18N
+ public static final String EXISTED_JQUERY ="existed-jquery"; // NOI18N
+ public static final String UI ="ui"; // NOI18N
RestPanel(WizardDescriptor descriptor) {
diff --git a/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/SimplifiedJspServlet.java b/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/SimplifiedJspServlet.java
index 90d5979..f7a8530 100644
--- a/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/SimplifiedJspServlet.java
+++ b/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/SimplifiedJspServlet.java
@@ -508,7 +508,7 @@ public class SimplifiedJspServlet extends JSPProcessor {
}
@Deprecated
- public static abstract class VirtualJavaClass {
+ public abstract static class VirtualJavaClass {
public final void create(Document doc, String virtualClassBody) {
FileObject fileDummyJava = null;
diff --git a/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/SyntaxElement.java b/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/SyntaxElement.java
index 451840d..8b72a5e 100644
--- a/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/SyntaxElement.java
+++ b/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/SyntaxElement.java
@@ -175,7 +175,7 @@ public abstract class SyntaxElement extends Object {
}
}
- public static abstract class TagLikeElement extends SyntaxElement {
+ public abstract static class TagLikeElement extends SyntaxElement {
String name;
public TagLikeElement(JspSyntaxSupport support, int from, int to, String name) {
@@ -209,7 +209,7 @@ public abstract class SyntaxElement extends Object {
}
- public static abstract class TagDirective extends TagLikeElement {
+ public abstract static class TagDirective extends TagLikeElement {
Map attribs;
public TagDirective( JspSyntaxSupport support, int from, int to, String name, Map attribs ) {
diff --git a/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/completion/AttrSupports.java b/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/completion/AttrSupports.java
index 020a5b1..b2ced6b 100644
--- a/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/completion/AttrSupports.java
+++ b/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/completion/AttrSupports.java
@@ -235,7 +235,7 @@ public class AttrSupports {
}
- public static abstract class GetSetPropertyProperty extends AttributeValueSupport.Default {
+ public abstract static class GetSetPropertyProperty extends AttributeValueSupport.Default {
public GetSetPropertyProperty(boolean tag, String longName, String attrName) {
super(tag, longName, attrName);
diff --git a/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/completion/JspCompletionProvider.java b/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/completion/JspCompletionProvider.java
index 08fe927..f659a6d 100644
--- a/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/completion/JspCompletionProvider.java
+++ b/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/completion/JspCompletionProvider.java
@@ -137,7 +137,7 @@ public class JspCompletionProvider implements CompletionProvider {
}
}
- public static abstract class AbstractQuery extends AsyncCompletionQuery {
+ public abstract static class AbstractQuery extends AsyncCompletionQuery {
@Override
protected void preQueryUpdate(JTextComponent component) {
diff --git a/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/parser/JspSyntaxElement.java b/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/parser/JspSyntaxElement.java
index 1502009..c0639ac 100644
--- a/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/parser/JspSyntaxElement.java
+++ b/enterprise/web.core.syntax/src/org/netbeans/modules/web/core/syntax/parser/JspSyntaxElement.java
@@ -142,7 +142,7 @@ public abstract class JspSyntaxElement {
}
}
- public static abstract class Named extends JspSyntaxElement {
+ public abstract static class Named extends JspSyntaxElement {
protected String name;
@@ -168,7 +168,7 @@ public abstract class JspSyntaxElement {
}
}
- public static abstract class AttributedTagLikeElement extends Named {
+ public abstract static class AttributedTagLikeElement extends Named {
private List<Attribute> attribs;
diff --git a/enterprise/web.core.syntax/test/qa-functional/src/org/netbeans/test/lib/BasicTokensTest.java b/enterprise/web.core.syntax/test/qa-functional/src/org/netbeans/test/lib/BasicTokensTest.java
index 8a9a3af..6d68f32 100644
--- a/enterprise/web.core.syntax/test/qa-functional/src/org/netbeans/test/lib/BasicTokensTest.java
+++ b/enterprise/web.core.syntax/test/qa-functional/src/org/netbeans/test/lib/BasicTokensTest.java
@@ -36,7 +36,7 @@ public abstract class BasicTokensTest extends JellyTestCase {
super(name);
}
- abstract protected boolean generateGoldenFiles();
+ protected abstract boolean generateGoldenFiles();
@Override
public void tearDown() {
diff --git a/enterprise/web.core.syntax/test/qa-functional/src/org/netbeans/test/syntax/CompletionTest.java b/enterprise/web.core.syntax/test/qa-functional/src/org/netbeans/test/syntax/CompletionTest.java
index a0f6f49..60af234 100644
--- a/enterprise/web.core.syntax/test/qa-functional/src/org/netbeans/test/syntax/CompletionTest.java
+++ b/enterprise/web.core.syntax/test/qa-functional/src/org/netbeans/test/syntax/CompletionTest.java
@@ -100,12 +100,12 @@ public class CompletionTest extends J2eeTestCase {
private static final boolean GENERATE_GOLDEN_FILES = false;//generate golden files, or test
private static final int COMPLETION_PREFIX_LENGHT = 40;
private static boolean projectsOpened = false;//open test projects
- protected final static List XML_EXTS = Arrays.asList(new String[]{"html", "tld", "xhtml"});
- protected final static List JSP_EXTS = Arrays.asList(new String[]{"jsp", "tag", "jspf", "tagf", "jspx", "tagx"});
+ protected static final List XML_EXTS = Arrays.asList(new String[]{"html", "tld", "xhtml"});
+ protected static final List JSP_EXTS = Arrays.asList(new String[]{"jsp", "tag", "jspf", "tagf", "jspx", "tagx"});
protected static List ignored_tests = Arrays.asList(new String[]{"testJS.js", "testJS2.js", "testInjection.xhtml", "testInjection.jsp", "testHTML.jsp",
"testScriptletsImplicitObjects.jsp", "testExpression.jsp", "testJSPDocumentHTML.jspx", "testHTML.tag", "testScriptletsJavaIssue.tag"});
- protected final static List JS_EXTS = Arrays.asList(new String[]{"js"/*,"java"*/});
- public final static Logger LOG = Logger.getLogger(CompletionTest.class.getName());
+ protected static final List JS_EXTS = Arrays.asList(new String[]{"js"/*,"java"*/});
+ public static final Logger LOG = Logger.getLogger(CompletionTest.class.getName());
protected FileObject testFileObj;
public static boolean isJDK8 = System.getProperty("java.version").startsWith("1.8");
diff --git a/enterprise/web.core.syntax/test/unit/src/org/netbeans/test/web/core/syntax/ContextJspServletGenTest.java b/enterprise/web.core.syntax/test/unit/src/org/netbeans/test/web/core/syntax/ContextJspServletGenTest.java
index edf1454..1a5d977 100644
--- a/enterprise/web.core.syntax/test/unit/src/org/netbeans/test/web/core/syntax/ContextJspServletGenTest.java
+++ b/enterprise/web.core.syntax/test/unit/src/org/netbeans/test/web/core/syntax/ContextJspServletGenTest.java
@@ -213,8 +213,8 @@ public class ContextJspServletGenTest extends TestBase2 {
private static class TestWebModuleImplementation2
implements WebModuleImplementation2
{
- private final static String WEB_INF = "WEB-INF"; // NOI18N
- private final static String DD = "web.xml"; // NOI18N
+ private static final String WEB_INF = "WEB-INF"; // NOI18N
+ private static final String DD = "web.xml"; // NOI18N
public TestWebModuleImplementation2(FileObject webRoot,
ClassPathProvider provider )
diff --git a/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/JspDataObject.java b/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/JspDataObject.java
index afe20e0..a5c7078 100644
--- a/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/JspDataObject.java
+++ b/enterprise/web.core/src/org/netbeans/modules/web/core/jsploader/JspDataObject.java
@@ -86,18 +86,18 @@ public class JspDataObject extends MultiDataObject implements QueryStringCookie
private static final Logger LOGGER = Logger.getLogger(JspDataObject.class.getName());
- transient private EditorCookie servletEdit;
- transient protected JspServletDataObject servletDataObject;
+ private transient EditorCookie servletEdit;
+ protected transient JspServletDataObject servletDataObject;
// it is guaranteed that if servletDataObject != null, then this is its
// last modified date at the time of last refresh
- transient private Date servletDataObjectDate;
- transient private CompileData compileData;
- transient private boolean firstStart;
- transient private Listener listener;
- transient private BaseJspEditorSupport editorSupport;
- transient final private static boolean debug = false;
-
- transient private AtomicReference<String> encoding = new AtomicReference<String>();
+ private transient Date servletDataObjectDate;
+ private transient CompileData compileData;
+ private transient boolean firstStart;
+ private transient Listener listener;
+ private transient BaseJspEditorSupport editorSupport;
+ private static final transient boolean debug = false;
+
+ private transient AtomicReference<String> encoding = new AtomicReference<String>();
@MultiViewElement.Registration(
displayName="#LBL_JSPEditorTab",
diff --git a/enterprise/web.core/src/org/netbeans/modules/web/wizards/DDTable.java b/enterprise/web.core/src/org/netbeans/modules/web/wizards/DDTable.java
index 8585337..b2e3b38 100644
--- a/enterprise/web.core/src/org/netbeans/modules/web/wizards/DDTable.java
+++ b/enterprise/web.core/src/org/netbeans/modules/web/wizards/DDTable.java
@@ -47,7 +47,7 @@ class DDTable extends JTable implements KeyListener {
private String titleKey;
private Editable editable;
private String[] headers;
- private final static int margin = 6;
+ private static final int margin = 6;
private Color darkerColor;
// Handle resizing for larger fonts
diff --git a/enterprise/web.core/src/org/netbeans/modules/web/wizards/InitParamPanel.java b/enterprise/web.core/src/org/netbeans/modules/web/wizards/InitParamPanel.java
index bce9677..c321460 100644
--- a/enterprise/web.core/src/org/netbeans/modules/web/wizards/InitParamPanel.java
+++ b/enterprise/web.core/src/org/netbeans/modules/web/wizards/InitParamPanel.java
@@ -41,9 +41,9 @@ import org.openide.util.NbBundle;
class InitParamPanel extends JPanel implements ActionListener,
ListSelectionListener {
- private final static String ADD = "add";
- private final static String EDIT = "edit";
- private final static String REMOVE = "remove";
+ private static final String ADD = "add";
+ private static final String EDIT = "edit";
+ private static final String REMOVE = "remove";
private ServletData deployData;
private BaseWizardPanel parent;
private JLabel jLinitparams;
diff --git a/enterprise/web.core/src/org/netbeans/modules/web/wizards/MappingPanel.java b/enterprise/web.core/src/org/netbeans/modules/web/wizards/MappingPanel.java
index f0e6a0b..144e410 100644
--- a/enterprise/web.core/src/org/netbeans/modules/web/wizards/MappingPanel.java
+++ b/enterprise/web.core/src/org/netbeans/modules/web/wizards/MappingPanel.java
@@ -42,11 +42,11 @@ import org.openide.util.NbBundle;
class MappingPanel extends JPanel implements ActionListener,
TableModelListener, ListSelectionListener {
- private final static String ADD = "add";
- private final static String EDIT = "edit";
- private final static String REMOVE = "remove";
- private final static String UP = "up";
- private final static String DOWN = "down";
+ private static final String ADD = "add";
+ private static final String EDIT = "edit";
+ private static final String REMOVE = "remove";
+ private static final String UP = "up";
+ private static final String DOWN = "down";
// UI Variables
private JLabel jLtableheader;
diff --git a/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/WebFreeformProperties.java b/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/WebFreeformProperties.java
index 581e880..7204c6d 100644
--- a/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/WebFreeformProperties.java
+++ b/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/WebFreeformProperties.java
@@ -29,30 +29,30 @@ public class WebFreeformProperties {
/**
* JPDA debug session name
*/
- public final static String JPDA_SESSION_NAME = "jpda.session.name"; // NOI18N
+ public static final String JPDA_SESSION_NAME = "jpda.session.name"; // NOI18N
/**
* JPDA transport type
*/
- public final static String JPDA_TRANSPORT = "jpda.transport"; // NOI18N
+ public static final String JPDA_TRANSPORT = "jpda.transport"; // NOI18N
/**
* JPDA host to connect to
*/
- public final static String JPDA_HOST = "jpda.host"; // NOI18N
+ public static final String JPDA_HOST = "jpda.host"; // NOI18N
- public final static String JPDA_ADDRESS = "jpda.address"; // NOI18N
+ public static final String JPDA_ADDRESS = "jpda.address"; // NOI18N
/**
* The full client URL (e.g., http://localhost:8084/AppName)
*/
- public final static String CLIENT_URL = "client.url"; // NOI18N
+ public static final String CLIENT_URL = "client.url"; // NOI18N
- public final static String SRC_FOLDERS = "src.folders"; // NOI18N
+ public static final String SRC_FOLDERS = "src.folders"; // NOI18N
- public final static String WEB_DOCBASE_DIR = "web.docbase.dir"; // NOI18N
+ public static final String WEB_DOCBASE_DIR = "web.docbase.dir"; // NOI18N
- public final static String DEBUG_SOURCEPATH = "debug.sourcepath"; // NOI18N
+ public static final String DEBUG_SOURCEPATH = "debug.sourcepath"; // NOI18N
private WebFreeformProperties() {
}
diff --git a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/DefaultFaceletLibraries.java b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/DefaultFaceletLibraries.java
index 7b4d2bb..3f81e85 100644
--- a/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/DefaultFaceletLibraries.java
+++ b/enterprise/web.jsf.editor/src/org/netbeans/modules/web/jsf/editor/facelets/DefaultFaceletLibraries.java
@@ -126,7 +126,7 @@ public class DefaultFaceletLibraries {
return files;
}
- protected synchronized static Map<String, Library> getJsf22FaceletPseudoLibraries(FaceletsLibrarySupport support) {
+ protected static synchronized Map<String, Library> getJsf22FaceletPseudoLibraries(FaceletsLibrarySupport support) {
if (jsf22FaceletPseudoLibraries == null) {
jsf22FaceletPseudoLibraries = new HashMap<>(2);
jsf22FaceletPseudoLibraries.put(DefaultLibraryInfo.JSF.getLegacyNamespace(), new JsfFaceletPseudoLibrary(support, DefaultLibraryInfo.JSF));
diff --git a/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/graph/SceneSerializer.java b/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/graph/SceneSerializer.java
index 46c2cb9..20e3555 100644
--- a/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/graph/SceneSerializer.java
+++ b/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/graph/SceneSerializer.java
@@ -159,7 +159,7 @@ public class SceneSerializer {
/**
* @param Should be either SCENE_PROJECT_SCOPR or SCENE_FACES_SCOPE
**/
- private final static Node createScopeElement( Document document, PageFlowSceneData sceneData, XmlScope scopeXml ){
+ private static final Node createScopeElement( Document document, PageFlowSceneData sceneData, XmlScope scopeXml ){
Node sceneScopeElement = null;
Map<String,PageFlowSceneData.PageData> facesConfigScopeMap = sceneData.getScopeData(scopeXml.getScope());
if( facesConfigScopeMap != null ){
@@ -208,7 +208,7 @@ public class SceneSerializer {
}
- private final static Logger LOG = Logger.getLogger("org.netbeans.modules.web.jsf.navigation");
+ private static final Logger LOG = Logger.getLogger("org.netbeans.modules.web.jsf.navigation");
// call in AWT to deserialize scene
public static void deserializeV1(PageFlowSceneData sceneData, FileObject file) {
LOG.entering("SceneSerializer", "deserializeV1(PageFlowSceneData sceneData, File file)");
diff --git a/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/graph/layout/TreeGraphLayoutUtility.java b/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/graph/layout/TreeGraphLayoutUtility.java
index dcbddea..dcaf3f5 100644
--- a/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/graph/layout/TreeGraphLayoutUtility.java
+++ b/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/graph/layout/TreeGraphLayoutUtility.java
@@ -61,11 +61,11 @@ public class TreeGraphLayoutUtility <N,E,P> {
this.vertical = vertical;
}
- public final static <N,E,P> void performLayout( GraphPinScene <N, E, P> scene) {
+ public static final <N,E,P> void performLayout( GraphPinScene <N, E, P> scene) {
performLayout( scene, 100, 100, 50, 50, true);
}
- public final static <N,E,P> void performLayout( GraphPinScene<N, E, P> graph, int originX, int originY, int verticalGap, int horizontalGap, boolean vertical){
+ public static final <N,E,P> void performLayout( GraphPinScene<N, E, P> graph, int originX, int originY, int verticalGap, int horizontalGap, boolean vertical){
Collection<N> allNodes = graph.getNodes();
HashSet<N> unresolvedNodes = new HashSet<N> (allNodes);
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/api/editor/JSFEditorUtilities.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/api/editor/JSFEditorUtilities.java
index bb2eb20..c6a8252 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/api/editor/JSFEditorUtilities.java
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/api/editor/JSFEditorUtilities.java
@@ -48,9 +48,9 @@ public class JSFEditorUtilities {
/** The constant from XML editor
*/
// The constant are taken from class org.netbeans.modules.xml.text.syntax.XMLTokenIDs
- public final static int XML_ELEMENT = 4;
- public final static int XML_TEXT = 1;
- public final static String END_LINE = System.getProperty("line.separator"); //NOI18N
+ public static final int XML_ELEMENT = 4;
+ public static final int XML_TEXT = 1;
+ public static final String END_LINE = System.getProperty("line.separator"); //NOI18N
/** Returns the value of from-view-id element of navigation rule definition on the offset possition.
* If there is not the navigation rule definition on the offset, then returns null.
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/api/facesmodel/JSFVersion.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/api/facesmodel/JSFVersion.java
index afa0fd4..97ee592 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/api/facesmodel/JSFVersion.java
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/api/facesmodel/JSFVersion.java
@@ -107,7 +107,7 @@ public enum JSFVersion {
* @return JSF version if any found on the WebModule compile classpath, {@code null} otherwise
*/
@CheckForNull
- public synchronized static JSFVersion forWebModule(@NonNull final WebModule webModule) {
+ public static synchronized JSFVersion forWebModule(@NonNull final WebModule webModule) {
Parameters.notNull("webModule", webModule); //NOI18N
JSFVersion version = projectVersionCache.get(webModule);
if (version == null) {
@@ -139,7 +139,7 @@ public enum JSFVersion {
* @since 1.65
*/
@CheckForNull
- public synchronized static JSFVersion forProject(@NonNull final Project project) {
+ public static synchronized JSFVersion forProject(@NonNull final Project project) {
Parameters.notNull("project", project); //NOI18N
WebModule webModule = WebModule.getWebModule(project.getProjectDirectory());
if (webModule != null) {
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/editor/JsfPopupAction.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/editor/JsfPopupAction.java
index 507d46a..7ac6789 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/editor/JsfPopupAction.java
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/editor/JsfPopupAction.java
@@ -56,8 +56,8 @@ import org.openide.util.actions.SystemAction;
public final class JsfPopupAction extends SystemAction implements Presenter.Popup {
private ArrayList actions = null;
- protected final static int MANAGED_BEAN_TYPE = 1;
- protected final static int NAVIGATION_RULE_TYPE = 2;
+ protected static final int MANAGED_BEAN_TYPE = 1;
+ protected static final int NAVIGATION_RULE_TYPE = 2;
public String getName() {
return NbBundle.getMessage(JsfPopupAction.class, "org-netbeans-modules-web-jsf-editor-JSFPopupAction.instance"); // NOI18N
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigComponentImpl.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigComponentImpl.java
index 1d95f72..9134c26 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigComponentImpl.java
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/facesmodel/JSFConfigComponentImpl.java
@@ -145,7 +145,7 @@ public abstract class JSFConfigComponentImpl extends AbstractDocumentComponent <
getModel().getAccess().reorderChildren(getPeer(), newIndexes, this);
}
- static public Element createElementNS(JSFConfigModel model,JSFConfigQNames jsfqname) {
+ public static Element createElementNS(JSFConfigModel model,JSFConfigQNames jsfqname) {
return model.getDocument().createElementNS(model.getRootComponent().getPeer().getNamespaceURI(), jsfqname.getQualifiedName(model.getVersion()));
}
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/ComponentImpl.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/ComponentImpl.java
index 7367ce8..35df899 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/ComponentImpl.java
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/ComponentImpl.java
@@ -42,7 +42,7 @@ public class ComponentImpl extends PersistentObject implements Component, Refre
private String tagName;
private Boolean createTag;
- private final static String DEFAULT_COMPONENT_NS = "http://xmlns.jcp.org/jsf/component"; //NOI18N
+ private static final String DEFAULT_COMPONENT_NS = "http://xmlns.jcp.org/jsf/component"; //NOI18N
protected ComponentImpl(AnnotationModelHelper helper, TypeElement typeElement) {
super(helper, typeElement);
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/JsfModelImpl.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/JsfModelImpl.java
index 7debc6a..cd45974 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/JsfModelImpl.java
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/JsfModelImpl.java
@@ -74,7 +74,7 @@ public class JsfModelImpl extends JsfModelManagers implements JsfModel {
private List<JSFConfigModel> models;
private JSFConfigModel facesConfigModel;
private Map<FileObject, WeakReference<JSFConfigModel>> modelCache = new HashMap<FileObject, WeakReference<JSFConfigModel>>();
- private final static Map<Class<? extends JsfModelElement>, ElementFinder<? extends JsfModelElement>> FINDERS =
+ private static final Map<Class<? extends JsfModelElement>, ElementFinder<? extends JsfModelElement>> FINDERS =
new HashMap<Class<? extends JsfModelElement>, ElementFinder<? extends JsfModelElement>>();
static {
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/ManagedBeanImpl.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/ManagedBeanImpl.java
index 6d1bf51..9a0f44f 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/ManagedBeanImpl.java
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/ManagedBeanImpl.java
@@ -186,7 +186,7 @@ class ManagedBeanImpl extends PersistentObject implements FacesManagedBean,
return result;
}
- private final static Map<String , ManagedBean.Scope> SCOPES
+ private static final Map<String , ManagedBean.Scope> SCOPES
= new HashMap<String, Scope>();
static {
SCOPES.put("javax.faces.bean.ApplicationScoped", // NOI18N
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/ObjectProviders.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/ObjectProviders.java
index 0be0bb3..fd51cf7 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/ObjectProviders.java
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/impl/metamodel/ObjectProviders.java
@@ -92,7 +92,7 @@ class ObjectProviders {
return result;
}
- private final static class ListenerForHandler implements ArrayValueHandler {
+ private static final class ListenerForHandler implements ArrayValueHandler {
ListenerForHandler(AnnotationModelHelper helper,
TypeElement type, List<SystemEventListener> listeners )
@@ -361,7 +361,7 @@ class ObjectProviders {
}
- private static abstract class AbstractProvider<T extends Refreshable>
+ private abstract static class AbstractProvider<T extends Refreshable>
implements ObjectProvider<T>
{
AbstractProvider(AnnotationModelHelper helper, String annotationName) {
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/palette/items/FromEntityBase.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/palette/items/FromEntityBase.java
index e712531..16dfb29 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/palette/items/FromEntityBase.java
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/palette/items/FromEntityBase.java
@@ -495,7 +495,7 @@ public abstract class FromEntityBase {
// }
// }
- public final static class FieldDesc {
+ public static final class FieldDesc {
private ExecutableElement method;
private String methodName;
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/refactoring/Occurrences.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/refactoring/Occurrences.java
index 4bb6fd5..6a0d30e 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/refactoring/Occurrences.java
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/refactoring/Occurrences.java
@@ -55,7 +55,7 @@ public class Occurrences {
private static final Logger LOGGER = Logger.getLogger(Occurrences.class.getName());
- public static abstract class OccurrenceItem {
+ public abstract static class OccurrenceItem {
// the faces configuration file
protected FileObject config;
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/TemplateClientPanelVisual.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/TemplateClientPanelVisual.java
index d52af93..f9b4341 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/TemplateClientPanelVisual.java
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/wizards/TemplateClientPanelVisual.java
@@ -77,7 +77,7 @@ public class TemplateClientPanelVisual extends javax.swing.JPanel implements Hel
private final Set<ChangeListener> listeners = new HashSet<>(1);
- private final static String VALUE_NAME = "name"; //NOI18N
+ private static final String VALUE_NAME = "name"; //NOI18N
/** Creates new form TemplateClientPanel */
public TemplateClientPanelVisual(WizardDescriptor wizardDescriptor) {
diff --git a/enterprise/web.jspparser/src/org/netbeans/modules/web/jsps/parserapi/Node.java b/enterprise/web.jspparser/src/org/netbeans/modules/web/jsps/parserapi/Node.java
index 07e11c3..13cefa4 100644
--- a/enterprise/web.jspparser/src/org/netbeans/modules/web/jsps/parserapi/Node.java
+++ b/enterprise/web.jspparser/src/org/netbeans/modules/web/jsps/parserapi/Node.java
@@ -836,7 +836,7 @@ public abstract class Node {
/**
* Represents an expression, declaration, or scriptlet
*/
- public static abstract class ScriptingElement extends Node {
+ public abstract static class ScriptingElement extends Node {
public ScriptingElement(String qName, String localName, String text,
Mark start, Node parent) {
diff --git a/enterprise/web.monitor/serversrc/org/netbeans/modules/web/monitor/server/MonitorFilter.java b/enterprise/web.monitor/serversrc/org/netbeans/modules/web/monitor/server/MonitorFilter.java
index 5261441..e5e1c35 100644
--- a/enterprise/web.monitor/serversrc/org/netbeans/modules/web/monitor/server/MonitorFilter.java
+++ b/enterprise/web.monitor/serversrc/org/netbeans/modules/web/monitor/server/MonitorFilter.java
@@ -56,22 +56,22 @@ import org.netbeans.modules.web.monitor.data.*;
public class MonitorFilter extends Logger implements Filter {
// REPLAY strings - must be coordinated with client.Controller
- public final static String REPLAY = "netbeans.replay"; //NOI18N
- public final static String PORT = "netbeans.replay.port"; //NOI18N
- public final static String REPLAYSTATUS = "netbeans.replay.status"; //NOI18N
- public final static String REPLAYSESSION = "netbeans.replay.session"; //NOI18N
+ public static final String REPLAY = "netbeans.replay"; //NOI18N
+ public static final String PORT = "netbeans.replay.port"; //NOI18N
+ public static final String REPLAYSTATUS = "netbeans.replay.status"; //NOI18N
+ public static final String REPLAYSESSION = "netbeans.replay.session"; //NOI18N
// The request attribute name under which we store a reference to
// ourself.
private String attribute = null;
- public final static String PREFIX = "netbeans.monitor"; //NOI18N
- private final static String attNameRequest =
+ public static final String PREFIX = "netbeans.monitor"; //NOI18N
+ private static final String attNameRequest =
"netbeans.monitor.request"; //NOI18N
- private final static String attNameResponse =
+ private static final String attNameResponse =
"netbeans.monitor.response"; //NOI18N
- private final static String attNameFilter =
+ private static final String attNameFilter =
"netbeans.monitor.filter"; //NOI18N
- private final static String attNameMonData =
+ private static final String attNameMonData =
"netbeans.monitor.monData"; //NOI18N
//private final static String attNameExecTime =
//"netbeans.monitor.execTime"; //NOI18N
@@ -86,7 +86,7 @@ public class MonitorFilter extends Logger implements Filter {
// configured.
private FilterConfig filterConfig = null;
- private final static String className =
+ private static final String className =
"org.netbeans.modules.web.monitor.server.Monitor"; //NOI18N
private static ResourceBundle statusmsgs =
@@ -113,7 +113,7 @@ public class MonitorFilter extends Logger implements Filter {
"/netbeans-tomcat-status-test"; //NOI18N
// debugging
- private final static boolean debug = false;
+ private static final boolean debug = false;
public MonitorFilter() {
}
diff --git a/enterprise/web.monitor/serversrc/org/netbeans/modules/web/monitor/server/MonitorRequestWrapper.java b/enterprise/web.monitor/serversrc/org/netbeans/modules/web/monitor/server/MonitorRequestWrapper.java
index 05e7727..2ecc23a 100644
--- a/enterprise/web.monitor/serversrc/org/netbeans/modules/web/monitor/server/MonitorRequestWrapper.java
+++ b/enterprise/web.monitor/serversrc/org/netbeans/modules/web/monitor/server/MonitorRequestWrapper.java
@@ -61,8 +61,8 @@ public class MonitorRequestWrapper extends HttpServletRequestWrapper {
// These fields are used to manage session replacement during
// replay, if the server supports it
- public final static String JSESSIONID = "JSESSIONID"; // NOI18N
- public final static String REPLACED =
+ public static final String JSESSIONID = "JSESSIONID"; // NOI18N
+ public static final String REPLACED =
"netbeans.replay.session-replaced"; //NOI18N
private static final boolean debug = false;
diff --git a/enterprise/web.monitor/serversrc/org/netbeans/modules/web/monitor/server/NotifyUtil.java b/enterprise/web.monitor/serversrc/org/netbeans/modules/web/monitor/server/NotifyUtil.java
index c199bbc..97d0553 100644
--- a/enterprise/web.monitor/serversrc/org/netbeans/modules/web/monitor/server/NotifyUtil.java
+++ b/enterprise/web.monitor/serversrc/org/netbeans/modules/web/monitor/server/NotifyUtil.java
@@ -51,10 +51,10 @@ class NotifyUtil {
private String ideServer = null;
private Vector otherIDEs = null;
boolean errorPrinted = false;
- private final static String putServlet =
+ private static final String putServlet =
"/servlet/org.netbeans.modules.web.monitor.client.PutTransaction?"; //NOI18N
- private final static String replayServlet =
+ private static final String replayServlet =
"/servlet/org.netbeans.modules.web.monitor.client.ReplaySendXMLServlet"; //NOI18N
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/ClientDisplay.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/ClientDisplay.java
index a4a1763..c8a08f1 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/ClientDisplay.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/ClientDisplay.java
@@ -37,7 +37,7 @@ import java.util.*;
public class ClientDisplay extends DataDisplay {
- private final static boolean debug = false;
+ private static final boolean debug = false;
private DisplayTable clientTable = null;
private DisplayTable engineTable = null;
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/ContextDisplay.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/ContextDisplay.java
index b6c7759..29adb2b 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/ContextDisplay.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/ContextDisplay.java
@@ -37,7 +37,7 @@ import java.util.*;
public class ContextDisplay extends DataDisplay {
- private final static boolean debug = false;
+ private static final boolean debug = false;
DisplayTable contextTable;
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/Controller.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/Controller.java
index c4455d6..c20dea4 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/Controller.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/Controller.java
@@ -66,17 +66,17 @@ import org.netbeans.modules.web.monitor.data.*;
class Controller {
// REPLAY strings - must be coordinated with server.MonitorFilter
- final static String REPLAY="netbeans.replay"; //NOI18N
- final static String PORT="netbeans.replay.port"; //NOI18N
- final static String REPLAYSTATUS="netbeans.replay.status"; //NOI18N
- final static String REPLAYSESSION="netbeans.replay.session"; //NOI18N
+ static final String REPLAY="netbeans.replay"; //NOI18N
+ static final String PORT="netbeans.replay.port"; //NOI18N
+ static final String REPLAYSTATUS="netbeans.replay.status"; //NOI18N
+ static final String REPLAYSESSION="netbeans.replay.session"; //NOI18N
static final boolean debug = false;
//private transient static boolean starting = true;
// Test server location and port
// Should use InetAddress.getLocalhost() instead
- private transient static String server = "localhost"; //NOI18N
- private transient static int port = 8080;
+ private static transient String server = "localhost"; //NOI18N
+ private static transient int port = 8080;
// Location of the files
private static FileObject monDir = null;
@@ -84,10 +84,10 @@ class Controller {
private static FileObject saveDir = null;
private static FileObject replayDir = null;
- final static String monDirStr = "HTTPMonitor"; // NOI18N
- final static String currDirStr = "current"; // NOI18N
- final static String saveDirStr = "save"; // NOI18N
- final static String replayDirStr = "replay"; // NOI18N
+ static final String monDirStr = "HTTPMonitor"; // NOI18N
+ static final String currDirStr = "current"; // NOI18N
+ static final String saveDirStr = "save"; // NOI18N
+ static final String replayDirStr = "replay"; // NOI18N
// Constant nodes etc we need to know about
private transient NavigateNode root = null;
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/CookieDisplay.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/CookieDisplay.java
index a04f5f0..30cd6c1 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/CookieDisplay.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/CookieDisplay.java
@@ -45,7 +45,7 @@ import org.netbeans.modules.web.monitor.data.*;
public class CookieDisplay extends DataDisplay {
- private final static boolean debug = false;
+ private static final boolean debug = false;
public CookieDisplay() {
super();
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/DataDisplay.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/DataDisplay.java
index 5f3010d..4e57c00 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/DataDisplay.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/DataDisplay.java
@@ -43,22 +43,22 @@ import org.netbeans.modules.web.monitor.data.DataRecord;
import org.netbeans.modules.web.monitor.data.Param;
import org.openide.awt.Mnemonics;
-abstract public class DataDisplay extends JPanel {
+public abstract class DataDisplay extends JPanel {
//
// Common Insets
// Insets(top, left, bottom, right)
- final static Insets zeroInsets = new Insets( 0, 0, 0, 0);
- final static Insets tableInsets = new Insets( 0, 18, 12, 12);
- final static Insets labelInsets = new Insets( 0, 6, 0, 0);
- final static Insets buttonInsets = new Insets( 6, 0, 5, 6);
- final static Insets sortButtonInsets = new Insets( 0, 12, 0, 0);
- final static Insets indentInsets = new Insets( 0, 18, 0, 0);
- final static Insets topSpacerInsets = new Insets(12, 0, 0, 0);
-
- final static int fullGridWidth = java.awt.GridBagConstraints.REMAINDER;
- final static double tableWeightX = 1.0;
- final static double tableWeightY = 0;
+ static final Insets zeroInsets = new Insets( 0, 0, 0, 0);
+ static final Insets tableInsets = new Insets( 0, 18, 12, 12);
+ static final Insets labelInsets = new Insets( 0, 6, 0, 0);
+ static final Insets buttonInsets = new Insets( 6, 0, 5, 6);
+ static final Insets sortButtonInsets = new Insets( 0, 12, 0, 0);
+ static final Insets indentInsets = new Insets( 0, 18, 0, 0);
+ static final Insets topSpacerInsets = new Insets(12, 0, 0, 0);
+
+ static final int fullGridWidth = java.awt.GridBagConstraints.REMAINDER;
+ static final double tableWeightX = 1.0;
+ static final double tableWeightY = 0;
public DataDisplay() {
super();
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanel.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanel.java
index 788b562..fa49c61 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanel.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanel.java
@@ -108,10 +108,10 @@ class EditPanel extends javax.swing.JPanel implements
//private JToggleButton browserCookieButton, savedCookieButton;
//private static boolean useBrowserCookie = true;
- final static String METHOD = "method"; //NOI18N
- final static String GET = "GET"; //NOI18N
- final static String POST = "POST"; //NOI18N
- final static String PUT = "PUT"; //NOI18N
+ static final String METHOD = "method"; //NOI18N
+ static final String GET = "GET"; //NOI18N
+ static final String POST = "POST"; //NOI18N
+ static final String PUT = "PUT"; //NOI18N
private static EditPanel instance = null;
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelCookies.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelCookies.java
index 82bef9e..c4e1d87 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelCookies.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelCookies.java
@@ -54,7 +54,7 @@ import org.openide.awt.Mnemonics;
class EditPanelCookies extends DataDisplay {
- private final static boolean debug = false;
+ private static final boolean debug = false;
private DisplayTable cookieTable = null;
private MonitorData monitorData = null;
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelHeaders.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelHeaders.java
index 4aa053e..4d948b6 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelHeaders.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelHeaders.java
@@ -54,7 +54,7 @@ import org.openide.awt.Mnemonics;
class EditPanelHeaders extends DataDisplay {
- private final static boolean debug = false;
+ private static final boolean debug = false;
private DisplayTable headerTable = null;
private MonitorData monitorData = null;
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelQuery.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelQuery.java
index f2e3a9b..a1d7614 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelQuery.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelQuery.java
@@ -57,7 +57,7 @@ import org.openide.awt.Mnemonics;
class EditPanelQuery extends DataDisplay {
- private final static boolean debug = false;
+ private static final boolean debug = false;
private DisplayTable paramTable = null;
private MonitorData monitorData = null;
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelRequest.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelRequest.java
index 3f1ae4d..f3cab0a 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelRequest.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelRequest.java
@@ -44,7 +44,7 @@ import org.netbeans.modules.web.monitor.data.*;
class EditPanelRequest extends DataDisplay {
- private final static boolean debug = false;
+ private static final boolean debug = false;
private static final String [] methodChoices = {
EditPanel.GET,
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelServer.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelServer.java
index f4013c0..c84c440 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelServer.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/EditPanelServer.java
@@ -48,7 +48,7 @@ import org.netbeans.modules.web.monitor.data.*;
class EditPanelServer extends DataDisplay {
- private final static boolean debug = false;
+ private static final boolean debug = false;
private boolean holdTableChanges = false;
private DisplayTable serverTable = null;
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/HeaderDisplay.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/HeaderDisplay.java
index e221b71..252fc8f 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/HeaderDisplay.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/HeaderDisplay.java
@@ -48,7 +48,7 @@ import java.util.*;
public class HeaderDisplay extends DataDisplay {
- private final static boolean debug = false;
+ private static final boolean debug = false;
private DisplayTable dt = null;
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/NameValueCellEditor.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/NameValueCellEditor.java
index 9c421cc..4286cfe 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/NameValueCellEditor.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/NameValueCellEditor.java
@@ -52,7 +52,7 @@ import org.openide.util.NbBundle;
* Param editorn vara non-modal? */
public class NameValueCellEditor extends DefaultCellEditor {
- private final static boolean debug = false;
+ private static final boolean debug = false;
private static String editNameAndValueTitle;
private static String editValueOnlyTitle;
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/ReplaySendXMLServlet.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/ReplaySendXMLServlet.java
index 6baef2c..12b3e48 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/ReplaySendXMLServlet.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/ReplaySendXMLServlet.java
@@ -41,7 +41,7 @@ public class ReplaySendXMLServlet extends HttpServlet {
private static FileObject currDir = null;
private static FileObject saveDir = null;
private static FileObject replayDir = null;
- private final static boolean debug = false;
+ private static final boolean debug = false;
//
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/RequestDisplay.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/RequestDisplay.java
index 9978a73..c8ca5f2 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/RequestDisplay.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/RequestDisplay.java
@@ -43,7 +43,7 @@ import javax.swing.event.TableModelListener;
public class RequestDisplay extends DataDisplay {
- private final static boolean debug = false;
+ private static final boolean debug = false;
private DisplayTable dt = null;
DisplayTable paramTable = null;
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/SessionDisplay.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/SessionDisplay.java
index 071cb23..a1b71e0 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/SessionDisplay.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/SessionDisplay.java
@@ -38,7 +38,7 @@ import java.util.*;
public class SessionDisplay extends DataDisplay {
- private final static boolean debug = false;
+ private static final boolean debug = false;
public SessionDisplay() {
super();
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/TransactionView.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/TransactionView.java
index 23ae346..761ef5f 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/TransactionView.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/TransactionView.java
@@ -70,8 +70,8 @@ class TransactionView extends TopComponent implements ExplorerManager.Provider,
PropertyChangeListener, ChangeListener {
// Handles all the files etc.
- private transient static TransactionView instance = null;
- private transient static Controller controller = null;
+ private static transient TransactionView instance = null;
+ private static transient Controller controller = null;
// Misc
private transient JToggleButton timeAButton, timeDButton,
@@ -85,7 +85,7 @@ class TransactionView extends TopComponent implements ExplorerManager.Provider,
private transient Dimension tabD = new Dimension(500,472);
// Display stuff
- private transient static ExplorerManager mgr = null;
+ private static transient ExplorerManager mgr = null;
private transient JPanel logPanel = null;
private transient JPanel dataPanel = null;
private transient JSplitPane splitPanel = null;
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/Util.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/Util.java
index 4b869c0..60c5e35 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/Util.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/Util.java
@@ -40,7 +40,7 @@ import org.netbeans.modules.web.monitor.data.*;
public class Util {
- private final static boolean debug = false;
+ private static final boolean debug = false;
public Util() {}
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ClientData.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ClientData.java
index db4df87..a3a757e 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ClientData.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ClientData.java
@@ -54,12 +54,12 @@ public class ClientData extends BaseBean {
}
//
- static public void addComparator(BeanComparator c) {
+ public static void addComparator(BeanComparator c) {
ClientData.comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c) {
+ public static void removeComparator(BeanComparator c) {
ClientData.comparators.remove(c);
}
//
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextAttributes.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextAttributes.java
index 3ddfe7f..cde876e 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextAttributes.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextAttributes.java
@@ -45,7 +45,7 @@ public class ContextAttributes extends BaseBean {
static Vector<BeanComparator> comparators = new Vector<>();
- static public final String PARAM = "Param"; // NOI18N
+ public static final String PARAM = "Param"; // NOI18N
public ContextAttributes() {
this(Common.USE_DEFAULT_VALUES);
@@ -130,12 +130,12 @@ public class ContextAttributes extends BaseBean {
}
//
- static public void addComparator(BeanComparator c) {
+ public static void addComparator(BeanComparator c) {
ContextAttributes.comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c) {
+ public static void removeComparator(BeanComparator c) {
ContextAttributes.comparators.remove(c);
}
//
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextData.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextData.java
index 8f9e625..c9a773e 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextData.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ContextData.java
@@ -43,8 +43,8 @@ public class ContextData extends BaseBean {
static Vector<BeanComparator> comparators = new Vector<>();
- static public final String PARAM = "Param"; //NOI18N
- static public final String CONTEXTATTRIBUTES =
+ public static final String PARAM = "Param"; //NOI18N
+ public static final String CONTEXTATTRIBUTES =
"ContextAttributes"; //NOI18N
public ContextData() {
@@ -134,12 +134,12 @@ public class ContextData extends BaseBean {
}
//
- static public void addComparator(BeanComparator c) {
+ public static void addComparator(BeanComparator c) {
ContextData.comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c) {
+ public static void removeComparator(BeanComparator c) {
ContextData.comparators.remove(c);
}
//
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookieIn.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookieIn.java
index f75454f..2d96e39 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookieIn.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookieIn.java
@@ -94,13 +94,13 @@ public class CookieIn extends BaseBean {
public void setValue(String v) {this.setAttributeValue("value", v);} //NOI18N
//
- static public void addComparator(BeanComparator c)
+ public static void addComparator(BeanComparator c)
{
CookieIn.comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c)
+ public static void removeComparator(BeanComparator c)
{
CookieIn.comparators.remove(c);
}
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookieOut.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookieOut.java
index 2de38a7..e9681e1 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookieOut.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookieOut.java
@@ -123,13 +123,13 @@ public class CookieOut extends BaseBean
}
//
- static public void addComparator(BeanComparator c)
+ public static void addComparator(BeanComparator c)
{
CookieOut.comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c)
+ public static void removeComparator(BeanComparator c)
{
CookieOut.comparators.remove(c);
}
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookiesData.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookiesData.java
index dc60d70..1406905 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookiesData.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/CookiesData.java
@@ -33,8 +33,8 @@ public class CookiesData extends BaseBean {
static Vector<BeanComparator> comparators = new Vector<>();
- static public final String COOKIEIN = "CookieIn"; // NOI18N
- static public final String COOKIEOUT = "CookieOut"; // NOI18N
+ public static final String COOKIEIN = "CookieIn"; // NOI18N
+ public static final String COOKIEOUT = "CookieOut"; // NOI18N
//public final static String JSESSIONID = "JSESSIONID"; // NOI18N
public CookiesData() {
@@ -171,12 +171,12 @@ public class CookiesData extends BaseBean {
}
//
- static public void addComparator(BeanComparator c) {
+ public static void addComparator(BeanComparator c) {
ClientData.comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c) {
+ public static void removeComparator(BeanComparator c) {
ClientData.comparators.remove(c);
}
//
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/DispatchData.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/DispatchData.java
index d0ffdbb..283745a 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/DispatchData.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/DispatchData.java
@@ -31,18 +31,18 @@ import org.netbeans.modules.schema2beans.Version;
public class DispatchData extends BaseBean implements DataRecord {
- private final static boolean debug = false;
+ private static final boolean debug = false;
static Vector<BeanComparator> comparators = new Vector<>();
- static public final String CLIENTDATA = "ClientData"; // NOI18N
- static public final String SESSIONDATA = "SessionData"; // NOI18N
- static public final String COOKIESDATA = "CookiesData"; // NOI18N
- static public final String REQUESTDATA = "RequestData"; // NOI18N
- static public final String SERVLETDATA = "ServletData"; // NOI18N
- static public final String CONTEXTDATA = "ContextData"; // NOI18N
- static public final String ENGINEDATA = "EngineData"; // NOI18N
- static public final String DISPATCHES = "Dispatches"; // NOI18N
+ public static final String CLIENTDATA = "ClientData"; // NOI18N
+ public static final String SESSIONDATA = "SessionData"; // NOI18N
+ public static final String COOKIESDATA = "CookiesData"; // NOI18N
+ public static final String REQUESTDATA = "RequestData"; // NOI18N
+ public static final String SERVLETDATA = "ServletData"; // NOI18N
+ public static final String CONTEXTDATA = "ContextData"; // NOI18N
+ public static final String ENGINEDATA = "EngineData"; // NOI18N
+ public static final String DISPATCHES = "Dispatches"; // NOI18N
public DispatchData() {
this(Common.USE_DEFAULT_VALUES);
@@ -422,12 +422,12 @@ public class DispatchData extends BaseBean implements DataRecord {
//
- static public void addComparator(BeanComparator c) {
+ public static void addComparator(BeanComparator c) {
MonitorData.comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c) {
+ public static void removeComparator(BeanComparator c) {
MonitorData.comparators.remove(c);
}
//
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Dispatches.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Dispatches.java
index 3a01868..dd2a922 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Dispatches.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Dispatches.java
@@ -30,7 +30,7 @@ public class Dispatches extends BaseBean {
static Vector<BeanComparator> comparators = new Vector<>();
- static public final String DISPATCHDATA = "DispatchData"; // NOI18N
+ public static final String DISPATCHDATA = "DispatchData"; // NOI18N
public Dispatches() {
this(Common.USE_DEFAULT_VALUES);
@@ -94,12 +94,12 @@ public class Dispatches extends BaseBean {
}
//
- static public void addComparator(BeanComparator c) {
+ public static void addComparator(BeanComparator c) {
comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c) {
+ public static void removeComparator(BeanComparator c) {
comparators.remove(c);
}
// Dump the content of this bean returning it as a String
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/EngineData.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/EngineData.java
index 59d8062..4b0168b 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/EngineData.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/EngineData.java
@@ -57,13 +57,13 @@ public class EngineData extends BaseBean {
}
//
- static public void addComparator(BeanComparator c)
+ public static void addComparator(BeanComparator c)
{
EngineData.comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c)
+ public static void removeComparator(BeanComparator c)
{
EngineData.comparators.remove(c);
}
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Headers.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Headers.java
index 5d75823..a172417 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Headers.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Headers.java
@@ -41,7 +41,7 @@ public class Headers extends BaseBean {
static Vector<BeanComparator> comparators = new Vector<>();
- static public final String PARAM = "Param"; // NOI18N
+ public static final String PARAM = "Param"; // NOI18N
public Headers() {
this(Common.USE_DEFAULT_VALUES);
@@ -181,12 +181,12 @@ public class Headers extends BaseBean {
}
//
- static public void addComparator(BeanComparator c) {
+ public static void addComparator(BeanComparator c) {
Headers.comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c) {
+ public static void removeComparator(BeanComparator c) {
Headers.comparators.remove(c);
}
//
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/MonitorData.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/MonitorData.java
index 5fb0902..95e56bb 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/MonitorData.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/MonitorData.java
@@ -42,19 +42,19 @@ import org.xml.sax.InputSource;
public class MonitorData extends BaseBean implements DataRecord {
- private final static boolean debug = false;
+ private static final boolean debug = false;
static Vector<BeanComparator> comparators = new Vector<>();
- static public final String CLIENTDATA = "ClientData"; // NOI18N
- static public final String SESSIONDATA = "SessionData"; // NOI18N
- static public final String COOKIESDATA = "CookiesData"; // NOI18N
- static public final String REQUESTDATA = "RequestData"; // NOI18N
- static public final String SERVLETDATA = "ServletData"; // NOI18N
- static public final String CONTEXTDATA = "ContextData"; // NOI18N
- static public final String ENGINEDATA = "EngineData"; // NOI18N
- static public final String MONITORDATA = "MonitorData"; // NOI18N
- static public final String DISPATCHES = "Dispatches"; // NOI18N
+ public static final String CLIENTDATA = "ClientData"; // NOI18N
+ public static final String SESSIONDATA = "SessionData"; // NOI18N
+ public static final String COOKIESDATA = "CookiesData"; // NOI18N
+ public static final String REQUESTDATA = "RequestData"; // NOI18N
+ public static final String SERVLETDATA = "ServletData"; // NOI18N
+ public static final String CONTEXTDATA = "ContextData"; // NOI18N
+ public static final String ENGINEDATA = "EngineData"; // NOI18N
+ public static final String MONITORDATA = "MonitorData"; // NOI18N
+ public static final String DISPATCHES = "Dispatches"; // NOI18N
public MonitorData() {
this(null, Common.USE_DEFAULT_VALUES);
@@ -474,12 +474,12 @@ public class MonitorData extends BaseBean implements DataRecord {
//
- static public void addComparator(BeanComparator c) {
+ public static void addComparator(BeanComparator c) {
MonitorData.comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c) {
+ public static void removeComparator(BeanComparator c) {
MonitorData.comparators.remove(c);
}
//
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Param.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Param.java
index c93691e..3742e28 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Param.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/Param.java
@@ -76,12 +76,12 @@ public class Param extends BaseBean {
}
//
- static public void addComparator(BeanComparator c) {
+ public static void addComparator(BeanComparator c) {
Param.comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c) {
+ public static void removeComparator(BeanComparator c) {
Param.comparators.remove(c);
}
//
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestAttributesIn.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestAttributesIn.java
index d59a8fe..bafb29d 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestAttributesIn.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestAttributesIn.java
@@ -45,7 +45,7 @@ public class RequestAttributesIn extends BaseBean {
static Vector<BeanComparator> comparators = new Vector<>();
- static public final String PARAM = "Param"; // NOI18N
+ public static final String PARAM = "Param"; // NOI18N
public RequestAttributesIn() {
this(Common.USE_DEFAULT_VALUES);
@@ -130,12 +130,12 @@ public class RequestAttributesIn extends BaseBean {
}
//
- static public void addComparator(BeanComparator c) {
+ public static void addComparator(BeanComparator c) {
RequestAttributesIn.comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c) {
+ public static void removeComparator(BeanComparator c) {
RequestAttributesIn.comparators.remove(c);
}
//
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestAttributesOut.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestAttributesOut.java
index 279145f..ec4ee4b 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestAttributesOut.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestAttributesOut.java
@@ -45,7 +45,7 @@ public class RequestAttributesOut extends BaseBean {
static Vector<BeanComparator> comparators = new Vector<>();
- static public final String PARAM = "Param"; // NOI18N
+ public static final String PARAM = "Param"; // NOI18N
public RequestAttributesOut() {
this(Common.USE_DEFAULT_VALUES);
@@ -130,12 +130,12 @@ public class RequestAttributesOut extends BaseBean {
}
//
- static public void addComparator(BeanComparator c) {
+ public static void addComparator(BeanComparator c) {
RequestAttributesOut.comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c) {
+ public static void removeComparator(BeanComparator c) {
RequestAttributesOut.comparators.remove(c);
}
//
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestData.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestData.java
index 56dfc31..3d380bd 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestData.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/RequestData.java
@@ -38,17 +38,17 @@ public class RequestData extends BaseBean {
static Vector<BeanComparator> comparators = new Vector<>();
- static public final String PARAM = "Param"; //NOI18N
- static public final String HEADERS = "Headers"; //NOI18N
- static public final String REQUESTATTRIBUTESIN =
+ public static final String PARAM = "Param"; //NOI18N
+ public static final String HEADERS = "Headers"; //NOI18N
+ public static final String REQUESTATTRIBUTESIN =
"RequestAttributesIn"; //NOI18N
- static public final String REQUESTATTRIBUTESOUT =
+ public static final String REQUESTATTRIBUTESOUT =
"RequestAttributesOut"; //NOI18N
- static public final String REQUESTDATA = "RequestData"; //NOI18N
+ public static final String REQUESTDATA = "RequestData"; //NOI18N
- public final static String JSESSIONID = "JSESSIONID"; // NOI18N
- public final static String COOKIE = "cookie"; // NOI18N
- static private final boolean debug = false;
+ public static final String JSESSIONID = "JSESSIONID"; // NOI18N
+ public static final String COOKIE = "cookie"; // NOI18N
+ private static final boolean debug = false;
public RequestData() {
@@ -235,7 +235,7 @@ public class RequestData extends BaseBean {
- static public String findSessionID(String cookieStr) {
+ public static String findSessionID(String cookieStr) {
if(cookieStr == null || cookieStr.equals("")) //NOI18N
return ""; //NOI18N
@@ -550,13 +550,13 @@ public class RequestData extends BaseBean {
}
//
- static public void addComparator(BeanComparator c)
+ public static void addComparator(BeanComparator c)
{
RequestData.comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c)
+ public static void removeComparator(BeanComparator c)
{
RequestData.comparators.remove(c);
}
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ServletData.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ServletData.java
index 5c92ba7..83cf3c1 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ServletData.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/ServletData.java
@@ -33,7 +33,7 @@ public class ServletData extends BaseBean {
static Vector<BeanComparator> comparators = new Vector<>();
- static public final String PARAM = "Param"; //NOI18N
+ public static final String PARAM = "Param"; //NOI18N
public ServletData() {
this(Common.USE_DEFAULT_VALUES);
@@ -104,12 +104,12 @@ public class ServletData extends BaseBean {
}
//
- static public void addComparator(BeanComparator c) {
+ public static void addComparator(BeanComparator c) {
ServletData.comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c) {
+ public static void removeComparator(BeanComparator c) {
ServletData.comparators.remove(c);
}
//
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionData.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionData.java
index dc46a39..d8e8179 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionData.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionData.java
@@ -33,8 +33,8 @@ public class SessionData extends BaseBean {
static Vector<BeanComparator> comparators = new Vector<>();
- static public final String SESSIONIN = "SessionIn"; //NOI18N
- static public final String SESSIONOUT = "SessionOut"; //NOI18N
+ public static final String SESSIONIN = "SessionIn"; //NOI18N
+ public static final String SESSIONOUT = "SessionOut"; //NOI18N
public SessionData() {
this(Common.USE_DEFAULT_VALUES);
@@ -103,12 +103,12 @@ public class SessionData extends BaseBean {
}
//
- static public void addComparator(BeanComparator c) {
+ public static void addComparator(BeanComparator c) {
SessionData.comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c) {
+ public static void removeComparator(BeanComparator c) {
SessionData.comparators.remove(c);
}
//
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionIn.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionIn.java
index 93b874c..fcd347a 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionIn.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionIn.java
@@ -46,7 +46,7 @@ public class SessionIn extends BaseBean {
static Vector<BeanComparator> comparators = new Vector<>();
- static public final String PARAM = "Param"; //NOI18N
+ public static final String PARAM = "Param"; //NOI18N
public SessionIn() {
this(Common.USE_DEFAULT_VALUES);
@@ -115,12 +115,12 @@ public class SessionIn extends BaseBean {
}
//
- static public void addComparator(BeanComparator c) {
+ public static void addComparator(BeanComparator c) {
SessionIn.comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c) {
+ public static void removeComparator(BeanComparator c) {
SessionIn.comparators.remove(c);
}
//
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionOut.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionOut.java
index 0550cd6..6f32547 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionOut.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/data/SessionOut.java
@@ -47,7 +47,7 @@ public class SessionOut extends BaseBean {
static Vector<BeanComparator> comparators = new Vector<>();
- static public final String PARAM = "Param"; //NOI18N
+ public static final String PARAM = "Param"; //NOI18N
public SessionOut() {
this(Common.USE_DEFAULT_VALUES);
@@ -117,12 +117,12 @@ public class SessionOut extends BaseBean {
}
//
- static public void addComparator(BeanComparator c) {
+ public static void addComparator(BeanComparator c) {
SessionOut.comparators.add(c);
}
//
- static public void removeComparator(BeanComparator c) {
+ public static void removeComparator(BeanComparator c) {
SessionOut.comparators.remove(c);
}
//
diff --git a/enterprise/web.project/src/org/netbeans/modules/web/project/classpath/ClassPathSupportCallbackImpl.java b/enterprise/web.project/src/org/netbeans/modules/web/project/classpath/ClassPathSupportCallbackImpl.java
index 86cfee0..75f8a3e 100644
--- a/enterprise/web.project/src/org/netbeans/modules/web/project/classpath/ClassPathSupportCallbackImpl.java
+++ b/enterprise/web.project/src/org/netbeans/modules/web/project/classpath/ClassPathSupportCallbackImpl.java
@@ -70,8 +70,8 @@ public final class ClassPathSupportCallbackImpl implements org.netbeans.modules.
//private static final String ATTR_FILES = "files"; //NOI18N
private static final String ATTR_DIRS = "dirs"; //NOI18N
- public final static String TAG_WEB_MODULE_LIBRARIES = "web-module-libraries"; // NOI18N
- public final static String TAG_WEB_MODULE__ADDITIONAL_LIBRARIES = "web-module-additional-libraries"; // NOI18N
+ public static final String TAG_WEB_MODULE_LIBRARIES = "web-module-libraries"; // NOI18N
+ public static final String TAG_WEB_MODULE__ADDITIONAL_LIBRARIES = "web-module-additional-libraries"; // NOI18N
public static final String PATH_IN_WAR_LIB = "WEB-INF/lib"; //NOI18N
public static final String PATH_IN_WAR_DIR = "WEB-INF/classes"; //NOI18N
diff --git a/enterprise/web.project/src/org/netbeans/modules/web/project/jaxws/WebProjectJAXWSSupport.java b/enterprise/web.project/src/org/netbeans/modules/web/project/jaxws/WebProjectJAXWSSupport.java
index 9aa22cf..2b2caf5 100644
--- a/enterprise/web.project/src/org/netbeans/modules/web/project/jaxws/WebProjectJAXWSSupport.java
+++ b/enterprise/web.project/src/org/netbeans/modules/web/project/jaxws/WebProjectJAXWSSupport.java
@@ -71,8 +71,8 @@ import org.openide.util.NbBundle;
public class WebProjectJAXWSSupport extends ProjectJAXWSSupport /*implements JAXWSSupportImpl*/ {
private WebProject project;
//servlet name and servlet listener for non-JSR 109 web services
- private final static String servletClassName = "com.sun.xml.ws.transport.http.servlet.WSServlet"; //NOI18N
- private final static String servletListener = "com.sun.xml.ws.transport.http.servlet.WSServletContextListener"; //NOI18N
+ private static final String servletClassName = "com.sun.xml.ws.transport.http.servlet.WSServlet"; //NOI18N
+ private static final String servletListener = "com.sun.xml.ws.transport.http.servlet.WSServletContextListener"; //NOI18N
/** Creates a new instance of JAXWSSupport */
public WebProjectJAXWSSupport(WebProject project, AntProjectHelper antProjectHelper) {
diff --git a/enterprise/web.project/src/org/netbeans/modules/web/project/ui/DocBaseNodeFactory.java b/enterprise/web.project/src/org/netbeans/modules/web/project/ui/DocBaseNodeFactory.java
index 07b8a5c..363becc 100644
--- a/enterprise/web.project/src/org/netbeans/modules/web/project/ui/DocBaseNodeFactory.java
+++ b/enterprise/web.project/src/org/netbeans/modules/web/project/ui/DocBaseNodeFactory.java
@@ -282,7 +282,7 @@ public final class DocBaseNodeFactory implements NodeFactory {
}
}
- private static abstract class BaseNode extends FilterNode {
+ private abstract static class BaseNode extends FilterNode {
private static Image WEB_PAGES_BADGE = ImageUtilities.loadImage( "org/netbeans/modules/web/project/ui/resources/webPagesBadge.gif" ); //NOI18N
/**
* The MIME type of Java files.
diff --git a/enterprise/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java b/enterprise/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java
index 63656f3..ba02cc6 100644
--- a/enterprise/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java
+++ b/enterprise/web.project/src/org/netbeans/modules/web/project/ui/customizer/WebProjectProperties.java
@@ -105,7 +105,7 @@ import org.openide.util.Task;
*
* @author Petr Hrebejk, Radko Najman
*/
-final public class WebProjectProperties {
+public final class WebProjectProperties {
// Special properties of the project
public static final String WEB_PROJECT_NAME = "web.project.name"; //NOI18N
diff --git a/enterprise/web.struts/src/org/netbeans/modules/web/struts/editor/StrutsConfigHyperlinkProvider.java b/enterprise/web.struts/src/org/netbeans/modules/web/struts/editor/StrutsConfigHyperlinkProvider.java
index b2eabc9..f258e09 100644
--- a/enterprise/web.struts/src/org/netbeans/modules/web/struts/editor/StrutsConfigHyperlinkProvider.java
+++ b/enterprise/web.struts/src/org/netbeans/modules/web/struts/editor/StrutsConfigHyperlinkProvider.java
@@ -54,7 +54,7 @@ import org.openide.util.NbBundle;
*/
public class StrutsConfigHyperlinkProvider implements HyperlinkProvider {
- static private boolean debug = false;
+ private static boolean debug = false;
private static Hashtable hyperlinkTable;
private final int JAVA_CLASS = 0;
diff --git a/enterprise/web.struts/src/org/netbeans/modules/web/struts/editor/StrutsEditorUtilities.java b/enterprise/web.struts/src/org/netbeans/modules/web/struts/editor/StrutsEditorUtilities.java
index d3000ec..d00405a 100644
--- a/enterprise/web.struts/src/org/netbeans/modules/web/struts/editor/StrutsEditorUtilities.java
+++ b/enterprise/web.struts/src/org/netbeans/modules/web/struts/editor/StrutsEditorUtilities.java
@@ -48,7 +48,7 @@ public class StrutsEditorUtilities {
protected static int XML_ELEMENT = 4;
protected static int XML_ATTRIBUTE_VALUE = 7;
- static public String END_LINE = System.getProperty("line.separator"); //NOI18N
+ public static String END_LINE = System.getProperty("line.separator"); //NOI18N
/** Returns the value of the path attribute, when there is an action
diff --git a/enterprise/websvc.customization/src/org/netbeans/modules/websvc/customization/multiview/PortTypeOperationPanel.java b/enterprise/websvc.customization/src/org/netbeans/modules/websvc/customization/multiview/PortTypeOperationPanel.java
index 2574913..0a8ddb8 100644
--- a/enterprise/websvc.customization/src/org/netbeans/modules/websvc/customization/multiview/PortTypeOperationPanel.java
+++ b/enterprise/websvc.customization/src/org/netbeans/modules/websvc/customization/multiview/PortTypeOperationPanel.java
@@ -164,7 +164,7 @@ public class PortTypeOperationPanel extends SaveableSectionInnerPanel{
}
}
- final public void syncButtons(){
+ public final void syncButtons(){
List<PortTypeOperationCustomization> ee =
operation.getExtensibilityElements(PortTypeOperationCustomization.class);
if(ee.size() == 1){
diff --git a/enterprise/websvc.customization/test/unit/src/org/netbeans/modules/websvc/customization/model/CustomizationTest.java b/enterprise/websvc.customization/test/unit/src/org/netbeans/modules/websvc/customization/model/CustomizationTest.java
index 03a7053..71cc97d 100644
--- a/enterprise/websvc.customization/test/unit/src/org/netbeans/modules/websvc/customization/model/CustomizationTest.java
+++ b/enterprise/websvc.customization/test/unit/src/org/netbeans/modules/websvc/customization/model/CustomizationTest.java
@@ -70,7 +70,7 @@ import org.openide.util.lookup.Lookups;
* @author Roderico Cruz
*/
public class CustomizationTest extends TestCase {
- private final static String TEST_WSDL = "resources/AddNumbers.wsdl";
+ private static final String TEST_WSDL = "resources/AddNumbers.wsdl";
public CustomizationTest(String testName) {
super(testName);
diff --git a/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/WsitWidget.java b/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/WsitWidget.java
index 4a5086a..e5b7227 100644
--- a/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/WsitWidget.java
+++ b/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/WsitWidget.java
@@ -236,7 +236,7 @@ public class WsitWidget extends AbstractTitledWidget {
}
}
- final static class WSConfigurationListener implements PropertyChangeListener {
+ static final class WSConfigurationListener implements PropertyChangeListener {
private WsitWidget widget;
private WSConfigurationListener(WsitWidget widget) {
diff --git a/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/widget/ButtonWidget.java b/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/widget/ButtonWidget.java
index 573657d..1cdb6bd 100644
--- a/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/widget/ButtonWidget.java
+++ b/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/widget/ButtonWidget.java
@@ -367,7 +367,7 @@ public class ButtonWidget extends ImageLabelWidget implements PropertyChangeList
private static final Color BACKGROUND_COLOR_PRESSED = new Color(0xCCCCCC);
private static final Color BACKGROUND_COLOR_DISABLED = new Color(0xE4E4E4);
- private final static class ButtonSelectProvider implements SelectProvider {
+ private static final class ButtonSelectProvider implements SelectProvider {
public static ButtonSelectProvider DEFAULT = new ButtonSelectProvider();
@@ -390,7 +390,7 @@ public class ButtonWidget extends ImageLabelWidget implements PropertyChangeList
}
- public final static class ButtonHotKeyProvider implements HotKeyAction.HotKeyProvider {
+ public static final class ButtonHotKeyProvider implements HotKeyAction.HotKeyProvider {
private ButtonWidget widget;
diff --git a/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/widget/ImageLabelWidget.java b/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/widget/ImageLabelWidget.java
index 0493eaa..31fa993 100644
--- a/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/widget/ImageLabelWidget.java
+++ b/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/widget/ImageLabelWidget.java
@@ -209,7 +209,7 @@ public class ImageLabelWidget extends Widget {
public static final int DEFAULT_GAP = 4;
- public static abstract class PaintableImageWidget extends Widget {
+ public abstract static class PaintableImageWidget extends Widget {
private static final Stroke STROKE = new BasicStroke(1.0F, BasicStroke.CAP_SQUARE, BasicStroke.JOIN_MITER);
diff --git a/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/widget/TableWidget.java b/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/widget/TableWidget.java
index 5d5d610..c459812 100644
--- a/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/widget/TableWidget.java
+++ b/enterprise/websvc.design/src/org/netbeans/modules/websvc/design/view/widget/TableWidget.java
@@ -50,7 +50,7 @@ public class TableWidget extends Widget{
private static final Color BORDER_COLOR = new Color(169, 197, 235);
private static final Color SELECTED_BORDER_COLOR = new Color(255,153,0);
private TableModel model;
- private final static int COLUMN_WIDTH = 100;
+ private static final int COLUMN_WIDTH = 100;
/**
* Creates a table widget for a tablemodel.
diff --git a/enterprise/websvc.design/test/unit/src/org/netbeans/modules/websvc/design/javamodel/ServiceModelTest.java b/enterprise/websvc.design/test/unit/src/org/netbeans/modules/websvc/design/javamodel/ServiceModelTest.java
index 3dbfd92..89461a1 100644
--- a/enterprise/websvc.design/test/unit/src/org/netbeans/modules/websvc/design/javamodel/ServiceModelTest.java
+++ b/enterprise/websvc.design/test/unit/src/org/netbeans/modules/websvc/design/javamodel/ServiceModelTest.java
@@ -535,7 +535,7 @@ public class ServiceModelTest extends NbTestCase {
* @param f the file to be read
* @return the contents of the file(s).
*/
- public final static String copyFileToString(java.io.File f) throws IOException {
+ public static final String copyFileToString(java.io.File f) throws IOException {
int s = (int) f.length();
byte[] data = new byte[s];
int len = new FileInputStream(f).read(data);
diff --git a/enterprise/websvc.editor.hints/src/org/netbeans/modules/websvc/editor/hints/WebServicesHintsProvider.java b/enterprise/websvc.editor.hints/src/org/netbeans/modules/websvc/editor/hints/WebServicesHintsProvider.java
index c385a72..bbb2149 100644
--- a/enterprise/websvc.editor.hints/src/org/netbeans/modules/websvc/editor/hints/WebServicesHintsProvider.java
+++ b/enterprise/websvc.editor.hints/src/org/netbeans/modules/websvc/editor/hints/WebServicesHintsProvider.java
@@ -59,7 +59,7 @@ import org.openide.util.RequestProcessor;
*/
public class WebServicesHintsProvider {
- private final static Object singleInstanceLock = new Object();
+ private static final Object singleInstanceLock = new Object();
private static WebServicesHintsProvider runningInstance = null;
private FileObject file;
diff --git a/enterprise/websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxws/catalog/impl/CatalogComponentImpl.java b/enterprise/websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxws/catalog/impl/CatalogComponentImpl.java
index 39e1490..5177f50 100644
--- a/enterprise/websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxws/catalog/impl/CatalogComponentImpl.java
+++ b/enterprise/websvc.jaxwsmodel/src/org/netbeans/modules/websvc/jaxws/catalog/impl/CatalogComponentImpl.java
@@ -38,7 +38,7 @@ public abstract class CatalogComponentImpl extends AbstractDocumentComponent<Cat
return (CatalogModelImpl) super.getModel();
}
- static public Element createElementNS(CatalogModel model, CatalogQNames rq) {
+ public static Element createElementNS(CatalogModel model, CatalogQNames rq) {
return model.getDocument().createElementNS(rq.getQName().getNamespaceURI(), rq.getQualifiedName());
}
diff --git a/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/util/ManagerUtil.java b/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/util/ManagerUtil.java
index a11ee95d..aa3267d 100644
--- a/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/util/ManagerUtil.java
+++ b/enterprise/websvc.manager/src/org/netbeans/modules/websvc/manager/util/ManagerUtil.java
@@ -61,7 +61,7 @@ import org.openide.util.NbBundle;
public class ManagerUtil {
public static final int BUFFER_SIZE = 4096;
public static final String xsdNamespace = "xsd";
- final static public String WSDL_FILE_EXTENSION = "wsdl";
+ public static final String WSDL_FILE_EXTENSION = "wsdl";
public static final String LOCALIZING_BUNDLE = "SystemFileSystem.localizingBundle";
@@ -589,7 +589,7 @@ public class ManagerUtil {
return null;
}
- public final static String PATH_IN_WAR_LIB = "WEB-INF/lib"; //NOI18N
+ public static final String PATH_IN_WAR_LIB = "WEB-INF/lib"; //NOI18N
/**
* Add an array of library references to a project, qualified for both the design-time classpath or deployed with the application
diff --git a/enterprise/websvc.projectapi/src/org/netbeans/modules/websvc/project/WebServiceAccessor.java b/enterprise/websvc.projectapi/src/org/netbeans/modules/websvc/project/WebServiceAccessor.java
index 61dfef7..dce6335 100644
--- a/enterprise/websvc.projectapi/src/org/netbeans/modules/websvc/project/WebServiceAccessor.java
+++ b/enterprise/websvc.projectapi/src/org/netbeans/modules/websvc/project/WebServiceAccessor.java
@@ -50,7 +50,7 @@ public abstract class WebServiceAccessor {
public abstract WebService createWebService(WebServiceImplementation serviceImpl);
- public static abstract class DescriptorAccessor {
+ public abstract static class DescriptorAccessor {
public static DescriptorAccessor DEFAULT;
public static DescriptorAccessor getDefault() {
diff --git a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/RESTExplorerPanel.java b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/RESTExplorerPanel.java
index 892eacc..2486ec1 100644
--- a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/RESTExplorerPanel.java
+++ b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/client/RESTExplorerPanel.java
@@ -53,7 +53,7 @@ public class RESTExplorerPanel extends JPanel implements ExplorerManager.Provide
private Node selectedResourceNode;
private ProjectNodeFactory factory;
- private final static ProjectNodeFactory REST_FACTORY = new RestProjectNodeFactory();
+ private static final ProjectNodeFactory REST_FACTORY = new RestProjectNodeFactory();
public RESTExplorerPanel() {
this( REST_FACTORY );
diff --git a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/codegen/ResourceJavaScript.java b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/codegen/ResourceJavaScript.java
index 65801a7..e2241db 100644
--- a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/codegen/ResourceJavaScript.java
+++ b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/codegen/ResourceJavaScript.java
@@ -47,7 +47,7 @@ import org.openide.util.Utilities;
class ResourceJavaScript extends TokenReplacer {
private static final String ENTITY_NAME_VAR = "entity_name";
- final static String RJSSUPPORT = "rjsSupport"; // NOI18N
+ static final String RJSSUPPORT = "rjsSupport"; // NOI18N
ResourceJavaScript( ClientStubsGenerator generator, Resource r,
FileObject jsFolder, Set<String> existingEntities)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists