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:48:56 UTC
[netbeans] branch master updated (9310f3d -> 0cfebd41)
This is an automated email from the ASF dual-hosted git repository.
mklaehn pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 9310f3d Support for generating Micronaut Data entity classes end repository interfaces added. (#3584)
new a6bb989 Use the blessed modifier order in projects located in cpplite projects
new b6daca9 Use the blessed modifier order in projects located in websvccommon projects
new 7df85fe Use the blessed modifier order in projects located in webcommon projects
new 5840175 Use the blessed modifier order in projects located in profiler projects
new a5373c0 Use the blessed modifier order in projects located in php projects
new 4672545 Use the blessed modifier order in projects located in nbi projects
new 68e45d3 Use the blessed modifier order in projects located in nb projects
new bff7d9d Use the blessed modifier order in projects located in nbbuild projects
new ed4851d Use the blessed modifier order in projects located in harness projects
new 6c1dddc Use the blessed modifier order in projects located in groovy projects
new bb30780 Use the blessed modifier order in projects located in contrib projects
new a3af860 Use the blessed modifier order in projects located in ergonomics projects
new 89151fc Use the blessed modifier order in projects located in extide projects
new 8ea4656 Use the blessed modifier order in projects located in enterprise projects
new 255cfd2 Use the blessed modifier order in projects located in platform projects
new 5c49be4 Use the blessed modifier order in projects located in ide projects
new 0cfebd41 Use the blessed modifier order in projects located in java projects
The 17 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../modules/cordova/platforms/ios/IOSPlatform.java | 2 +-
.../grailsproject/SourceCategoriesGrails11.java | 4 +-
.../grailsproject/SourceCategoriesGrails301.java | 4 +-
.../commands/GrailsCommandChooser.java | 4 +-
.../ui/wizards/impl/GrailsTargetChooserPanel.java | 2 +-
.../framework/HibernateWebModuleExtender.java | 2 +-
.../modules/j2ee/jboss4/ide/JBOutputSupport.java | 2 +-
.../modules/j2ee/jboss4/ide/JBStartRunnable.java | 22 +++---
.../j2ee/weblogic9/WLConnectionSupport.java | 4 +-
.../websvc/metro/model/MetroConfigLoader.java | 4 +-
.../wsitconf/api/DesignerListenerProvider.java | 2 +-
.../websvc/wsitconf/api/DevDefaultsProvider.java | 2 +-
.../refactoring/WSITRefactoringPlugin.java | 2 +-
.../wsitconf/wsdlmodelext/RMDeliveryAssurance.java | 4 +-
.../wsitconf/wsdlmodelext/RMSequenceBinding.java | 4 +-
.../wsitconf/wsdlmodelext/WSITModelSupport.java | 2 +-
.../wsitmodelext/versioning/ConfigVersion.java | 2 +-
.../debuggingview/DebuggingActionsProvider.java | 2 +-
.../cpplite/debugger/AbstractDebugTest.java | 6 +-
.../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 +-
.../ide/ergonomics/fod/FeatureProjectFactory.java | 2 +-
.../ide/ergonomics/fod/FoDLayersProvider.java | 2 +-
.../modules/ide/ergonomics/CommonServersBase.java | 2 +-
.../modules/gradle/ActionProviderImpl.java | 4 +-
.../modules/gradle/NbGradleProjectImpl.java | 2 +-
.../gradle/api/GradleBaseProjectBuilder.java | 4 +-
.../modules/gradle/api/GradleDependency.java | 8 +--
.../gradle/api/execute/GradleCommandLine.java | 2 +-
.../modules/gradle/cache/AbstractDiskCache.java | 10 +--
.../modules/gradle/cache/ProjectInfoDiskCache.java | 2 +-
.../gradle/customizer/BuildActionsCustomizer.java | 2 +-
.../execute/GradleCliCompletionProvider.java | 2 +-
.../execute/GradleDistributionProviderImpl.java | 2 +-
.../modules/gradle/nodes/BuildScriptsNode.java | 2 +-
.../modules/gradle/options/SettingsPanel.java | 2 +-
.../gradle/spi/newproject/TemplateOperation.java | 2 +-
.../org/apache/tools/ant/module/AntSettings.java | 2 +-
.../tools/ant/module/api/AntTargetExecutor.java | 4 +-
.../apache/tools/ant/module/bridge/AntBridge.java | 2 +-
.../tools/ant/module/nodes/AntProjectChildren.java | 2 +-
.../tools/ant/module/run/TargetExecutor.java | 2 +-
.../tools/ant/module/run/VerticalGridLayout.java | 2 +-
.../tools/ant/module/spi/AntOutputStream.java | 12 ++--
.../org/netbeans/test/groovy/GeneralGroovy.java | 2 +-
.../groovy/refactoring/ui/WhereUsedPanel.java | 2 +-
.../SingleGroovySourceRunActionProvider.java | 4 +-
.../modules/apisupport/jnlplauncher/Main.java | 4 +-
.../nbjunit/src/org/netbeans/junit/NbTestCase.java | 24 +++----
.../src/org/netbeans/junit/NbTestDecorator.java | 20 +++---
.../org/netbeans/junit/ParametricTestSuite.java | 2 +-
.../src/org/netbeans/junit/MockServicesTest.java | 2 +-
.../src/org/netbeans/insane/impl/RootTest.java | 2 +-
.../modules/debugger/importd/ImportDebugger.java | 10 +--
.../modules/debugger/importd2/ImportDebugger.java | 10 +--
.../src/org/netbeans/api/debugger/Breakpoint.java | 2 +-
.../src/org/netbeans/api/debugger/Properties.java | 4 +-
.../api/java/queries/BinaryForSourceQuery.java | 2 +-
.../support/CompositePathResourceBase.java | 4 +-
.../java/classpath/support/PathResourceBase.java | 4 +-
.../java/queries/BinaryForSourceQuery2Test.java | 2 +-
.../spi/xml/cookies/ShareableInputSource.java | 2 +-
.../issuetable/IssuetableTestFactory.java | 2 +-
.../modules/bugtracking/BugtrackingManager.java | 4 +-
.../modules/bugtracking/RepositoryImpl.java | 8 +--
.../modules/bugtracking/RepositoryRegistry.java | 2 +-
.../netbeans/modules/bugtracking/api/Query.java | 2 +-
.../modules/bugtracking/api/Repository.java | 6 +-
.../bugtracking/spi/RepositoryProvider.java | 2 +-
.../modules/bugtracking/tasks/DashboardUtils.java | 6 +-
.../bugtracking/tasks/cache/StorageUtils.java | 2 +-
.../modules/bugtracking/team/TeamRepositories.java | 2 +-
.../bugtracking/ui/query/QueryTopComponent.java | 2 +-
.../dummies/DummyBugtrackingOwnerSupport.java | 2 +-
.../modules/bugtracking/dummies/DummyNode.java | 2 +-
.../bugtracking/ui/query/QTCTestHidden.java | 2 +-
.../bugtracking/util/BugtrackingUtilTest.java | 4 +-
.../bugzilla/commands/BugzillaExecutor.java | 2 +-
.../modules/bugzilla/issue/CommentsPanel.java | 10 +--
.../modules/bugzilla/query/QueryParameter.java | 2 +-
.../repository/BugzillaRepositoryController.java | 2 +-
.../modules/bugzilla/query/QueryParameterTest.java | 12 ++--
.../netbeans/modules/analysis/spi/Analyzer.java | 2 +-
.../modules/csl/api/DataLoadersBridge.java | 2 +-
.../modules/csl/editor/fold/GsfFoldManager.java | 2 +-
.../netbeans/modules/csl/spi/CommentHandler.java | 2 +-
.../modules/csl/spi/DefaultDataLoadersBridge.java | 2 +-
.../org/netbeans/modules/css/editor/HtmlTags.java | 2 +-
.../css/editor/actions/CopyStyleAction.java | 4 +-
.../netbeans/modules/css/indexing/CssIndexer.java | 2 +-
.../CssActionsImplementationProvider.java | 4 +-
.../modules/css/refactoring/CssElementContext.java | 2 +-
.../modules/css/lib/api/properties/Node.java | 2 +-
.../css/lib/api/properties/NodeVisitor.java | 2 +-
.../css/lib/api/properties/TokenAcceptor.java | 2 +-
.../CPActionsImplementationProvider.java | 2 +-
.../modules/db/sql/execute/SQLExecuteHelper.java | 16 ++---
.../modules/db/sql/execute/ui/SQLHistoryPanel.java | 4 +-
.../modules/db/sql/loader/SQLEditorSupport.java | 2 +-
.../netbeans/modules/db/sql/loader/SQLNode.java | 2 +-
.../db/dataview/output/DataViewPageContext.java | 2 +-
.../DataViewTableDataExportFileChooser.java | 2 +-
.../db/dataview/table/CellFocusCustomRenderer.java | 2 +-
.../db/dataview/table/ResultSetCellRenderer.java | 6 +-
.../modules/db/dataview/util/DateType.java | 2 +-
.../modules/db/dataview/util/EncodingHelper.java | 8 +--
.../modules/db/dataview/util/TimeType.java | 2 +-
.../modules/db/dataview/util/TimestampType.java | 2 +-
.../db/metadata/model/JDBCConnMetadataModel.java | 2 +-
.../modules/db/mysql/impl/ConnectionProcessor.java | 2 +-
.../modules/db/mysql/ui/AdminPropertiesPanel.java | 2 +-
.../modules/db/mysql/util/ExecSupport.java | 2 +-
.../modules/db/sql/lexer/SQLLanguageConfig.java | 2 +-
.../querymodel/BooleanExpressionList.java | 2 +-
.../api/db/sql/support/SQLIdentifiers.java | 2 +-
.../modules/db/explorer/DatabaseConnection.java | 4 +-
.../modules/db/explorer/dlg/ConnectionDialog.java | 2 +-
.../db/explorer/dlg/ConnectionNamePanel.java | 2 +-
.../modules/db/explorer/dlg/DataModel.java | 4 +-
.../db/explorer/metadata/MetadataModelManager.java | 4 +-
.../org/netbeans/modules/derby/ExecSupport.java | 2 +-
.../modules/diff/builtin/DiffPresenter.java | 2 +-
.../ui/api/FileNamesCompletionProvider.java | 6 +-
.../support/ui/api/FileSelectorField.java | 2 +-
.../nativeexecution/AbstractNativeProcess.java | 8 +--
.../nativeexecution/ExecutionEnvironmentImpl.java | 2 +-
.../modules/nativeexecution/JschSupport.java | 6 +-
.../nativeexecution/RemoteNativeProcess.java | 2 +-
.../TerminalLocalNativeProcess.java | 4 +-
.../api/NativeProcessExecutionService.java | 2 +-
.../api/execution/PostMessageDisplayer.java | 4 +-
.../api/util/CommonTasksSupport.java | 2 +-
.../api/util/ConnectionManager.java | 2 +-
.../nativeexecution/api/util/ExternalTerminal.java | 4 +-
.../modules/nativeexecution/api/util/MacroMap.java | 2 +-
.../nativeexecution/api/util/ProcessUtils.java | 2 +-
.../nativeexecution/api/util/RemoteStatistics.java | 2 +-
.../modules/nativeexecution/api/util/Shell.java | 6 +-
.../api/util/ShellScriptRunner.java | 4 +-
.../api/util/ShellValidationSupport.java | 4 +-
.../nativeexecution/jsch/JSchConnectionTask.java | 2 +-
.../nativeexecution/pty/NbStartUtility.java | 2 +-
.../modules/nativeexecution/pty/PtyAllocator.java | 2 +-
.../nativeexecution/pty/PtyOpenUtility.java | 2 +-
.../pty/PtyProcessStartUtility.java | 2 +-
.../modules/nativeexecution/pty/PtyUtility.java | 2 +-
.../spi/JSchAuthenticationSelection.java | 4 +-
.../support/NativeExecutionUserNotification.java | 16 ++---
.../spi/support/PasswordProviderFactory.java | 2 +-
.../sps/impl/RequestPrivilegesAction.java | 2 +-
.../sps/impl/RequestPrivilegesTask.java | 2 +-
.../nativeexecution/sps/impl/SPSCommonImpl.java | 4 +-
.../nativeexecution/support/ObservableAction.java | 2 +-
.../nativeexecution/support/RemoteUserInfo.java | 6 +-
.../nativeexecution/support/Win32APISupport.java | 2 +-
.../support/filesearch/FileSearchSupport.java | 6 +-
.../support/hostinfo/impl/HostInfoFactory.java | 2 +-
.../nativeexecution/ConcurrentTasksSupport.java | 2 +-
.../modules/nativeexecution/EnvironmentTest.java | 2 +-
.../modules/nativeexecution/NativeTaskTest.java | 2 +-
.../api/util/ConnectionManagerTest.java | 2 +-
.../api/util/SlowHostInfoProvider.java | 2 +-
.../terminal/action/TerminalSupportImpl.java | 2 +-
.../terminal/ui/TerminalContainerTopComponent.java | 4 +-
.../modules/editor/actions/CamelCaseActions.java | 2 +-
.../modules/editor/bookmarks/BookmarkInfo.java | 2 +-
.../modules/editor/bookmarks/ui/BookmarksView.java | 4 +-
.../editor/bracesmatching/MasterMatcherTest.java | 8 +--
.../storage/CodeTemplatesStorage.java | 2 +-
.../editor/errorstripe/AnnotationViewTest.java | 2 +-
.../modules/editor/fold/ui/ActionFactory.java | 2 +-
.../modules/editor/fold/ui/VerticalFlowLayout.java | 2 +-
.../modules/editor/fold/LegacySettingsSync.java | 2 +-
.../modules/editor/fold/FoldManagerTesting.java | 4 +-
.../src/org/netbeans/editor/AnnotationDesc.java | 6 +-
.../src/org/netbeans/editor/AnnotationType.java | 6 +-
.../src/org/netbeans/editor/AnnotationTypes.java | 6 +-
.../src/org/netbeans/editor/FinderFactory.java | 10 +--
.../src/org/netbeans/editor/GlyphGutter.java | 8 +--
.../org/netbeans/editor/KeySequenceInputPanel.java | 2 +-
.../src/org/netbeans/editor/TokenItem.java | 2 +-
.../org/netbeans/editor/ext/ExtFinderFactory.java | 6 +-
.../src/org/netbeans/editor/ext/FileStorage.java | 4 +-
.../modules/editor/lib/BeforeSaveTasks.java | 2 +-
.../modules/editor/lib/drawing/DrawGraphics.java | 2 +-
.../modules/editor/lib/drawing/DrawLayer.java | 2 +-
.../netbeans/editor/UndoableEditWrapperTest.java | 2 +-
.../org/netbeans/api/editor/EditorRegistry.java | 2 +-
.../lib2/highlighting/HighlightsMergeTesting.java | 6 +-
.../editor/lib2/view/RootViewRandomTesting.java | 2 +-
.../editor/macros/storage/MacrosStorage.java | 2 +-
.../modules/editor/search/DocumentFinder.java | 8 +--
.../modules/editor/search/EditorFindSupport.java | 6 +-
.../modules/editor/search/SearchNbEditorKit.java | 2 +-
.../editor/search/SearchPropertiesSupport.java | 6 +-
.../editor/search/TextSearchHighlighting.java | 2 +-
.../modules/editor/search/DocumentFinderTest.java | 2 +-
.../storage/preferences/PreferencesStorage.java | 2 +-
.../editor/structure/api/DocumentModel.java | 8 +--
.../lib/editor/util/AbstractCharSequence.java | 2 +-
.../org/netbeans/lib/editor/util/CompactMap.java | 2 +-
.../lib/editor/util/random/DocumentTesting.java | 6 +-
.../editor/util/random/RandomTestContainer.java | 4 +-
.../modules/editor/impl/CustomizableSideBar.java | 2 +-
.../actions/clipboardhistory/ClipboardHistory.java | 2 +-
.../clipboardhistory/CompletionLayoutPopup.java | 4 +-
.../clipboardhistory/ListCompletionView.java | 2 +-
.../modules/editor/BaseDocumentUnitTestCase.java | 2 +-
.../modules/extbrowser/NbDdeBrowserImpl.java | 6 +-
.../base/ExplicitProcessParameters.java | 2 +-
.../netbeans/modules/extexecution/RerunAction.java | 2 +-
.../src/org/netbeans/modules/git/GitFileNode.java | 2 +-
.../org/netbeans/modules/git/HistoryRegistry.java | 2 +-
.../modules/git/ui/history/RepositoryRevision.java | 2 +-
.../modules/git/ui/shelve/ShelveChangesAction.java | 2 +-
.../src/org/netbeans/test/git/utils/TestKit.java | 24 +++----
.../gsf/codecoverage/CoverageManagerImpl.java | 2 +-
.../gsf/codecoverage/api/CoverageManager.java | 2 +-
.../gsf/testrunner/ui/api/TestMethodNode.java | 2 +-
.../modules/html/editor/lib/XmlSTElements.java | 4 +-
.../editor/completion/HtmlCompletionProvider.java | 2 +-
.../modules/html/editor/hints/Attribute.java | 2 +-
.../html/editor/hints/CharacterReference.java | 2 +-
.../modules/html/editor/hints/Comments.java | 2 +-
.../modules/html/editor/hints/Doctype.java | 2 +-
.../modules/html/editor/hints/Element.java | 2 +-
.../modules/html/editor/hints/Encoding.java | 2 +-
.../modules/html/editor/hints/ForeignContent.java | 2 +-
.../netbeans/modules/html/editor/hints/Form.java | 2 +-
.../modules/html/editor/hints/HeadContent.java | 2 +-
.../html/editor/hints/HtmlHintsProvider.java | 2 +-
.../netbeans/modules/html/editor/hints/Ids.java | 2 +-
.../modules/html/editor/hints/Internal.java | 2 +-
.../modules/html/editor/hints/Nesting.java | 2 +-
.../modules/html/editor/hints/Normalization.java | 2 +-
.../html/editor/hints/NotValidButCommon.java | 2 +-
.../html/editor/hints/NotValidatedContent.java | 2 +-
.../modules/html/editor/hints/Obsolete.java | 2 +-
.../html/editor/hints/ProcessingInstruction.java | 2 +-
.../modules/html/editor/hints/StrayContent.java | 2 +-
.../netbeans/modules/html/editor/hints/Table.java | 2 +-
.../modules/html/editor/hints/TagsMatching.java | 2 +-
.../modules/html/editor/hints/UnexpectedChars.java | 2 +-
.../modules/html/editor/indexing/HtmlIndexer.java | 2 +-
.../modules/html/editor/javadoc/HelpManager.java | 2 +-
.../modules/html/parser/ElementsFactory.java | 2 +-
.../netbeans/modules/hudson/api/HudsonManager.java | 2 +-
.../modules/hudson/spi/BuilderConnector.java | 4 +-
.../ide/BlacklistedClassesHandlerSingleton.java | 10 +--
.../org/netbeans/test/ide/GeneralSanityTest.java | 2 +-
.../modules/jumpto/common/AbstractModelFilter.java | 2 +-
.../org/netbeans/modules/jumpto/file/Worker.java | 2 +-
.../netbeans/modules/jumpto/type/UiOptions.java | 4 +-
.../spi/jumpto/support/NameMatcherFactory.java | 2 +-
.../modules/languages/yaml/YamlParser.java | 2 +-
.../modules/languages/yaml/YamlStructureItem.java | 6 +-
.../languages/features/ASTBrowserTopComponent.java | 2 +-
.../features/TokensBrowserTopComponent.java | 2 +-
.../src/org/netbeans/test/lib/BasicTokensTest.java | 2 +-
.../org/netbeans/spi/lexer/LanguageHierarchy.java | 2 +-
.../org/netbeans/lib/terminalemulator/Attr.java | 16 ++---
.../netbeans/lib/terminalemulator/AttrSave.java | 60 ++++++++--------
.../org/netbeans/lib/terminalemulator/Term.java | 8 +--
.../lib/terminalemulator/support/ColorValue.java | 2 +-
.../lib/terminalemulator/support/FontPanel.java | 2 +-
.../lib/terminalemulator/support/LineFilter.java | 2 +-
.../lib/terminalemulator/support/TermOptions.java | 2 +-
.../git/jgit/commands/IgnoreUnignoreCommand.java | 2 +-
.../netbeans/libs/graalsdk/impl/GraalContext.java | 4 +-
.../modules/localhistory/LocalHistory.java | 4 +-
.../localhistory/ui/view/HistoryTopComponent.java | 2 +-
.../modules/localtasks/task/LocalTask.java | 2 +-
.../modules/lsp/client/LSPBindingsTest.java | 2 +-
.../org/netbeans/modules/lsp/client/TestUtils.java | 2 +-
.../modules/mercurial/ExceptionHandler.java | 14 ++--
.../modules/mercurial/HistoryRegistry.java | 2 +-
.../modules/mercurial/options/PropertiesTable.java | 2 +-
.../modules/mercurial/ui/commit/CommitAction.java | 2 +-
.../mercurial/ui/diff/DiffFileTreeImpl.java | 2 +-
.../mercurial/ui/properties/PropertiesTable.java | 2 +-
.../mercurial/ui/queues/CreateRefreshAction.java | 4 +-
.../mercurial/ui/repository/Repository.java | 18 ++---
.../netbeans/modules/mercurial/util/HgCommand.java | 30 ++++----
.../org/netbeans/modules/mylyn/util/WikiUtils.java | 2 +-
.../swing/dirchooser/DirectoryChooserUI.java | 2 +-
.../netbeans/swing/dirchooser/DirectoryNode.java | 4 +-
.../src/org/openidex/search/SearchHistory.java | 6 +-
.../src/org/openidex/search/SearchType.java | 2 +-
.../parsing/impl/RunWhenScanFinishedSupport.java | 2 +-
.../modules/parsing/impl/TaskProcessor.java | 14 ++--
.../parsing/impl/indexing/RepositoryUpdater.java | 6 +-
.../parsing/impl/indexing/PathRegistryTest.java | 6 +-
.../impl/indexing/RepositoryUpdaterTest.java | 4 +-
.../modules/parsing/lucene/DocumentIndexImpl.java | 2 +-
.../modules/parsing/lucene/support/Queries.java | 4 +-
.../netbeans/modules/parsing/nb/EventSupport.java | 2 +-
.../project/indexingbridge/IndexingBridge.java | 2 +-
.../project/spi/intern/ProjectIDEServices.java | 2 +-
.../spi/project/ProjectServiceProvider.java | 2 +-
.../netbeans/modules/project/ui/ExitDialog.java | 2 +-
.../netbeans/modules/project/ui/ProjectTab.java | 4 +-
.../modules/project/ui/TemplatesPanelGUI.java | 2 +-
.../project/ui/actions/VerticalGridLayout.java | 2 +-
.../modules/project/uiapi/BaseUtilities.java | 2 +-
.../project/ui/support/ProjectCustomizerTest.java | 2 +-
.../properties/syntax/EditorSettingsCopy.java | 2 +-
.../org/netbeans/modules/properties/Element.java | 2 +-
.../netbeans/modules/properties/LocalePanel.java | 2 +-
.../modules/properties/PresentableFileEntry.java | 2 +-
.../modules/properties/PropertiesOpen.java | 4 +-
.../properties/PropertiesRequestProcessor.java | 2 +-
.../modules/properties/TableViewSettings.java | 2 +-
.../modules/refactoring/spi/impl/CheckNode.java | 4 +-
.../modules/refactoring/spi/ui/ScopeProvider.java | 2 +-
.../netbeans/modules/schema2beans/AttrProp.java | 30 ++++----
.../modules/schema2beans/BaseAttribute.java | 24 +++----
.../org/netbeans/modules/schema2beans/Common.java | 84 +++++++++++-----------
.../netbeans/modules/schema2beans/DDFactory.java | 10 +--
.../netbeans/modules/schema2beans/DDRegistry.java | 2 +-
.../modules/schema2beans/DDRegistryParser.java | 4 +-
.../modules/schema2beans/GraphManager.java | 2 +-
.../modules/schema2beans/JavaBeansUtil.java | 2 +-
.../netbeans/modules/schema2beans/TraceLogger.java | 4 +-
.../org/netbeans/modules/schema2beans/Version.java | 6 +-
.../org/netbeans/modules/schema2beans/XMLUtil.java | 2 +-
.../AbstractCodeGeneratorClass.java | 26 +++----
.../modules/schema2beansdev/BaseBeansFactory.java | 2 +-
.../modules/schema2beansdev/DocDefParser.java | 20 +++---
.../netbeans/modules/schema2beansdev/GenBeans.java | 6 +-
.../modules/schema2beansdev/JavaBeanClass.java | 2 +-
.../modules/schema2beansdev/JavaBeansFactory.java | 2 +-
.../modules/schema2beansdev/SchemaRep.java | 62 ++++++++--------
.../modules/schema2beansdev/XMLSchemaParser.java | 4 +-
.../modules/schema2beansdev/gen/JavaUtil.java | 42 +++++------
.../modules/schema2beansdev/gen/JavaWriter.java | 26 +++----
.../modules/schema2beansdev/gen/XMLWriter.java | 2 +-
.../ui/annotations/WatchAnnotationProvider.java | 2 +-
.../modules/debugger/ui/eval/CodeEvaluatorUI.java | 2 +-
.../debugger/ui/models/WatchesActionsProvider.java | 2 +-
.../ui/views/debugging/FiltersDescriptor.java | 2 +-
.../debugger/ui/views/debugging/TapPanel.java | 2 +-
.../netbeans/spi/debugger/ui/CodeEvaluator.java | 2 +-
.../netbeans/spi/debugger/ui/DebuggingView.java | 4 +-
.../spi/debugger/ui/EditorContextDispatcher.java | 4 +-
.../editor/hints/borrowed/ListCompletionView.java | 4 +-
.../modules/navigator/NavigatorTCTest.java | 4 +-
.../netbeans/modules/palette/ui/DnDSupport.java | 4 +-
.../netbeans/modules/palette/ui/DropGlassPane.java | 18 ++---
.../org/netbeans/spi/palette/PaletteSwitch.java | 2 +-
.../netbeans/spi/palette/PaletteTopComponent.java | 2 +-
.../netbeans/spi/palette/PaletteSwitchTest.java | 2 +-
.../spi/viewmodel/CachedChildrenTreeModel.java | 2 +-
.../src/org/netbeans/spi/viewmodel/Models.java | 28 ++++----
.../client/SvnClientExceptionHandler.java | 40 +++++------
.../subversion/client/SvnClientFactory.java | 18 ++---
.../subversion/client/parser/EntriesCache.java | 2 +-
.../modules/subversion/config/CertificateFile.java | 6 +-
.../modules/subversion/config/PasswordFile.java | 2 +-
.../modules/subversion/ui/browser/Browser.java | 30 ++++----
.../subversion/ui/browser/RepositoryPathNode.java | 4 +-
.../subversion/ui/browser/RepositoryPaths.java | 2 +-
.../subversion/ui/browser/SelectPathAction.java | 2 +-
.../modules/subversion/ui/lock/LockAction.java | 2 +-
.../modules/subversion/ui/lock/UnlockAction.java | 2 +-
.../subversion/ui/repository/ConnectionType.java | 10 +--
.../subversion/ui/repository/Repository.java | 12 ++--
.../modules/subversion/ui/search/SvnSearch.java | 16 ++---
.../netbeans/test/subversion/utils/TestKit.java | 20 +++---
.../modules/subversion/AbstractSvnTestCase.java | 2 +-
.../modules/tasklist/todo/settings/Settings.java | 2 +-
.../tasklist/todo/settings/ToDoCustomizer.java | 2 +-
.../modules/tasklist/filter/TaskProperty.java | 2 +-
.../modules/tasklist/impl/TaskIndexer.java | 2 +-
.../modules/tasklist/ui/TaskListTopComponent.java | 4 +-
.../bugtracking/commons/AttachmentsPanel.java | 2 +-
.../bugtracking/commons/AutoupdateSupport.java | 2 +-
.../commons/FileToRepoMappingStorage.java | 2 +-
.../bugtracking/commons/FindTypesSupport.java | 8 +--
.../bugtracking/commons/HyperlinkSupport.java | 8 +--
.../bugtracking/commons/IssueSettingsStorage.java | 4 +-
.../modules/bugtracking/commons/JiraUpdater.java | 2 +-
.../bugtracking/commons/SaveQueryPanel.java | 2 +-
.../bugtracking/commons/SimpleIssueFinder.java | 2 +-
.../netbeans/modules/team/commons/LogUtils.java | 4 +-
.../team/commons/treelist/ListRendererPanel.java | 2 +-
.../team/commons/treelist/TreeListNode.java | 8 +--
.../netbeans/modules/terminal/api/ui/IOTerm.java | 4 +-
.../modules/terminal/api/ui/IOVisibility.java | 8 +--
.../terminal/api/ui/IOVisibilityControl.java | 4 +-
.../iocontainer/TerminalContainerCommon.java | 46 ++++++------
.../iocontainer/TerminalContainerMuxable.java | 6 +-
.../iocontainer/TerminalContainerTabbed.java | 6 +-
.../netbeans/modules/terminal/ioprovider/Task.java | 2 +-
.../modules/terminal/ioprovider/Terminal.java | 6 +-
.../modules/terminal/T5_MTStress_Test.java | 4 +-
.../netbeans/modules/terminal/api/IOConnect.java | 4 +-
.../netbeans/modules/terminal/api/IOEmulation.java | 6 +-
.../netbeans/modules/terminal/api/IONotifier.java | 8 +--
.../org/netbeans/modules/terminal/api/IOTerm.java | 8 +--
.../org/netbeans/modules/terminal/test/IOTest.java | 4 +-
.../modules/openfile/OpenFileDialogFilter.java | 2 +-
.../modules/versioning/core/VersioningManager.java | 2 +-
.../core/filesystems/VCSFilesystemInterceptor.java | 4 +-
.../modules/versioning/core/spi/VCSContext.java | 2 +-
.../versioning/VCSFilesystemTestFactory.java | 2 +-
.../versioning/ui/history/HistoryComponent.java | 4 +-
.../versioning/ui/history/HistoryDiffView.java | 2 +-
.../src/org/netbeans/modules/turbo/Memory.java | 2 +-
.../src/org/netbeans/modules/turbo/Turbo.java | 2 +-
.../versioning/history/AbstractSummaryView.java | 6 +-
.../shelve/ShelveChangesActionsRegistry.java | 2 +-
.../versioning/shelve/ShelveChangesSupport.java | 2 +-
.../modules/versioning/util/ExportDiffSupport.java | 6 +-
.../modules/versioning/util/SimpleLookup.java | 2 +-
.../versioning/util/VCSHyperlinkSupport.java | 4 +-
.../modules/versioning/util/VCSKenaiAccessor.java | 6 +-
.../versioning/util/common/FileTreeView.java | 4 +-
.../versioning/util/projects/ProjectsView.java | 2 +-
.../versioning/util/status/VCSStatusNode.java | 2 +-
.../modules/versioning/hooks/VCSHookTest.java | 4 +-
.../modules/versioning/spi/VCSContext.java | 2 +-
.../modules/web/browser/api/WebBrowserPane.java | 2 +-
.../browser/spi/ExternalModificationsSupport.java | 2 +-
.../web/browser/ui/picker/RendererImpl.java | 2 +-
.../web/indent/api/support/AbstractIndenter.java | 10 +--
.../indent/api/support/MarkupAbstractIndenter.java | 38 +++++-----
.../debugging/api/debugger/AbstractObject.java | 2 +-
.../modules/web/webkit/debugging/api/dom/Node.java | 10 +--
.../web/webkit/debugging/api/network/Network.java | 6 +-
.../modules/xml/axi/datatype/NumberBase.java | 4 +-
.../xml/axi/impl/DefaultSchemaGenerator.java | 2 +-
.../modules/xml/catalog/CatalogAction.java | 2 +-
.../netbeans/modules/xml/catalog/CatalogPanel.java | 10 +--
.../org/netbeans/modules/xml/api/EncodingUtil.java | 8 +--
.../modules/xml/core/lib/EncodingHelper.java | 8 +--
.../modules/xml/dtd/grammar/DTDGrammar.java | 2 +-
.../modules/xml/multiview/ItemEditorHelper.java | 2 +-
.../xml/multiview/ui/AbstractDesignEditor.java | 4 +-
.../modules/xml/multiview/ui/PanelView.java | 4 +-
.../xml/multiview/ui/SectionVisualTheme.java | 30 ++++----
.../catalog/model/impl/CatalogComponentImpl.java | 2 +-
.../completion/spi/CompletionModelProvider.java | 2 +-
.../schema/model/impl/SyncUnitReviewVisitor.java | 2 +-
ide/xml.tax/lib/src/org/netbeans/tax/TreeName.java | 6 +-
.../src/org/netbeans/tax/TreeNamedObjectMap.java | 2 +-
.../lib/src/org/netbeans/tax/TreeObject.java | 6 +-
.../lib/src/org/netbeans/tax/TreeObjectList.java | 2 +-
.../lib/src/org/netbeans/tax/TreeUtilities.java | 6 +-
.../src/org/netbeans/tax/io/TreeStreamResult.java | 2 +-
.../src/org/netbeans/tax/AbstractFactoryTest.java | 2 +-
.../beans/customizer/AbstractTreeCustomizer.java | 4 +-
.../xml/tax/traversal/TreeNodeFilterHandle.java | 2 +-
.../modules/xml/text/indent/XMLFormatterTest.java | 2 +-
.../modules/xml/text/api/dom/XMLSyntaxSupport.java | 2 +-
.../text/breadcrumbs/EditorRegistryMonitor.java | 2 +-
.../xml/text/completion/SyntaxQueryHelper.java | 14 ++--
.../xml/text/syntax/javacc/lib/CharStream.java | 24 +++----
.../xml/text/completion/CompletionJTest.java | 2 +-
.../xml/tools/actions/AbstractCheckTest.java | 2 +-
.../extensions/mime/validation/WSIAPValidator.java | 4 +-
.../modules/xml/xam/AbstractModelFactory.java | 2 +-
.../xml/xam/dom/AbstractDocumentComponent.java | 2 +-
.../modules/xml/xam/spi/XsdBasedValidator.java | 2 +-
.../org/netbeans/modules/xml/xdm/diff/XDMUtil.java | 6 +-
.../netbeans/modules/xml/xdm/nodes/Convertors.java | 8 +--
.../org/netbeans/modules/xml/EntityDataObject.java | 2 +-
.../modules/xml/actions/CollectSystemAction.java | 2 +-
.../modules/xml/cookies/CookieFactory.java | 2 +-
.../modules/xml/wizard/impl/SchemaPanel.java | 8 +--
.../org/netbeans/modules/xsl/XSLDataObject.java | 2 +-
.../modules/xsl/grammar/XSLGrammarQuery.java | 6 +-
.../modules/xsl/settings/TransformHistory.java | 4 +-
.../modules/ant/debugger/VerticalGridLayout.java | 2 +-
.../netbeans/modules/ant/grammar/AntGrammar.java | 2 +-
.../CompilerOptionsQueryImplementation.java | 2 +-
.../netbeans/modules/beans/PatternAnalyser.java | 2 +-
.../src/org/netbeans/modules/classfile/CPName.java | 2 +-
.../org/netbeans/modules/classfile/ClassName.java | 8 +--
.../org/netbeans/modules/dbschema/DBElement.java | 2 +-
.../netbeans/modules/dbschema/DBIdentifier.java | 2 +-
.../dbschema/jdbcimpl/DBschemaDataObject.java | 2 +-
.../dbschema/jdbcimpl/TableElementImpl.java | 2 +-
.../wizard/DBSchemaConnectionWizardPanel.java | 2 +-
.../jdbcimpl/wizard/DBSchemaTablesPanel.java | 2 +-
.../dbschema/migration/archiver/MapClassName.java | 4 +-
.../modules/dbschema/util/SQLTypeUtil.java | 12 ++--
.../debugger/jpda/projects/ConstantPool.java | 2 +-
.../jpda/projects/EditorContextSupport.java | 2 +-
.../models/DebuggingTruffleActionsProvider.java | 2 +-
.../modules/debugger/jpda/ui/JavaUtils.java | 2 +-
.../jpda/ui/models/DebuggingActionsProvider.java | 2 +-
.../jpda/ui/models/DebuggingNodeModel.java | 4 +-
.../jpda/ui/models/VariablesSwitchViewAction.java | 2 +-
.../jpda/ui/models/VariablesTreeModelFilterSI.java | 2 +-
.../jpda/visual/remote/RemoteAWTService.java | 4 +-
.../debugger/jpda/visual/JavaComponentInfo.java | 52 +++++++-------
.../breakpoints/BaseComponentBreakpointImpl.java | 8 +--
.../visual/breakpoints/ComponentBreakpoint.java | 4 +-
.../modules/debugger/jpda/DebuggerConsoleIO.java | 2 +-
.../debugger/jpda/breakpoints/BreakpointImpl.java | 4 +-
.../debugger/jpda/expr/EvaluationContext.java | 2 +-
.../debugger/jpda/expr/EvaluatorVisitor.java | 4 +-
.../debugger/jpda/models/CallStackFrameImpl.java | 2 +-
.../jpda/models/VariableMirrorTranslator.java | 4 +-
.../jpda/testapps/JPDAClassTypeTestApp.java | 4 +-
.../jpda/testapps/MethodBreakpointApp.java | 2 +-
.../netbeans/modules/form/ComponentInspector.java | 2 +-
.../org/netbeans/modules/form/FormDataObject.java | 4 +-
.../src/org/netbeans/modules/form/FormModel.java | 6 +-
.../netbeans/modules/form/FormPropertyContext.java | 2 +-
.../modules/form/FormPropertyEditorManager.java | 2 +-
.../src/org/netbeans/modules/form/FormUtils.java | 2 +-
.../netbeans/modules/form/JavaCodeGenerator.java | 6 +-
.../netbeans/modules/form/RADComponentNode.java | 4 +-
.../modules/form/RADConnectionPropertyEditor.java | 14 ++--
.../modules/form/RADVisualFormContainer.java | 2 +-
.../modules/form/codestructure/CodeStructure.java | 4 +-
.../netbeans/modules/form/forminfo/FormInfo.java | 2 +-
.../layoutsupport/delegates/GridBagCustomizer.java | 4 +-
.../delegates/GridBagLayoutSupport.java | 4 +-
.../layoutsupport/delegates/ScrollPaneSupport.java | 2 +-
.../griddesigner/UndoRedoSupport.java | 2 +-
.../netbeans/modules/form/project/ClassSource.java | 2 +-
.../data/OpenForm/StringArrayCustomEditor.java | 2 +-
.../classpath/AbstractGradleClassPathImpl.java | 2 +-
.../classpath/GlobalClassPathProviderImpl.java | 8 +--
.../gradle/java/output/JDPAProcessorFactory.java | 2 +-
.../gradle/test/GradleTestProgressListener.java | 2 +-
.../modules/i18n/HelpStringCustomEditor.java | 2 +-
.../src/org/netbeans/modules/i18n/I18nSupport.java | 2 +-
.../org/netbeans/modules/i18n/SelectorUtils.java | 6 +-
.../modules/i18n/wizard/I18nWizardDescriptor.java | 4 +-
.../core/api/support/progress/ProgressSupport.java | 6 +-
.../rename/RelationshipMappingRename.java | 2 +-
.../whereused/RelationshipMappingWhereUsed.java | 2 +-
.../j2ee/jpa/refactoring/SourceTestSupport.java | 2 +-
.../j2ee/jpa/verification/JPAProblemFinder.java | 6 +-
.../annotation/parser/AnnotationParser.java | 4 +-
.../persistence/dd/common/PersistenceUnit.java | 4 +-
.../j2ee/persistence/dd/common/Property.java | 4 +-
.../editor/completion/JPACompletionItem.java | 8 +--
.../entitygenerator/DbSchemaEjbGenerator.java | 2 +-
.../j2ee/persistence/jpqleditor/JPQLExecutor.java | 22 +++---
.../j2ee/persistence/provider/ToplinkProvider.java | 2 +-
.../j2ee/persistence/spi/jpql/ManagedType.java | 2 +-
.../persistence/unit/PersistenceCfgProperties.java | 32 ++++-----
.../util/PersistenceProviderComboboxHelper.java | 6 +-
.../wizard/PersistenceClientEntitySelection.java | 2 +-
.../modules/j2ee/persistence/wizard/Util.java | 2 +-
.../persistence/wizard/dbscript/DBScriptPanel.java | 2 +-
.../wizard/fromdb/EntityClassesPanel.java | 2 +-
.../persistence/wizard/fromdb/TableSource.java | 2 +-
.../persistence/wizard/fromdb/TableUISupport.java | 2 +-
.../sourcetestsupport/SourceTestSupport.java | 2 +-
.../java/api/common/applet/AppletSupport.java | 4 +-
.../api/common/classpath/ModuleClassPaths.java | 2 +-
.../java/api/common/impl/RootsAccessor.java | 2 +-
.../api/common/project/BaseActionProvider.java | 12 ++--
.../api/common/project/JavaActionProvider.java | 2 +-
.../common/project/ui/MultiModuleNodeFactory.java | 2 +-
.../modules/java/completion/Utilities.java | 4 +-
.../completion/data/GenericMethodInvocation.java | 2 +-
.../org/netbeans/modules/java/disco/Client.java | 4 +-
.../netbeans/modules/java/disco/DownloadPanel.java | 2 +-
.../java/disco/archive/JDKCommonsUnzip.java | 2 +-
.../modules/java/disco/archive/UnarchiveUtils.java | 2 +-
.../java/editor/base/javadoc/Utilities.java | 4 +-
.../java/editor/base/semantic/UnusedDetector.java | 2 +-
.../semantic/data/MarkCorrespondingMethods1.java | 2 +-
.../data/ReadWriteUseArgumentOfAbstractMethod.java | 2 +-
.../modules/editor/java/JavaCompletionItem.java | 2 +-
.../editor/codegen/EqualsHashCodeGenerator.java | 2 +-
.../java/editor/fold/JavaElementFoldManager.java | 2 +-
.../com/toy/anagrams/lib/StaticWordLibrary.java | 2 +-
.../modules/java/guards/JavaGuardedReader.java | 2 +-
.../java/hints/declarative/test/TestPerformer.java | 2 +-
.../java/hints/spiimpl/options/HintsPanel.java | 2 +-
.../modules/java/hints/analyzer/AnalyzeFolder.java | 2 +-
.../hints/analyzer/ui/AnalyzerTopComponent.java | 2 +-
.../java/hints/errors/ChangeMethodReturnType.java | 2 +-
.../hints/errors/ImplementAllAbstractMethods.java | 2 +-
.../modules/java/hints/errors/ImportClass.java | 2 +-
.../java/hints/jdk/ConvertTextBlockToString.java | 2 +-
.../modules/java/hints/jdk/ConvertToVarHint.java | 2 +-
.../j2seembedded/platform/ConnectionMethod.java | 16 ++---
.../j2seplatform/DebianJavaPlatformDetector.java | 4 +-
.../j2seplatform/SdkManJavaPlatformDetector.java | 2 +-
.../platformdefinition/J2SEPlatformImpl.java | 2 +-
.../queries/DefaultClassPathProvider.java | 8 +--
.../java/j2seplatform/queries/QueriesCache.java | 2 +-
.../modules/java/jarloader/JarDataNode.java | 2 +-
.../j2seproject/api/J2SEProjectPlatformTest.java | 2 +-
.../lsp/server/debugging/attach/Processes.java | 2 +-
.../modules/java/lsp/server/htmlui/Browser.java | 2 +-
.../modules/java/lsp/server/htmlui/Buttons.java | 8 +--
.../modules/java/lsp/server/htmlui/HttpServer.java | 4 +-
.../lsp/server/protocol/WorkspaceServiceImpl.java | 2 +-
.../lsp/server/ui/AbstractGlobalActionContext.java | 2 +-
.../lsp/server/explorer/TreeViewProviderTest.java | 2 +-
.../modules/java/mx/project/SuiteLogicalView.java | 2 +-
.../nativeimage/debugger/actions/Processes.java | 2 +-
.../java/navigation/JavadocTopComponent.java | 2 +-
.../modules/java/navigation/base/Filters.java | 2 +-
.../stackanalyzer/AnalyzeStackTopComponent.java | 2 +-
.../openjdk/project/LogicalViewProviderImpl.java | 2 +-
.../modules/java/platform/PlatformSettings.java | 2 +-
.../preprocessorbridge/spi/JavaSourceUtilImpl.java | 2 +-
.../java/project/ui/ProjectProblemsProviders.java | 4 +-
.../org/netbeans/api/java/source/CodeStyle.java | 4 +-
.../org/netbeans/api/java/source/ScanUtils.java | 2 +-
.../org/netbeans/api/java/source/SourceUtils.java | 2 +-
.../api/java/source/support/ProfileSupport.java | 6 +-
.../java/source/indexing/JavaCustomIndexer.java | 2 +-
.../source/indexing/JavaFileFilterListener.java | 2 +-
.../java/source/indexing/JavaIndexerWorker.java | 2 +-
.../java/source/indexing/TransactionContext.java | 2 +-
.../java/source/parsing/CachingArchive.java | 2 +-
.../modules/java/source/parsing/FileObjects.java | 6 +-
.../java/source/parsing/SourceFileManager.java | 2 +-
.../java/source/save/PositionEstimator.java | 2 +-
.../modules/java/source/usages/BinaryAnalyser.java | 4 +-
.../netbeans/api/java/source/TestUtilities.java | 10 +--
.../source/parsing/IndexerTransactionTest.java | 4 +-
.../support/CaretAwareJavaSourceTaskFactory.java | 4 +-
.../support/LookupBasedJavaSourceTaskFactory.java | 2 +-
.../SelectionAwareJavaSourceTaskFactory.java | 4 +-
.../org/netbeans/modules/java/IndentFileEntry.java | 2 +-
.../src/org/netbeans/modules/java/JavaNode.java | 2 +-
.../netbeans/modules/java/ui/CategorySupport.java | 2 +-
.../src/org/netbeans/test/java/Common.java | 2 +-
.../java/source/ui/ElementOpenAccessor.java | 4 +-
.../modules/java/testrunner/CommonTestUtil.java | 2 +-
.../netbeans/modules/javadoc/JavadocModule.java | 4 +-
.../netbeans/modules/javadoc/hints/AddTagFix.java | 6 +-
.../modules/javadoc/search/IndexBuilder.java | 4 +-
.../modules/javadoc/search/SearchThreadJdk12.java | 30 ++++----
.../javadoc/search/SearchThreadJdk12_japan.java | 50 ++++++-------
.../modules/form/FormEditorOperatorTest.java | 2 +-
.../jshell/editor/OverrideEditorActions.java | 2 +-
.../jshell/env/CompilerOptionsProvider.java | 2 +-
.../modules/jshell/env/SourceLevelProvider.java | 2 +-
.../netbeans/modules/jshell/launch/NIOStreams.java | 2 +-
.../modules/jshell/navigation/NavigationTask.java | 2 +-
.../jshell/support/PersistentSnippetsSupport.java | 2 +-
.../netbeans/modules/junit/TestGeneratorSetup.java | 12 ++--
.../netbeans/modules/junit/api/JUnitTestUtil.java | 16 ++---
.../org/netbeans/lib/jshell/agent/AgentWorker.java | 2 +-
.../netbeans/lib/jshell/agent/NbJShellAgent.java | 2 +-
.../modules/maven/codegen/NewMirrorPanel.java | 8 +--
.../maven/indexer/api/RepositoryPreferences.java | 2 +-
.../maven/indexer/api/RepositoryQueries.java | 6 +-
.../indexer/api/AbstractTestQueryProvider.java | 2 +-
.../netbeans/modules/maven/ActionProviderImpl.java | 4 +-
.../netbeans/modules/maven/NbMavenProjectImpl.java | 2 +-
.../modules/maven/actions/CreateLibraryAction.java | 2 +-
.../support/ReflectionTextComponentUpdater.java | 2 +-
.../modules/maven/api/output/OutputUtils.java | 2 +-
.../maven/classpath/ClassPathProviderImpl.java | 40 +++++------
.../maven/customizer/CustomizerProviderImpl.java | 4 +-
.../modules/maven/dependencies/CheckNode.java | 4 +-
.../modules/maven/execute/ActionToGoalUtils.java | 2 +-
.../maven/execute/MavenCommandLineExecutor.java | 2 +-
.../modules/maven/execute/ModelRunConfig.java | 2 +-
.../modules/maven/nodes/DependenciesNode.java | 2 +-
.../modules/maven/options/SettingsPanel.java | 2 +-
.../queries/RepositoryForBinaryQueryImpl.java | 2 +-
.../modules/maven/runjar/MavenExecuteUtils.java | 2 +-
.../nashorn/execution/actions/ExecJSAction.java | 2 +-
.../actions/spi/ContextProviderSupport.java | 4 +-
.../mobility/actions/OpenMIDletEditorTest.java | 2 +-
.../performance/guitracker/ActionTracker.java | 66 ++++++++---------
.../utilities/MeasureStartupTimeTestCase.java | 2 +-
.../src/threaddemo/locking/EventLock.java | 2 +-
.../src/threaddemo/util/TwoWaySupport.java | 2 +-
.../eclipse/core/EclipseProjectReference.java | 4 +-
.../eclipse/core/UpgradableProject.java | 2 +-
.../core/spi/UpgradableProjectLookupProvider.java | 2 +-
.../eclipse/gui/ProjectImporterTestCase.java | 2 +-
.../java/callhierarchy/CallHierarchyTasks.java | 2 +-
.../callhierarchy/CallHierarchyTopComponent.java | 2 +-
.../java/plugins/ChangeParamsTransformer.java | 6 +-
.../plugins/ExtractInterfaceRefactoringPlugin.java | 2 +-
.../ExtractSuperclassRefactoringPlugin.java | 2 +-
.../refactoring/java/ui/ContextAnalyzer.java | 8 +--
.../ui/ReplaceConstructorWithBuilderPanel.java | 2 +-
.../refactoring/java/ui/WhereUsedPanel.java | 2 +-
.../java/ui/scope/CustomScopePanel.java | 2 +-
.../test/refactoring/RefactoringTestCase.java | 2 +-
.../selenium2/maven/Selenium2MavenSupportImpl.java | 14 ++--
.../modules/java/hints/spiimpl/JavaFixImpl.java | 2 +-
.../java/hints/spiimpl/batch/BatchSearch.java | 4 +-
.../modules/java/hints/spiimpl/pm/BulkSearch.java | 2 +-
.../java/hints/spiimpl/batch/BatchSearchTest.java | 4 +-
.../completion/completors/BeansRefCompletor.java | 2 +-
.../spring/beans/model/ExclusiveAccess.java | 2 +-
.../spring/beans/model/impl/ObjectProviders.java | 2 +-
.../src/org/netbeans/modules/testng/TestUtil.java | 14 ++--
.../whitelist/project/WhiteListLookupProvider.java | 2 +-
.../upgrade/systemoptions/PropertiesStorage.java | 2 +-
.../upgrade/systemoptions/SettingsRecognizer.java | 2 +-
.../modules/welcome/content/LinkButton.java | 4 +-
.../modules/welcome/ui/StartPageContent.java | 8 +--
.../netbeans/modules/welcome/ui/TabbedPane.java | 2 +-
.../netbeans/nbbuild/AutoUpdateCatalogParser.java | 4 +-
.../org/netbeans/installer/utils/BrowserUtils.java | 6 +-
.../utils/helper/swing/NbiTreeTableModel.java | 6 +-
.../installer/utils/system/NativeUtils.java | 16 ++---
.../components/panels/ErrorMessagePanel.java | 2 +-
.../utils/comment/handlers/BlockFileHandler.java | 12 ++--
.../netbeans/modules/php/dbgp/SessionProgress.java | 2 +-
.../php/dbgp/breakpoints/LineBreakpoint.java | 6 +-
.../netbeans/modules/php/dbgp/URIMapperTest.java | 2 +-
.../modules/php/editor/parser/ASTPHP5Parser.java | 16 ++---
.../editor/parser/astnodes/FieldsDeclaration.java | 2 +-
.../php/editor/parser/astnodes/PHPDocTag.java | 4 +-
.../php/editor/parser/astnodes/SimpleASTNode.java | 8 +--
.../parser/astnodes/SingleFieldDeclaration.java | 2 +-
.../src/org/netbeans/test/php/Commit.java | 10 +--
.../src/org/netbeans/test/php/GeneralPHP.java | 2 +-
.../modules/php/editor/csl/TestUtilities.java | 8 +--
.../modules/php/editor/parser/PrintASTVisitor.java | 4 +-
.../editor/actions/ToggleBlockCommentAction.java | 4 +-
.../editor/completion/TplCompletionProvider.java | 2 +-
.../entries/SmartyCodeCompletionOffer.java | 6 +-
.../netbeans/modules/htmlui/FallbackViewer.java | 2 +-
.../src/org/netbeans/modules/htmlui/ATech.java | 2 +-
.../api/progress/ProgressHandleFactoryTest.java | 2 +-
.../progress/module/ProgressApiAccessor.java | 2 +-
.../src/org/netbeans/api/search/SearchHistory.java | 8 +--
.../netbeans/modules/search/BasicSearchForm.java | 2 +-
.../org/netbeans/modules/search/ResultView.java | 2 +-
.../netbeans/modules/search/ResultViewPanel.java | 2 +-
.../modules/search/ui/FormLayoutHelper.java | 2 +-
.../netbeans/spi/search/SearchScopeDefinition.java | 4 +-
.../provider/DefaultSearchResultsDisplayer.java | 2 +-
.../spi/search/provider/SearchProvider.java | 2 +-
.../search/provider/SearchResultsDisplayer.java | 2 +-
.../netbeans/api/visual/action/WidgetAction.java | 4 +-
.../netbeans/api/visual/graph/GraphPinScene.java | 2 +-
.../org/netbeans/api/visual/graph/GraphScene.java | 2 +-
.../libsrc/org/netbeans/updater/UpdaterFrame.java | 10 +--
.../services/OperationContainerImpl.java | 2 +-
.../autoupdate/services/OperationValidator.java | 16 ++---
.../autoupdate/services/UpdateManagerImpl.java | 2 +-
.../modules/autoupdate/services/Utilities.java | 2 +-
.../updateprovider/AutoupdateCatalogParser.java | 2 +-
.../autoupdate/updateprovider/DummyModuleInfo.java | 2 +-
.../services/FeatureDependsOnFeatureTest.java | 2 +-
.../services/FeatureNotUpToDateTest.java | 2 +-
.../autoupdate/ui/LocalDownloadSupport.java | 2 +-
.../modules/autoupdate/ui/SettingsTab.java | 2 +-
.../netbeans/core/execution/ExecutionEngine.java | 2 +-
.../multitabs/impl/FolderNameTabDecorator.java | 2 +-
.../multitabs/impl/ProjectColorTabDecorator.java | 2 +-
.../org/netbeans/core/multiview/SplitLayerUI.java | 2 +-
.../org/netbeans/core/multiview/TabsComponent.java | 2 +-
.../core/spi/multiview/MultiViewFactory.java | 4 +-
.../core/network/proxy/NetworkProxySettings.java | 8 +--
.../proxy/fallback/FallbackNetworkProxy.java | 22 +++---
.../network/proxy/gnome/GconfNetworkProxy.java | 44 ++++++------
.../network/proxy/gnome/GnomeNetworkProxy.java | 2 +-
.../network/proxy/gnome/GsettingsNetworkProxy.java | 48 ++++++-------
.../core/network/proxy/kde/KdeNetworkProxy.java | 44 ++++++------
.../core/network/proxy/mac/MacNetworkProxy.java | 36 +++++-----
.../core/network/proxy/pac/datetime/DateRange.java | 2 +-
.../proxy/pac/datetime/PacUtilsDateTime.java | 4 +-
.../core/network/proxy/pac/datetime/TimeRange.java | 2 +-
.../network/proxy/windows/WindowsNetworkProxy.java | 14 ++--
.../core/network/utils/SimpleObjCache.java | 2 +-
.../proxy/pac/impl/PacHelperMethodsImplTest.java | 4 +-
.../core/startup/AutomaticDependencies.java | 2 +-
.../core/startup/layers/BinaryCacheManager.java | 2 +-
.../startup/layers/ParsingLayerCacheManager.java | 10 +--
.../options/filetypes/IgnoredFilesPreferences.java | 2 +-
.../core/windows/ModeStructureSnapshot.java | 2 +-
.../netbeans/core/windows/PersistenceHandler.java | 2 +-
.../netbeans/core/windows/TopComponentTracker.java | 2 +-
.../core/windows/documentgroup/PleaseWait.java | 2 +-
.../netbeans/core/windows/model/SplitSubModel.java | 2 +-
.../core/windows/services/ActionPasteType.java | 8 +--
.../core/windows/services/NbPresenter.java | 2 +-
.../windows/view/ModeStructureAccessorImpl.java | 2 +-
.../netbeans/core/windows/view/ui/MainWindow.java | 2 +-
.../org/netbeans/core/windows/view/ui/NbSheet.java | 4 +-
.../ui/popupswitcher/KeyboardPopupSwitcher.java | 4 +-
.../view/ui/StatusLineElementProviderTest.java | 6 +-
.../src/org/netbeans/modules/favorites/Tab.java | 10 +--
.../org/netbeans/modules/htmlui/impl/ATech.java | 2 +-
.../modules/javahelp/BrowserDisplayer.java | 2 +-
.../org/netbeans/lib/uihandler/DecorableTest.java | 2 +-
.../masterfs/watcher/windows/WindowsNotifier.java | 2 +-
.../masterfs/filebasedfs/FileBasedFileSystem.java | 10 +--
.../filebasedfs/children/ChildrenSupport.java | 2 +-
.../filebasedfs/fileobjects/BaseFileObj.java | 2 +-
.../masterfs/filebasedfs/naming/NamingFactory.java | 2 +-
.../filebasedfs/MIMESupportLoggingTest.java | 2 +-
.../filebasedfs/fileobjects/FolderObjTest.java | 4 +-
.../utils/FileChangedManagerDeadlockTest.java | 2 +-
.../netbeans/modules/netbinox/NetbinoxHooks.java | 2 +-
.../netbeans/modules/netbinox/HookRaceTest.java | 4 +-
.../src/org/netbeans/JarClassLoader.java | 2 +-
.../o.n.bootstrap/src/org/netbeans/ModuleData.java | 4 +-
.../src/org/netbeans/ModuleManager.java | 4 +-
.../src/org/netbeans/ProxyClassPackages.java | 6 +-
.../unit/src/org/netbeans/CLIHandlerGrepTest.java | 4 +-
.../org/netbeans/CLIHandlerReadingOfInputTest.java | 4 +-
.../org/netbeans/CLIHandlerServerWaitsTest.java | 4 +-
.../test/unit/src/org/netbeans/CLIHandlerTest.java | 4 +-
.../org/netbeans/beaninfo/editors/FontEditor.java | 4 +-
.../o.n.core/src/org/netbeans/core/ExitDialog.java | 2 +-
.../src/org/netbeans/core/ModuleActions.java | 6 +-
.../netbeans/core/projects/XMLSettingsTest.java | 2 +-
.../netbeans/core/HtmlBrowserComponentTest.java | 2 +-
.../netbeans/swing/laf/dark/DarkMetalTheme.java | 2 +-
.../src/org/netbeans/swing/etable/ETable.java | 12 ++--
.../src/org/netbeans/swing/outline/Outline.java | 2 +-
.../netbeans/swing/plaf/aqua/AquaSeparatorUI.java | 4 +-
.../org/netbeans/swing/plaf/gtk/GtkLFCustoms.java | 2 +-
.../beanstubs/org/openide/util/Utilities.java | 2 +-
.../plaf/NonStretchingViewTabLayoutModel.java | 4 +-
.../swing/tabcontrol/plaf/WinFlatUtils.java | 2 +-
.../openide.awt/src/org/openide/awt/Actions.java | 2 +-
.../src/org/openide/awt/HtmlBrowser.java | 4 +-
.../src/org/openide/awt/MouseUtils.java | 4 +-
.../src/org/openide/awt/QuickSearch.java | 2 +-
.../src/org/openide/awt/SplittedPanel.java | 22 +++---
.../src/org/openide/awt/ContextActionTest.java | 2 +-
.../src/org/openide/explorer/ExplorerPanel.java | 2 +-
.../src/org/openide/explorer/view/TTVTest.java | 2 +-
.../src/org/openide/WizardValidationException.java | 2 +-
.../openide/explorer/ExplorerActionsImpl.java | 2 +-
.../org/openide/explorer/propertysheet/PSheet.java | 4 +-
.../openide/explorer/propertysheet/PropUtils.java | 4 +-
.../explorer/propertysheet/PropertySheetView.java | 6 +-
.../src/org/openide/explorer/view/ChoiceView.java | 6 +-
.../openide/explorer/view/CustomPopupFactory.java | 2 +-
.../openide/explorer/view/DragDropUtilities.java | 2 +-
.../org/openide/explorer/view/DropGlassPane.java | 16 ++---
.../src/org/openide/explorer/view/ListView.java | 10 +--
.../src/org/openide/explorer/view/MenuView.java | 4 +-
.../src/org/openide/explorer/view/OutlineView.java | 4 +-
.../explorer/view/OutlineViewDropSupport.java | 6 +-
.../src/org/openide/explorer/view/TableSheet.java | 6 +-
.../src/org/openide/explorer/view/TableView.java | 4 +-
.../src/org/openide/explorer/view/TreeView.java | 12 ++--
.../openide/explorer/view/TreeViewDropSupport.java | 12 ++--
.../org/openide/explorer/view/ViewTooltips.java | 4 +-
.../explorer/propertysheet/ProxyNodeTest.java | 2 +-
.../explorer/view/TreeTableView126560Test.java | 2 +-
.../org/openide/explorer/view/TreeViewTest.java | 2 +-
.../openide/filesystems/FileFilterSupport.java | 2 +-
.../openide/filesystems/AbstractFileSystem.java | 4 +-
.../org/openide/filesystems/AbstractFolder.java | 2 +-
.../org/openide/filesystems/DefaultAttributes.java | 16 ++---
.../src/org/openide/filesystems/ExternalUtil.java | 2 +-
.../src/org/openide/filesystems/FCLSupport.java | 8 +--
.../src/org/openide/filesystems/FileObject.java | 10 +--
.../src/org/openide/filesystems/FileSystem.java | 6 +-
.../src/org/openide/filesystems/Repository.java | 4 +-
.../src/org/openide/filesystems/XMLMapAttr.java | 6 +-
.../org/openide/filesystems/FileObjectTestHid.java | 10 +--
.../src/org/openide/filesystems/TestUtilHid.java | 14 ++--
.../src/org/openide/windows/IOColorLines.java | 2 +-
.../src/org/openide/windows/IOColorPrint.java | 2 +-
.../src/org/openide/windows/IOColors.java | 4 +-
.../src/org/openide/windows/IOFolding.java | 2 +-
.../src/org/openide/windows/IOPosition.java | 2 +-
.../src/org/openide/windows/IOSelect.java | 2 +-
.../openide.io/src/org/openide/windows/IOTab.java | 8 +--
.../src/org/openide/actions/NewTemplateAction.java | 2 +-
.../src/org/openide/awt/Toolbar.java | 2 +-
.../src/org/openide/loaders/DataFolder.java | 8 +--
.../src/org/openide/loaders/DataLoaderPool.java | 4 +-
.../src/org/openide/loaders/DataNode.java | 2 +-
.../src/org/openide/loaders/DataObjectPool.java | 4 +-
.../org/openide/loaders/DataTransferSupport.java | 2 +-
.../src/org/openide/loaders/FileEntry.java | 4 +-
.../src/org/openide/loaders/FolderList.java | 14 ++--
.../org/openide/loaders/InstanceDataObject.java | 6 +-
.../src/org/openide/loaders/InstanceNode.java | 2 +-
.../src/org/openide/loaders/MultiDataObject.java | 2 +-
.../src/org/openide/text/DataEditorSupport.java | 8 +--
.../openide/loaders/AskEditorQuestionsTest.java | 2 +-
.../unit/src/org/openide/loaders/TestUtilHid.java | 2 +-
.../org/openide/text/DataEditorReadOnlyTest.java | 2 +-
.../org/openide/text/DataEditorSupportTest.java | 2 +-
.../FileEncodingQueryDataEditorSupportTest.java | 2 +-
.../src/org/openide/modules/Dependency.java | 20 +++---
.../openide/nodes/NodesRegistrationSupport.java | 2 +-
.../src/org/openide/nodes/ChildFactory.java | 2 +-
.../src/org/openide/nodes/Children.java | 6 +-
.../src/org/openide/nodes/CookieSetLkp.java | 4 +-
.../openide.nodes/src/org/openide/nodes/Index.java | 2 +-
.../openide.nodes/src/org/openide/nodes/Node.java | 6 +-
.../src/org/openide/nodes/PropertySupport.java | 6 +-
.../openide.nodes/src/org/openide/nodes/Sheet.java | 2 +-
.../src/org/openide/util/actions/CookieAction.java | 2 +-
.../src/org/openide/text/Annotatable.java | 12 ++--
.../src/org/openide/text/Annotation.java | 10 +--
.../openide/text/CloneableEditorInitializer.java | 2 +-
.../src/org/openide/text/DocumentLine.java | 2 +-
.../src/org/openide/text/IndentEngine.java | 4 +-
.../openide.text/src/org/openide/text/Line.java | 20 +++---
.../src/org/openide/text/PositionRef.java | 8 +--
.../src/org/openide/text/QuietEditorPane.java | 6 +-
.../openide/text/AskEditorQuestionsTest.java | 2 +-
.../src/org/openide/text/Deadlock207571Test.java | 2 +-
.../org/openide/text/EditToBeUndoneRedoneTest.java | 2 +-
.../src/org/openide/text/LoadMultipleDocsTest.java | 2 +-
.../org/openide/text/WrapEditorComponentTest.java | 2 +-
.../src/org/openide/util/Lookup.java | 4 +-
.../org/openide/util/lookup/AbstractLookup.java | 4 +-
.../org/openide/util/lookup/InstanceContent.java | 4 +-
.../src/org/openide/util/lookup/ProxyLookup.java | 4 +-
.../lookup/AbstractLookupArrayStorageTest.java | 2 +-
.../src/org/openide/ServiceType.java | 4 +-
.../src/org/openide/util/HelpCtx.java | 2 +-
.../src/org/openide/util/ImageUtilities.java | 2 +-
.../src/org/openide/util/NetworkSettings.java | 2 +-
.../org/openide/util/actions/ActionInvoker.java | 2 +-
.../openide/util/actions/CallbackSystemAction.java | 2 +-
.../openide/util/datatransfer/ExTransferable.java | 6 +-
.../org/openide/util/UtilitiesTranslateTest.java | 4 +-
.../org/openide/util/actions/SystemActionTest.java | 2 +-
.../src/org/openide/util/CharSequences.java | 4 +-
.../src/org/openide/util/NbBundle.java | 2 +-
.../src/org/openide/util/NbCollections.java | 2 +-
.../src/org/openide/util/RequestProcessor.java | 6 +-
.../org/openide/util/io/NbMarshalledObject.java | 2 +-
.../unit/src/org/openide/util/WeakSetTest.java | 4 +-
.../org/openide/windows/CloneableTopComponent.java | 4 +-
.../src/org/openide/windows/ModeUtilities.java | 2 +-
.../openide/windows/TopComponentGetLookupTest.java | 2 +-
.../src/org/netbeans/modules/options/Utils.java | 2 +-
.../modules/options/keymap/KeymapModel.java | 2 +-
.../modules/sampler/SamplesOutputStream.java | 6 +-
.../org/netbeans/modules/sendopts/OptionImpl.java | 2 +-
.../org/netbeans/api/sendopts/StreamingTest.java | 4 +-
.../settings/examples/JavaCompilerSetting.java | 8 +--
.../modules/settings/examples/ProxySettings.java | 4 +-
.../src/org/netbeans/modules/settings/Env.java | 12 ++--
.../org/netbeans/modules/settings/SaveSupport.java | 4 +-
.../modules/settings/ScheduledRequest.java | 4 +-
.../settings/convertors/ModuleInfoManager.java | 4 +-
.../settings/convertors/SerialDataConvertor.java | 2 +-
.../settings/convertors/SerialDataNode.java | 2 +-
.../convertors/XMLPropertiesConvertor.java | 6 +-
.../settings/convertors/XMLSettingsSupport.java | 6 +-
.../netbeans/spi/settings/ConvertorResolver.java | 2 +-
.../org/netbeans/spi/settings/DOMConvertor.java | 16 ++---
.../modules/settings/convertors/FooSetting.java | 4 +-
.../netbeans/spi/settings/DOMConvertorTest.java | 6 +-
.../modules/quicksearch/CommandEvaluator.java | 2 +-
.../modules/quicksearch/SlowProviderTest.java | 4 +-
.../modules/templates/actions/TemplatesAction.java | 2 +-
.../modules/templates/ui/TemplatesPanel.java | 8 +--
.../modules/templatesui/AbstractWizard.java | 2 +-
.../exceptions/ReporterResultTopComponent.java | 2 +-
.../org/netbeans/modules/uihandler/Installer.java | 6 +-
.../org/netbeans/modules/uihandler/UINodeTest.java | 2 +-
.../netbeans/lib/profiler/charts/ChartItem.java | 2 +-
.../netbeans/lib/profiler/charts/ItemsModel.java | 2 +-
.../lib/profiler/charts/PaintersModel.java | 2 +-
.../lib/profiler/charts/axis/AxisMark.java | 2 +-
.../profiler/charts/axis/AxisMarksComputer.java | 4 +-
.../lib/profiler/charts/axis/AxisMarksPainter.java | 2 +-
.../lib/profiler/charts/xy/XYItemPainter.java | 2 +-
.../profiler/ui/LiveResultsWindowContributor.java | 2 +-
.../org/netbeans/lib/profiler/ui/SwingWorker.java | 10 +--
.../lib/profiler/ui/components/CloseButton.java | 2 +-
.../lib/profiler/ui/components/LazyComboBox.java | 2 +-
.../profiler/ui/components/ProfilerToolbar.java | 2 +-
.../ui/cpu/statistics/StatisticalModule.java | 8 +--
.../netbeans/lib/profiler/ui/results/DataView.java | 2 +-
.../lib/profiler/ui/swing/ExportUtils.java | 10 +--
.../lib/profiler/ui/swing/FilterUtils.java | 2 +-
.../lib/profiler/ui/swing/ProfilerPopup.java | 2 +-
.../lib/profiler/ui/swing/ProfilerTreeTable.java | 2 +-
.../profiler/ui/swing/ProfilerTreeTableModel.java | 2 +-
.../lib/profiler/ui/swing/SearchUtils.java | 2 +-
.../netbeans/lib/profiler/ui/SwingWorkerTest.java | 4 +-
.../org/netbeans/lib/profiler/ProfilerClient.java | 2 +-
.../netbeans/lib/profiler/classfile/ClassPath.java | 2 +-
.../lib/profiler/heap/AbstractLongMap.java | 2 +-
.../netbeans/lib/profiler/heap/HprofGCRoots.java | 4 +-
.../org/netbeans/lib/profiler/heap/Progress.java | 4 +-
.../profiler/results/RuntimeCCTNodeProcessor.java | 18 ++---
.../profiler/results/cpu/CPUCallGraphBuilder.java | 4 +-
.../lib/profiler/results/cpu/InstrTimingData.java | 2 +-
.../lib/profiler/results/cpu/MethodInfoMapper.java | 2 +-
.../results/cpu/StackTraceSnapshotBuilder.java | 4 +-
.../lib/profiler/results/cpu/ThreadInfo.java | 2 +-
.../results/cpu/marking/MarkingEngine.java | 2 +-
.../profiler/results/jdbc/JdbcGraphBuilder.java | 2 +-
.../profiler/results/locks/LockGraphBuilder.java | 2 +-
.../lib/profiler/results/locks/MonitorInfo.java | 2 +-
.../lib/profiler/results/memory/HeapHistogram.java | 2 +-
.../profiler/results/memory/JMethodIdTable.java | 18 ++---
.../lib/profiler/server/ProfilerRuntime.java | 2 +-
.../lib/profiler/server/ProfilerServer.java | 2 +-
.../MavenProjectProfilingSupportProvider.java | 4 +-
.../modules/maven/profiler/RunCheckerImpl.java | 2 +-
.../modules/profiler/api/EditorSupport.java | 2 +-
.../netbeans/modules/profiler/api/GoToSource.java | 2 +-
.../modules/profiler/api/ProfilerProject.java | 6 +-
.../modules/profiler/api/ProfilerSource.java | 8 +--
.../profiler/api/java/ExternalPackages.java | 2 +-
.../profiler/api/java/JavaProfilerSource.java | 4 +-
.../profiler/api/java/ProfilerTypeUtils.java | 2 +-
.../modules/profiler/api/java/SourceClassInfo.java | 28 ++++----
.../profiler/api/java/SourceMethodInfo.java | 14 ++--
.../profiler/api/java/SourcePackageInfo.java | 6 +-
.../modules/profiler/spi/IconsProvider.java | 2 +-
.../profiler/spi/ProfilerStorageProvider.java | 2 +-
.../modules/profiler/spi/SessionListener.java | 2 +-
.../spi/java/AbstractJavaProfilerSource.java | 2 +-
.../spi/java/ProfilerTypeUtilsProvider.java | 6 +-
.../attach/providers/RemotePackExporter.java | 2 +-
.../attach/spi/AbstractRemotePackExporter.java | 10 +--
.../attach/steps/BasicAttachStepsProvider.java | 6 +-
.../profiler/heapwalk/HeapFragmentWalker.java | 2 +-
.../profiler/heapwalk/HeapWalkerManager.java | 4 +-
.../modules/profiler/heapwalk/OQLController.java | 4 +-
.../modules/profiler/heapwalk/OQLSupport.java | 4 +-
.../profiler/heapwalk/OverviewController.java | 12 ++--
.../heapwalk/details/api/ExportAction.java | 2 +-
.../heapwalk/details/jdk/ui/BorderBuilders.java | 2 +-
.../heapwalk/details/jdk/ui/ButtonBuilders.java | 2 +-
.../heapwalk/details/jdk/ui/ComponentBuilders.java | 4 +-
.../details/jdk/ui/TextComponentBuilders.java | 2 +-
.../profiler/heapwalk/details/jdk/ui/Utils.java | 4 +-
.../details/netbeans/PlatformDetailsProvider.java | 24 +++----
.../heapwalk/details/spi/DetailsProvider.java | 4 +-
.../profiler/heapwalk/oql/ui/OQLEditor.java | 16 ++---
.../j2se/J2SEProjectProfilingSupportProvider.java | 2 +-
.../nbimpl/actions/FileSensitivePerformer.java | 2 +-
.../profiler/nbimpl/actions/ProfilerLauncher.java | 20 +++---
.../nbimpl/actions/ProjectSensitivePerformer.java | 4 +-
.../profiler/nbimpl/javac/ScanSensitiveTask.java | 4 +-
.../nbimpl/project/AntProjectSupportProvider.java | 2 +-
.../JavaProjectProfilingSupportProvider.java | 4 +-
.../profiler/nbimpl/project/ProjectUtilities.java | 4 +-
.../providers/BaseProfilerTypeUtilsImpl.java | 10 +--
.../nbimpl/providers/GoToJavaSourceProvider.java | 4 +-
.../oql/language/ClassnameCompletionItem.java | 16 ++---
.../oql/language/FunctionCompletionItem.java | 10 +--
.../oql/language/KeywordCompletionItem.java | 10 +--
.../oql/language/OQLCompletionProvider.java | 6 +-
.../modules/profiler/oql/language/OQLLexer.java | 6 +-
.../modules/profiler/oql/language/OQLTokenId.java | 2 +-
.../oql/language/PackageCompletionItem.java | 8 +--
.../profiler/oql/language/ui/OQLEditor.java | 6 +-
.../modules/profiler/oql/engine/api/OQLEngine.java | 10 +--
.../profiler/oql/engine/api/OQLException.java | 2 +-
.../profiler/oql/engine/api/ReferenceChain.java | 2 +-
.../oql/engine/api/impl/OQLEngineImpl.java | 4 +-
.../profiler/oql/engine/api/impl/Snapshot.java | 2 +-
.../profiler/oql/engine/api/impl/TreeIterator.java | 6 +-
.../oql/repository/api/OQLQueryCategory.java | 2 +-
.../oql/repository/api/OQLQueryDefinition.java | 2 +-
.../oql/repository/api/OQLQueryRepository.java | 10 +--
.../modules/profiler/oql/spi/OQLEditorImpl.java | 8 +--
.../profiler/ppoints/ProfilingPointWizard.java | 2 +-
.../profiler/ppoints/ProfilingPointsManager.java | 2 +-
.../ppoints/ui/InsertProfilingPointMenuAction.java | 2 +-
.../profiler/ppoints/ui/ProjectSelector.java | 2 +-
.../ppoints/ui/ToggleProfilingPointAction.java | 2 +-
.../modules/profiler/snaptracer/TracerPackage.java | 4 +-
.../modules/profiler/snaptracer/TracerProbe.java | 4 +-
.../snaptracer/impl/IdeSnapshotAction.java | 2 +-
.../snaptracer/impl/export/DataExport.java | 2 +-
.../snaptracer/impl/timeline/ChartPanel.java | 2 +-
.../modules/profiler/utilities/Delegate.java | 4 +-
.../modules/profiler/NetBeansProfiler.java | 4 +-
.../netbeans/modules/profiler/ResultsManager.java | 4 +-
.../modules/profiler/SaveSnapshotAction.java | 2 +-
.../modules/profiler/actions/AttachAction.java | 4 +-
.../actions/GetCmdLineArgumentsAction.java | 2 +-
.../modules/profiler/actions/HeapDumpAction.java | 4 +-
.../profiler/actions/InternalStatsAction.java | 2 +-
.../profiler/actions/ResetResultsAction.java | 4 +-
.../modules/profiler/actions/RunGCAction.java | 4 +-
.../modules/profiler/actions/StopAction.java | 6 +-
.../profiler/actions/TakeSnapshotAction.java | 2 +-
.../profiler/actions/TakeThreadDumpAction.java | 2 +-
.../modules/profiler/v2/ProfilerFeature.java | 10 +--
.../modules/profiler/v2/ProfilerFeatures.java | 2 +-
.../modules/profiler/v2/ProfilerPlugin.java | 2 +-
.../modules/profiler/v2/ProfilerSession.java | 6 +-
.../modules/profiler/v2/ProfilerSessions.java | 2 +-
.../profiler/v2/features/MethodsFeatureModes.java | 16 ++---
.../profiler/v2/features/ObjectsFeatureModes.java | 12 ++--
.../profiler/v2/features/SQLFeatureModes.java | 6 +-
.../profiler/v2/impl/ClassMethodSelector.java | 12 ++--
.../profiler/v2/impl/SnapshotsWindowUI.java | 2 +-
.../cordova/platforms/android/AndroidPlatform.java | 2 +-
.../cordova/platforms/EnhancedBrowserImpl.java | 2 +-
.../platforms/RefreshOnSaveListenerImpl.java | 4 +-
.../modules/cordova/updatetask/XMLFile.java | 2 +-
.../netbeans/modules/cordova/CordovaPlatform.java | 2 +-
.../cordova/project/MobileConfigurationImpl.java | 2 +-
.../modules/cordova/wizard/CordovaTemplate.java | 2 +-
.../plugins/ExtensionManagerAccessor.java | 2 +-
.../plugins/chrome/ChromeManagerAccessor.java | 2 +-
.../angular/editor/AngularJsCompletionItem.java | 2 +-
.../angular/model/AngularConfigInterceptor.java | 2 +-
.../angular/model/AngularModuleInterceptor.java | 4 +-
.../html/angular/model/AngularWhenInterceptor.java | 8 +--
.../modules/html/angular/TestProjectSupport.java | 2 +-
.../editor/AngularJsDeclarationFinder2Test.java | 2 +-
.../bower/ui/libraries/DependenciesPanel.java | 8 +--
.../netbeans/modules/javascript/cdnjs/Library.java | 2 +-
.../javascript/cdnjs/ui/SelectionPanel.java | 6 +-
.../nodejs/ui/libraries/DependenciesPanel.java | 8 +--
.../v8debug/ui/eval/EvaluationResultsModel.java | 2 +-
.../modules/javascript2/editor/FileUtils.java | 2 +-
.../modules/javascript2/editor/JsKeywords.java | 4 +-
.../javascript2/editor/JsStructureScanner.java | 8 +--
.../javascript2/editor/JsTypedTextInterceptor.java | 4 +-
.../javascript2/editor/formatter/CodeStyle.java | 2 +-
.../javascript2/editor/parser/JsErrorManager.java | 2 +-
.../editor/parser/SanitizingParser.java | 4 +-
.../javascript2/extjs/ExtJsCodeCompletion.java | 2 +-
.../jade/editor/JadeCodeCompletion.java | 4 +-
.../jade/editor/JadeCompletionItem.java | 6 +-
.../jquery/editor/JQueryCodeCompletion.java | 2 +-
.../jquery/model/JQueryExtendInterceptor.java | 2 +-
.../jquery/model/JQueryWidgetInterceptor.java | 2 +-
.../javascript2/jsdoc/model/JsDocElementType.java | 2 +-
.../modules/javascript2/model/CatchBlockImpl.java | 2 +-
.../modules/javascript2/model/JsFunctionImpl.java | 6 +-
.../modules/javascript2/model/JsObjectImpl.java | 8 +--
.../modules/javascript2/model/ModelVisitor.java | 2 +-
.../javascript2/model/api/IndexedElement.java | 6 +-
.../javascript2/nodejs/TestProjectSupport.java | 2 +-
.../nodejs/editor/NodeJSCodeCompletionTest.java | 2 +-
.../NodeJsCodeCompletionWithJsRunTimeTest.java | 2 +-
.../prototypejs/model/CreateInterceptor.java | 6 +-
.../requirejs/RequireJsDataProvider.java | 2 +-
.../requirejs/editor/FSCompletionUtils.java | 2 +-
.../javascript2/requirejs/editor/SimpleHandle.java | 2 +-
.../requirejs/editor/model/ConfigInterceptor.java | 2 +-
.../javascript2/requirejs/TestProjectSupport.java | 2 +-
.../editor/RequireJSCodeCompletionTest.java | 2 +-
.../lib/v8debug/client/cmdline/V8Debug.java | 2 +-
.../clientproject/build/ui/VerticalGridLayout.java | 2 +-
.../browser/BrowserActionProvider.java | 2 +-
.../browser/ClientProjectEnhancedBrowserImpl.java | 4 +-
.../browser/RefreshOnSaveListenerImpl.java | 4 +-
.../web/inspect/webkit/knockout/KnockoutNode.java | 2 +-
.../debugger/eval/ui/EvaluationResultsModel.java | 2 +-
.../websvc/saas/model/SaasServicesModel.java | 2 +-
.../spi/websvcmgr/WsdlServiceProxyDescriptor.java | 2 +-
.../saas/codegen/SaasClientCodeGenerator.java | 4 +-
.../websvc/saas/codegen/util/Inflector.java | 2 +-
.../websvc/saas/ui/nodes/SaasMethodNode.java | 2 +-
1375 files changed, 3301 insertions(+), 3301 deletions(-)
---------------------------------------------------------------------
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
[netbeans] 08/17: Use the blessed modifier order in projects located in nbbuild projects
Posted by mk...@apache.org.
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 bff7d9d2d597b94161b1b1cebf1a143b7b96ea9e
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Fri Feb 18 11:09:29 2022 +0100
Use the blessed modifier order in projects located in nbbuild projects
---
nbbuild/antsrc/org/netbeans/nbbuild/AutoUpdateCatalogParser.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/AutoUpdateCatalogParser.java b/nbbuild/antsrc/org/netbeans/nbbuild/AutoUpdateCatalogParser.java
index 6d06426..b19a88e 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/AutoUpdateCatalogParser.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/AutoUpdateCatalogParser.java
@@ -130,10 +130,10 @@ class AutoUpdateCatalogParser extends DefaultHandler {
private static Map<String, ModuleItem> cache;
private static URI cacheURI;
- synchronized static Map<String, ModuleItem> getUpdateItems (URL url, URL provider, Task task) throws IOException {
+ static synchronized Map<String, ModuleItem> getUpdateItems (URL url, URL provider, Task task) throws IOException {
return getUpdateItems(url, null, provider, task);
}
- synchronized static Map<String, ModuleItem> getUpdateItems (URL url, InputStream data, URL provider, Task task) throws IOException {
+ static synchronized Map<String, ModuleItem> getUpdateItems (URL url, InputStream data, URL provider, Task task) throws IOException {
Map<String, ModuleItem> items = new HashMap<> ();
URI base;
---------------------------------------------------------------------
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
[netbeans] 06/17: Use the blessed modifier order in projects located in nbi projects
Posted by mk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mklaehn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 467254516cd5c56194022a68c3aa7bb683c525da
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Fri Feb 18 11:09:08 2022 +0100
Use the blessed modifier order in projects located in nbi projects
---
.../src/org/netbeans/installer/utils/BrowserUtils.java | 6 +++---
.../installer/utils/helper/swing/NbiTreeTableModel.java | 6 +++---
.../org/netbeans/installer/utils/system/NativeUtils.java | 16 ++++++++--------
.../wizard/components/panels/ErrorMessagePanel.java | 2 +-
.../infra/utils/comment/handlers/BlockFileHandler.java | 12 ++++++------
5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/nbi/engine/src/org/netbeans/installer/utils/BrowserUtils.java b/nbi/engine/src/org/netbeans/installer/utils/BrowserUtils.java
index 92c5d0d..254684c 100644
--- a/nbi/engine/src/org/netbeans/installer/utils/BrowserUtils.java
+++ b/nbi/engine/src/org/netbeans/installer/utils/BrowserUtils.java
@@ -34,9 +34,9 @@ import javax.swing.event.HyperlinkListener;
*/
public class BrowserUtils {
- private final static boolean isBrowseSupported;
- private final static Method browseMethod;
- private final static Object desktop;
+ private static final boolean isBrowseSupported;
+ private static final Method browseMethod;
+ private static final Object desktop;
static {
diff --git a/nbi/engine/src/org/netbeans/installer/utils/helper/swing/NbiTreeTableModel.java b/nbi/engine/src/org/netbeans/installer/utils/helper/swing/NbiTreeTableModel.java
index 456acaf..2e121fb 100644
--- a/nbi/engine/src/org/netbeans/installer/utils/helper/swing/NbiTreeTableModel.java
+++ b/nbi/engine/src/org/netbeans/installer/utils/helper/swing/NbiTreeTableModel.java
@@ -52,7 +52,7 @@ public abstract class NbiTreeTableModel implements TableModel {
public abstract int getTreeColumnIndex();
- final public TreeModel getTreeModel() {
+ public final TreeModel getTreeModel() {
return treeModel;
}
@@ -62,7 +62,7 @@ public abstract class NbiTreeTableModel implements TableModel {
addTreeModelListener();
}
- final public JTree getTree() {
+ public final JTree getTree() {
return tree;
}
@@ -81,7 +81,7 @@ public abstract class NbiTreeTableModel implements TableModel {
}
// partial TableModel implementation ////////////////////////////////////////////
- final public int getRowCount() {
+ public final int getRowCount() {
return tree.getRowCount();
}
diff --git a/nbi/engine/src/org/netbeans/installer/utils/system/NativeUtils.java b/nbi/engine/src/org/netbeans/installer/utils/system/NativeUtils.java
index 101ed4d..9fd820f 100644
--- a/nbi/engine/src/org/netbeans/installer/utils/system/NativeUtils.java
+++ b/nbi/engine/src/org/netbeans/installer/utils/system/NativeUtils.java
@@ -57,21 +57,21 @@ public abstract class NativeUtils {
private static HashSet<File> forbiddenDeletingFiles = new HashSet<File>();
private static List <LauncherResource> uninstallerJVMs = new ArrayList <LauncherResource> ();
private static Platform currentPlatform;
- public final static String NATIVE_RESOURCE_SUFFIX = "native/"; // NOI18N
- public final static String NATIVE_JNILIB_RESOURCE_SUFFIX =
+ public static final String NATIVE_RESOURCE_SUFFIX = "native/"; // NOI18N
+ public static final String NATIVE_JNILIB_RESOURCE_SUFFIX =
NATIVE_RESOURCE_SUFFIX +
"jnilib/"; // NOI18N
- public final static String NATIVE_LAUNCHER_RESOURCE_SUFFIX =
+ public static final String NATIVE_LAUNCHER_RESOURCE_SUFFIX =
NATIVE_RESOURCE_SUFFIX +
"launcher/"; // NOI18N
- public final static String NATIVE_CLEANER_RESOURCE_SUFFIX =
+ public static final String NATIVE_CLEANER_RESOURCE_SUFFIX =
NATIVE_RESOURCE_SUFFIX +
"cleaner/"; // NOI18N
private static OnExitCleanerHandler cleanerHandler;
protected abstract Platform getPlatform();
- final public Platform getCurrentPlatform() {
+ public final Platform getCurrentPlatform() {
if (currentPlatform == null) {
currentPlatform = getPlatform();
}
@@ -295,7 +295,7 @@ public abstract class NativeUtils {
return !(forbiddenDeletingFiles.contains(file));
}
- public final static int FA_MODE_SET = 1;
- public final static int FA_MODE_ADD = 2;
- public final static int FA_MODE_REMOVE = 4;
+ public static final int FA_MODE_SET = 1;
+ public static final int FA_MODE_ADD = 2;
+ public static final int FA_MODE_REMOVE = 4;
}
diff --git a/nbi/engine/src/org/netbeans/installer/wizard/components/panels/ErrorMessagePanel.java b/nbi/engine/src/org/netbeans/installer/wizard/components/panels/ErrorMessagePanel.java
index 0886ba9..57cda94 100644
--- a/nbi/engine/src/org/netbeans/installer/wizard/components/panels/ErrorMessagePanel.java
+++ b/nbi/engine/src/org/netbeans/installer/wizard/components/panels/ErrorMessagePanel.java
@@ -222,7 +222,7 @@ public class ErrorMessagePanel extends WizardPanel {
return null;
}
- protected synchronized final void updateErrorMessage() {
+ protected final synchronized void updateErrorMessage() {
String message;
try {
diff --git a/nbi/infra/utils/comment-correcter/src/org/netbeans/installer/infra/utils/comment/handlers/BlockFileHandler.java b/nbi/infra/utils/comment-correcter/src/org/netbeans/installer/infra/utils/comment/handlers/BlockFileHandler.java
index 72c7045..38f166f 100644
--- a/nbi/infra/utils/comment-correcter/src/org/netbeans/installer/infra/utils/comment/handlers/BlockFileHandler.java
+++ b/nbi/infra/utils/comment-correcter/src/org/netbeans/installer/infra/utils/comment/handlers/BlockFileHandler.java
@@ -108,7 +108,7 @@ public abstract class BlockFileHandler implements FileHandler {
/**
* {@inheritDoc}
*/
- final public void load(final File file) throws IOException {
+ public final void load(final File file) throws IOException {
if (file == null) {
throw new IllegalArgumentException(
"The 'file' parameter cannot be null."); // NOI18N
@@ -120,7 +120,7 @@ public abstract class BlockFileHandler implements FileHandler {
/**
* {@inheritDoc}
*/
- final public void save(final File file) throws IOException {
+ public final void save(final File file) throws IOException {
if (file == null) {
throw new IllegalArgumentException(
"The 'file' parameter cannot be null."); // NOI18N
@@ -136,7 +136,7 @@ public abstract class BlockFileHandler implements FileHandler {
/**
* {@inheritDoc}
*/
- final public String getCurrentComment() {
+ public final String getCurrentComment() {
if (contents == null) {
throw new IllegalStateException(
"The contents cache has not been intialized."); // NOI18N
@@ -154,7 +154,7 @@ public abstract class BlockFileHandler implements FileHandler {
/**
* {@inheritDoc}
*/
- final public String getCorrectComment(final String text, final int lineLength) {
+ public final String getCorrectComment(final String text, final int lineLength) {
return commentStart +
Utils.reformat(text, commentPrefix, lineLength) +
commentEnd + Utils.NL;
@@ -163,7 +163,7 @@ public abstract class BlockFileHandler implements FileHandler {
/**
* {@inheritDoc}
*/
- final public void insertComment(final String text, final int lineLength) {
+ public final void insertComment(final String text, final int lineLength) {
if (text == null) {
throw new IllegalArgumentException(
"The 'text' parameter cannot be null."); // NOI18N
@@ -189,7 +189,7 @@ public abstract class BlockFileHandler implements FileHandler {
/**
* {@inheritDoc}
*/
- final public void updateComment(final String text, final int lineLength) {
+ public final void updateComment(final String text, final int lineLength) {
if (text == null) {
throw new IllegalArgumentException(
"The 'text' parameter cannot be null."); // NOI18N
---------------------------------------------------------------------
To unsubscribe, e-mail: 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
[netbeans] 16/17: Use the blessed modifier order in projects located in ide projects
Posted by mk...@apache.org.
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 5c49be407de13013c8b3d88d522d1a9ef4a4c7cf
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Fri Feb 18 11:12:58 2022 +0100
Use the blessed modifier order in projects located in ide projects
---
.../modules/debugger/importd/ImportDebugger.java | 10 +--
.../modules/debugger/importd2/ImportDebugger.java | 10 +--
.../src/org/netbeans/api/debugger/Breakpoint.java | 2 +-
.../src/org/netbeans/api/debugger/Properties.java | 4 +-
.../api/java/queries/BinaryForSourceQuery.java | 2 +-
.../support/CompositePathResourceBase.java | 4 +-
.../java/classpath/support/PathResourceBase.java | 4 +-
.../java/queries/BinaryForSourceQuery2Test.java | 2 +-
.../spi/xml/cookies/ShareableInputSource.java | 2 +-
.../issuetable/IssuetableTestFactory.java | 2 +-
.../modules/bugtracking/BugtrackingManager.java | 4 +-
.../modules/bugtracking/RepositoryImpl.java | 8 +--
.../modules/bugtracking/RepositoryRegistry.java | 2 +-
.../netbeans/modules/bugtracking/api/Query.java | 2 +-
.../modules/bugtracking/api/Repository.java | 6 +-
.../bugtracking/spi/RepositoryProvider.java | 2 +-
.../modules/bugtracking/tasks/DashboardUtils.java | 6 +-
.../bugtracking/tasks/cache/StorageUtils.java | 2 +-
.../modules/bugtracking/team/TeamRepositories.java | 2 +-
.../bugtracking/ui/query/QueryTopComponent.java | 2 +-
.../dummies/DummyBugtrackingOwnerSupport.java | 2 +-
.../modules/bugtracking/dummies/DummyNode.java | 2 +-
.../bugtracking/ui/query/QTCTestHidden.java | 2 +-
.../bugtracking/util/BugtrackingUtilTest.java | 4 +-
.../bugzilla/commands/BugzillaExecutor.java | 2 +-
.../modules/bugzilla/issue/CommentsPanel.java | 10 +--
.../modules/bugzilla/query/QueryParameter.java | 2 +-
.../repository/BugzillaRepositoryController.java | 2 +-
.../modules/bugzilla/query/QueryParameterTest.java | 12 ++--
.../netbeans/modules/analysis/spi/Analyzer.java | 2 +-
.../modules/csl/api/DataLoadersBridge.java | 2 +-
.../modules/csl/editor/fold/GsfFoldManager.java | 2 +-
.../netbeans/modules/csl/spi/CommentHandler.java | 2 +-
.../modules/csl/spi/DefaultDataLoadersBridge.java | 2 +-
.../org/netbeans/modules/css/editor/HtmlTags.java | 2 +-
.../css/editor/actions/CopyStyleAction.java | 4 +-
.../netbeans/modules/css/indexing/CssIndexer.java | 2 +-
.../CssActionsImplementationProvider.java | 4 +-
.../modules/css/refactoring/CssElementContext.java | 2 +-
.../modules/css/lib/api/properties/Node.java | 2 +-
.../css/lib/api/properties/NodeVisitor.java | 2 +-
.../css/lib/api/properties/TokenAcceptor.java | 2 +-
.../CPActionsImplementationProvider.java | 2 +-
.../modules/db/sql/execute/SQLExecuteHelper.java | 16 ++---
.../modules/db/sql/execute/ui/SQLHistoryPanel.java | 4 +-
.../modules/db/sql/loader/SQLEditorSupport.java | 2 +-
.../netbeans/modules/db/sql/loader/SQLNode.java | 2 +-
.../db/dataview/output/DataViewPageContext.java | 2 +-
.../DataViewTableDataExportFileChooser.java | 2 +-
.../db/dataview/table/CellFocusCustomRenderer.java | 2 +-
.../db/dataview/table/ResultSetCellRenderer.java | 6 +-
.../modules/db/dataview/util/DateType.java | 2 +-
.../modules/db/dataview/util/EncodingHelper.java | 8 +--
.../modules/db/dataview/util/TimeType.java | 2 +-
.../modules/db/dataview/util/TimestampType.java | 2 +-
.../db/metadata/model/JDBCConnMetadataModel.java | 2 +-
.../modules/db/mysql/impl/ConnectionProcessor.java | 2 +-
.../modules/db/mysql/ui/AdminPropertiesPanel.java | 2 +-
.../modules/db/mysql/util/ExecSupport.java | 2 +-
.../modules/db/sql/lexer/SQLLanguageConfig.java | 2 +-
.../querymodel/BooleanExpressionList.java | 2 +-
.../api/db/sql/support/SQLIdentifiers.java | 2 +-
.../modules/db/explorer/DatabaseConnection.java | 4 +-
.../modules/db/explorer/dlg/ConnectionDialog.java | 2 +-
.../db/explorer/dlg/ConnectionNamePanel.java | 2 +-
.../modules/db/explorer/dlg/DataModel.java | 4 +-
.../db/explorer/metadata/MetadataModelManager.java | 4 +-
.../org/netbeans/modules/derby/ExecSupport.java | 2 +-
.../modules/diff/builtin/DiffPresenter.java | 2 +-
.../ui/api/FileNamesCompletionProvider.java | 6 +-
.../support/ui/api/FileSelectorField.java | 2 +-
.../nativeexecution/AbstractNativeProcess.java | 8 +--
.../nativeexecution/ExecutionEnvironmentImpl.java | 2 +-
.../modules/nativeexecution/JschSupport.java | 6 +-
.../nativeexecution/RemoteNativeProcess.java | 2 +-
.../TerminalLocalNativeProcess.java | 4 +-
.../api/NativeProcessExecutionService.java | 2 +-
.../api/execution/PostMessageDisplayer.java | 4 +-
.../api/util/CommonTasksSupport.java | 2 +-
.../api/util/ConnectionManager.java | 2 +-
.../nativeexecution/api/util/ExternalTerminal.java | 4 +-
.../modules/nativeexecution/api/util/MacroMap.java | 2 +-
.../nativeexecution/api/util/ProcessUtils.java | 2 +-
.../nativeexecution/api/util/RemoteStatistics.java | 2 +-
.../modules/nativeexecution/api/util/Shell.java | 6 +-
.../api/util/ShellScriptRunner.java | 4 +-
.../api/util/ShellValidationSupport.java | 4 +-
.../nativeexecution/jsch/JSchConnectionTask.java | 2 +-
.../nativeexecution/pty/NbStartUtility.java | 2 +-
.../modules/nativeexecution/pty/PtyAllocator.java | 2 +-
.../nativeexecution/pty/PtyOpenUtility.java | 2 +-
.../pty/PtyProcessStartUtility.java | 2 +-
.../modules/nativeexecution/pty/PtyUtility.java | 2 +-
.../spi/JSchAuthenticationSelection.java | 4 +-
.../support/NativeExecutionUserNotification.java | 16 ++---
.../spi/support/PasswordProviderFactory.java | 2 +-
.../sps/impl/RequestPrivilegesAction.java | 2 +-
.../sps/impl/RequestPrivilegesTask.java | 2 +-
.../nativeexecution/sps/impl/SPSCommonImpl.java | 4 +-
.../nativeexecution/support/ObservableAction.java | 2 +-
.../nativeexecution/support/RemoteUserInfo.java | 6 +-
.../nativeexecution/support/Win32APISupport.java | 2 +-
.../support/filesearch/FileSearchSupport.java | 6 +-
.../support/hostinfo/impl/HostInfoFactory.java | 2 +-
.../nativeexecution/ConcurrentTasksSupport.java | 2 +-
.../modules/nativeexecution/EnvironmentTest.java | 2 +-
.../modules/nativeexecution/NativeTaskTest.java | 2 +-
.../api/util/ConnectionManagerTest.java | 2 +-
.../api/util/SlowHostInfoProvider.java | 2 +-
.../terminal/action/TerminalSupportImpl.java | 2 +-
.../terminal/ui/TerminalContainerTopComponent.java | 4 +-
.../modules/editor/actions/CamelCaseActions.java | 2 +-
.../modules/editor/bookmarks/BookmarkInfo.java | 2 +-
.../modules/editor/bookmarks/ui/BookmarksView.java | 4 +-
.../editor/bracesmatching/MasterMatcherTest.java | 8 +--
.../storage/CodeTemplatesStorage.java | 2 +-
.../editor/errorstripe/AnnotationViewTest.java | 2 +-
.../modules/editor/fold/ui/ActionFactory.java | 2 +-
.../modules/editor/fold/ui/VerticalFlowLayout.java | 2 +-
.../modules/editor/fold/LegacySettingsSync.java | 2 +-
.../modules/editor/fold/FoldManagerTesting.java | 4 +-
.../src/org/netbeans/editor/AnnotationDesc.java | 6 +-
.../src/org/netbeans/editor/AnnotationType.java | 6 +-
.../src/org/netbeans/editor/AnnotationTypes.java | 6 +-
.../src/org/netbeans/editor/FinderFactory.java | 10 +--
.../src/org/netbeans/editor/GlyphGutter.java | 8 +--
.../org/netbeans/editor/KeySequenceInputPanel.java | 2 +-
.../src/org/netbeans/editor/TokenItem.java | 2 +-
.../org/netbeans/editor/ext/ExtFinderFactory.java | 6 +-
.../src/org/netbeans/editor/ext/FileStorage.java | 4 +-
.../modules/editor/lib/BeforeSaveTasks.java | 2 +-
.../modules/editor/lib/drawing/DrawGraphics.java | 2 +-
.../modules/editor/lib/drawing/DrawLayer.java | 2 +-
.../netbeans/editor/UndoableEditWrapperTest.java | 2 +-
.../org/netbeans/api/editor/EditorRegistry.java | 2 +-
.../lib2/highlighting/HighlightsMergeTesting.java | 6 +-
.../editor/lib2/view/RootViewRandomTesting.java | 2 +-
.../editor/macros/storage/MacrosStorage.java | 2 +-
.../modules/editor/search/DocumentFinder.java | 8 +--
.../modules/editor/search/EditorFindSupport.java | 6 +-
.../modules/editor/search/SearchNbEditorKit.java | 2 +-
.../editor/search/SearchPropertiesSupport.java | 6 +-
.../editor/search/TextSearchHighlighting.java | 2 +-
.../modules/editor/search/DocumentFinderTest.java | 2 +-
.../storage/preferences/PreferencesStorage.java | 2 +-
.../editor/structure/api/DocumentModel.java | 8 +--
.../lib/editor/util/AbstractCharSequence.java | 2 +-
.../org/netbeans/lib/editor/util/CompactMap.java | 2 +-
.../lib/editor/util/random/DocumentTesting.java | 6 +-
.../editor/util/random/RandomTestContainer.java | 4 +-
.../modules/editor/impl/CustomizableSideBar.java | 2 +-
.../actions/clipboardhistory/ClipboardHistory.java | 2 +-
.../clipboardhistory/CompletionLayoutPopup.java | 4 +-
.../clipboardhistory/ListCompletionView.java | 2 +-
.../modules/editor/BaseDocumentUnitTestCase.java | 2 +-
.../modules/extbrowser/NbDdeBrowserImpl.java | 6 +-
.../base/ExplicitProcessParameters.java | 2 +-
.../netbeans/modules/extexecution/RerunAction.java | 2 +-
.../src/org/netbeans/modules/git/GitFileNode.java | 2 +-
.../org/netbeans/modules/git/HistoryRegistry.java | 2 +-
.../modules/git/ui/history/RepositoryRevision.java | 2 +-
.../modules/git/ui/shelve/ShelveChangesAction.java | 2 +-
.../src/org/netbeans/test/git/utils/TestKit.java | 24 +++----
.../gsf/codecoverage/CoverageManagerImpl.java | 2 +-
.../gsf/codecoverage/api/CoverageManager.java | 2 +-
.../gsf/testrunner/ui/api/TestMethodNode.java | 2 +-
.../modules/html/editor/lib/XmlSTElements.java | 4 +-
.../editor/completion/HtmlCompletionProvider.java | 2 +-
.../modules/html/editor/hints/Attribute.java | 2 +-
.../html/editor/hints/CharacterReference.java | 2 +-
.../modules/html/editor/hints/Comments.java | 2 +-
.../modules/html/editor/hints/Doctype.java | 2 +-
.../modules/html/editor/hints/Element.java | 2 +-
.../modules/html/editor/hints/Encoding.java | 2 +-
.../modules/html/editor/hints/ForeignContent.java | 2 +-
.../netbeans/modules/html/editor/hints/Form.java | 2 +-
.../modules/html/editor/hints/HeadContent.java | 2 +-
.../html/editor/hints/HtmlHintsProvider.java | 2 +-
.../netbeans/modules/html/editor/hints/Ids.java | 2 +-
.../modules/html/editor/hints/Internal.java | 2 +-
.../modules/html/editor/hints/Nesting.java | 2 +-
.../modules/html/editor/hints/Normalization.java | 2 +-
.../html/editor/hints/NotValidButCommon.java | 2 +-
.../html/editor/hints/NotValidatedContent.java | 2 +-
.../modules/html/editor/hints/Obsolete.java | 2 +-
.../html/editor/hints/ProcessingInstruction.java | 2 +-
.../modules/html/editor/hints/StrayContent.java | 2 +-
.../netbeans/modules/html/editor/hints/Table.java | 2 +-
.../modules/html/editor/hints/TagsMatching.java | 2 +-
.../modules/html/editor/hints/UnexpectedChars.java | 2 +-
.../modules/html/editor/indexing/HtmlIndexer.java | 2 +-
.../modules/html/editor/javadoc/HelpManager.java | 2 +-
.../modules/html/parser/ElementsFactory.java | 2 +-
.../netbeans/modules/hudson/api/HudsonManager.java | 2 +-
.../modules/hudson/spi/BuilderConnector.java | 4 +-
.../ide/BlacklistedClassesHandlerSingleton.java | 10 +--
.../org/netbeans/test/ide/GeneralSanityTest.java | 2 +-
.../modules/jumpto/common/AbstractModelFilter.java | 2 +-
.../org/netbeans/modules/jumpto/file/Worker.java | 2 +-
.../netbeans/modules/jumpto/type/UiOptions.java | 4 +-
.../spi/jumpto/support/NameMatcherFactory.java | 2 +-
.../modules/languages/yaml/YamlParser.java | 2 +-
.../modules/languages/yaml/YamlStructureItem.java | 6 +-
.../languages/features/ASTBrowserTopComponent.java | 2 +-
.../features/TokensBrowserTopComponent.java | 2 +-
.../src/org/netbeans/test/lib/BasicTokensTest.java | 2 +-
.../org/netbeans/spi/lexer/LanguageHierarchy.java | 2 +-
.../org/netbeans/lib/terminalemulator/Attr.java | 16 ++---
.../netbeans/lib/terminalemulator/AttrSave.java | 60 ++++++++--------
.../org/netbeans/lib/terminalemulator/Term.java | 8 +--
.../lib/terminalemulator/support/ColorValue.java | 2 +-
.../lib/terminalemulator/support/FontPanel.java | 2 +-
.../lib/terminalemulator/support/LineFilter.java | 2 +-
.../lib/terminalemulator/support/TermOptions.java | 2 +-
.../git/jgit/commands/IgnoreUnignoreCommand.java | 2 +-
.../netbeans/libs/graalsdk/impl/GraalContext.java | 4 +-
.../modules/localhistory/LocalHistory.java | 4 +-
.../localhistory/ui/view/HistoryTopComponent.java | 2 +-
.../modules/localtasks/task/LocalTask.java | 2 +-
.../modules/lsp/client/LSPBindingsTest.java | 2 +-
.../org/netbeans/modules/lsp/client/TestUtils.java | 2 +-
.../modules/mercurial/ExceptionHandler.java | 14 ++--
.../modules/mercurial/HistoryRegistry.java | 2 +-
.../modules/mercurial/options/PropertiesTable.java | 2 +-
.../modules/mercurial/ui/commit/CommitAction.java | 2 +-
.../mercurial/ui/diff/DiffFileTreeImpl.java | 2 +-
.../mercurial/ui/properties/PropertiesTable.java | 2 +-
.../mercurial/ui/queues/CreateRefreshAction.java | 4 +-
.../mercurial/ui/repository/Repository.java | 18 ++---
.../netbeans/modules/mercurial/util/HgCommand.java | 30 ++++----
.../org/netbeans/modules/mylyn/util/WikiUtils.java | 2 +-
.../swing/dirchooser/DirectoryChooserUI.java | 2 +-
.../netbeans/swing/dirchooser/DirectoryNode.java | 4 +-
.../src/org/openidex/search/SearchHistory.java | 6 +-
.../src/org/openidex/search/SearchType.java | 2 +-
.../parsing/impl/RunWhenScanFinishedSupport.java | 2 +-
.../modules/parsing/impl/TaskProcessor.java | 14 ++--
.../parsing/impl/indexing/RepositoryUpdater.java | 6 +-
.../parsing/impl/indexing/PathRegistryTest.java | 6 +-
.../impl/indexing/RepositoryUpdaterTest.java | 4 +-
.../modules/parsing/lucene/DocumentIndexImpl.java | 2 +-
.../modules/parsing/lucene/support/Queries.java | 4 +-
.../netbeans/modules/parsing/nb/EventSupport.java | 2 +-
.../project/indexingbridge/IndexingBridge.java | 2 +-
.../project/spi/intern/ProjectIDEServices.java | 2 +-
.../spi/project/ProjectServiceProvider.java | 2 +-
.../netbeans/modules/project/ui/ExitDialog.java | 2 +-
.../netbeans/modules/project/ui/ProjectTab.java | 4 +-
.../modules/project/ui/TemplatesPanelGUI.java | 2 +-
.../project/ui/actions/VerticalGridLayout.java | 2 +-
.../modules/project/uiapi/BaseUtilities.java | 2 +-
.../project/ui/support/ProjectCustomizerTest.java | 2 +-
.../properties/syntax/EditorSettingsCopy.java | 2 +-
.../org/netbeans/modules/properties/Element.java | 2 +-
.../netbeans/modules/properties/LocalePanel.java | 2 +-
.../modules/properties/PresentableFileEntry.java | 2 +-
.../modules/properties/PropertiesOpen.java | 4 +-
.../properties/PropertiesRequestProcessor.java | 2 +-
.../modules/properties/TableViewSettings.java | 2 +-
.../modules/refactoring/spi/impl/CheckNode.java | 4 +-
.../modules/refactoring/spi/ui/ScopeProvider.java | 2 +-
.../netbeans/modules/schema2beans/AttrProp.java | 30 ++++----
.../modules/schema2beans/BaseAttribute.java | 24 +++----
.../org/netbeans/modules/schema2beans/Common.java | 84 +++++++++++-----------
.../netbeans/modules/schema2beans/DDFactory.java | 10 +--
.../netbeans/modules/schema2beans/DDRegistry.java | 2 +-
.../modules/schema2beans/DDRegistryParser.java | 4 +-
.../modules/schema2beans/GraphManager.java | 2 +-
.../modules/schema2beans/JavaBeansUtil.java | 2 +-
.../netbeans/modules/schema2beans/TraceLogger.java | 4 +-
.../org/netbeans/modules/schema2beans/Version.java | 6 +-
.../org/netbeans/modules/schema2beans/XMLUtil.java | 2 +-
.../AbstractCodeGeneratorClass.java | 26 +++----
.../modules/schema2beansdev/BaseBeansFactory.java | 2 +-
.../modules/schema2beansdev/DocDefParser.java | 20 +++---
.../netbeans/modules/schema2beansdev/GenBeans.java | 6 +-
.../modules/schema2beansdev/JavaBeanClass.java | 2 +-
.../modules/schema2beansdev/JavaBeansFactory.java | 2 +-
.../modules/schema2beansdev/SchemaRep.java | 62 ++++++++--------
.../modules/schema2beansdev/XMLSchemaParser.java | 4 +-
.../modules/schema2beansdev/gen/JavaUtil.java | 42 +++++------
.../modules/schema2beansdev/gen/JavaWriter.java | 26 +++----
.../modules/schema2beansdev/gen/XMLWriter.java | 2 +-
.../ui/annotations/WatchAnnotationProvider.java | 2 +-
.../modules/debugger/ui/eval/CodeEvaluatorUI.java | 2 +-
.../debugger/ui/models/WatchesActionsProvider.java | 2 +-
.../ui/views/debugging/FiltersDescriptor.java | 2 +-
.../debugger/ui/views/debugging/TapPanel.java | 2 +-
.../netbeans/spi/debugger/ui/CodeEvaluator.java | 2 +-
.../netbeans/spi/debugger/ui/DebuggingView.java | 4 +-
.../spi/debugger/ui/EditorContextDispatcher.java | 4 +-
.../editor/hints/borrowed/ListCompletionView.java | 4 +-
.../modules/navigator/NavigatorTCTest.java | 4 +-
.../netbeans/modules/palette/ui/DnDSupport.java | 4 +-
.../netbeans/modules/palette/ui/DropGlassPane.java | 18 ++---
.../org/netbeans/spi/palette/PaletteSwitch.java | 2 +-
.../netbeans/spi/palette/PaletteTopComponent.java | 2 +-
.../netbeans/spi/palette/PaletteSwitchTest.java | 2 +-
.../spi/viewmodel/CachedChildrenTreeModel.java | 2 +-
.../src/org/netbeans/spi/viewmodel/Models.java | 28 ++++----
.../client/SvnClientExceptionHandler.java | 40 +++++------
.../subversion/client/SvnClientFactory.java | 18 ++---
.../subversion/client/parser/EntriesCache.java | 2 +-
.../modules/subversion/config/CertificateFile.java | 6 +-
.../modules/subversion/config/PasswordFile.java | 2 +-
.../modules/subversion/ui/browser/Browser.java | 30 ++++----
.../subversion/ui/browser/RepositoryPathNode.java | 4 +-
.../subversion/ui/browser/RepositoryPaths.java | 2 +-
.../subversion/ui/browser/SelectPathAction.java | 2 +-
.../modules/subversion/ui/lock/LockAction.java | 2 +-
.../modules/subversion/ui/lock/UnlockAction.java | 2 +-
.../subversion/ui/repository/ConnectionType.java | 10 +--
.../subversion/ui/repository/Repository.java | 12 ++--
.../modules/subversion/ui/search/SvnSearch.java | 16 ++---
.../netbeans/test/subversion/utils/TestKit.java | 20 +++---
.../modules/subversion/AbstractSvnTestCase.java | 2 +-
.../modules/tasklist/todo/settings/Settings.java | 2 +-
.../tasklist/todo/settings/ToDoCustomizer.java | 2 +-
.../modules/tasklist/filter/TaskProperty.java | 2 +-
.../modules/tasklist/impl/TaskIndexer.java | 2 +-
.../modules/tasklist/ui/TaskListTopComponent.java | 4 +-
.../bugtracking/commons/AttachmentsPanel.java | 2 +-
.../bugtracking/commons/AutoupdateSupport.java | 2 +-
.../commons/FileToRepoMappingStorage.java | 2 +-
.../bugtracking/commons/FindTypesSupport.java | 8 +--
.../bugtracking/commons/HyperlinkSupport.java | 8 +--
.../bugtracking/commons/IssueSettingsStorage.java | 4 +-
.../modules/bugtracking/commons/JiraUpdater.java | 2 +-
.../bugtracking/commons/SaveQueryPanel.java | 2 +-
.../bugtracking/commons/SimpleIssueFinder.java | 2 +-
.../netbeans/modules/team/commons/LogUtils.java | 4 +-
.../team/commons/treelist/ListRendererPanel.java | 2 +-
.../team/commons/treelist/TreeListNode.java | 8 +--
.../netbeans/modules/terminal/api/ui/IOTerm.java | 4 +-
.../modules/terminal/api/ui/IOVisibility.java | 8 +--
.../terminal/api/ui/IOVisibilityControl.java | 4 +-
.../iocontainer/TerminalContainerCommon.java | 46 ++++++------
.../iocontainer/TerminalContainerMuxable.java | 6 +-
.../iocontainer/TerminalContainerTabbed.java | 6 +-
.../netbeans/modules/terminal/ioprovider/Task.java | 2 +-
.../modules/terminal/ioprovider/Terminal.java | 6 +-
.../modules/terminal/T5_MTStress_Test.java | 4 +-
.../netbeans/modules/terminal/api/IOConnect.java | 4 +-
.../netbeans/modules/terminal/api/IOEmulation.java | 6 +-
.../netbeans/modules/terminal/api/IONotifier.java | 8 +--
.../org/netbeans/modules/terminal/api/IOTerm.java | 8 +--
.../org/netbeans/modules/terminal/test/IOTest.java | 4 +-
.../modules/openfile/OpenFileDialogFilter.java | 2 +-
.../modules/versioning/core/VersioningManager.java | 2 +-
.../core/filesystems/VCSFilesystemInterceptor.java | 4 +-
.../modules/versioning/core/spi/VCSContext.java | 2 +-
.../versioning/VCSFilesystemTestFactory.java | 2 +-
.../versioning/ui/history/HistoryComponent.java | 4 +-
.../versioning/ui/history/HistoryDiffView.java | 2 +-
.../src/org/netbeans/modules/turbo/Memory.java | 2 +-
.../src/org/netbeans/modules/turbo/Turbo.java | 2 +-
.../versioning/history/AbstractSummaryView.java | 6 +-
.../shelve/ShelveChangesActionsRegistry.java | 2 +-
.../versioning/shelve/ShelveChangesSupport.java | 2 +-
.../modules/versioning/util/ExportDiffSupport.java | 6 +-
.../modules/versioning/util/SimpleLookup.java | 2 +-
.../versioning/util/VCSHyperlinkSupport.java | 4 +-
.../modules/versioning/util/VCSKenaiAccessor.java | 6 +-
.../versioning/util/common/FileTreeView.java | 4 +-
.../versioning/util/projects/ProjectsView.java | 2 +-
.../versioning/util/status/VCSStatusNode.java | 2 +-
.../modules/versioning/hooks/VCSHookTest.java | 4 +-
.../modules/versioning/spi/VCSContext.java | 2 +-
.../modules/web/browser/api/WebBrowserPane.java | 2 +-
.../browser/spi/ExternalModificationsSupport.java | 2 +-
.../web/browser/ui/picker/RendererImpl.java | 2 +-
.../web/indent/api/support/AbstractIndenter.java | 10 +--
.../indent/api/support/MarkupAbstractIndenter.java | 38 +++++-----
.../debugging/api/debugger/AbstractObject.java | 2 +-
.../modules/web/webkit/debugging/api/dom/Node.java | 10 +--
.../web/webkit/debugging/api/network/Network.java | 6 +-
.../modules/xml/axi/datatype/NumberBase.java | 4 +-
.../xml/axi/impl/DefaultSchemaGenerator.java | 2 +-
.../modules/xml/catalog/CatalogAction.java | 2 +-
.../netbeans/modules/xml/catalog/CatalogPanel.java | 10 +--
.../org/netbeans/modules/xml/api/EncodingUtil.java | 8 +--
.../modules/xml/core/lib/EncodingHelper.java | 8 +--
.../modules/xml/dtd/grammar/DTDGrammar.java | 2 +-
.../modules/xml/multiview/ItemEditorHelper.java | 2 +-
.../xml/multiview/ui/AbstractDesignEditor.java | 4 +-
.../modules/xml/multiview/ui/PanelView.java | 4 +-
.../xml/multiview/ui/SectionVisualTheme.java | 30 ++++----
.../catalog/model/impl/CatalogComponentImpl.java | 2 +-
.../completion/spi/CompletionModelProvider.java | 2 +-
.../schema/model/impl/SyncUnitReviewVisitor.java | 2 +-
ide/xml.tax/lib/src/org/netbeans/tax/TreeName.java | 6 +-
.../src/org/netbeans/tax/TreeNamedObjectMap.java | 2 +-
.../lib/src/org/netbeans/tax/TreeObject.java | 6 +-
.../lib/src/org/netbeans/tax/TreeObjectList.java | 2 +-
.../lib/src/org/netbeans/tax/TreeUtilities.java | 6 +-
.../src/org/netbeans/tax/io/TreeStreamResult.java | 2 +-
.../src/org/netbeans/tax/AbstractFactoryTest.java | 2 +-
.../beans/customizer/AbstractTreeCustomizer.java | 4 +-
.../xml/tax/traversal/TreeNodeFilterHandle.java | 2 +-
.../modules/xml/text/indent/XMLFormatterTest.java | 2 +-
.../modules/xml/text/api/dom/XMLSyntaxSupport.java | 2 +-
.../text/breadcrumbs/EditorRegistryMonitor.java | 2 +-
.../xml/text/completion/SyntaxQueryHelper.java | 14 ++--
.../xml/text/syntax/javacc/lib/CharStream.java | 24 +++----
.../xml/text/completion/CompletionJTest.java | 2 +-
.../xml/tools/actions/AbstractCheckTest.java | 2 +-
.../extensions/mime/validation/WSIAPValidator.java | 4 +-
.../modules/xml/xam/AbstractModelFactory.java | 2 +-
.../xml/xam/dom/AbstractDocumentComponent.java | 2 +-
.../modules/xml/xam/spi/XsdBasedValidator.java | 2 +-
.../org/netbeans/modules/xml/xdm/diff/XDMUtil.java | 6 +-
.../netbeans/modules/xml/xdm/nodes/Convertors.java | 8 +--
.../org/netbeans/modules/xml/EntityDataObject.java | 2 +-
.../modules/xml/actions/CollectSystemAction.java | 2 +-
.../modules/xml/cookies/CookieFactory.java | 2 +-
.../modules/xml/wizard/impl/SchemaPanel.java | 8 +--
.../org/netbeans/modules/xsl/XSLDataObject.java | 2 +-
.../modules/xsl/grammar/XSLGrammarQuery.java | 6 +-
.../modules/xsl/settings/TransformHistory.java | 4 +-
419 files changed, 1054 insertions(+), 1054 deletions(-)
diff --git a/ide/api.debugger/examples/importdebug/org/netbeans/modules/debugger/importd/ImportDebugger.java b/ide/api.debugger/examples/importdebug/org/netbeans/modules/debugger/importd/ImportDebugger.java
index 15f965e..59b12c2 100644
--- a/ide/api.debugger/examples/importdebug/org/netbeans/modules/debugger/importd/ImportDebugger.java
+++ b/ide/api.debugger/examples/importdebug/org/netbeans/modules/debugger/importd/ImportDebugger.java
@@ -79,7 +79,7 @@ public class ImportDebugger extends SecondaryDebuggerSupport {
// variables ...............................................................
- transient private ValidatorImpl validator;
+ private transient ValidatorImpl validator;
// init ....................................................................
@@ -130,7 +130,7 @@ public class ImportDebugger extends SecondaryDebuggerSupport {
/**
* Trace into.
*/
- synchronized public void traceInto () throws DebuggerException {
+ public synchronized void traceInto () throws DebuggerException {
setState (DEBUGGER_RUNNING);
Line l = step ();
if (l == null) {
@@ -147,7 +147,7 @@ public class ImportDebugger extends SecondaryDebuggerSupport {
/**
* Trace over.
*/
- synchronized public void traceOver () throws DebuggerException {
+ public synchronized void traceOver () throws DebuggerException {
setState (DEBUGGER_RUNNING);
int d = stack.size ();
Line l = null;
@@ -168,7 +168,7 @@ public class ImportDebugger extends SecondaryDebuggerSupport {
/**
* Go.
*/
- synchronized public void go () throws DebuggerException {
+ public synchronized void go () throws DebuggerException {
setLastAction (ACTION_CONTINUE);
setState (DEBUGGER_RUNNING);
@@ -183,7 +183,7 @@ public class ImportDebugger extends SecondaryDebuggerSupport {
/**
* Step out.
*/
- synchronized public void stepOut () throws DebuggerException {
+ public synchronized void stepOut () throws DebuggerException {
setLastAction (ACTION_STEP_OUT);
setState (DEBUGGER_RUNNING);
diff --git a/ide/api.debugger/examples/importdebugII/org/netbeans/modules/debugger/importd2/ImportDebugger.java b/ide/api.debugger/examples/importdebugII/org/netbeans/modules/debugger/importd2/ImportDebugger.java
index 4871aba..4844a1a 100644
--- a/ide/api.debugger/examples/importdebugII/org/netbeans/modules/debugger/importd2/ImportDebugger.java
+++ b/ide/api.debugger/examples/importdebugII/org/netbeans/modules/debugger/importd2/ImportDebugger.java
@@ -80,7 +80,7 @@ public class ImportDebugger extends SecondaryDebuggerSupport {
// variables ...............................................................
- transient private ValidatorImpl validator;
+ private transient ValidatorImpl validator;
// init ....................................................................
@@ -130,7 +130,7 @@ public class ImportDebugger extends SecondaryDebuggerSupport {
/**
* Trace into.
*/
- synchronized public void traceInto () throws DebuggerException {
+ public synchronized void traceInto () throws DebuggerException {
setState (DEBUGGER_RUNNING);
Line l = step ();
if (l == null) {
@@ -147,7 +147,7 @@ public class ImportDebugger extends SecondaryDebuggerSupport {
/**
* Trace over.
*/
- synchronized public void traceOver () throws DebuggerException {
+ public synchronized void traceOver () throws DebuggerException {
setState (DEBUGGER_RUNNING);
Stack stack = getStack ();
int d = stack.size ();
@@ -169,7 +169,7 @@ public class ImportDebugger extends SecondaryDebuggerSupport {
/**
* Go.
*/
- synchronized public void go () throws DebuggerException {
+ public synchronized void go () throws DebuggerException {
setLastAction (ACTION_CONTINUE);
setState (DEBUGGER_RUNNING);
@@ -184,7 +184,7 @@ public class ImportDebugger extends SecondaryDebuggerSupport {
/**
* Step out.
*/
- synchronized public void stepOut () throws DebuggerException {
+ public synchronized void stepOut () throws DebuggerException {
setLastAction (ACTION_STEP_OUT);
setState (DEBUGGER_RUNNING);
diff --git a/ide/api.debugger/src/org/netbeans/api/debugger/Breakpoint.java b/ide/api.debugger/src/org/netbeans/api/debugger/Breakpoint.java
index 3602993..8306272 100644
--- a/ide/api.debugger/src/org/netbeans/api/debugger/Breakpoint.java
+++ b/ide/api.debugger/src/org/netbeans/api/debugger/Breakpoint.java
@@ -369,7 +369,7 @@ public abstract class Breakpoint {
* groups and associated breakpoints.
* @since 1.25
*/
- public static abstract class GroupProperties {
+ public abstract static class GroupProperties {
/**
* Get the language of the source file with the breakpoint.
diff --git a/ide/api.debugger/src/org/netbeans/api/debugger/Properties.java b/ide/api.debugger/src/org/netbeans/api/debugger/Properties.java
index f88af39..1369242 100644
--- a/ide/api.debugger/src/org/netbeans/api/debugger/Properties.java
+++ b/ide/api.debugger/src/org/netbeans/api/debugger/Properties.java
@@ -404,7 +404,7 @@ public abstract class Properties {
}
- private final static class PrimitiveRegister {
+ private static final class PrimitiveRegister {
private HashMap properties = new HashMap ();
private boolean isInitialized = false;
@@ -689,7 +689,7 @@ public abstract class Properties {
ServicesHolder<Reader> readers = new ReaderHolder();
ServicesHolder<Initializer> initializers = new InitializerHolder();
- private static abstract class ServicesHolder<T> {
+ private abstract static class ServicesHolder<T> {
private Class<T> clazz;
// Holds the list to prevent from garbage-collect. Do not remove!
diff --git a/ide/api.java.classpath/src/org/netbeans/api/java/queries/BinaryForSourceQuery.java b/ide/api.java.classpath/src/org/netbeans/api/java/queries/BinaryForSourceQuery.java
index 254b505..4a1143f 100644
--- a/ide/api.java.classpath/src/org/netbeans/api/java/queries/BinaryForSourceQuery.java
+++ b/ide/api.java.classpath/src/org/netbeans/api/java/queries/BinaryForSourceQuery.java
@@ -133,7 +133,7 @@ public final class BinaryForSourceQuery {
* of this class.
* @since 1.58
*/
- public static abstract class Result2 implements Result {
+ public abstract static class Result2 implements Result {
Result2() {
}
diff --git a/ide/api.java.classpath/src/org/netbeans/spi/java/classpath/support/CompositePathResourceBase.java b/ide/api.java.classpath/src/org/netbeans/spi/java/classpath/support/CompositePathResourceBase.java
index 1c42e28..2f6370e 100644
--- a/ide/api.java.classpath/src/org/netbeans/spi/java/classpath/support/CompositePathResourceBase.java
+++ b/ide/api.java.classpath/src/org/netbeans/spi/java/classpath/support/CompositePathResourceBase.java
@@ -80,7 +80,7 @@ public abstract class CompositePathResourceBase implements PathResourceImplement
* The listener is notified when the roots of the PathResource are changed.
* @param listener
*/
- public synchronized final void addPropertyChangeListener(PropertyChangeListener listener) {
+ public final synchronized void addPropertyChangeListener(PropertyChangeListener listener) {
if (this.pListeners == null)
this.pListeners = new ArrayList<PropertyChangeListener> ();
this.pListeners.add (listener);
@@ -90,7 +90,7 @@ public abstract class CompositePathResourceBase implements PathResourceImplement
* Removes PropertyChangeListener
* @param listener
*/
- public synchronized final void removePropertyChangeListener(PropertyChangeListener listener) {
+ public final synchronized void removePropertyChangeListener(PropertyChangeListener listener) {
if (this.pListeners == null)
return;
this.pListeners.remove (listener);
diff --git a/ide/api.java.classpath/src/org/netbeans/spi/java/classpath/support/PathResourceBase.java b/ide/api.java.classpath/src/org/netbeans/spi/java/classpath/support/PathResourceBase.java
index 6002b98..7041d9b 100644
--- a/ide/api.java.classpath/src/org/netbeans/spi/java/classpath/support/PathResourceBase.java
+++ b/ide/api.java.classpath/src/org/netbeans/spi/java/classpath/support/PathResourceBase.java
@@ -39,7 +39,7 @@ public abstract class PathResourceBase implements PathResourceImplementation {
* The listener is notified when the roots of the PathResource are changed.
* @param listener
*/
- public synchronized final void addPropertyChangeListener(PropertyChangeListener listener) {
+ public final synchronized void addPropertyChangeListener(PropertyChangeListener listener) {
if (this.pListeners == null)
this.pListeners = new ArrayList<PropertyChangeListener> ();
this.pListeners.add (listener);
@@ -49,7 +49,7 @@ public abstract class PathResourceBase implements PathResourceImplementation {
* Removes PropertyChangeListener
* @param listener
*/
- public synchronized final void removePropertyChangeListener(PropertyChangeListener listener) {
+ public final synchronized void removePropertyChangeListener(PropertyChangeListener listener) {
if (this.pListeners == null)
return;
this.pListeners.remove (listener);
diff --git a/ide/api.java.classpath/test/unit/src/org/netbeans/api/java/queries/BinaryForSourceQuery2Test.java b/ide/api.java.classpath/test/unit/src/org/netbeans/api/java/queries/BinaryForSourceQuery2Test.java
index 96fbfe6..047bb4d 100644
--- a/ide/api.java.classpath/test/unit/src/org/netbeans/api/java/queries/BinaryForSourceQuery2Test.java
+++ b/ide/api.java.classpath/test/unit/src/org/netbeans/api/java/queries/BinaryForSourceQuery2Test.java
@@ -74,7 +74,7 @@ public class BinaryForSourceQuery2Test extends NbTestCase {
@SuppressWarnings("PackageVisibleField")
// BEGIN: org.netbeans.api.java.queries.BinaryForSourceQuery2Test.SampleQuery
@ServiceProvider(service = BinaryForSourceQueryImplementation.class)
- public final static class SampleQuery
+ public static final class SampleQuery
implements BinaryForSourceQueryImplementation2<SampleQuery.PrivateData> {
public SampleQuery() {
}
diff --git a/ide/api.xml.ui/src/org/netbeans/spi/xml/cookies/ShareableInputSource.java b/ide/api.xml.ui/src/org/netbeans/spi/xml/cookies/ShareableInputSource.java
index b9ad2ef..fc8d55f 100644
--- a/ide/api.xml.ui/src/org/netbeans/spi/xml/cookies/ShareableInputSource.java
+++ b/ide/api.xml.ui/src/org/netbeans/spi/xml/cookies/ShareableInputSource.java
@@ -36,7 +36,7 @@ final class ShareableInputSource extends InputSource {
private final InputSource peer;
private final int bufferSize;
// #32939 keep the buffer big enough to be able to validate large XML documets
- private final static int BUFFER_SIZE = 1024 * 1024 + 7;
+ private static final int BUFFER_SIZE = 1024 * 1024 + 7;
private IOException resetException;
public static ShareableInputSource create(InputSource peer) {
diff --git a/ide/bugtracking.commons/test/unit/src/org/netbeans/modules/bugtracking/issuetable/IssuetableTestFactory.java b/ide/bugtracking.commons/test/unit/src/org/netbeans/modules/bugtracking/issuetable/IssuetableTestFactory.java
index 0ad638d..5f67af1 100644
--- a/ide/bugtracking.commons/test/unit/src/org/netbeans/modules/bugtracking/issuetable/IssuetableTestFactory.java
+++ b/ide/bugtracking.commons/test/unit/src/org/netbeans/modules/bugtracking/issuetable/IssuetableTestFactory.java
@@ -47,7 +47,7 @@ public abstract class IssuetableTestFactory extends NbTestSetup {
public abstract int getColumnsCountBeforeSave();
public abstract int getColumnsCountAfterSave();
- public final static IssuetableTestFactory getInstance (Test test) {
+ public static final IssuetableTestFactory getInstance (Test test) {
IssuetableTestFactory factory = getFromMap (test);
return factory;
}
diff --git a/ide/bugtracking/src/org/netbeans/modules/bugtracking/BugtrackingManager.java b/ide/bugtracking/src/org/netbeans/modules/bugtracking/BugtrackingManager.java
index 8505719..cdd5c1b 100644
--- a/ide/bugtracking/src/org/netbeans/modules/bugtracking/BugtrackingManager.java
+++ b/ide/bugtracking/src/org/netbeans/modules/bugtracking/BugtrackingManager.java
@@ -47,7 +47,7 @@ public final class BugtrackingManager implements LookupListener {
/**
* Recent issues have changed.
*/
- public final static String PROP_RECENT_ISSUES_CHANGED = "recent.issues.changed"; // NOI18N
+ public static final String PROP_RECENT_ISSUES_CHANGED = "recent.issues.changed"; // NOI18N
private static BugtrackingManager instance;
@@ -74,7 +74,7 @@ public final class BugtrackingManager implements LookupListener {
private final PropertyChangeSupport support = new PropertyChangeSupport(this);
- public synchronized static BugtrackingManager getInstance() {
+ public static synchronized BugtrackingManager getInstance() {
if(instance == null) {
instance = new BugtrackingManager();
}
diff --git a/ide/bugtracking/src/org/netbeans/modules/bugtracking/RepositoryImpl.java b/ide/bugtracking/src/org/netbeans/modules/bugtracking/RepositoryImpl.java
index 04cdfe4..a41b956 100644
--- a/ide/bugtracking/src/org/netbeans/modules/bugtracking/RepositoryImpl.java
+++ b/ide/bugtracking/src/org/netbeans/modules/bugtracking/RepositoryImpl.java
@@ -45,18 +45,18 @@ import org.openide.util.Utilities;
*/
public final class RepositoryImpl<R, Q, I> {
- private final static Logger LOG = Logger.getLogger("org.netbeans.modules.bugtracking.Repository"); // NOI18N
+ private static final Logger LOG = Logger.getLogger("org.netbeans.modules.bugtracking.Repository"); // NOI18N
- public final static String EVENT_QUERY_LIST_CHANGED = RepositoryProvider.EVENT_QUERY_LIST_CHANGED;
+ public static final String EVENT_QUERY_LIST_CHANGED = RepositoryProvider.EVENT_QUERY_LIST_CHANGED;
- public final static String EVENT_UNSUBMITTED_ISSUES_CHANGED = RepositoryProvider.EVENT_UNSUBMITTED_ISSUES_CHANGED;
+ public static final String EVENT_UNSUBMITTED_ISSUES_CHANGED = RepositoryProvider.EVENT_UNSUBMITTED_ISSUES_CHANGED;
/**
* RepositoryProvider's attributes have changed, e.g. name, url, etc.
* Old and new value are maps of changed doubles: attribute-name / attribute-value.
* Old value can be null in case the repository is created.
*/
- public final static String EVENT_ATTRIBUTES_CHANGED = "bugtracking.repository.attributes.changed"; //NOI18N
+ public static final String EVENT_ATTRIBUTES_CHANGED = "bugtracking.repository.attributes.changed"; //NOI18N
public static final String ATTRIBUTE_URL = "repository.attribute.url"; //NOI18N
public static final String ATTRIBUTE_DISPLAY_NAME = "repository.attribute.displayName"; //NOI18N
diff --git a/ide/bugtracking/src/org/netbeans/modules/bugtracking/RepositoryRegistry.java b/ide/bugtracking/src/org/netbeans/modules/bugtracking/RepositoryRegistry.java
index 5d3d255..40d5e23 100644
--- a/ide/bugtracking/src/org/netbeans/modules/bugtracking/RepositoryRegistry.java
+++ b/ide/bugtracking/src/org/netbeans/modules/bugtracking/RepositoryRegistry.java
@@ -60,7 +60,7 @@ public class RepositoryRegistry {
* A repository was created or removed, where old value is a Collection of all repositories
* before the change and new value a Collection of all repositories after the change.
*/
- public final static String EVENT_REPOSITORIES_CHANGED = RepositoryManager.EVENT_REPOSITORIES_CHANGED; // NOI18N
+ public static final String EVENT_REPOSITORIES_CHANGED = RepositoryManager.EVENT_REPOSITORIES_CHANGED; // NOI18N
private final PropertyChangeSupport changeSupport = new PropertyChangeSupport(this);
diff --git a/ide/bugtracking/src/org/netbeans/modules/bugtracking/api/Query.java b/ide/bugtracking/src/org/netbeans/modules/bugtracking/api/Query.java
index 13d6e7d..efe9e0a 100644
--- a/ide/bugtracking/src/org/netbeans/modules/bugtracking/api/Query.java
+++ b/ide/bugtracking/src/org/netbeans/modules/bugtracking/api/Query.java
@@ -35,7 +35,7 @@ public final class Query {
* Fired after the Query was refreshed.
* @since 1.85
*/
- public final static String EVENT_QUERY_REFRESHED = "bugtracking.query.finished"; // NOI18N
+ public static final String EVENT_QUERY_REFRESHED = "bugtracking.query.finished"; // NOI18N
private final QueryImpl impl;
diff --git a/ide/bugtracking/src/org/netbeans/modules/bugtracking/api/Repository.java b/ide/bugtracking/src/org/netbeans/modules/bugtracking/api/Repository.java
index b00a554..9ad5952 100644
--- a/ide/bugtracking/src/org/netbeans/modules/bugtracking/api/Repository.java
+++ b/ide/bugtracking/src/org/netbeans/modules/bugtracking/api/Repository.java
@@ -42,15 +42,15 @@ public final class Repository {
* A query from this repository was saved or removed.
* @since 1.85
*/
- public final static String EVENT_QUERY_LIST_CHANGED = RepositoryProvider.EVENT_QUERY_LIST_CHANGED;
+ public static final String EVENT_QUERY_LIST_CHANGED = RepositoryProvider.EVENT_QUERY_LIST_CHANGED;
/**
* RepositoryProvider's attributes have changed, e.g. name, url, etc.
* @since 1.85
*/
- public final static String EVENT_ATTRIBUTES_CHANGED = RepositoryImpl.EVENT_ATTRIBUTES_CHANGED;
+ public static final String EVENT_ATTRIBUTES_CHANGED = RepositoryImpl.EVENT_ATTRIBUTES_CHANGED;
- private final static Logger LOG = Logger.getLogger("org.netbeans.modules.bugtracking.Repository"); // NOI18N
+ private static final Logger LOG = Logger.getLogger("org.netbeans.modules.bugtracking.Repository"); // NOI18N
static {
APIAccessorImpl.createAccesor();
diff --git a/ide/bugtracking/src/org/netbeans/modules/bugtracking/spi/RepositoryProvider.java b/ide/bugtracking/src/org/netbeans/modules/bugtracking/spi/RepositoryProvider.java
index c5595be..ff4ba36 100644
--- a/ide/bugtracking/src/org/netbeans/modules/bugtracking/spi/RepositoryProvider.java
+++ b/ide/bugtracking/src/org/netbeans/modules/bugtracking/spi/RepositoryProvider.java
@@ -40,7 +40,7 @@ public interface RepositoryProvider<R, Q, I> {
* A query from this repository was saved or removed.
* @since 1.85
*/
- public final static String EVENT_QUERY_LIST_CHANGED = "bugtracking.repository.queries.changed"; // NOI18N
+ public static final String EVENT_QUERY_LIST_CHANGED = "bugtracking.repository.queries.changed"; // NOI18N
/**
* The content of unsubmitted issues for the repository changes.
diff --git a/ide/bugtracking/src/org/netbeans/modules/bugtracking/tasks/DashboardUtils.java b/ide/bugtracking/src/org/netbeans/modules/bugtracking/tasks/DashboardUtils.java
index 61efd8d..9766626 100644
--- a/ide/bugtracking/src/org/netbeans/modules/bugtracking/tasks/DashboardUtils.java
+++ b/ide/bugtracking/src/org/netbeans/modules/bugtracking/tasks/DashboardUtils.java
@@ -78,9 +78,9 @@ import org.openide.xml.XMLUtil;
*/
public class DashboardUtils {
- private final static int VISIBLE_START_CHARS = 5;
- private final static String BOLD_START_SUBSTITUTE = "$$$BOLD_START$$$"; //NOI18
- private final static String BOLD_END_SUBSTITUTE = "$$$BOLD_END$$$"; //NOI18
+ private static final int VISIBLE_START_CHARS = 5;
+ private static final String BOLD_START_SUBSTITUTE = "$$$BOLD_START$$$"; //NOI18
+ private static final String BOLD_END_SUBSTITUTE = "$$$BOLD_END$$$"; //NOI18
private static final String NEW_COLOR = UIUtils.getColorString(UIUtils.getTaskNewColor());
private static final String MODIFIED_COLOR = UIUtils.getColorString(UIUtils.getTaskModifiedColor());
private static final String CONFLICT_COLOR = UIUtils.getColorString(UIUtils.getTaskConflictColor());
diff --git a/ide/bugtracking/src/org/netbeans/modules/bugtracking/tasks/cache/StorageUtils.java b/ide/bugtracking/src/org/netbeans/modules/bugtracking/tasks/cache/StorageUtils.java
index 311b602..f69f4fa 100644
--- a/ide/bugtracking/src/org/netbeans/modules/bugtracking/tasks/cache/StorageUtils.java
+++ b/ide/bugtracking/src/org/netbeans/modules/bugtracking/tasks/cache/StorageUtils.java
@@ -42,7 +42,7 @@ public class StorageUtils {
private static FileLocks instance;
- private synchronized static FileLocks getInstance() {
+ private static synchronized FileLocks getInstance() {
if (instance == null) {
instance = new FileLocks();
}
diff --git a/ide/bugtracking/src/org/netbeans/modules/bugtracking/team/TeamRepositories.java b/ide/bugtracking/src/org/netbeans/modules/bugtracking/team/TeamRepositories.java
index 0a0c98c..9cdff83 100644
--- a/ide/bugtracking/src/org/netbeans/modules/bugtracking/team/TeamRepositories.java
+++ b/ide/bugtracking/src/org/netbeans/modules/bugtracking/team/TeamRepositories.java
@@ -75,7 +75,7 @@ public abstract class TeamRepositories implements PropertyChangeListener {
private final PropertyChangeSupport support = new PropertyChangeSupport(this);
- public synchronized static TeamRepositories getInstance() {
+ public static synchronized TeamRepositories getInstance() {
if(instance == null) {
instance = Lookup.getDefault().lookup(TeamRepositories.class);
if (instance == null) {
diff --git a/ide/bugtracking/src/org/netbeans/modules/bugtracking/ui/query/QueryTopComponent.java b/ide/bugtracking/src/org/netbeans/modules/bugtracking/ui/query/QueryTopComponent.java
index d7c2133..48c1f40 100644
--- a/ide/bugtracking/src/org/netbeans/modules/bugtracking/ui/query/QueryTopComponent.java
+++ b/ide/bugtracking/src/org/netbeans/modules/bugtracking/ui/query/QueryTopComponent.java
@@ -604,7 +604,7 @@ public final class QueryTopComponent extends TopComponent
});
}
- final static class ResolvableHelper implements Serializable {
+ static final class ResolvableHelper implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/ide/bugtracking/test/unit/src/org/netbeans/modules/bugtracking/dummies/DummyBugtrackingOwnerSupport.java b/ide/bugtracking/test/unit/src/org/netbeans/modules/bugtracking/dummies/DummyBugtrackingOwnerSupport.java
index cb6b790..b706ddb 100644
--- a/ide/bugtracking/test/unit/src/org/netbeans/modules/bugtracking/dummies/DummyBugtrackingOwnerSupport.java
+++ b/ide/bugtracking/test/unit/src/org/netbeans/modules/bugtracking/dummies/DummyBugtrackingOwnerSupport.java
@@ -88,7 +88,7 @@ public class DummyBugtrackingOwnerSupport extends BugtrackingOwnerSupport {
}
@Override
- synchronized public RepositoryImpl getRepository(FileObject fo) {
+ public synchronized RepositoryImpl getRepository(FileObject fo) {
Object obj = fo.getAttribute(DummyNode.TEST_REPO);
if(obj instanceof Repository) {
return APIAccessor.IMPL.getImpl((Repository)obj);
diff --git a/ide/bugtracking/test/unit/src/org/netbeans/modules/bugtracking/dummies/DummyNode.java b/ide/bugtracking/test/unit/src/org/netbeans/modules/bugtracking/dummies/DummyNode.java
index 9ff51dc..0f98dd2 100644
--- a/ide/bugtracking/test/unit/src/org/netbeans/modules/bugtracking/dummies/DummyNode.java
+++ b/ide/bugtracking/test/unit/src/org/netbeans/modules/bugtracking/dummies/DummyNode.java
@@ -37,7 +37,7 @@ import org.openide.util.lookup.Lookups;
* @author Marian Petras
*/
public class DummyNode extends AbstractNode {
- final static String TEST_REPO = "testrepo";
+ static final String TEST_REPO = "testrepo";
private final String name;
private final Repository repository;
diff --git a/ide/bugtracking/test/unit/src/org/netbeans/modules/bugtracking/ui/query/QTCTestHidden.java b/ide/bugtracking/test/unit/src/org/netbeans/modules/bugtracking/ui/query/QTCTestHidden.java
index 631de9c..0a30a34 100644
--- a/ide/bugtracking/test/unit/src/org/netbeans/modules/bugtracking/ui/query/QTCTestHidden.java
+++ b/ide/bugtracking/test/unit/src/org/netbeans/modules/bugtracking/ui/query/QTCTestHidden.java
@@ -283,7 +283,7 @@ public class QTCTestHidden extends NbTestCase {
tooltip="bugtracking connector created for testing purposes"
)
public static class MyConnector implements BugtrackingConnector {
- final static String ID = "QTCconector";
+ static final String ID = "QTCconector";
public MyConnector() {
}
diff --git a/ide/bugtracking/test/unit/src/org/netbeans/modules/bugtracking/util/BugtrackingUtilTest.java b/ide/bugtracking/test/unit/src/org/netbeans/modules/bugtracking/util/BugtrackingUtilTest.java
index 34632ca..9e28450 100644
--- a/ide/bugtracking/test/unit/src/org/netbeans/modules/bugtracking/util/BugtrackingUtilTest.java
+++ b/ide/bugtracking/test/unit/src/org/netbeans/modules/bugtracking/util/BugtrackingUtilTest.java
@@ -37,7 +37,7 @@ import org.netbeans.modules.bugtracking.spi.*;
*/
public class BugtrackingUtilTest {
- private final static String[] VALID_HOSTS = new String [] {
+ private static final String[] VALID_HOSTS = new String [] {
"netbeans.org/bugzilla",
"123.netbeans.org/bugzilla",
"netbeans123.org/bugzilla",
@@ -48,7 +48,7 @@ public class BugtrackingUtilTest {
"netbeans.org/eventhis",
};
- private final static String[] INVALID_HOSTS = new String [] {
+ private static final String[] INVALID_HOSTS = new String [] {
"n123etbeans.org/bugzilla",
"netbeans.aorg/bugzilla",
"netbeans.123org/bugzilla",
diff --git a/ide/bugzilla/src/org/netbeans/modules/bugzilla/commands/BugzillaExecutor.java b/ide/bugzilla/src/org/netbeans/modules/bugzilla/commands/BugzillaExecutor.java
index dfe40ad..7f0da48 100644
--- a/ide/bugzilla/src/org/netbeans/modules/bugzilla/commands/BugzillaExecutor.java
+++ b/ide/bugzilla/src/org/netbeans/modules/bugzilla/commands/BugzillaExecutor.java
@@ -332,7 +332,7 @@ public class BugzillaExecutor {
return true;
}
- private static abstract class ExceptionHandler {
+ private abstract static class ExceptionHandler {
protected String errroMsg;
protected CoreException ce;
diff --git a/ide/bugzilla/src/org/netbeans/modules/bugzilla/issue/CommentsPanel.java b/ide/bugzilla/src/org/netbeans/modules/bugzilla/issue/CommentsPanel.java
index 1cf1611..59926a1 100644
--- a/ide/bugzilla/src/org/netbeans/modules/bugzilla/issue/CommentsPanel.java
+++ b/ide/bugzilla/src/org/netbeans/modules/bugzilla/issue/CommentsPanel.java
@@ -81,9 +81,9 @@ import org.openide.util.RequestProcessor;
public class CommentsPanel extends JPanel {
static final RequestProcessor RP = new RequestProcessor("Bugzilla Comments Panel", 5, false); // NOI18N
private static final DateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); // NOI18N
- private final static String REPLY_TO_PROPERTY = "replyTo"; // NOI18N
- private final static String QUOTE_PREFIX = "> "; // NOI18N
- private final static int MAX_COMMENT_HEIGHT = 10000;
+ private static final String REPLY_TO_PROPERTY = "replyTo"; // NOI18N
+ private static final String QUOTE_PREFIX = "> "; // NOI18N
+ private static final int MAX_COMMENT_HEIGHT = 10000;
private static Color blueBackground = null;
private static Color greyForeground = null;
@@ -524,8 +524,8 @@ public class CommentsPanel extends JPanel {
}
}
- private final static Icon ei;
- private final static Icon ci;
+ private static final Icon ei;
+ private static final Icon ci;
private static final int ICON_WIDTH;
static {
JTree tv = new JTree();
diff --git a/ide/bugzilla/src/org/netbeans/modules/bugzilla/query/QueryParameter.java b/ide/bugzilla/src/org/netbeans/modules/bugzilla/query/QueryParameter.java
index d3a7f4c..bb1e5ce 100644
--- a/ide/bugzilla/src/org/netbeans/modules/bugzilla/query/QueryParameter.java
+++ b/ide/bugzilla/src/org/netbeans/modules/bugzilla/query/QueryParameter.java
@@ -53,7 +53,7 @@ import org.openide.util.ChangeSupport;
* @author Tomas Stupka
*/
public abstract class QueryParameter {
- final static ParameterValue[] EMPTY_PARAMETER_VALUE = new ParameterValue[] {new ParameterValue("", "")}; // NOI18N
+ static final ParameterValue[] EMPTY_PARAMETER_VALUE = new ParameterValue[] {new ParameterValue("", "")}; // NOI18N
static final ParameterValue PV_CONTAINS_ALL_KEYWORDS = new ParameterValue("contains all keywords", "allwords"); // NOI18N
static final ParameterValue PV_CONTAINS_ANY_KEYWORDS = new ParameterValue("contains any keywords", "anywords"); // NOI18N
diff --git a/ide/bugzilla/src/org/netbeans/modules/bugzilla/repository/BugzillaRepositoryController.java b/ide/bugzilla/src/org/netbeans/modules/bugzilla/repository/BugzillaRepositoryController.java
index f7bd22b..680a0c9 100644
--- a/ide/bugzilla/src/org/netbeans/modules/bugzilla/repository/BugzillaRepositoryController.java
+++ b/ide/bugzilla/src/org/netbeans/modules/bugzilla/repository/BugzillaRepositoryController.java
@@ -379,7 +379,7 @@ public class BugzillaRepositoryController implements RepositoryController, Docum
}
@Override
- final public void run() {
+ public final void run() {
UIUtils.runInAWT(new Runnable() {
@Override
public void run() {
diff --git a/ide/bugzilla/test/unit/src/org/netbeans/modules/bugzilla/query/QueryParameterTest.java b/ide/bugzilla/test/unit/src/org/netbeans/modules/bugzilla/query/QueryParameterTest.java
index 06cc2bf..8c391f6 100644
--- a/ide/bugzilla/test/unit/src/org/netbeans/modules/bugzilla/query/QueryParameterTest.java
+++ b/ide/bugzilla/test/unit/src/org/netbeans/modules/bugzilla/query/QueryParameterTest.java
@@ -44,12 +44,12 @@ import org.netbeans.modules.bugzilla.query.QueryParameter.TextFieldParameter;
*/
public class QueryParameterTest extends NbTestCase implements TestConstants {
- private final static String PARAMETER = "parameter";
- private final static ParameterValue PV1 = new ParameterValue("pv1");
- private final static ParameterValue PV2 = new ParameterValue("pv2");
- private final static ParameterValue PV3 = new ParameterValue("pv3");
- private final static ParameterValue PV4 = new ParameterValue("pv4");
- private final static ParameterValue[] VALUES = new ParameterValue[] {PV1, PV2, PV3, PV4};
+ private static final String PARAMETER = "parameter";
+ private static final ParameterValue PV1 = new ParameterValue("pv1");
+ private static final ParameterValue PV2 = new ParameterValue("pv2");
+ private static final ParameterValue PV3 = new ParameterValue("pv3");
+ private static final ParameterValue PV4 = new ParameterValue("pv4");
+ private static final ParameterValue[] VALUES = new ParameterValue[] {PV1, PV2, PV3, PV4};
public QueryParameterTest(String arg0) {
super(arg0);
diff --git a/ide/code.analysis/src/org/netbeans/modules/analysis/spi/Analyzer.java b/ide/code.analysis/src/org/netbeans/modules/analysis/spi/Analyzer.java
index a0ee2d7..81305b0 100644
--- a/ide/code.analysis/src/org/netbeans/modules/analysis/spi/Analyzer.java
+++ b/ide/code.analysis/src/org/netbeans/modules/analysis/spi/Analyzer.java
@@ -56,7 +56,7 @@ public interface Analyzer extends Cancellable {
*/
public Iterable<? extends ErrorDescription> analyze();
- public static abstract class AnalyzerFactory {
+ public abstract static class AnalyzerFactory {
private final String id;
private final String displayName;
private final String iconPath;
diff --git a/ide/csl.api/src/org/netbeans/modules/csl/api/DataLoadersBridge.java b/ide/csl.api/src/org/netbeans/modules/csl/api/DataLoadersBridge.java
index f3f6aa5..f3dfcdc 100644
--- a/ide/csl.api/src/org/netbeans/modules/csl/api/DataLoadersBridge.java
+++ b/ide/csl.api/src/org/netbeans/modules/csl/api/DataLoadersBridge.java
@@ -82,7 +82,7 @@ public abstract class DataLoadersBridge {
//---
private static DataLoadersBridge instance = null;
- public synchronized static DataLoadersBridge getDefault() {
+ public static synchronized DataLoadersBridge getDefault() {
if (instance == null) {
instance = Lookup.getDefault().lookup(DataLoadersBridge.class);
//TODO: listen on the lookup ? Seems too much
diff --git a/ide/csl.api/src/org/netbeans/modules/csl/editor/fold/GsfFoldManager.java b/ide/csl.api/src/org/netbeans/modules/csl/editor/fold/GsfFoldManager.java
index 227e5eb..d118baa 100644
--- a/ide/csl.api/src/org/netbeans/modules/csl/editor/fold/GsfFoldManager.java
+++ b/ide/csl.api/src/org/netbeans/modules/csl/editor/fold/GsfFoldManager.java
@@ -253,7 +253,7 @@ public class GsfFoldManager implements FoldManager {
}
//XXX: this will hold JavaElementFoldTask as long as the FileObject exists:
- private final static Map<FileObject, JavaElementFoldTask> file2Task = new WeakHashMap<FileObject, JavaElementFoldTask>();
+ private static final Map<FileObject, JavaElementFoldTask> file2Task = new WeakHashMap<FileObject, JavaElementFoldTask>();
static JavaElementFoldTask getTask(FileObject file) {
synchronized (file2Task) {
diff --git a/ide/csl.api/src/org/netbeans/modules/csl/spi/CommentHandler.java b/ide/csl.api/src/org/netbeans/modules/csl/spi/CommentHandler.java
index a0df625..80e10b3 100644
--- a/ide/csl.api/src/org/netbeans/modules/csl/spi/CommentHandler.java
+++ b/ide/csl.api/src/org/netbeans/modules/csl/spi/CommentHandler.java
@@ -69,7 +69,7 @@ public interface CommentHandler {
* Default implementation using simple document text search.
*
*/
- public static abstract class DefaultCommentHandler implements CommentHandler {
+ public abstract static class DefaultCommentHandler implements CommentHandler {
public int[] getAdjustedBlocks(@NonNull Document doc, int from, int to) {
return new int[]{from,to};
diff --git a/ide/csl.api/src/org/netbeans/modules/csl/spi/DefaultDataLoadersBridge.java b/ide/csl.api/src/org/netbeans/modules/csl/spi/DefaultDataLoadersBridge.java
index 2dd946b..e773b1a 100644
--- a/ide/csl.api/src/org/netbeans/modules/csl/spi/DefaultDataLoadersBridge.java
+++ b/ide/csl.api/src/org/netbeans/modules/csl/spi/DefaultDataLoadersBridge.java
@@ -189,7 +189,7 @@ public class DefaultDataLoadersBridge extends DataLoadersBridge {
* Adds listener on a given FileObject and notify if the dataobject is being deleted or
* disposed.
*/
- private final static class DataObjectListener implements PropertyChangeListener {
+ private static final class DataObjectListener implements PropertyChangeListener {
private DataObject dobj;
private final FileObject fobj;
diff --git a/ide/css.editor/src/org/netbeans/modules/css/editor/HtmlTags.java b/ide/css.editor/src/org/netbeans/modules/css/editor/HtmlTags.java
index c0f9c8d..f0c7735 100644
--- a/ide/css.editor/src/org/netbeans/modules/css/editor/HtmlTags.java
+++ b/ide/css.editor/src/org/netbeans/modules/css/editor/HtmlTags.java
@@ -26,7 +26,7 @@ package org.netbeans.modules.css.editor;
* to avoid css.editor to html.parser or html.lib dependency
*/
-final public class HtmlTags {
+public final class HtmlTags {
private static String[] tags = {
"a", "abbr", "abs", "address", "and", "animate", "animateColor",
diff --git a/ide/css.editor/src/org/netbeans/modules/css/editor/actions/CopyStyleAction.java b/ide/css.editor/src/org/netbeans/modules/css/editor/actions/CopyStyleAction.java
index 3872119..ebf0c8b 100644
--- a/ide/css.editor/src/org/netbeans/modules/css/editor/actions/CopyStyleAction.java
+++ b/ide/css.editor/src/org/netbeans/modules/css/editor/actions/CopyStyleAction.java
@@ -91,7 +91,7 @@ public abstract class CopyStyleAction extends BaseAction {
}
/** Produces XML PI text. */
- public final static class XML extends CopyStyleAction {
+ public static final class XML extends CopyStyleAction {
public static final String copyStyleAction = NbBundle.getMessage(CopyStyleAction.class, "Copy-XML-Style");//NOI18N
@@ -108,7 +108,7 @@ public abstract class CopyStyleAction extends BaseAction {
}
/** Produces HTML style text. */
- public final static class HTML extends CopyStyleAction {
+ public static final class HTML extends CopyStyleAction {
public static final String copyStyleAction = NbBundle.getMessage(CopyStyleAction.class, "Copy-HTML-Style");//NOI18N
diff --git a/ide/css.editor/src/org/netbeans/modules/css/indexing/CssIndexer.java b/ide/css.editor/src/org/netbeans/modules/css/indexing/CssIndexer.java
index a307807..5f363a6 100644
--- a/ide/css.editor/src/org/netbeans/modules/css/indexing/CssIndexer.java
+++ b/ide/css.editor/src/org/netbeans/modules/css/indexing/CssIndexer.java
@@ -164,7 +164,7 @@ public class CssIndexer extends EmbeddingIndexer {
RP.post(() -> fireChangeImpl(fo));
}
- static private void fireChangeImpl(FileObject fo) {
+ private static void fireChangeImpl(FileObject fo) {
Project p = FileOwnerQuery.getOwner(fo);
if (p == null) {
// no project to notify
diff --git a/ide/css.editor/src/org/netbeans/modules/css/refactoring/CssActionsImplementationProvider.java b/ide/css.editor/src/org/netbeans/modules/css/refactoring/CssActionsImplementationProvider.java
index 4172a39..96218f8 100644
--- a/ide/css.editor/src/org/netbeans/modules/css/refactoring/CssActionsImplementationProvider.java
+++ b/ide/css.editor/src/org/netbeans/modules/css/refactoring/CssActionsImplementationProvider.java
@@ -216,7 +216,7 @@ public class CssActionsImplementationProvider extends ActionsImplementationProvi
return node.getLookup().lookup(EditorCookie.class);
}
- private static abstract class NodeToFileTask extends UserTask implements Runnable {
+ private abstract static class NodeToFileTask extends UserTask implements Runnable {
private final Node node;
private CssElementContext context;
@@ -285,7 +285,7 @@ public class CssActionsImplementationProvider extends ActionsImplementationProvi
protected abstract RefactoringUI createRefactoringUI(CssElementContext context);
}
- private static abstract class TextComponentTask extends UserTask implements Runnable {
+ private abstract static class TextComponentTask extends UserTask implements Runnable {
private final Document document;
private final int caretOffset;
diff --git a/ide/css.editor/src/org/netbeans/modules/css/refactoring/CssElementContext.java b/ide/css.editor/src/org/netbeans/modules/css/refactoring/CssElementContext.java
index 7d41773..83d97c8 100644
--- a/ide/css.editor/src/org/netbeans/modules/css/refactoring/CssElementContext.java
+++ b/ide/css.editor/src/org/netbeans/modules/css/refactoring/CssElementContext.java
@@ -43,7 +43,7 @@ public abstract class CssElementContext {
public abstract FileObject getFileObject();
- public static abstract class AbstractFileContext extends CssElementContext {
+ public abstract static class AbstractFileContext extends CssElementContext {
private FileObject fo;
diff --git a/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/Node.java b/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/Node.java
index ef46ea5..e369fe0 100644
--- a/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/Node.java
+++ b/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/Node.java
@@ -39,7 +39,7 @@ public interface Node {
public CharSequence image();
- static abstract class AbstractNode implements Node {
+ abstract static class AbstractNode implements Node {
@Override
public void accept(NodeVisitor visitor) {
diff --git a/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/NodeVisitor.java b/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/NodeVisitor.java
index 794166a..2c70b9e 100644
--- a/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/NodeVisitor.java
+++ b/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/NodeVisitor.java
@@ -29,7 +29,7 @@ public interface NodeVisitor {
public void unvisit(Node node);
- public static abstract class Adapter implements NodeVisitor {
+ public abstract static class Adapter implements NodeVisitor {
@Override
public boolean visit(Node node) {
diff --git a/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/TokenAcceptor.java b/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/TokenAcceptor.java
index 6910bac..5658c3f 100644
--- a/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/TokenAcceptor.java
+++ b/ide/css.lib/src/org/netbeans/modules/css/lib/api/properties/TokenAcceptor.java
@@ -506,7 +506,7 @@ public abstract class TokenAcceptor {
}
- public static abstract class TokenImageAcceptor extends TokenAcceptor {
+ public abstract static class TokenImageAcceptor extends TokenAcceptor {
public TokenImageAcceptor(String id) {
super(id);
diff --git a/ide/css.prep/src/org/netbeans/modules/css/prep/editor/refactoring/CPActionsImplementationProvider.java b/ide/css.prep/src/org/netbeans/modules/css/prep/editor/refactoring/CPActionsImplementationProvider.java
index efc2414..aae11be 100644
--- a/ide/css.prep/src/org/netbeans/modules/css/prep/editor/refactoring/CPActionsImplementationProvider.java
+++ b/ide/css.prep/src/org/netbeans/modules/css/prep/editor/refactoring/CPActionsImplementationProvider.java
@@ -207,7 +207,7 @@ public class CPActionsImplementationProvider extends ActionsImplementationProvid
return false;
}
- private static abstract class TextComponentTask extends UserTask implements Runnable {
+ private abstract static class TextComponentTask extends UserTask implements Runnable {
private final Document document;
private final int caretOffset;
diff --git a/ide/db.core/src/org/netbeans/modules/db/sql/execute/SQLExecuteHelper.java b/ide/db.core/src/org/netbeans/modules/db/sql/execute/SQLExecuteHelper.java
index c184cf0..01fff02 100644
--- a/ide/db.core/src/org/netbeans/modules/db/sql/execute/SQLExecuteHelper.java
+++ b/ide/db.core/src/org/netbeans/modules/db/sql/execute/SQLExecuteHelper.java
@@ -417,11 +417,11 @@ public final class SQLExecuteHelper {
return true;
}
- private final static String SQL99_STRING_QUOTE = "'";
- private final static String SQL99_IDENTIFIER_QUOTE = "\"";
- private final static String MYSQL_QUOTE = "`";
- private final static String MSSQL_END_QUOTE = "]";
- private final static String MSSQL_BEGIN_QUOTE = "[";
+ private static final String SQL99_STRING_QUOTE = "'";
+ private static final String SQL99_IDENTIFIER_QUOTE = "\"";
+ private static final String MYSQL_QUOTE = "`";
+ private static final String MSSQL_END_QUOTE = "]";
+ private static final String MSSQL_BEGIN_QUOTE = "[";
/**
* Consume a delimiter statement.
@@ -620,11 +620,11 @@ public final class SQLExecuteHelper {
*/
static class Compatibility {
- public final static Compatibility COMPAT_GENERIC = new Compatibility(false, false);
+ public static final Compatibility COMPAT_GENERIC = new Compatibility(false, false);
- public final static Compatibility COMPAT_MYSQL = new Compatibility(true, false);
+ public static final Compatibility COMPAT_MYSQL = new Compatibility(true, false);
- public final static Compatibility COMPAT_POSTGERSQL = new Compatibility(false, true);
+ public static final Compatibility COMPAT_POSTGERSQL = new Compatibility(false, true);
/**
* Mysql supports "#" ('hash'-Char) as line comment in addition to
diff --git a/ide/db.core/src/org/netbeans/modules/db/sql/execute/ui/SQLHistoryPanel.java b/ide/db.core/src/org/netbeans/modules/db/sql/execute/ui/SQLHistoryPanel.java
index 29a3640..cf0474e 100644
--- a/ide/db.core/src/org/netbeans/modules/db/sql/execute/ui/SQLHistoryPanel.java
+++ b/ide/db.core/src/org/netbeans/modules/db/sql/execute/ui/SQLHistoryPanel.java
@@ -70,8 +70,8 @@ public class SQLHistoryPanel extends javax.swing.JPanel {
public static final String SAVE_STATEMENTS_CLEARED = ""; // NOI18N
public static final Logger LOGGER = Logger.getLogger(SQLHistoryPanel.class.getName());
private JEditorPane editorPane;
- final private ListSelectionModel sqlTableSelektion;
- final private DateFormat dateTimeFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
+ private final ListSelectionModel sqlTableSelektion;
+ private final DateFormat dateTimeFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
/** Creates new form SQLHistoryPanel */
public SQLHistoryPanel(final JEditorPane editorPane) {
diff --git a/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLEditorSupport.java b/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLEditorSupport.java
index ec30096..3d75da0 100644
--- a/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLEditorSupport.java
+++ b/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLEditorSupport.java
@@ -490,7 +490,7 @@ public class SQLEditorSupport extends DataEditorSupport
}
}
- private final static class SQLExecutor implements Runnable, Cancellable {
+ private static final class SQLExecutor implements Runnable, Cancellable {
private final SQLCloneableEditor editor;
private final SQLEditorSupport parent;
diff --git a/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLNode.java b/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLNode.java
index 9fd0cd8..70b5276 100644
--- a/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLNode.java
+++ b/ide/db.core/src/org/netbeans/modules/db/sql/loader/SQLNode.java
@@ -32,7 +32,7 @@ import org.openide.util.actions.SystemAction;
*/
public class SQLNode extends DataNode {
- private final static String ICON_BASE = "org/netbeans/modules/db/sql/loader/resources/sql16.png"; // NOI18N
+ private static final String ICON_BASE = "org/netbeans/modules/db/sql/loader/resources/sql16.png"; // NOI18N
public SQLNode(SQLDataObject dataObject, Lookup lookup) {
super(dataObject, Children.LEAF, lookup);
diff --git a/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewPageContext.java b/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewPageContext.java
index 2c9c8c1..44fd42c 100644
--- a/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewPageContext.java
+++ b/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/DataViewPageContext.java
@@ -72,7 +72,7 @@ class DataViewPageContext {
return currentPos;
}
- synchronized private void setCurrentPos(int currentPos) {
+ private synchronized void setCurrentPos(int currentPos) {
int oldPos = this.currentPos;
this.currentPos = currentPos;
firePropertyChange(PROP_currentPos, oldPos, currentPos);
diff --git a/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/dataexport/DataViewTableDataExportFileChooser.java b/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/dataexport/DataViewTableDataExportFileChooser.java
index 903f37b..cc6a125 100644
--- a/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/dataexport/DataViewTableDataExportFileChooser.java
+++ b/ide/db.dataview/src/org/netbeans/modules/db/dataview/output/dataexport/DataViewTableDataExportFileChooser.java
@@ -49,7 +49,7 @@ public class DataViewTableDataExportFileChooser {
private static File previouslySelectedDirectory;
- public synchronized static void extractAsFile(final DataViewTableUIModel model) {
+ public static synchronized void extractAsFile(final DataViewTableUIModel model) {
final JFileChooser fc = initializeFileChooser();
int returnVal = fc.showDialog(null, Bundle.LBL_FILE_CHOOSER());
switch (returnVal) {
diff --git a/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/CellFocusCustomRenderer.java b/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/CellFocusCustomRenderer.java
index 922c642..a30a4c9 100644
--- a/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/CellFocusCustomRenderer.java
+++ b/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/CellFocusCustomRenderer.java
@@ -31,7 +31,7 @@ import org.netbeans.modules.db.dataview.util.ColorHelper;
*/
public class CellFocusCustomRenderer extends DefaultTableCellRenderer {
- private final static Color selectedCellBackground = ColorHelper.getTablecellFocused();
+ private static final Color selectedCellBackground = ColorHelper.getTablecellFocused();
public CellFocusCustomRenderer() {
setOpaque(true);
diff --git a/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java b/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java
index ec3490e..57cea4f 100644
--- a/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java
+++ b/ide/db.dataview/src/org/netbeans/modules/db/dataview/table/ResultSetCellRenderer.java
@@ -46,9 +46,9 @@ import org.netbeans.modules.db.dataview.util.TimestampType;
*/
public class ResultSetCellRenderer extends DefaultTableCellRenderer {
- protected final static FormatStringValue DATETIME_TO_STRING = new FormatStringValue(new SimpleDateFormat (TimestampType.DEFAULT_FORMAT_PATTERN));
- protected final static FormatStringValue TIME_TO_STRING = new FormatStringValue(new SimpleDateFormat (TimeType.DEFAULT_FOMAT_PATTERN));
- protected final static FormatStringValue Date_TO_STRING = new FormatStringValue(new SimpleDateFormat (DateType.DEFAULT_FOMAT_PATTERN));
+ protected static final FormatStringValue DATETIME_TO_STRING = new FormatStringValue(new SimpleDateFormat (TimestampType.DEFAULT_FORMAT_PATTERN));
+ protected static final FormatStringValue TIME_TO_STRING = new FormatStringValue(new SimpleDateFormat (TimeType.DEFAULT_FOMAT_PATTERN));
+ protected static final FormatStringValue Date_TO_STRING = new FormatStringValue(new SimpleDateFormat (DateType.DEFAULT_FOMAT_PATTERN));
private final TableCellRenderer NULL_RENDERER = new NullObjectCellRenderer();
private final TableCellRenderer DEFAULT_RENDERER = new SQLConstantsCellRenderer();
diff --git a/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/DateType.java b/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/DateType.java
index 5d997d1..235d070 100644
--- a/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/DateType.java
+++ b/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/DateType.java
@@ -81,7 +81,7 @@ public class DateType {
return new java.sql.Date(cal.getTimeInMillis());
}
- private synchronized static java.util.Date doParse (String sVal) {
+ private static synchronized java.util.Date doParse (String sVal) {
java.util.Date dVal = null;
for (DateFormat format : DATE_PARSING_FORMATS) {
try {
diff --git a/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/EncodingHelper.java b/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/EncodingHelper.java
index 2296786..4d3bbe5 100644
--- a/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/EncodingHelper.java
+++ b/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/EncodingHelper.java
@@ -304,10 +304,10 @@ public class EncodingHelper extends Object {
/**
* IANA to Java encoding mappings
*/
- final static Map<String, String> encodingIANA2JavaMap = new TreeMap<String, String>();
- final static Map<String, String> encodingIANADescriptionMap = new TreeMap<String, String>();
- final static Map<String, String> encodingIANAAliasesMap = new TreeMap<String, String>();
- final static Map<String, String> encodingJava2IANAMap = new TreeMap<String, String>();
+ static final Map<String, String> encodingIANA2JavaMap = new TreeMap<String, String>();
+ static final Map<String, String> encodingIANADescriptionMap = new TreeMap<String, String>();
+ static final Map<String, String> encodingIANAAliasesMap = new TreeMap<String, String>();
+ static final Map<String, String> encodingJava2IANAMap = new TreeMap<String, String>();
/**
* Static initialization
diff --git a/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/TimeType.java b/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/TimeType.java
index daced42..946fe42 100644
--- a/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/TimeType.java
+++ b/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/TimeType.java
@@ -84,7 +84,7 @@ public class TimeType {
}
}
- private synchronized static Date doParse (String sVal) {
+ private static synchronized Date doParse (String sVal) {
Date dVal = null;
for (DateFormat format : TIME_PARSING_FORMATS) {
try {
diff --git a/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/TimestampType.java b/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/TimestampType.java
index b50c7af..2a58ce7 100644
--- a/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/TimestampType.java
+++ b/ide/db.dataview/src/org/netbeans/modules/db/dataview/util/TimestampType.java
@@ -76,7 +76,7 @@ public class TimestampType {
}
}
- public synchronized static Date doParse (String sVal) {
+ public static synchronized Date doParse (String sVal) {
Date dVal = null;
for (DateFormat format : TIMESTAMP_PARSING_FORMATS) {
try {
diff --git a/ide/db.metadata.model/src/org/netbeans/modules/db/metadata/model/JDBCConnMetadataModel.java b/ide/db.metadata.model/src/org/netbeans/modules/db/metadata/model/JDBCConnMetadataModel.java
index 824dcc7..464832b 100644
--- a/ide/db.metadata.model/src/org/netbeans/modules/db/metadata/model/JDBCConnMetadataModel.java
+++ b/ide/db.metadata.model/src/org/netbeans/modules/db/metadata/model/JDBCConnMetadataModel.java
@@ -41,7 +41,7 @@ import org.netbeans.modules.db.metadata.model.jdbc.oracle.OracleMetadata;
*/
public class JDBCConnMetadataModel implements MetadataModelImplementation {
- private final static Logger LOGGER = Logger.getLogger(JDBCConnMetadataModel.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(JDBCConnMetadataModel.class.getName());
private final ReentrantLock lock = new ReentrantLock();
private final WeakReference<Connection> connRef;
diff --git a/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/ConnectionProcessor.java b/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/ConnectionProcessor.java
index cc41ac8..c42d6de 100644
--- a/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/ConnectionProcessor.java
+++ b/ide/db.mysql/src/org/netbeans/modules/db/mysql/impl/ConnectionProcessor.java
@@ -56,7 +56,7 @@ public final class ConnectionProcessor implements Runnable {
setQuoter();
}
- synchronized private void setQuoter() throws DatabaseException {
+ private synchronized void setQuoter() throws DatabaseException {
// Enforces the invariant relationship between the database connection
// and the quoter
try {
diff --git a/ide/db.mysql/src/org/netbeans/modules/db/mysql/ui/AdminPropertiesPanel.java b/ide/db.mysql/src/org/netbeans/modules/db/mysql/ui/AdminPropertiesPanel.java
index e710c9d..ef393d0 100644
--- a/ide/db.mysql/src/org/netbeans/modules/db/mysql/ui/AdminPropertiesPanel.java
+++ b/ide/db.mysql/src/org/netbeans/modules/db/mysql/ui/AdminPropertiesPanel.java
@@ -45,7 +45,7 @@ public class AdminPropertiesPanel extends javax.swing.JPanel {
private Color nbErrorForeground;
// the most recent directory where a new path was chosen
- static private String recentDirectory = null;
+ private static String recentDirectory = null;
private void validatePanel() {
descriptor.setValid(false);
diff --git a/ide/db.mysql/src/org/netbeans/modules/db/mysql/util/ExecSupport.java b/ide/db.mysql/src/org/netbeans/modules/db/mysql/util/ExecSupport.java
index 2f83eaa..b4588f2 100644
--- a/ide/db.mysql/src/org/netbeans/modules/db/mysql/util/ExecSupport.java
+++ b/ide/db.mysql/src/org/netbeans/modules/db/mysql/util/ExecSupport.java
@@ -102,7 +102,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/ide/db.sql.editor/src/org/netbeans/modules/db/sql/lexer/SQLLanguageConfig.java b/ide/db.sql.editor/src/org/netbeans/modules/db/sql/lexer/SQLLanguageConfig.java
index ac1e404..fcfb183 100644
--- a/ide/db.sql.editor/src/org/netbeans/modules/db/sql/lexer/SQLLanguageConfig.java
+++ b/ide/db.sql.editor/src/org/netbeans/modules/db/sql/lexer/SQLLanguageConfig.java
@@ -24,7 +24,7 @@ import org.netbeans.modules.csl.spi.LanguageRegistration;
@LanguageRegistration(mimeType=SQLLanguageConfig.mimeType)
public class SQLLanguageConfig extends DefaultLanguageConfig {
- public final static String mimeType = "text/x-sql";
+ public static final String mimeType = "text/x-sql";
@Override
public Language<SQLTokenId> getLexerLanguage() {
diff --git a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/BooleanExpressionList.java b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/BooleanExpressionList.java
index 557ba6c..3dba74a 100644
--- a/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/BooleanExpressionList.java
+++ b/ide/db.sql.visualeditor/src/org/netbeans/modules/db/sql/visualeditor/querymodel/BooleanExpressionList.java
@@ -123,7 +123,7 @@ abstract class BooleanExpressionList implements ExpressionList {
}
}
- static protected void flattenExpression(List expressionsToFlatten, Class typeToLookFor, List expressions) {
+ protected static void flattenExpression(List expressionsToFlatten, Class typeToLookFor, List expressions) {
int size = expressionsToFlatten.size();
for (int i = 0; i < size; i++) {
Object expr = expressionsToFlatten.get(i);
diff --git a/ide/db/src/org/netbeans/api/db/sql/support/SQLIdentifiers.java b/ide/db/src/org/netbeans/api/db/sql/support/SQLIdentifiers.java
index 185591a..c12135f 100644
--- a/ide/db/src/org/netbeans/api/db/sql/support/SQLIdentifiers.java
+++ b/ide/db/src/org/netbeans/api/db/sql/support/SQLIdentifiers.java
@@ -60,7 +60,7 @@ public final class SQLIdentifiers {
/**
* This is a utility class that is used to quote identifiers.
*/
- public static abstract class Quoter {
+ public abstract static class Quoter {
final String quoteString;
diff --git a/ide/db/src/org/netbeans/modules/db/explorer/DatabaseConnection.java b/ide/db/src/org/netbeans/modules/db/explorer/DatabaseConnection.java
index 6bf9791..a03b34b 100644
--- a/ide/db/src/org/netbeans/modules/db/explorer/DatabaseConnection.java
+++ b/ide/db/src/org/netbeans/modules/db/explorer/DatabaseConnection.java
@@ -174,8 +174,8 @@ public final class DatabaseConnection implements DBConnection {
private volatile JDBCDriver jdbcdrv = null;
private JDBCDriver[] drivers = null;
- static private final Lookup.Result<OpenConnectionInterface> openConnectionLookupResult;
- static private Collection<? extends OpenConnectionInterface> openConnectionServices = null;
+ private static final Lookup.Result<OpenConnectionInterface> openConnectionLookupResult;
+ private static Collection<? extends OpenConnectionInterface> openConnectionServices = null;
static {
openConnectionLookupResult = Lookup.getDefault().lookup(new Lookup.Template<>(OpenConnectionInterface.class));
openConnectionLookupResult.addLookupListener(new LookupListener() {
diff --git a/ide/db/src/org/netbeans/modules/db/explorer/dlg/ConnectionDialog.java b/ide/db/src/org/netbeans/modules/db/explorer/dlg/ConnectionDialog.java
index 94d0702..04a7229 100644
--- a/ide/db/src/org/netbeans/modules/db/explorer/dlg/ConnectionDialog.java
+++ b/ide/db/src/org/netbeans/modules/db/explorer/dlg/ConnectionDialog.java
@@ -150,7 +150,7 @@ public class ConnectionDialog {
* the <code>JPanel</code>, which is displayed using <code>DialogDescriptor</code>
* does not know when this happens.
*/
- public static abstract class FocusablePanel extends JPanel {
+ public abstract static class FocusablePanel extends JPanel {
public abstract void initializeFocus();
}
diff --git a/ide/db/src/org/netbeans/modules/db/explorer/dlg/ConnectionNamePanel.java b/ide/db/src/org/netbeans/modules/db/explorer/dlg/ConnectionNamePanel.java
index d196ed2..0e4f746 100644
--- a/ide/db/src/org/netbeans/modules/db/explorer/dlg/ConnectionNamePanel.java
+++ b/ide/db/src/org/netbeans/modules/db/explorer/dlg/ConnectionNamePanel.java
@@ -23,7 +23,7 @@ import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
public class ConnectionNamePanel extends javax.swing.JPanel {
- public final static String PROP_CONNECTION_NAME = "ConnectionName";
+ public static final String PROP_CONNECTION_NAME = "ConnectionName";
/**
* Creates a new form SchemaPanel
diff --git a/ide/db/src/org/netbeans/modules/db/explorer/dlg/DataModel.java b/ide/db/src/org/netbeans/modules/db/explorer/dlg/DataModel.java
index aed2b28..807eeda 100644
--- a/ide/db/src/org/netbeans/modules/db/explorer/dlg/DataModel.java
+++ b/ide/db/src/org/netbeans/modules/db/explorer/dlg/DataModel.java
@@ -37,8 +37,8 @@ public class DataModel extends AbstractTableModel
/** Column data */
private List<ColumnItem> data;
- transient private List<ColumnItem> primaryKeys = new ArrayList<ColumnItem>();
- transient private List<ColumnItem> uniqueKeys = new ArrayList<ColumnItem>();
+ private transient List<ColumnItem> primaryKeys = new ArrayList<ColumnItem>();
+ private transient List<ColumnItem> uniqueKeys = new ArrayList<ColumnItem>();
static final long serialVersionUID =4162743695966976536L;
diff --git a/ide/db/src/org/netbeans/modules/db/explorer/metadata/MetadataModelManager.java b/ide/db/src/org/netbeans/modules/db/explorer/metadata/MetadataModelManager.java
index a7b56bd..6fb123d 100644
--- a/ide/db/src/org/netbeans/modules/db/explorer/metadata/MetadataModelManager.java
+++ b/ide/db/src/org/netbeans/modules/db/explorer/metadata/MetadataModelManager.java
@@ -47,7 +47,7 @@ public class MetadataModelManager {
// XXX test against memory leak.
// XXX test if DatabaseConnection can be GC'd.
- private final static WeakHashMap<DatabaseConnection, MetadataModel> conn2Model = new WeakHashMap<DatabaseConnection, MetadataModel>();
+ private static final WeakHashMap<DatabaseConnection, MetadataModel> conn2Model = new WeakHashMap<DatabaseConnection, MetadataModel>();
private MetadataModelManager() {}
@@ -83,7 +83,7 @@ public class MetadataModelManager {
return conn;
}
- private final static class Listener implements DbMetaDataListener {
+ private static final class Listener implements DbMetaDataListener {
// Remove when issue 141698 is fixed.
private static Listener create() {
diff --git a/ide/derby/src/org/netbeans/modules/derby/ExecSupport.java b/ide/derby/src/org/netbeans/modules/derby/ExecSupport.java
index 828c70f..9aa6935 100644
--- a/ide/derby/src/org/netbeans/modules/derby/ExecSupport.java
+++ b/ide/derby/src/org/netbeans/modules/derby/ExecSupport.java
@@ -118,7 +118,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/ide/diff/src/org/netbeans/modules/diff/builtin/DiffPresenter.java b/ide/diff/src/org/netbeans/modules/diff/builtin/DiffPresenter.java
index fc91e79..5021539 100644
--- a/ide/diff/src/org/netbeans/modules/diff/builtin/DiffPresenter.java
+++ b/ide/diff/src/org/netbeans/modules/diff/builtin/DiffPresenter.java
@@ -438,7 +438,7 @@ public class DiffPresenter extends javax.swing.JPanel {
/**
* This class contains informations about the differences.
*/
- public static abstract class Info extends Object {
+ public abstract static class Info extends Object {
private String name1;
private String name2;
diff --git a/ide/dlight.nativeexecution.nb/src/org/netbeans/modules/nativeexecution/support/ui/api/FileNamesCompletionProvider.java b/ide/dlight.nativeexecution.nb/src/org/netbeans/modules/nativeexecution/support/ui/api/FileNamesCompletionProvider.java
index b63bf28..f7762af 100644
--- a/ide/dlight.nativeexecution.nb/src/org/netbeans/modules/nativeexecution/support/ui/api/FileNamesCompletionProvider.java
+++ b/ide/dlight.nativeexecution.nb/src/org/netbeans/modules/nativeexecution/support/ui/api/FileNamesCompletionProvider.java
@@ -35,8 +35,8 @@ import org.openide.util.RequestProcessor.Task;
*/
public abstract class FileNamesCompletionProvider implements AutocompletionProvider {
- private final static int cacheSizeLimit = 20;
- private final static int cacheLifetime = 1000 * 60 * 10; // 10 min
+ private static final int cacheSizeLimit = 20;
+ private static final int cacheLifetime = 1000 * 60 * 10; // 10 min
private final ExecutionEnvironment env;
private final LinkedList<CachedValue> cache = new LinkedList<>();
private final Task cleanUpTask;
@@ -143,7 +143,7 @@ public abstract class FileNamesCompletionProvider implements AutocompletionProvi
}
}
- private final static class CachedValue {
+ private static final class CachedValue {
final String key;
final List<String> value;
diff --git a/ide/dlight.nativeexecution.nb/src/org/netbeans/modules/nativeexecution/support/ui/api/FileSelectorField.java b/ide/dlight.nativeexecution.nb/src/org/netbeans/modules/nativeexecution/support/ui/api/FileSelectorField.java
index 8f58e16..307a116 100644
--- a/ide/dlight.nativeexecution.nb/src/org/netbeans/modules/nativeexecution/support/ui/api/FileSelectorField.java
+++ b/ide/dlight.nativeexecution.nb/src/org/netbeans/modules/nativeexecution/support/ui/api/FileSelectorField.java
@@ -44,7 +44,7 @@ import org.openide.util.RequestProcessor;
public final class FileSelectorField extends JTextField
implements PopupMenuListener {
- private final static RequestProcessor rp = new RequestProcessor("FileSelectorField", 3); // NOI18N
+ private static final RequestProcessor rp = new RequestProcessor("FileSelectorField", 3); // NOI18N
private final AtomicReference<CompletionTask> currentTask;
private boolean listenersInactive = false;
private AutocompletionProvider provider;
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/AbstractNativeProcess.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/AbstractNativeProcess.java
index b62ad60..20ed0e2 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/AbstractNativeProcess.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/AbstractNativeProcess.java
@@ -58,11 +58,11 @@ import org.openide.util.NbBundle;
public abstract class AbstractNativeProcess extends NativeProcess implements ExProcessInfoProvider {
- protected final static java.util.logging.Logger LOG = Logger.getInstance();
- private final static Integer PID_TIMEOUT =
+ protected static final java.util.logging.Logger LOG = Logger.getInstance();
+ private static final Integer PID_TIMEOUT =
Integer.valueOf(System.getProperty(
"dlight.nativeexecutor.pidtimeout", "70")); // NOI18N
- private final static Integer SIGKILL_TIMEOUT =
+ private static final Integer SIGKILL_TIMEOUT =
Integer.valueOf(System.getProperty(
"dlight.nativeexecutor.forcekill.timeout", "5")); // NOI18N
/*package*/ static final Boolean FIX_ERASE_KEY_IN_TERMINAL = Boolean.valueOf(System.getProperty("fixEraseKeyInTerminal", "true")); // NOI18N;
@@ -193,7 +193,7 @@ public abstract class AbstractNativeProcess extends NativeProcess implements ExP
}
}
- abstract protected void create() throws Throwable;
+ protected abstract void create() throws Throwable;
protected final boolean isInterrupted() {
try {
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/ExecutionEnvironmentImpl.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/ExecutionEnvironmentImpl.java
index 8b885f9..0e11698 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/ExecutionEnvironmentImpl.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/ExecutionEnvironmentImpl.java
@@ -32,7 +32,7 @@ import org.netbeans.modules.nativeexecution.api.util.HostInfoUtils;
* The configuration of the environment for a {@link NativeProcess} execution.
* ExecutionEnvirenment is about "<b>where</b>" to start a native process.
*/
-final public class ExecutionEnvironmentImpl implements ExecutionEnvironment, Serializable {
+public final class ExecutionEnvironmentImpl implements ExecutionEnvironment, Serializable {
private final String user;
private final String host;
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/JschSupport.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/JschSupport.java
index a6a598a..a99497e 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/JschSupport.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/JschSupport.java
@@ -37,7 +37,7 @@ import org.netbeans.modules.nativeexecution.support.Logger;
*/
public final class JschSupport {
- private final static java.util.logging.Logger log = Logger.getInstance();
+ private static final java.util.logging.Logger log = Logger.getInstance();
private JschSupport() {
}
@@ -114,7 +114,7 @@ public final class JschSupport {
return start(worker, env, 2);
}
- private synchronized static ChannelStreams start(final JSchWorker<ChannelStreams> worker, final ExecutionEnvironment env, final int attempts) throws IOException, JSchException, InterruptedException {
+ private static synchronized ChannelStreams start(final JSchWorker<ChannelStreams> worker, final ExecutionEnvironment env, final int attempts) throws IOException, JSchException, InterruptedException {
int retry = attempts;
while (retry-- > 0) {
@@ -151,7 +151,7 @@ public final class JschSupport {
throw new IOException("Failed to execute " + worker.toString()); // NOI18N
}
- public final static class ChannelStreams {
+ public static final class ChannelStreams {
public final InputStream out;
public final InputStream err;
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/RemoteNativeProcess.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/RemoteNativeProcess.java
index 208459a..b15f99a 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/RemoteNativeProcess.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/RemoteNativeProcess.java
@@ -28,7 +28,7 @@ import org.openide.util.Exceptions;
public final class RemoteNativeProcess extends AbstractNativeProcess {
- private final static int startupErrorExitValue = 184;
+ private static final int startupErrorExitValue = 184;
private ChannelStreams streams = null;
public RemoteNativeProcess(NativeProcessInfo info) {
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/TerminalLocalNativeProcess.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/TerminalLocalNativeProcess.java
index 9d29583..f906709 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/TerminalLocalNativeProcess.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/TerminalLocalNativeProcess.java
@@ -57,8 +57,8 @@ import org.openide.util.Utilities;
*/
public final class TerminalLocalNativeProcess extends AbstractNativeProcess {
- private final static java.util.logging.Logger log = Logger.getInstance();
- private final static File dorunScript;
+ private static final java.util.logging.Logger log = Logger.getInstance();
+ private static final File dorunScript;
private ExternalTerminal terminal;
private File resultFile;
private final OSFamily osFamily;
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/NativeProcessExecutionService.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/NativeProcessExecutionService.java
index ea58f33..4688196 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/NativeProcessExecutionService.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/NativeProcessExecutionService.java
@@ -65,7 +65,7 @@ public final class NativeProcessExecutionService {
private static class ExecutionTask implements Callable<Integer> {
- private final static Logger log = org.netbeans.modules.nativeexecution.support.Logger.getInstance();
+ private static final Logger log = org.netbeans.modules.nativeexecution.support.Logger.getInstance();
private final NativeProcessBuilder npb;
private final LineProcessor outProcessor;
private final LineProcessor errProcessor;
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/execution/PostMessageDisplayer.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/execution/PostMessageDisplayer.java
index a23642b..60ac8da 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/execution/PostMessageDisplayer.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/execution/PostMessageDisplayer.java
@@ -44,7 +44,7 @@ public interface PostMessageDisplayer {
public String getPostMessage(NativeProcess.State state, int rc, long time);
- public final static class Default implements PostMessageDisplayer2 {
+ public static final class Default implements PostMessageDisplayer2 {
private final String actionName;
@@ -199,7 +199,7 @@ public interface PostMessageDisplayer {
/*
* @since 1.30.1
*/
- public static abstract class AbstractDisplayer implements PostMessageDisplayer2 {
+ public abstract static class AbstractDisplayer implements PostMessageDisplayer2 {
private final Default defaultImpl;
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/CommonTasksSupport.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/CommonTasksSupport.java
index 91bcd5a..ec62595 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/CommonTasksSupport.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/CommonTasksSupport.java
@@ -352,7 +352,7 @@ public final class CommonTasksSupport {
private static class CommandRunner implements Callable<Integer> {
- private final static Logger log = org.netbeans.modules.nativeexecution.support.Logger.getInstance();
+ private static final Logger log = org.netbeans.modules.nativeexecution.support.Logger.getInstance();
private final ExecutionEnvironment execEnv;
private final String cmd;
private final String[] args;
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ConnectionManager.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ConnectionManager.java
index 783184d..5cfc2a7 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ConnectionManager.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ConnectionManager.java
@@ -583,7 +583,7 @@ public final class ConnectionManager {
private static class ConnectToAction
extends AbstractAction implements AsynchronousAction {
- private final static ConnectionManager cm = ConnectionManager.getInstance();
+ private static final ConnectionManager cm = ConnectionManager.getInstance();
private final ExecutionEnvironment env;
private final Runnable onConnect;
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ExternalTerminal.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ExternalTerminal.java
index a8e47aa..b4b140d 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ExternalTerminal.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ExternalTerminal.java
@@ -39,7 +39,7 @@ import org.openide.util.Utilities;
*/
public final class ExternalTerminal {
- private final static ConcurrentHashMap<TermEnvPair, String> execCache =
+ private static final ConcurrentHashMap<TermEnvPair, String> execCache =
new ConcurrentHashMap<>();
private final TerminalProfile profile;
private String title = null;
@@ -213,7 +213,7 @@ public final class ExternalTerminal {
}
/*package*/
- final static class TermEnvPair {
+ static final class TermEnvPair {
public final ExecutionEnvironment env;
public final String termexec;
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/MacroMap.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/MacroMap.java
index 8749948..4450204 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/MacroMap.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/MacroMap.java
@@ -44,7 +44,7 @@ import org.openide.util.Utilities;
*/
public final class MacroMap implements Cloneable {
- private final static java.util.logging.Logger log = Logger.getInstance();
+ private static final java.util.logging.Logger log = Logger.getInstance();
private final ExecutionEnvironment execEnv;
private final MacroExpander macroExpander;
private final TreeMap<String, String> hostEnv;
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ProcessUtils.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ProcessUtils.java
index 161bced..4c9e248 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ProcessUtils.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ProcessUtils.java
@@ -55,7 +55,7 @@ public final class ProcessUtils {
private ProcessUtils() {
}
- private final static String remoteCharSet = System.getProperty("cnd.remote.charset", "UTF-8"); // NOI18N
+ private static final String remoteCharSet = System.getProperty("cnd.remote.charset", "UTF-8"); // NOI18N
public static String getRemoteCharSet() {
return remoteCharSet;
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/RemoteStatistics.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/RemoteStatistics.java
index 6b0924d..89f6232 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/RemoteStatistics.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/RemoteStatistics.java
@@ -58,7 +58,7 @@ public final class RemoteStatistics implements Callable<Boolean> {
}
}
- public static abstract class ActivityID {
+ public abstract static class ActivityID {
/*package*/ ActivityID() {}
}
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/Shell.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/Shell.java
index b0350f6..598c97b 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/Shell.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/Shell.java
@@ -28,9 +28,9 @@ import org.netbeans.modules.nativeexecution.support.windows.PathConverter.PathTy
*/
public class Shell {
- final public ShellType type;
- final public String shell;
- final public File bindir;
+ public final ShellType type;
+ public final String shell;
+ public final File bindir;
private ShellValidationStatus validationStatus = null;
public Shell(ShellType type, String shell, File bindir) {
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ShellScriptRunner.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ShellScriptRunner.java
index ff17518..781bc97 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ShellScriptRunner.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ShellScriptRunner.java
@@ -275,7 +275,7 @@ public final class ShellScriptRunner {
}
}
- public final static class LoggerLineProcessor implements LineProcessor {
+ public static final class LoggerLineProcessor implements LineProcessor {
private final String prefix;
@@ -297,7 +297,7 @@ public final class ShellScriptRunner {
}
}
- public final static class BufferedLineProcessor implements LineProcessor {
+ public static final class BufferedLineProcessor implements LineProcessor {
private final List<String> buffer = new ArrayList<>();
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ShellValidationSupport.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ShellValidationSupport.java
index 9b7b19e..b908a05 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ShellValidationSupport.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/ShellValidationSupport.java
@@ -40,8 +40,8 @@ import org.openide.util.NbPreferences;
*/
public final class ShellValidationSupport {
- protected final static ShellValidationStatus NOSHELL = new ShellValidationStatus(null, Arrays.asList("No shell"), null); // NOI18N
- protected final static ShellValidationStatus VALID = new ShellValidationStatus(null, null, null);
+ protected static final ShellValidationStatus NOSHELL = new ShellValidationStatus(null, Arrays.asList("No shell"), null); // NOI18N
+ protected static final ShellValidationStatus VALID = new ShellValidationStatus(null, null, null);
private ShellValidationSupport() {
}
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/jsch/JSchConnectionTask.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/jsch/JSchConnectionTask.java
index 9c80d2b..46db907 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/jsch/JSchConnectionTask.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/jsch/JSchConnectionTask.java
@@ -274,7 +274,7 @@ public final class JSchConnectionTask implements Cancellable {
CONNECTION_TIMEOUT,
}
- private final static class Result {
+ private static final class Result {
public final JSchChannelsSupport cs;
public final Problem problem;
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/NbStartUtility.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/NbStartUtility.java
index 5a3bc91..15fbf47 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/NbStartUtility.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/NbStartUtility.java
@@ -36,7 +36,7 @@ import org.openide.modules.InstalledFileLocator;
public class NbStartUtility extends HelperUtility {
private static final boolean ENABLED = Boolean.parseBoolean(System.getProperty("enable.nbstart", "true")); // NOI18N
- private final static NbStartUtility instance = new NbStartUtility();
+ private static final NbStartUtility instance = new NbStartUtility();
public NbStartUtility() {
super("bin/nativeexecution/${osname}-${platform}${_isa}/pty"); // NOI18N
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/PtyAllocator.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/PtyAllocator.java
index 566343d..69611ec 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/PtyAllocator.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/PtyAllocator.java
@@ -143,7 +143,7 @@ public final class PtyAllocator {
return result;
}
- private final static class PtyImplementation implements Pty {
+ private static final class PtyImplementation implements Pty {
private final String tty;
private final int pid;
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/PtyOpenUtility.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/PtyOpenUtility.java
index b5fcc6e..972d694 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/PtyOpenUtility.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/PtyOpenUtility.java
@@ -90,7 +90,7 @@ final class PtyOpenUtility extends HelperUtility {
return new PtyInfo(pid, tty);
}
- final static class PtyInfo {
+ static final class PtyInfo {
final int pid;
final String tty;
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/PtyProcessStartUtility.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/PtyProcessStartUtility.java
index 06d7698..c4773db 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/PtyProcessStartUtility.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/PtyProcessStartUtility.java
@@ -26,7 +26,7 @@ import org.netbeans.modules.nativeexecution.api.util.HelperUtility;
*/
public final class PtyProcessStartUtility extends HelperUtility {
- private final static PtyProcessStartUtility instance = new PtyProcessStartUtility();
+ private static final PtyProcessStartUtility instance = new PtyProcessStartUtility();
private PtyProcessStartUtility() {
super("bin/nativeexecution/$osname-${platform}$_isa/process_start"); // NOI18N
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/PtyUtility.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/PtyUtility.java
index 0c927c9..905782c 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/PtyUtility.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/pty/PtyUtility.java
@@ -26,7 +26,7 @@ import org.netbeans.modules.nativeexecution.api.util.HelperUtility;
*/
public final class PtyUtility extends HelperUtility {
- private final static PtyUtility instance = new PtyUtility();
+ private static final PtyUtility instance = new PtyUtility();
private PtyUtility() {
super("bin/nativeexecution/$osname-${platform}$_isa/pty"); // NOI18N
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/spi/JSchAuthenticationSelection.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/spi/JSchAuthenticationSelection.java
index ab2c4c6..f04e3ae 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/spi/JSchAuthenticationSelection.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/spi/JSchAuthenticationSelection.java
@@ -26,7 +26,7 @@ import org.openide.util.Lookup;
*
* @author masha
*/
-abstract public class JSchAuthenticationSelection {
+public abstract class JSchAuthenticationSelection {
private static final JSchAuthenticationSelection INSTANCE = new JSchAuthenticationSelectionImpl();
public static JSchAuthenticationSelection find() {
@@ -37,7 +37,7 @@ abstract public class JSchAuthenticationSelection {
return sels.iterator().next();
}
- abstract public boolean initAuthentication(Authentication auth);
+ public abstract boolean initAuthentication(Authentication auth);
private static final class JSchAuthenticationSelectionImpl extends JSchAuthenticationSelection {
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/spi/support/NativeExecutionUserNotification.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/spi/support/NativeExecutionUserNotification.java
index 0de3629..1b3675e 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/spi/support/NativeExecutionUserNotification.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/spi/support/NativeExecutionUserNotification.java
@@ -25,7 +25,7 @@ import org.openide.util.Lookup;
*
* @author masha
*/
-abstract public class NativeExecutionUserNotification {
+public abstract class NativeExecutionUserNotification {
private static NativeExecutionUserNotification INSTANCE = null;
@@ -46,19 +46,19 @@ abstract public class NativeExecutionUserNotification {
return INSTANCE;
}
- abstract public void notify(String message, Descriptor type);
+ public abstract void notify(String message, Descriptor type);
- abstract public void notify(String message);
+ public abstract void notify(String message);
- abstract public void notifyStatus(String message);
+ public abstract void notifyStatus(String message);
- abstract public void showErrorNotification(String title, String shortMessage, String longMesage);
+ public abstract void showErrorNotification(String title, String shortMessage, String longMesage);
- abstract public void showInfoNotification(String title, String shortMessage, String longMesage);
+ public abstract void showInfoNotification(String title, String shortMessage, String longMesage);
- abstract public boolean confirmShellStatusValiation(String title, final String header, final String footer, final Shell shell);
+ public abstract boolean confirmShellStatusValiation(String title, final String header, final String footer, final Shell shell);
- abstract public boolean showYesNoQuestion(String title, String text);
+ public abstract boolean showYesNoQuestion(String title, String text);
private static class Trivial extends NativeExecutionUserNotification {
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/spi/support/PasswordProviderFactory.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/spi/support/PasswordProviderFactory.java
index d08712a..300f977 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/spi/support/PasswordProviderFactory.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/spi/support/PasswordProviderFactory.java
@@ -22,7 +22,7 @@ package org.netbeans.modules.nativeexecution.spi.support;
*
* @author masha
*/
-abstract public interface PasswordProviderFactory {
+public abstract interface PasswordProviderFactory {
/**
*
* @param secretType
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/sps/impl/RequestPrivilegesAction.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/sps/impl/RequestPrivilegesAction.java
index d2a7307..871f321 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/sps/impl/RequestPrivilegesAction.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/sps/impl/RequestPrivilegesAction.java
@@ -29,7 +29,7 @@ import org.openide.util.NbBundle;
public final class RequestPrivilegesAction
extends ObservableAction<Boolean> {
- private final static ConcurrentHashMap<Key, RequestPrivilegesAction> cache =
+ private static final ConcurrentHashMap<Key, RequestPrivilegesAction> cache =
new ConcurrentHashMap<>();
private final SPSCommonImpl support;
private final Collection<String> requestedPrivileges;
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/sps/impl/RequestPrivilegesTask.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/sps/impl/RequestPrivilegesTask.java
index 76c6c5b..5ffa4f3 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/sps/impl/RequestPrivilegesTask.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/sps/impl/RequestPrivilegesTask.java
@@ -80,7 +80,7 @@ public final class RequestPrivilegesTask implements Computable<RequestPrivileges
final Collection<String> requestedPrivileges;
final boolean askForPassword;
- final private String privilegesString;
+ private final String privilegesString;
final SPSCommonImpl support;
public RequestPrivilegesTaskParams(
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/sps/impl/SPSCommonImpl.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/sps/impl/SPSCommonImpl.java
index 623ee9c..4d9cfe4 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/sps/impl/SPSCommonImpl.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/sps/impl/SPSCommonImpl.java
@@ -38,9 +38,9 @@ import org.openide.util.WeakListeners;
public abstract class SPSCommonImpl implements SolarisPrivilegesSupport {
- private final static TasksCachedProcessor<ExecutionEnvironment, List<String>> cachedPrivilegesFetcher =
+ private static final TasksCachedProcessor<ExecutionEnvironment, List<String>> cachedPrivilegesFetcher =
new TasksCachedProcessor<>(new FetchPrivilegesTask(), false);
- private final static TasksCachedProcessor<RequestPrivilegesTaskParams, Boolean> cachedPrivilegesRequestor =
+ private static final TasksCachedProcessor<RequestPrivilegesTaskParams, Boolean> cachedPrivilegesRequestor =
new TasksCachedProcessor<>(new RequestPrivilegesTask(), true);
private final ExecutionEnvironment execEnv;
private volatile boolean cancelled = false;
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/ObservableAction.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/ObservableAction.java
index 52d82b4..ca841f1 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/ObservableAction.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/ObservableAction.java
@@ -87,7 +87,7 @@ public abstract class ObservableAction<T>
* @see #invoke()
* @see #actionPerformed(java.awt.event.ActionEvent)
*/
- abstract protected T performAction();
+ protected abstract T performAction();
/**
* Invoked when an action occurs. <p>
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/RemoteUserInfo.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/RemoteUserInfo.java
index ce7d628..5f0e339 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/RemoteUserInfo.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/RemoteUserInfo.java
@@ -36,10 +36,10 @@ import org.netbeans.modules.nativeexecution.spi.support.PasswordProviderFactory;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;
-final public class RemoteUserInfo implements UserInfo, UIKeyboardInteractive {
+public final class RemoteUserInfo implements UserInfo, UIKeyboardInteractive {
- private final static Object lock = RemoteUserInfo.class.getName() + "Lock"; // NOI18N
- private final static PasswordManager pm = PasswordManager.getInstance();
+ private static final Object lock = RemoteUserInfo.class.getName() + "Lock"; // NOI18N
+ private static final PasswordManager pm = PasswordManager.getInstance();
// private final Component parent;
private final ExecutionEnvironment env;
// private volatile Component parentWindow = null;
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/Win32APISupport.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/Win32APISupport.java
index f3e7d41..fe66d34 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/Win32APISupport.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/Win32APISupport.java
@@ -48,7 +48,7 @@ public interface Win32APISupport extends StdCallLibrary {
return o;
}
}
- public final static HANDLE INVALID_HANDLE = new HANDLE() {
+ public static final HANDLE INVALID_HANDLE = new HANDLE() {
{
super.setPointer(Pointer.createConstant(-1));
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/filesearch/FileSearchSupport.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/filesearch/FileSearchSupport.java
index e43ca30..ef49a9b 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/filesearch/FileSearchSupport.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/filesearch/FileSearchSupport.java
@@ -25,8 +25,8 @@ import org.openide.util.Lookup;
public final class FileSearchSupport {
- private final static java.util.logging.Logger log = Logger.getInstance();
- private final static TasksCachedProcessor<FileSearchParams, String> processor =
+ private static final java.util.logging.Logger log = Logger.getInstance();
+ private static final TasksCachedProcessor<FileSearchParams, String> processor =
new TasksCachedProcessor<>(
new Searcher(), false);
@@ -35,7 +35,7 @@ public final class FileSearchSupport {
return processor.compute(fileSearchParams);
}
- private final static class Searcher implements Computable<FileSearchParams, String> {
+ private static final class Searcher implements Computable<FileSearchParams, String> {
public String compute(FileSearchParams fileSearchParams) throws InterruptedException {
final Collection<? extends FileSearcher> searchers = Lookup.getDefault().lookupAll(FileSearcher.class);
diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/hostinfo/impl/HostInfoFactory.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/hostinfo/impl/HostInfoFactory.java
index 1f3b96c..677ef74 100644
--- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/hostinfo/impl/HostInfoFactory.java
+++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/support/hostinfo/impl/HostInfoFactory.java
@@ -203,7 +203,7 @@ public final class HostInfoFactory {
return result;
}
- static private class HostInfoImpl implements HostInfo {
+ private static class HostInfoImpl implements HostInfo {
private OS os;
private CpuFamily cpuFamily;
diff --git a/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/ConcurrentTasksSupport.java b/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/ConcurrentTasksSupport.java
index 2a1fbff..a053f2c 100644
--- a/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/ConcurrentTasksSupport.java
+++ b/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/ConcurrentTasksSupport.java
@@ -37,7 +37,7 @@ import junit.framework.Assert;
*/
public final class ConcurrentTasksSupport {
- final private static Logger log = Logger.getLogger(ConcurrentTasksSupport.class.getName());
+ private static final Logger log = Logger.getLogger(ConcurrentTasksSupport.class.getName());
final int concurrentTasks;
final ArrayList<TaskFactory> factories = new ArrayList<>();
final CyclicBarrier startSignal;
diff --git a/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/EnvironmentTest.java b/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/EnvironmentTest.java
index 2513831..88d5aab 100644
--- a/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/EnvironmentTest.java
+++ b/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/EnvironmentTest.java
@@ -50,7 +50,7 @@ import org.openide.util.Utilities;
*/
public class EnvironmentTest extends NativeExecutionBaseTestCase {
- private final static String nonexistentVarName = "SOME_NEW_VAR";
+ private static final String nonexistentVarName = "SOME_NEW_VAR";
public EnvironmentTest(String name) {
super(name);
diff --git a/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/NativeTaskTest.java b/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/NativeTaskTest.java
index ed2898d..31c47af 100644
--- a/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/NativeTaskTest.java
+++ b/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/NativeTaskTest.java
@@ -136,7 +136,7 @@ public class NativeTaskTest extends NativeExecutionBaseTestCase {
assertEquals(threadsNum, counters.getCounter(CNT_EXECUTION_SUCCESS).get());
}
- private final static class Worker implements Runnable {
+ private static final class Worker implements Runnable {
private final CountDownLatch start;
private final CountDownLatch latch;
diff --git a/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/api/util/ConnectionManagerTest.java b/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/api/util/ConnectionManagerTest.java
index 01d5fd3..11efbfa 100644
--- a/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/api/util/ConnectionManagerTest.java
+++ b/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/api/util/ConnectionManagerTest.java
@@ -163,7 +163,7 @@ public class ConnectionManagerTest extends NativeExecutionBaseTestCase {
counters.assertEquals("Number of exceptions", "exceptions", 0);
}
- private final static class GetConnectToActionTaskFactory implements ConcurrentTasksSupport.TaskFactory {
+ private static final class GetConnectToActionTaskFactory implements ConcurrentTasksSupport.TaskFactory {
private final ExecutionEnvironment env;
private final Counters counters;
diff --git a/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/api/util/SlowHostInfoProvider.java b/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/api/util/SlowHostInfoProvider.java
index bcc2582..3bf7f08 100644
--- a/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/api/util/SlowHostInfoProvider.java
+++ b/ide/dlight.nativeexecution/test/unit/src/org/netbeans/modules/nativeexecution/api/util/SlowHostInfoProvider.java
@@ -29,7 +29,7 @@ import org.openide.util.Lookup;
import org.openide.util.lookup.ServiceProvider;
@ServiceProvider(service = org.netbeans.modules.nativeexecution.support.hostinfo.HostInfoProvider.class, position = 10)
-final public class SlowHostInfoProvider implements HostInfoProvider {
+public final class SlowHostInfoProvider implements HostInfoProvider {
private static final java.util.logging.Logger log = Logger.getInstance();
diff --git a/ide/dlight.terminal/src/org/netbeans/modules/dlight/terminal/action/TerminalSupportImpl.java b/ide/dlight.terminal/src/org/netbeans/modules/dlight/terminal/action/TerminalSupportImpl.java
index 8273c80..4a4bc05 100644
--- a/ide/dlight.terminal/src/org/netbeans/modules/dlight/terminal/action/TerminalSupportImpl.java
+++ b/ide/dlight.terminal/src/org/netbeans/modules/dlight/terminal/action/TerminalSupportImpl.java
@@ -383,7 +383,7 @@ public final class TerminalSupportImpl {
}
}
- private final static class NativeProcessListener implements ChangeListener, PropertyChangeListener {
+ private static final class NativeProcessListener implements ChangeListener, PropertyChangeListener {
private final AtomicReference<NativeProcess> processRef;
private final AtomicBoolean destroyed;
diff --git a/ide/dlight.terminal/src/org/netbeans/modules/dlight/terminal/ui/TerminalContainerTopComponent.java b/ide/dlight.terminal/src/org/netbeans/modules/dlight/terminal/ui/TerminalContainerTopComponent.java
index d0f32f6..bf4d65a 100644
--- a/ide/dlight.terminal/src/org/netbeans/modules/dlight/terminal/ui/TerminalContainerTopComponent.java
+++ b/ide/dlight.terminal/src/org/netbeans/modules/dlight/terminal/ui/TerminalContainerTopComponent.java
@@ -64,7 +64,7 @@ public final class TerminalContainerTopComponent extends TopComponent {
/** path to the icon used by the component and its open action */
private static final String ICON_PATH = "org/netbeans/modules/dlight/terminal/ui/term.png";// NOI18N
private static final String PREFERRED_ID = "TerminalContainerTopComponent";// NOI18N
- public final static String AUTO_OPEN_LOCAL_PROPERTY = "AutoOpenLocalTerminal"; // NOI18N
+ public static final String AUTO_OPEN_LOCAL_PROPERTY = "AutoOpenLocalTerminal"; // NOI18N
private final TerminalContainer tc;
public TerminalContainerTopComponent() {
@@ -120,7 +120,7 @@ public final class TerminalContainerTopComponent extends TopComponent {
}
private static Action[] actions;
- private synchronized static Action[] getToolbarActions() {
+ private static synchronized Action[] getToolbarActions() {
if (actions == null) {
List<? extends Action> termActions = Utilities.actionsForPath(TerminalAction.TERMINAL_ACTIONS_PATH);// NOI18N
actions = termActions.toArray(new Action[termActions.size()]);
diff --git a/ide/editor.actions/src/org/netbeans/modules/editor/actions/CamelCaseActions.java b/ide/editor.actions/src/org/netbeans/modules/editor/actions/CamelCaseActions.java
index 60b317a..8177aaa 100644
--- a/ide/editor.actions/src/org/netbeans/modules/editor/actions/CamelCaseActions.java
+++ b/ide/editor.actions/src/org/netbeans/modules/editor/actions/CamelCaseActions.java
@@ -45,7 +45,7 @@ public class CamelCaseActions {
/* package */ static final String deleteNextCamelCasePosition = "delete-next-camel-case-position"; //NOI18N
static final String SYSTEM_ACTION_CLASS_NAME_PROPERTY = "systemActionClassName";
- public static abstract class CamelCaseAction extends AbstractEditorAction {
+ public abstract static class CamelCaseAction extends AbstractEditorAction {
public CamelCaseAction(Map<String, ?> attrs) {
super(attrs);
diff --git a/ide/editor.bookmarks/src/org/netbeans/modules/editor/bookmarks/BookmarkInfo.java b/ide/editor.bookmarks/src/org/netbeans/modules/editor/bookmarks/BookmarkInfo.java
index e41fb04..7ed8f04 100644
--- a/ide/editor.bookmarks/src/org/netbeans/modules/editor/bookmarks/BookmarkInfo.java
+++ b/ide/editor.bookmarks/src/org/netbeans/modules/editor/bookmarks/BookmarkInfo.java
@@ -35,7 +35,7 @@ public final class BookmarkInfo {
/**
* Special entry used in popup switcher to represent jumping to bookmarks view.
*/
- public final static BookmarkInfo BOOKMARKS_WINDOW = new BookmarkInfo(0, "Bookmarks Window", 0, ""); // NOI18N
+ public static final BookmarkInfo BOOKMARKS_WINDOW = new BookmarkInfo(0, "Bookmarks Window", 0, ""); // NOI18N
public static final Comparator<BookmarkInfo> CURRENT_LINE_COMPARATOR = new Comparator<BookmarkInfo>() {
diff --git a/ide/editor.bookmarks/src/org/netbeans/modules/editor/bookmarks/ui/BookmarksView.java b/ide/editor.bookmarks/src/org/netbeans/modules/editor/bookmarks/ui/BookmarksView.java
index e95100e..a530c6e 100644
--- a/ide/editor.bookmarks/src/org/netbeans/modules/editor/bookmarks/ui/BookmarksView.java
+++ b/ide/editor.bookmarks/src/org/netbeans/modules/editor/bookmarks/ui/BookmarksView.java
@@ -126,8 +126,8 @@ implements BookmarkManagerListener, PropertyChangeListener, ExplorerManager.Prov
};
}
- private transient final BookmarksNodeTree nodeTree;
- private transient final ExplorerManager explorerManager;
+ private final transient BookmarksNodeTree nodeTree;
+ private final transient ExplorerManager explorerManager;
private transient boolean treeViewShowing; // Whether viewed as tree or as a table
private transient JSplitPane splitPane;
private transient BookmarksTableView tableView;
diff --git a/ide/editor.bracesmatching/test/unit/src/org/netbeans/modules/editor/bracesmatching/MasterMatcherTest.java b/ide/editor.bracesmatching/test/unit/src/org/netbeans/modules/editor/bracesmatching/MasterMatcherTest.java
index 854988f..eef50a0 100644
--- a/ide/editor.bracesmatching/test/unit/src/org/netbeans/modules/editor/bracesmatching/MasterMatcherTest.java
+++ b/ide/editor.bracesmatching/test/unit/src/org/netbeans/modules/editor/bracesmatching/MasterMatcherTest.java
@@ -237,12 +237,12 @@ public class MasterMatcherTest extends NbTestCase {
private static final class BlockingMatcher implements BracesMatcher, BracesMatcherFactory {
private static volatile int counter;
- public volatile static BlockingMatcher lastMatcher = null;
+ public static volatile BlockingMatcher lastMatcher = null;
- public volatile static boolean blockInFindOrigin = false;
+ public static volatile boolean blockInFindOrigin = false;
- public volatile static int [] origin = null;
- public volatile static int [] matches = null;
+ public static volatile int [] origin = null;
+ public static volatile int [] matches = null;
public final MatcherContext context;
diff --git a/ide/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/CodeTemplatesStorage.java b/ide/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/CodeTemplatesStorage.java
index feaa000..07a24f2 100644
--- a/ide/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/CodeTemplatesStorage.java
+++ b/ide/editor.codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/CodeTemplatesStorage.java
@@ -115,7 +115,7 @@ public final class CodeTemplatesStorage implements StorageDescription<String, Co
private static final String MIME_TYPE = "text/x-nbeditor-codetemplatesettings"; //NOI18N
- private static abstract class TemplatesReader extends StorageReader<String, CodeTemplateDescription> {
+ private abstract static class TemplatesReader extends StorageReader<String, CodeTemplateDescription> {
protected TemplatesReader(FileObject f, String mimePath) {
super(f, mimePath);
}
diff --git a/ide/editor.errorstripe/test/unit/src/org/netbeans/modules/editor/errorstripe/AnnotationViewTest.java b/ide/editor.errorstripe/test/unit/src/org/netbeans/modules/editor/errorstripe/AnnotationViewTest.java
index 4572273..125d6b7 100644
--- a/ide/editor.errorstripe/test/unit/src/org/netbeans/modules/editor/errorstripe/AnnotationViewTest.java
+++ b/ide/editor.errorstripe/test/unit/src/org/netbeans/modules/editor/errorstripe/AnnotationViewTest.java
@@ -228,7 +228,7 @@ public class AnnotationViewTest extends NbTestCase {
f.setVisible(false);
}
- private static abstract class Action {
+ private abstract static class Action {
public abstract void test(AnnotationView aView, BaseDocument document) throws Exception;
}
diff --git a/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/ActionFactory.java b/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/ActionFactory.java
index 2c96b64..8442cc8 100644
--- a/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/ActionFactory.java
+++ b/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/ActionFactory.java
@@ -301,7 +301,7 @@ final class ActionFactory {
}
- static abstract class LocalBaseAction extends BaseAction {
+ abstract static class LocalBaseAction extends BaseAction {
public LocalBaseAction() {
super();
}
diff --git a/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/VerticalFlowLayout.java b/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/VerticalFlowLayout.java
index d5599fd..e1829d3 100644
--- a/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/VerticalFlowLayout.java
+++ b/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/VerticalFlowLayout.java
@@ -33,7 +33,7 @@ import java.util.Set;
*/
final class VerticalFlowLayout implements LayoutManager2 {
- final private Set<Component> components = new LinkedHashSet<Component>();
+ private final Set<Component> components = new LinkedHashSet<Component>();
private int hgap = 0;
private int vgap = 0;
diff --git a/ide/editor.fold/src/org/netbeans/modules/editor/fold/LegacySettingsSync.java b/ide/editor.fold/src/org/netbeans/modules/editor/fold/LegacySettingsSync.java
index 7ddc090..ae39180 100644
--- a/ide/editor.fold/src/org/netbeans/modules/editor/fold/LegacySettingsSync.java
+++ b/ide/editor.fold/src/org/netbeans/modules/editor/fold/LegacySettingsSync.java
@@ -48,7 +48,7 @@ class LegacySettingsSync implements PreferenceChangeListener {
private Reference<Preferences> defaultMimePrefs;
- synchronized static LegacySettingsSync get() {
+ static synchronized LegacySettingsSync get() {
if (INSTANCE == null) {
INSTANCE = new LegacySettingsSync();
}
diff --git a/ide/editor.fold/test/unit/src/org/netbeans/modules/editor/fold/FoldManagerTesting.java b/ide/editor.fold/test/unit/src/org/netbeans/modules/editor/fold/FoldManagerTesting.java
index afc174f..851c7e0 100644
--- a/ide/editor.fold/test/unit/src/org/netbeans/modules/editor/fold/FoldManagerTesting.java
+++ b/ide/editor.fold/test/unit/src/org/netbeans/modules/editor/fold/FoldManagerTesting.java
@@ -155,7 +155,7 @@ public final class FoldManagerTesting {
});
}
- final static class AddFoldsOp extends RandomTestContainer.Op {
+ static final class AddFoldsOp extends RandomTestContainer.Op {
public AddFoldsOp() {
super(ADD_FOLDS);
@@ -182,7 +182,7 @@ public final class FoldManagerTesting {
}
- final static class RemoveFoldsOp extends RandomTestContainer.Op {
+ static final class RemoveFoldsOp extends RandomTestContainer.Op {
public RemoveFoldsOp() {
super(REMOVE_FOLDS);
diff --git a/ide/editor.lib/src/org/netbeans/editor/AnnotationDesc.java b/ide/editor.lib/src/org/netbeans/editor/AnnotationDesc.java
index 7f35708..316c569 100644
--- a/ide/editor.lib/src/org/netbeans/editor/AnnotationDesc.java
+++ b/ide/editor.lib/src/org/netbeans/editor/AnnotationDesc.java
@@ -169,18 +169,18 @@ public abstract class AnnotationDesc extends Object implements Comparable<Annota
/** Add listeners on changes of annotation properties
* @param l change listener*/
- final public void addPropertyChangeListener(PropertyChangeListener l) {
+ public final void addPropertyChangeListener(PropertyChangeListener l) {
support.addPropertyChangeListener(l);
}
/** Remove listeners on changes of annotation properties
* @param l change listener*/
- final public void removePropertyChangeListener(PropertyChangeListener l) {
+ public final void removePropertyChangeListener(PropertyChangeListener l) {
support.removePropertyChangeListener(l);
}
/** Fire property change to registered listeners. */
- final protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
+ protected final void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
support.firePropertyChange(propertyName, oldValue, newValue);
}
diff --git a/ide/editor.lib/src/org/netbeans/editor/AnnotationType.java b/ide/editor.lib/src/org/netbeans/editor/AnnotationType.java
index 8c128c5..aca94bb 100644
--- a/ide/editor.lib/src/org/netbeans/editor/AnnotationType.java
+++ b/ide/editor.lib/src/org/netbeans/editor/AnnotationType.java
@@ -579,18 +579,18 @@ public class AnnotationType {
/** Add listeners on changes of annotation type properties
* @param l change listener*/
- final public void addPropertyChangeListener(java.beans.PropertyChangeListener l) {
+ public final void addPropertyChangeListener(java.beans.PropertyChangeListener l) {
support.addPropertyChangeListener (l);
}
/** Remove listeners on changes of annotation type properties
* @param l change listener*/
- final public void removePropertyChangeListener(java.beans.PropertyChangeListener l) {
+ public final void removePropertyChangeListener(java.beans.PropertyChangeListener l) {
support.removePropertyChangeListener (l);
}
/** Fire property change to registered listeners. */
- final protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
+ protected final void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
support.firePropertyChange(propertyName, oldValue, newValue);
}
diff --git a/ide/editor.lib/src/org/netbeans/editor/AnnotationTypes.java b/ide/editor.lib/src/org/netbeans/editor/AnnotationTypes.java
index fdb1311..1ac5758 100644
--- a/ide/editor.lib/src/org/netbeans/editor/AnnotationTypes.java
+++ b/ide/editor.lib/src/org/netbeans/editor/AnnotationTypes.java
@@ -251,18 +251,18 @@ public class AnnotationTypes {
/** Add listeners on changes of annotation type properties
* @param l change listener*/
- final public void addPropertyChangeListener(java.beans.PropertyChangeListener l) {
+ public final void addPropertyChangeListener(java.beans.PropertyChangeListener l) {
support.addPropertyChangeListener (l);
}
/** Remove listeners on changes of annotation type properties
* @param l change listener*/
- final public void removePropertyChangeListener(java.beans.PropertyChangeListener l) {
+ public final void removePropertyChangeListener(java.beans.PropertyChangeListener l) {
support.removePropertyChangeListener (l);
}
/** Fire property change to registered listeners. */
- final protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
+ protected final void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
support.firePropertyChange(this, propertyName, oldValue, newValue);
}
diff --git a/ide/editor.lib/src/org/netbeans/editor/FinderFactory.java b/ide/editor.lib/src/org/netbeans/editor/FinderFactory.java
index 6588e3c..effc396 100644
--- a/ide/editor.lib/src/org/netbeans/editor/FinderFactory.java
+++ b/ide/editor.lib/src/org/netbeans/editor/FinderFactory.java
@@ -33,7 +33,7 @@ public class FinderFactory {
/** Abstract finder implementation. The only <CODE>find()</CODE>
* method must be redefined.
*/
- public static abstract class AbstractFinder implements Finder {
+ public abstract static class AbstractFinder implements Finder {
/** Was the string found? */
protected boolean found;
@@ -209,7 +209,7 @@ public class FinderFactory {
}
/** Generic forward finder that simplifies the search process. */
- public static abstract class GenericFwdFinder extends AbstractFinder {
+ public abstract static class GenericFwdFinder extends AbstractFinder {
public final int find(int bufferStartPos, char buffer[],
int offset1, int offset2, int reqPos, int limitPos) {
@@ -242,7 +242,7 @@ public class FinderFactory {
}
/** Generic backward finder that simplifies the search process. */
- public static abstract class GenericBwdFinder extends AbstractFinder {
+ public abstract static class GenericBwdFinder extends AbstractFinder {
public final int find(int bufferStartPos, char buffer[],
int offset1, int offset2, int reqPos, int limitPos) {
@@ -274,7 +274,7 @@ public class FinderFactory {
}
- public static abstract class GenericFinder extends AbstractFinder {
+ public abstract static class GenericFinder extends AbstractFinder {
/** Flag that determines whether the search is in the forward direction */
protected boolean forward;
@@ -1004,7 +1004,7 @@ public class FinderFactory {
}
/** Support for creating blocks finders. */
- public static abstract class AbstractBlocksFinder extends AbstractFinder
+ public abstract static class AbstractBlocksFinder extends AbstractFinder
implements BlocksFinder {
private static int[] EMPTY_INT_ARRAY = new int[0];
diff --git a/ide/editor.lib/src/org/netbeans/editor/GlyphGutter.java b/ide/editor.lib/src/org/netbeans/editor/GlyphGutter.java
index 0939d34..228e27a 100644
--- a/ide/editor.lib/src/org/netbeans/editor/GlyphGutter.java
+++ b/ide/editor.lib/src/org/netbeans/editor/GlyphGutter.java
@@ -117,20 +117,20 @@ public class GlyphGutter extends JComponent implements Annotations.AnnotationsLi
private int glyphGutterWidth;
/** Predefined width of the glyph icons */
- private final static int glyphWidth = 16;
+ private static final int glyphWidth = 16;
/** Predefined width of the cycling button */
- private final static int glyphButtonWidth = 9;
+ private static final int glyphButtonWidth = 9;
/** Predefined left area width - area between left border of the number
* and the left border of the glyphgutter
*/
- private final static int leftGap= 10;
+ private static final int leftGap= 10;
/** Predefined right area width - area between right border of the number
* and the right border of the glyphgutter
*/
- private final static int rightGap= 4;
+ private static final int rightGap= 4;
/** Whether the line numbers are shown or not */
private boolean showLineNumbers = true;
diff --git a/ide/editor.lib/src/org/netbeans/editor/KeySequenceInputPanel.java b/ide/editor.lib/src/org/netbeans/editor/KeySequenceInputPanel.java
index 61a45e5..1836cfa 100644
--- a/ide/editor.lib/src/org/netbeans/editor/KeySequenceInputPanel.java
+++ b/ide/editor.lib/src/org/netbeans/editor/KeySequenceInputPanel.java
@@ -41,7 +41,7 @@ import org.openide.util.NbBundle;
public class KeySequenceInputPanel extends javax.swing.JPanel {
- public final static String PROP_KEYSEQUENCE = "keySequence"; // NOI18N
+ public static final String PROP_KEYSEQUENCE = "keySequence"; // NOI18N
private Vector strokes = new Vector();
private StringBuffer text = new StringBuffer();
private final ResourceBundle bundle = NbBundle.getBundle(BaseKit.class);
diff --git a/ide/editor.lib/src/org/netbeans/editor/TokenItem.java b/ide/editor.lib/src/org/netbeans/editor/TokenItem.java
index 5325933..eca56e3 100644
--- a/ide/editor.lib/src/org/netbeans/editor/TokenItem.java
+++ b/ide/editor.lib/src/org/netbeans/editor/TokenItem.java
@@ -57,7 +57,7 @@ public interface TokenItem {
public TokenItem getPrevious();
/** Abstract implementation that doesn't contain chaining methods. */
- public static abstract class AbstractItem implements TokenItem {
+ public abstract static class AbstractItem implements TokenItem {
private TokenID tokenID;
diff --git a/ide/editor.lib/src/org/netbeans/editor/ext/ExtFinderFactory.java b/ide/editor.lib/src/org/netbeans/editor/ext/ExtFinderFactory.java
index f4342a5..8665183 100644
--- a/ide/editor.lib/src/org/netbeans/editor/ext/ExtFinderFactory.java
+++ b/ide/editor.lib/src/org/netbeans/editor/ext/ExtFinderFactory.java
@@ -38,7 +38,7 @@ public class ExtFinderFactory {
* the <tt>lineFound()</tt> method that can do a local find.
* !!! Udelat to poradne i s vice bufferama
*/
- public static abstract class LineFwdFinder extends FinderFactory.AbstractFinder {
+ public abstract static class LineFwdFinder extends FinderFactory.AbstractFinder {
private int origStartPos;
@@ -111,7 +111,7 @@ public class ExtFinderFactory {
* the <tt>lineFound()</tt> method that can do a local find.
* !!! Udelat to poradne i s vice bufferama
*/
- public static abstract class LineBwdFinder extends FinderFactory.AbstractFinder {
+ public abstract static class LineBwdFinder extends FinderFactory.AbstractFinder {
private int origStartPos;
@@ -191,7 +191,7 @@ public class ExtFinderFactory {
* the <tt>lineFound()</tt> method that can do a local find.
* !!! Udelat to poradne i s vice bufferama
*/
- public static abstract class LineBlocksFinder extends FinderFactory.AbstractBlocksFinder {
+ public abstract static class LineBlocksFinder extends FinderFactory.AbstractBlocksFinder {
private int origStartPos;
diff --git a/ide/editor.lib/src/org/netbeans/editor/ext/FileStorage.java b/ide/editor.lib/src/org/netbeans/editor/ext/FileStorage.java
index e66762d..d783010 100644
--- a/ide/editor.lib/src/org/netbeans/editor/ext/FileStorage.java
+++ b/ide/editor.lib/src/org/netbeans/editor/ext/FileStorage.java
@@ -417,7 +417,7 @@ public class FileStorage {
}
/** Locks the file and disable other threads to write */
- public synchronized final void lockFile() {
+ public final synchronized void lockFile() {
if ((currentLock == null) || (Thread.currentThread() != currentLock)) {
try{
if (currentLock == null){
@@ -437,7 +437,7 @@ public class FileStorage {
}
/** Unlocks the file and notifies wqiting threads */
- public synchronized final void unlockFile() {
+ public final synchronized void unlockFile() {
if (Thread.currentThread() != currentLock) {
throw new RuntimeException(WRITE_LOCK_MISSING);
}
diff --git a/ide/editor.lib/src/org/netbeans/modules/editor/lib/BeforeSaveTasks.java b/ide/editor.lib/src/org/netbeans/modules/editor/lib/BeforeSaveTasks.java
index 5e79e25..1c4f38c 100644
--- a/ide/editor.lib/src/org/netbeans/modules/editor/lib/BeforeSaveTasks.java
+++ b/ide/editor.lib/src/org/netbeans/modules/editor/lib/BeforeSaveTasks.java
@@ -55,7 +55,7 @@ public final class BeforeSaveTasks {
return beforeSaveTasks;
}
- private final static ThreadLocal<Boolean> ignoreOnSaveTasks = new ThreadLocal<Boolean>() {
+ private static final ThreadLocal<Boolean> ignoreOnSaveTasks = new ThreadLocal<Boolean>() {
@Override protected Boolean initialValue() {
return false;
}
diff --git a/ide/editor.lib/src/org/netbeans/modules/editor/lib/drawing/DrawGraphics.java b/ide/editor.lib/src/org/netbeans/modules/editor/lib/drawing/DrawGraphics.java
index ffc4621..c32dd80 100644
--- a/ide/editor.lib/src/org/netbeans/modules/editor/lib/drawing/DrawGraphics.java
+++ b/ide/editor.lib/src/org/netbeans/modules/editor/lib/drawing/DrawGraphics.java
@@ -175,7 +175,7 @@ public interface DrawGraphics {
/** Abstract draw-graphics that maintains a fg and bg color, font,
* current x and y coordinates.
*/
- public static abstract class AbstractDG implements DrawGraphics {
+ public abstract static class AbstractDG implements DrawGraphics {
/** Current foreground color */
Color foreColor;
diff --git a/ide/editor.lib/src/org/netbeans/modules/editor/lib/drawing/DrawLayer.java b/ide/editor.lib/src/org/netbeans/modules/editor/lib/drawing/DrawLayer.java
index f33cd63..9a3e3d7 100644
--- a/ide/editor.lib/src/org/netbeans/modules/editor/lib/drawing/DrawLayer.java
+++ b/ide/editor.lib/src/org/netbeans/modules/editor/lib/drawing/DrawLayer.java
@@ -134,7 +134,7 @@ package org.netbeans.modules.editor.lib.drawing;
* @deprecated Please use Highlighting SPI instead, for details see
* <a href="@org-netbeans-modules-editor-lib2@/overview-summary.html">Editor Library 2</a>.
*/
- public static abstract class AbstractLayer implements DrawLayer {
+ public abstract static class AbstractLayer implements DrawLayer {
/** Name of this layer. The name of the layer must be unique among
* layers installed into EditorUI
diff --git a/ide/editor.lib/test/unit/src/org/netbeans/editor/UndoableEditWrapperTest.java b/ide/editor.lib/test/unit/src/org/netbeans/editor/UndoableEditWrapperTest.java
index 7855b1d..4ae6d8a 100644
--- a/ide/editor.lib/test/unit/src/org/netbeans/editor/UndoableEditWrapperTest.java
+++ b/ide/editor.lib/test/unit/src/org/netbeans/editor/UndoableEditWrapperTest.java
@@ -93,7 +93,7 @@ public class UndoableEditWrapperTest extends NbTestCase {
static final String mimeType = "text/plain";
/** the support to work with */
- transient final CES support;
+ final transient CES support;
private transient String content = ""; // initial document content
private transient boolean modified = false;
diff --git a/ide/editor.lib2/src/org/netbeans/api/editor/EditorRegistry.java b/ide/editor.lib2/src/org/netbeans/api/editor/EditorRegistry.java
index 8ca9bea..227b0f7 100644
--- a/ide/editor.lib2/src/org/netbeans/api/editor/EditorRegistry.java
+++ b/ide/editor.lib2/src/org/netbeans/api/editor/EditorRegistry.java
@@ -344,7 +344,7 @@ public final class EditorRegistry {
fireEvents(events);
}
- private synchronized static void _focusGained(JTextComponent c, Component origFocused, List<PropertyChangeEvent> events) {
+ private static synchronized void _focusGained(JTextComponent c, Component origFocused, List<PropertyChangeEvent> events) {
Item item = item(c);
assert (item != null) : "Not registered!"; // NOI18N
diff --git a/ide/editor.lib2/test/unit/src/org/netbeans/modules/editor/lib2/highlighting/HighlightsMergeTesting.java b/ide/editor.lib2/test/unit/src/org/netbeans/modules/editor/lib2/highlighting/HighlightsMergeTesting.java
index b4ed27f..f2212ee 100644
--- a/ide/editor.lib2/test/unit/src/org/netbeans/modules/editor/lib2/highlighting/HighlightsMergeTesting.java
+++ b/ide/editor.lib2/test/unit/src/org/netbeans/modules/editor/lib2/highlighting/HighlightsMergeTesting.java
@@ -231,7 +231,7 @@ public class HighlightsMergeTesting {
}
}
- final static class AddLayerOp extends RandomTestContainer.Op {
+ static final class AddLayerOp extends RandomTestContainer.Op {
public AddLayerOp(String name) {
super(name);
@@ -262,7 +262,7 @@ public class HighlightsMergeTesting {
}
- final static class RemoveLayerOp extends RandomTestContainer.Op {
+ static final class RemoveLayerOp extends RandomTestContainer.Op {
public RemoveLayerOp(String name) {
super(name);
@@ -281,7 +281,7 @@ public class HighlightsMergeTesting {
}
- final static class MergeCheck extends RandomTestContainer.Check {
+ static final class MergeCheck extends RandomTestContainer.Check {
@Override
protected void check(Context context) throws Exception {
diff --git a/ide/editor.lib2/test/unit/src/org/netbeans/modules/editor/lib2/view/RootViewRandomTesting.java b/ide/editor.lib2/test/unit/src/org/netbeans/modules/editor/lib2/view/RootViewRandomTesting.java
index f791b1a..7e8cb3b 100644
--- a/ide/editor.lib2/test/unit/src/org/netbeans/modules/editor/lib2/view/RootViewRandomTesting.java
+++ b/ide/editor.lib2/test/unit/src/org/netbeans/modules/editor/lib2/view/RootViewRandomTesting.java
@@ -110,7 +110,7 @@ public class RootViewRandomTesting {
}
}
- final static class PaneOp extends RandomTestContainer.Op {
+ static final class PaneOp extends RandomTestContainer.Op {
public PaneOp(String name) {
super(name);
diff --git a/ide/editor.macros/src/org/netbeans/modules/editor/macros/storage/MacrosStorage.java b/ide/editor.macros/src/org/netbeans/modules/editor/macros/storage/MacrosStorage.java
index 77a8b17..8f02936 100644
--- a/ide/editor.macros/src/org/netbeans/modules/editor/macros/storage/MacrosStorage.java
+++ b/ide/editor.macros/src/org/netbeans/modules/editor/macros/storage/MacrosStorage.java
@@ -118,7 +118,7 @@ public final class MacrosStorage implements StorageDescription<String, MacroDesc
private static final String MIME_TYPE = "text/x-nbeditor-macrosettings"; //NOI18N
- private static abstract class MacrosReader extends StorageReader<String, MacroDescription> {
+ private abstract static class MacrosReader extends StorageReader<String, MacroDescription> {
protected MacrosReader(FileObject f, String mimePath) {
super(f, mimePath);
}
diff --git a/ide/editor.search/src/org/netbeans/modules/editor/search/DocumentFinder.java b/ide/editor.search/src/org/netbeans/modules/editor/search/DocumentFinder.java
index 6cb7694..ce64add 100755
--- a/ide/editor.search/src/org/netbeans/modules/editor/search/DocumentFinder.java
+++ b/ide/editor.search/src/org/netbeans/modules/editor/search/DocumentFinder.java
@@ -439,7 +439,7 @@ public class DocumentFinder
private FalseFinder() {}
}
- private static abstract class AbstractBlocksFinder extends AbstractFinder
+ private abstract static class AbstractBlocksFinder extends AbstractFinder
implements BlocksFinder {
private static final int[] EMPTY_INT_ARRAY = new int[0];
@@ -527,7 +527,7 @@ public class DocumentFinder
/** Abstract finder implementation. The only <CODE>find()</CODE>
* method must be redefined.
*/
- private static abstract class AbstractFinder implements DocFinder {
+ private abstract static class AbstractFinder implements DocFinder {
/** Was the string found? */
protected boolean found;
@@ -830,7 +830,7 @@ public class DocumentFinder
/** Generic forward finder that simplifies the search process. */
- private static abstract class GenericFwdFinder extends AbstractFinder {
+ private abstract static class GenericFwdFinder extends AbstractFinder {
@Override
public final int find(int initOffset, CharSequence chars) {
@@ -864,7 +864,7 @@ public class DocumentFinder
}
/** Generic backward finder that simplifies the search process. */
- private static abstract class GenericBwdFinder extends AbstractFinder {
+ private abstract static class GenericBwdFinder extends AbstractFinder {
@Override
public final int find(int initOffset, CharSequence chars) {
diff --git a/ide/editor.search/src/org/netbeans/modules/editor/search/EditorFindSupport.java b/ide/editor.search/src/org/netbeans/modules/editor/search/EditorFindSupport.java
index 901ded7..3dcecb7 100644
--- a/ide/editor.search/src/org/netbeans/modules/editor/search/EditorFindSupport.java
+++ b/ide/editor.search/src/org/netbeans/modules/editor/search/EditorFindSupport.java
@@ -159,7 +159,7 @@ public final class EditorFindSupport {
}
/** Get shared instance of find support */
- public synchronized static EditorFindSupport getInstance() {
+ public static synchronized EditorFindSupport getInstance() {
if (findSupport == null) {
findSupport = new EditorFindSupport();
}
@@ -1097,7 +1097,7 @@ public final class EditorFindSupport {
return newCacheKey.toString();
}
- public final static class SPW{
+ public static final class SPW{
private final String searchExpression;
private final boolean wholeWords;
private final boolean matchCase;
@@ -1166,7 +1166,7 @@ public final class EditorFindSupport {
}
} // End of SPW class
- public final static class RP {
+ public static final class RP {
private final String replaceExpression;
private final boolean preserveCase;
diff --git a/ide/editor.search/src/org/netbeans/modules/editor/search/SearchNbEditorKit.java b/ide/editor.search/src/org/netbeans/modules/editor/search/SearchNbEditorKit.java
index 03257f7..ba8b7dd 100644
--- a/ide/editor.search/src/org/netbeans/modules/editor/search/SearchNbEditorKit.java
+++ b/ide/editor.search/src/org/netbeans/modules/editor/search/SearchNbEditorKit.java
@@ -80,7 +80,7 @@ public final class SearchNbEditorKit extends NbEditorKit {
}
private static PropertyChangeListener searchAndReplaceBarPersistentListener = null;
- public synchronized static void makeSearchAndReplaceBarPersistent() {
+ public static synchronized void makeSearchAndReplaceBarPersistent() {
if (searchAndReplaceBarPersistentListener == null) {
searchAndReplaceBarPersistentListener = new PropertyChangeListener() {
@Override
diff --git a/ide/editor.search/src/org/netbeans/modules/editor/search/SearchPropertiesSupport.java b/ide/editor.search/src/org/netbeans/modules/editor/search/SearchPropertiesSupport.java
index 7cb69e8..2e29548 100644
--- a/ide/editor.search/src/org/netbeans/modules/editor/search/SearchPropertiesSupport.java
+++ b/ide/editor.search/src/org/netbeans/modules/editor/search/SearchPropertiesSupport.java
@@ -38,7 +38,7 @@ public final class SearchPropertiesSupport {
private SearchPropertiesSupport() {
}
- private synchronized static SearchPropertiesSupport getInstance() {
+ private static synchronized SearchPropertiesSupport getInstance() {
if (instance == null) {
instance = new SearchPropertiesSupport();
}
@@ -49,14 +49,14 @@ public final class SearchPropertiesSupport {
return prefs;
}
- public synchronized static SearchProperties getSearchProperties() {
+ public static synchronized SearchProperties getSearchProperties() {
if (searchProps == null) {
searchProps = createDefaultSearchProperties();
}
return searchProps;
}
- public synchronized static SearchProperties getReplaceProperties() {
+ public static synchronized SearchProperties getReplaceProperties() {
if (replaceProps == null) {
replaceProps = createDefaultReplaceProperties();
}
diff --git a/ide/editor.search/src/org/netbeans/modules/editor/search/TextSearchHighlighting.java b/ide/editor.search/src/org/netbeans/modules/editor/search/TextSearchHighlighting.java
index a1dd295..5304e4c 100644
--- a/ide/editor.search/src/org/netbeans/modules/editor/search/TextSearchHighlighting.java
+++ b/ide/editor.search/src/org/netbeans/modules/editor/search/TextSearchHighlighting.java
@@ -193,7 +193,7 @@ public class TextSearchHighlighting extends AbstractHighlightsContainer implemen
@MimeRegistration(mimeType = "", service = HighlightsLayerFactory.class)
public static final class FactoryImpl implements HighlightsLayerFactory {
- public final static class SearchBlockHighlighting extends BlockHighlighting {
+ public static final class SearchBlockHighlighting extends BlockHighlighting {
public SearchBlockHighlighting(String layerId, JTextComponent component) {
super(layerId,component);
EditorFindSupport.getInstance().hookLayer(this, component);
diff --git a/ide/editor.search/test/unit/src/org/netbeans/modules/editor/search/DocumentFinderTest.java b/ide/editor.search/test/unit/src/org/netbeans/modules/editor/search/DocumentFinderTest.java
index cf5b19c..5c5dac2 100755
--- a/ide/editor.search/test/unit/src/org/netbeans/modules/editor/search/DocumentFinderTest.java
+++ b/ide/editor.search/test/unit/src/org/netbeans/modules/editor/search/DocumentFinderTest.java
@@ -32,7 +32,7 @@ import org.netbeans.modules.editor.search.DocumentFinder.FindReplaceResult;
*/
public class DocumentFinderTest {
- private final static int[] NOT_FOUND_RESULT = new int[]{-1, 0};
+ private static final int[] NOT_FOUND_RESULT = new int[]{-1, 0};
public DocumentFinderTest() {
}
diff --git a/ide/editor.settings.lib/src/org/netbeans/modules/editor/settings/storage/preferences/PreferencesStorage.java b/ide/editor.settings.lib/src/org/netbeans/modules/editor/settings/storage/preferences/PreferencesStorage.java
index d725841..db9ab3f 100644
--- a/ide/editor.settings.lib/src/org/netbeans/modules/editor/settings/storage/preferences/PreferencesStorage.java
+++ b/ide/editor.settings.lib/src/org/netbeans/modules/editor/settings/storage/preferences/PreferencesStorage.java
@@ -109,7 +109,7 @@ public final class PreferencesStorage implements StorageDescription<String, Type
private static final String MIME_TYPE = "text/x-nbeditor-preferences"; //NOI18N
- private static abstract class PreferencesReader extends StorageReader<String, TypedValue> {
+ private abstract static class PreferencesReader extends StorageReader<String, TypedValue> {
protected PreferencesReader(FileObject f, String mimePath) {
super(f, mimePath);
}
diff --git a/ide/editor.structure/src/org/netbeans/modules/editor/structure/api/DocumentModel.java b/ide/editor.structure/src/org/netbeans/modules/editor/structure/api/DocumentModel.java
index ec8d897..d5e2324 100644
--- a/ide/editor.structure/src/org/netbeans/modules/editor/structure/api/DocumentModel.java
+++ b/ide/editor.structure/src/org/netbeans/modules/editor/structure/api/DocumentModel.java
@@ -727,7 +727,7 @@ public final class DocumentModel {
// ------ model synchronization -------
//-------------------------------------
- public synchronized final void readLock() {
+ public final synchronized void readLock() {
try {
while (currWriter != null) {
if (currWriter == Thread.currentThread()) {
@@ -743,7 +743,7 @@ public final class DocumentModel {
}
}
- public synchronized final void readUnlock() {
+ public final synchronized void readUnlock() {
if (currWriter == Thread.currentThread()) {
// writer has full read access.
return;
@@ -754,7 +754,7 @@ public final class DocumentModel {
notify();
}
- private synchronized final void writeLock() {
+ private final synchronized void writeLock() {
try {
while ((numReaders > 0) || (currWriter != null)) {
if (Thread.currentThread() == currWriter) {
@@ -774,7 +774,7 @@ public final class DocumentModel {
}
}
- private synchronized final void writeUnlock() {
+ private final synchronized void writeUnlock() {
if (--numWriters <= 0) {
numWriters = 0;
currWriter = null;
diff --git a/ide/editor.util/src/org/netbeans/lib/editor/util/AbstractCharSequence.java b/ide/editor.util/src/org/netbeans/lib/editor/util/AbstractCharSequence.java
index 7071722..5c0277c 100644
--- a/ide/editor.util/src/org/netbeans/lib/editor/util/AbstractCharSequence.java
+++ b/ide/editor.util/src/org/netbeans/lib/editor/util/AbstractCharSequence.java
@@ -90,7 +90,7 @@ public abstract class AbstractCharSequence implements CharSequence {
* i.e. charsequence.equals(string) works
* but string.equals(charsequence) does not.
*/
- public static abstract class StringLike extends AbstractCharSequence {
+ public abstract static class StringLike extends AbstractCharSequence {
public int hashCode() {
return CharSequenceUtilities.stringLikeHashCode(this);
diff --git a/ide/editor.util/src/org/netbeans/lib/editor/util/CompactMap.java b/ide/editor.util/src/org/netbeans/lib/editor/util/CompactMap.java
index 4a6f17d..e567269 100644
--- a/ide/editor.util/src/org/netbeans/lib/editor/util/CompactMap.java
+++ b/ide/editor.util/src/org/netbeans/lib/editor/util/CompactMap.java
@@ -350,7 +350,7 @@ public class CompactMap<K,V> implements Map<K,V> {
* This is suitable for the cases when e.g. the value is a primitive
* data type.
*/
- public static abstract class MapEntry<K,V> implements Map.Entry<K,V> {
+ public abstract static class MapEntry<K,V> implements Map.Entry<K,V> {
private MapEntry<K,V> nextMapEntry; // 12 bytes (8-Object + 4)
diff --git a/ide/editor.util/test/unit/src/org/netbeans/lib/editor/util/random/DocumentTesting.java b/ide/editor.util/test/unit/src/org/netbeans/lib/editor/util/random/DocumentTesting.java
index 91c9080..50adc2e 100644
--- a/ide/editor.util/test/unit/src/org/netbeans/lib/editor/util/random/DocumentTesting.java
+++ b/ide/editor.util/test/unit/src/org/netbeans/lib/editor/util/random/DocumentTesting.java
@@ -324,7 +324,7 @@ public class DocumentTesting {
}
}
- final static class InsertOp extends RandomTestContainer.Op {
+ static final class InsertOp extends RandomTestContainer.Op {
public InsertOp(String name) {
super(name);
@@ -355,7 +355,7 @@ public class DocumentTesting {
}
- final static class RemoveOp extends RandomTestContainer.Op {
+ static final class RemoveOp extends RandomTestContainer.Op {
public RemoveOp(String name) {
super(name);
@@ -387,7 +387,7 @@ public class DocumentTesting {
}
- final static class UndoRedo extends RandomTestContainer.Op {
+ static final class UndoRedo extends RandomTestContainer.Op {
UndoRedo(String name) {
super(name);
diff --git a/ide/editor.util/test/unit/src/org/netbeans/lib/editor/util/random/RandomTestContainer.java b/ide/editor.util/test/unit/src/org/netbeans/lib/editor/util/random/RandomTestContainer.java
index bc389a9..1db2a0e 100644
--- a/ide/editor.util/test/unit/src/org/netbeans/lib/editor/util/random/RandomTestContainer.java
+++ b/ide/editor.util/test/unit/src/org/netbeans/lib/editor/util/random/RandomTestContainer.java
@@ -303,7 +303,7 @@ public final class RandomTestContainer extends PropertyProvider {
* Random operation that can be registered for random testing container
* and that can be triggered with certain probability.
*/
- public static abstract class Op {
+ public abstract static class Op {
private final String name;
@@ -325,7 +325,7 @@ public final class RandomTestContainer extends PropertyProvider {
/**
* Check correctness of things after each operation.
*/
- public static abstract class Check {
+ public abstract static class Check {
protected abstract void check(Context context) throws Exception;
diff --git a/ide/editor/src/org/netbeans/modules/editor/impl/CustomizableSideBar.java b/ide/editor/src/org/netbeans/modules/editor/impl/CustomizableSideBar.java
index 3361bf5..dbc7994 100644
--- a/ide/editor/src/org/netbeans/modules/editor/impl/CustomizableSideBar.java
+++ b/ide/editor/src/org/netbeans/modules/editor/impl/CustomizableSideBar.java
@@ -218,7 +218,7 @@ public final class CustomizableSideBar {
* the line with the editor component's background, so the divisor and editor's
* graphics (i.e. brace ruler) are separated.
*/
- private final static class WestSidebarHolder extends JPanel implements LookupListener, PropertyChangeListener, Runnable {
+ private static final class WestSidebarHolder extends JPanel implements LookupListener, PropertyChangeListener, Runnable {
/**
* The text editor, whose background will be used as a padding
*/
diff --git a/ide/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/ClipboardHistory.java b/ide/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/ClipboardHistory.java
index b4f9168..191abdf 100644
--- a/ide/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/ClipboardHistory.java
+++ b/ide/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/ClipboardHistory.java
@@ -56,7 +56,7 @@ public final class ClipboardHistory implements ClipboardListener {
}
}
- public synchronized static ClipboardHistory getInstance() {
+ public static synchronized ClipboardHistory getInstance() {
if (instance == null) {
instance = new ClipboardHistory();
}
diff --git a/ide/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/CompletionLayoutPopup.java b/ide/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/CompletionLayoutPopup.java
index b835a95..2ed1050 100644
--- a/ide/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/CompletionLayoutPopup.java
+++ b/ide/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/CompletionLayoutPopup.java
@@ -630,7 +630,7 @@ public class CompletionLayoutPopup {
private static FullTextPopup instance;
- public synchronized static FullTextPopup getInstance() {
+ public static synchronized FullTextPopup getInstance() {
if (instance == null) {
instance = new FullTextPopup();
}
@@ -679,7 +679,7 @@ public class CompletionLayoutPopup {
}
}
- public synchronized static CompletionPopup getInstance() {
+ public static synchronized CompletionPopup getInstance() {
if (instance == null) {
instance = new CompletionPopup();
}
diff --git a/ide/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/ListCompletionView.java b/ide/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/ListCompletionView.java
index 7a07518..4f0ca2e 100644
--- a/ide/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/ListCompletionView.java
+++ b/ide/editor/src/org/netbeans/modules/editor/impl/actions/clipboardhistory/ListCompletionView.java
@@ -46,7 +46,7 @@ public class ListCompletionView extends JList {
public static final int COMPLETION_ITEM_HEIGHT = 16;
private static final int DARKER_COLOR_COMPONENT = 5;
- private final static Icon icon = ImageUtilities.loadImageIcon("org/netbeans/modules/editor/hints/resources/suggestion.gif", false); // NOI18N
+ private static final Icon icon = ImageUtilities.loadImageIcon("org/netbeans/modules/editor/hints/resources/suggestion.gif", false); // NOI18N
private final int fixedItemHeight;
private Font font;
private final RenderComponent renderComponent;
diff --git a/ide/editor/test/unit/src/org/netbeans/modules/editor/BaseDocumentUnitTestCase.java b/ide/editor/test/unit/src/org/netbeans/modules/editor/BaseDocumentUnitTestCase.java
index fc73d28..63be7e5 100644
--- a/ide/editor/test/unit/src/org/netbeans/modules/editor/BaseDocumentUnitTestCase.java
+++ b/ide/editor/test/unit/src/org/netbeans/modules/editor/BaseDocumentUnitTestCase.java
@@ -106,7 +106,7 @@ public class BaseDocumentUnitTestCase extends NbTestCase {
*
* @return caret instance.
*/
- protected synchronized final Caret getCaret () {
+ protected final synchronized Caret getCaret () {
if (caret == null) {
caret = new CaretImpl(getDocument(), loadCaretOffset);
}
diff --git a/ide/extbrowser/src/org/netbeans/modules/extbrowser/NbDdeBrowserImpl.java b/ide/extbrowser/src/org/netbeans/modules/extbrowser/NbDdeBrowserImpl.java
index 3eff89e..6851618 100644
--- a/ide/extbrowser/src/org/netbeans/modules/extbrowser/NbDdeBrowserImpl.java
+++ b/ide/extbrowser/src/org/netbeans/modules/extbrowser/NbDdeBrowserImpl.java
@@ -116,15 +116,15 @@ public class NbDdeBrowserImpl extends ExtBrowserImpl {
logFine("NbDdeBrowserImpl created with factory:", extBrowserFactory); // NOI18N
}
- native private byte [] reqDdeMessage (String srv, String topic, String item, int timeout) throws NbBrowserException;
+ private native byte [] reqDdeMessage (String srv, String topic, String item, int timeout) throws NbBrowserException;
/** finds registry entry for browser opening */
- public native static String getBrowserPath (String browser) throws NbBrowserException;
+ public static native String getBrowserPath (String browser) throws NbBrowserException;
/** returns the command that executes default application for opening of
* .html files
*/
- public native static String getDefaultOpenCommand() throws NbBrowserException;
+ public static native String getDefaultOpenCommand() throws NbBrowserException;
/** Sets current URL.
*
diff --git a/ide/extexecution.base/src/org/netbeans/api/extexecution/base/ExplicitProcessParameters.java b/ide/extexecution.base/src/org/netbeans/api/extexecution/base/ExplicitProcessParameters.java
index a25e199..87a958a 100644
--- a/ide/extexecution.base/src/org/netbeans/api/extexecution/base/ExplicitProcessParameters.java
+++ b/ide/extexecution.base/src/org/netbeans/api/extexecution/base/ExplicitProcessParameters.java
@@ -276,7 +276,7 @@ public final class ExplicitProcessParameters {
* </ul>
* and the mode can be overridden for each group.
*/
- public final static class Builder {
+ public static final class Builder {
private int position = 0;
private List<String> launcherArguments = null;
private List<String> arguments = null;
diff --git a/ide/extexecution/src/org/netbeans/modules/extexecution/RerunAction.java b/ide/extexecution/src/org/netbeans/modules/extexecution/RerunAction.java
index fcb01a4..8395496 100644
--- a/ide/extexecution/src/org/netbeans/modules/extexecution/RerunAction.java
+++ b/ide/extexecution/src/org/netbeans/modules/extexecution/RerunAction.java
@@ -131,7 +131,7 @@ public final class RerunAction extends AbstractAction implements ChangeListener
}
}
- public static abstract class Accessor {
+ public abstract static class Accessor {
private static volatile Accessor accessor;
diff --git a/ide/git/src/org/netbeans/modules/git/GitFileNode.java b/ide/git/src/org/netbeans/modules/git/GitFileNode.java
index 9597049..683e1a9 100644
--- a/ide/git/src/org/netbeans/modules/git/GitFileNode.java
+++ b/ide/git/src/org/netbeans/modules/git/GitFileNode.java
@@ -37,7 +37,7 @@ import org.openide.util.NbBundle;
*/
public abstract class GitFileNode<T extends FileNodeInformation> extends VCSFileNode {
- public static abstract class FileNodeInformation extends VCSFileInformation {
+ public abstract static class FileNodeInformation extends VCSFileInformation {
public abstract boolean isCopied ();
diff --git a/ide/git/src/org/netbeans/modules/git/HistoryRegistry.java b/ide/git/src/org/netbeans/modules/git/HistoryRegistry.java
index fe9f51f..137e5c5 100644
--- a/ide/git/src/org/netbeans/modules/git/HistoryRegistry.java
+++ b/ide/git/src/org/netbeans/modules/git/HistoryRegistry.java
@@ -47,7 +47,7 @@ public class HistoryRegistry {
private HistoryRegistry() {}
- public synchronized static HistoryRegistry getInstance() {
+ public static synchronized HistoryRegistry getInstance() {
if(instance == null) {
instance = new HistoryRegistry();
}
diff --git a/ide/git/src/org/netbeans/modules/git/ui/history/RepositoryRevision.java b/ide/git/src/org/netbeans/modules/git/ui/history/RepositoryRevision.java
index 513a770..57a2c2b 100644
--- a/ide/git/src/org/netbeans/modules/git/ui/history/RepositoryRevision.java
+++ b/ide/git/src/org/netbeans/modules/git/ui/history/RepositoryRevision.java
@@ -430,7 +430,7 @@ public class RepositoryRevision {
}
}
- private static abstract class HistoryEventAction extends AbstractAction implements ContextAwareAction {
+ private abstract static class HistoryEventAction extends AbstractAction implements ContextAwareAction {
public HistoryEventAction (String name) {
super(name);
diff --git a/ide/git/src/org/netbeans/modules/git/ui/shelve/ShelveChangesAction.java b/ide/git/src/org/netbeans/modules/git/ui/shelve/ShelveChangesAction.java
index 1ac5d7c..e59bc03 100644
--- a/ide/git/src/org/netbeans/modules/git/ui/shelve/ShelveChangesAction.java
+++ b/ide/git/src/org/netbeans/modules/git/ui/shelve/ShelveChangesAction.java
@@ -303,7 +303,7 @@ public class ShelveChangesAction extends SingleRepositoryAction {
private static UnshelveMenu instance;
- synchronized static UnshelveMenu getInstance () {
+ static synchronized UnshelveMenu getInstance () {
if (instance == null) {
instance = new UnshelveMenu();
}
diff --git a/ide/git/test/qa-functional/src/org/netbeans/test/git/utils/TestKit.java b/ide/git/test/qa-functional/src/org/netbeans/test/git/utils/TestKit.java
index e37e59b..ba1e326 100644
--- a/ide/git/test/qa-functional/src/org/netbeans/test/git/utils/TestKit.java
+++ b/ide/git/test/qa-functional/src/org/netbeans/test/git/utils/TestKit.java
@@ -56,23 +56,23 @@ import org.netbeans.test.git.operators.CommitOperator;
*/
public final class TestKit {
- public final static String MODIFIED_COLOR = "#0000FF";
- public final static String NEW_COLOR = "#008000";
- public final static String CONFLICT_COLOR = "#FF0000";
- public final static String IGNORED_COLOR = "#999999";
- public final static String MODIFIED_STATUS = "[-/M]";
- public final static String NEW_STATUS = "[-/A]";
- public final static String CONFLICT_STATUS = "[Conflict ]";
- public final static String IGNORED_STATUS = "[I]";
- public final static String UPTODATE_STATUS = "";
- private final static String TMP_PATH = "/tmp";
- private final static String WORK_PATH = "work";
+ public static final String MODIFIED_COLOR = "#0000FF";
+ public static final String NEW_COLOR = "#008000";
+ public static final String CONFLICT_COLOR = "#FF0000";
+ public static final String IGNORED_COLOR = "#999999";
+ public static final String MODIFIED_STATUS = "[-/M]";
+ public static final String NEW_STATUS = "[-/A]";
+ public static final String CONFLICT_STATUS = "[Conflict ]";
+ public static final String IGNORED_STATUS = "[I]";
+ public static final String UPTODATE_STATUS = "";
+ private static final String TMP_PATH = "/tmp";
+ private static final String WORK_PATH = "work";
public static final String PROJECT_NAME = "JavaApp";
public static final String PROJECT_TYPE = "Java Application";
public static final String PROJECT_CATEGORY = "Java with Ant";
public static final String CLONE_SUF_0 = "_clone0";
public static final String CLONE_SUF_1 = "_clone1";
- public final static String LOGGER_NAME = "org.netbeans.modules.git.t9y";
+ public static final String LOGGER_NAME = "org.netbeans.modules.git.t9y";
public static int TIME_OUT = 15;
public static File prepareProject(String prj_category, String prj_type, String prj_name) throws Exception {
diff --git a/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/CoverageManagerImpl.java b/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/CoverageManagerImpl.java
index 8fa6c7e..48a5480 100644
--- a/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/CoverageManagerImpl.java
+++ b/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/CoverageManagerImpl.java
@@ -54,7 +54,7 @@ public class CoverageManagerImpl implements CoverageManager {
public static final String COVERAGE_INSTANCE_FILE = "coverage.instance"; // NOI18N
private static final String MIME_TYPE = "mimeType"; // NOI18N
private static final String COVERAGE_DOC_PROPERTY = "coverage"; // NOI18N
- private final static String PREF_EDITOR_BAR = "editorBar"; // NOI18N
+ private static final String PREF_EDITOR_BAR = "editorBar"; // NOI18N
private final Set<String> enabledMimeTypes = new HashSet<>();
private final Map<Project, CoverageReportTopComponent> showingReports = new HashMap<>();
private Boolean showEditorBar;
diff --git a/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/api/CoverageManager.java b/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/api/CoverageManager.java
index a78d7a1..c1cbd32 100644
--- a/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/api/CoverageManager.java
+++ b/ide/gsf.codecoverage/src/org/netbeans/modules/gsf/codecoverage/api/CoverageManager.java
@@ -27,7 +27,7 @@ import org.netbeans.modules.gsf.codecoverage.CoverageManagerImpl;
* @author Tor Norbye
*/
public interface CoverageManager {
- public final static CoverageManager INSTANCE = new CoverageManagerImpl();
+ public static final CoverageManager INSTANCE = new CoverageManagerImpl();
public boolean isEnabled(Project project);
public boolean isAggregating(Project project);
diff --git a/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodNode.java b/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodNode.java
index 67eee3b..5faeab4 100644
--- a/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodNode.java
+++ b/ide/gsf.testrunner.ui/src/org/netbeans/modules/gsf/testrunner/ui/api/TestMethodNode.java
@@ -250,7 +250,7 @@ public class TestMethodNode extends AbstractNode {
private static final class DisplayNameMapper {
- private final static Logger LOG = Logger.getLogger(TestMethodNode.class.getName());
+ private static final Logger LOG = Logger.getLogger(TestMethodNode.class.getName());
@NbBundle.Messages({
"MSG_TestMethodPassed_HTML_cause=passed",
diff --git a/ide/html.editor.lib/src/org/netbeans/modules/html/editor/lib/XmlSTElements.java b/ide/html.editor.lib/src/org/netbeans/modules/html/editor/lib/XmlSTElements.java
index 6db7ebd..db8d587 100644
--- a/ide/html.editor.lib/src/org/netbeans/modules/html/editor/lib/XmlSTElements.java
+++ b/ide/html.editor.lib/src/org/netbeans/modules/html/editor/lib/XmlSTElements.java
@@ -32,7 +32,7 @@ import org.openide.util.CharSequences;
*/
public class XmlSTElements {
- static abstract class ElementBase implements Element {
+ abstract static class ElementBase implements Element {
private CharSequence source;
private int from, to;
@@ -89,7 +89,7 @@ public class XmlSTElements {
}
}
- static abstract class NamedElement extends ElementBase implements Named {
+ abstract static class NamedElement extends ElementBase implements Named {
private CharSequence name; //we can possibly use the original source code + pointer
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/completion/HtmlCompletionProvider.java b/ide/html.editor/src/org/netbeans/modules/html/editor/completion/HtmlCompletionProvider.java
index 85fe4dc..48b7fce 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/completion/HtmlCompletionProvider.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/completion/HtmlCompletionProvider.java
@@ -249,7 +249,7 @@ public class HtmlCompletionProvider implements CompletionProvider {
}
}
- private static abstract class AbstractQuery extends AsyncCompletionQuery {
+ private abstract static class AbstractQuery extends AsyncCompletionQuery {
protected final boolean triggeredByAutocompletion;
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Attribute.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Attribute.java
index bc9dbdb..3bf0e37 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Attribute.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Attribute.java
@@ -51,7 +51,7 @@ public class Attribute extends PatternRule {
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public Pattern[] getPatterns() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/CharacterReference.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/CharacterReference.java
index 78f5274..fc23db6 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/CharacterReference.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/CharacterReference.java
@@ -40,7 +40,7 @@ public class CharacterReference extends PatternRule {
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public Pattern[] getPatterns() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Comments.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Comments.java
index 74c7df3..f744a93 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Comments.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Comments.java
@@ -36,7 +36,7 @@ public class Comments extends PatternRule {
".--!. found in comment."
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public Pattern[] getPatterns() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Doctype.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Doctype.java
index 7d4d5aa..b953dd9 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Doctype.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Doctype.java
@@ -61,7 +61,7 @@ public class Doctype extends PatternRule {
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public Pattern[] getPatterns() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Element.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Element.java
index 3281c92..ac051d1 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Element.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Element.java
@@ -68,7 +68,7 @@ public class Element extends PatternRule {
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
private static final int UNKNOWN_ATTRIBUTE_PATTERN_INDEX = 0;
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Encoding.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Encoding.java
index 342eb4f..f4b231a 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Encoding.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Encoding.java
@@ -50,7 +50,7 @@ public class Encoding extends PatternRule {
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public Pattern[] getPatterns() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/ForeignContent.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/ForeignContent.java
index f8cbbb1..ce7790e 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/ForeignContent.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/ForeignContent.java
@@ -38,7 +38,7 @@ public class ForeignContent extends PatternRule {
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public Pattern[] getPatterns() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Form.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Form.java
index 815f211..8d9cd80 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Form.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Form.java
@@ -31,7 +31,7 @@ public class Form extends PatternRule {
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public Pattern[] getPatterns() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/HeadContent.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/HeadContent.java
index b5ff83f..9a0c3df 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/HeadContent.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/HeadContent.java
@@ -41,7 +41,7 @@ public class HeadContent extends PatternRule {
"Required children missing from element \"head\"."
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public Pattern[] getPatterns() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/HtmlHintsProvider.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/HtmlHintsProvider.java
index b0b5d7d..67724e8 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/HtmlHintsProvider.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/HtmlHintsProvider.java
@@ -621,7 +621,7 @@ public class HtmlHintsProvider implements HintsProvider {
}
- private static abstract class AbstractErrorChecksForMimetypeFix implements HintFix {
+ private abstract static class AbstractErrorChecksForMimetypeFix implements HintFix {
protected Document doc;
protected String mimeType;
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Ids.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Ids.java
index 0f5da5a..688523d 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Ids.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Ids.java
@@ -35,7 +35,7 @@ public class Ids extends PatternRule {
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public Pattern[] getPatterns() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Internal.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Internal.java
index f14288d..ba01f85 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Internal.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Internal.java
@@ -41,7 +41,7 @@ public class Internal extends PatternRule {
"Too many messages.",
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public Pattern[] getPatterns() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Nesting.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Nesting.java
index b09df8e..6c75797 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Nesting.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Nesting.java
@@ -68,7 +68,7 @@ public class Nesting extends PatternRule {
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
private static final int UNKNOWN_ELEMENT_PATTERN_INDEX = 0;
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Normalization.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Normalization.java
index fb8069f..f6e092c 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Normalization.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Normalization.java
@@ -32,7 +32,7 @@ public class Normalization extends PatternRule {
"Source text is not in Unicode Normalization Form C"
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public Pattern[] getPatterns() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/NotValidButCommon.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/NotValidButCommon.java
index d533cbb..d1ad637 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/NotValidButCommon.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/NotValidButCommon.java
@@ -35,7 +35,7 @@ public class NotValidButCommon extends PatternRule {
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public int getPriority() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/NotValidatedContent.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/NotValidatedContent.java
index e88a369..3695d31 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/NotValidatedContent.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/NotValidatedContent.java
@@ -31,7 +31,7 @@ public class NotValidatedContent extends PatternRule {
"Content is being hidden from the validator based on namespace filtering."
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public Pattern[] getPatterns() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Obsolete.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Obsolete.java
index bc1d4a3..540441a 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Obsolete.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Obsolete.java
@@ -36,7 +36,7 @@ public class Obsolete extends PatternRule {
"The \"Content-Language\" state is obsolete.",
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public Pattern[] getPatterns() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/ProcessingInstruction.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/ProcessingInstruction.java
index 7be8928..624dfec 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/ProcessingInstruction.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/ProcessingInstruction.java
@@ -34,7 +34,7 @@ public class ProcessingInstruction extends PatternRule {
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public Pattern[] getPatterns() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/StrayContent.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/StrayContent.java
index 0542343..3e24977 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/StrayContent.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/StrayContent.java
@@ -33,7 +33,7 @@ public class StrayContent extends PatternRule {
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public Pattern[] getPatterns() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Table.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Table.java
index 67c27b1..d556d8c 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Table.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/Table.java
@@ -44,7 +44,7 @@ public class Table extends PatternRule {
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public Pattern[] getPatterns() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/TagsMatching.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/TagsMatching.java
index ee1d4fa..6ddebe4 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/TagsMatching.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/TagsMatching.java
@@ -40,7 +40,7 @@ public class TagsMatching extends PatternRule {
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public Pattern[] getPatterns() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/UnexpectedChars.java b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/UnexpectedChars.java
index 460b69b..0e42197 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/hints/UnexpectedChars.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/hints/UnexpectedChars.java
@@ -34,7 +34,7 @@ public class UnexpectedChars extends PatternRule {
}; //NOI18N
- private final static Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
+ private static final Pattern[] PATTERNS = buildPatterns(PATTERNS_SOURCES);
@Override
public Pattern[] getPatterns() {
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/indexing/HtmlIndexer.java b/ide/html.editor/src/org/netbeans/modules/html/editor/indexing/HtmlIndexer.java
index 84c1421..bf79db4 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/indexing/HtmlIndexer.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/indexing/HtmlIndexer.java
@@ -87,7 +87,7 @@ public class HtmlIndexer extends EmbeddingIndexer {
});
}
- static private void fireChangeImpl(FileObject fo) {
+ private static void fireChangeImpl(FileObject fo) {
Project p = FileOwnerQuery.getOwner(fo);
if (p == null) {
// no project to notify
diff --git a/ide/html.editor/src/org/netbeans/modules/html/editor/javadoc/HelpManager.java b/ide/html.editor/src/org/netbeans/modules/html/editor/javadoc/HelpManager.java
index 3220200..7e31083 100644
--- a/ide/html.editor/src/org/netbeans/modules/html/editor/javadoc/HelpManager.java
+++ b/ide/html.editor/src/org/netbeans/modules/html/editor/javadoc/HelpManager.java
@@ -59,7 +59,7 @@ public class HelpManager {
lastURL = null;
}
- static public HelpManager getDefault(){
+ public static HelpManager getDefault(){
if (manager == null){
manager = new HelpManager();
}
diff --git a/ide/html.parser/src/org/netbeans/modules/html/parser/ElementsFactory.java b/ide/html.parser/src/org/netbeans/modules/html/parser/ElementsFactory.java
index ea9c6ee..a682e66 100644
--- a/ide/html.parser/src/org/netbeans/modules/html/parser/ElementsFactory.java
+++ b/ide/html.parser/src/org/netbeans/modules/html/parser/ElementsFactory.java
@@ -194,7 +194,7 @@ public class ElementsFactory {
}
- static abstract class TagElement implements Named, ModifiableElement {
+ abstract static class TagElement implements Named, ModifiableElement {
//32-64
protected CharSequence source;
diff --git a/ide/hudson/src/org/netbeans/modules/hudson/api/HudsonManager.java b/ide/hudson/src/org/netbeans/modules/hudson/api/HudsonManager.java
index bb7fa9f..213a3d3 100644
--- a/ide/hudson/src/org/netbeans/modules/hudson/api/HudsonManager.java
+++ b/ide/hudson/src/org/netbeans/modules/hudson/api/HudsonManager.java
@@ -57,7 +57,7 @@ public class HudsonManager {
* @param sync interval (in minutes) between refreshes, or 0 to disable
* @param persistence persistence settings for the new instance
*/
- public synchronized static HudsonInstance addInstance(String name, String url, int sync,
+ public static synchronized HudsonInstance addInstance(String name, String url, int sync,
final Persistence persistence) {
for (HudsonInstance existing : HudsonManagerImpl.getDefault().getInstances()) {
if (existing.getUrl().equals(url)) {
diff --git a/ide/hudson/src/org/netbeans/modules/hudson/spi/BuilderConnector.java b/ide/hudson/src/org/netbeans/modules/hudson/spi/BuilderConnector.java
index d253432..dbd3b04 100644
--- a/ide/hudson/src/org/netbeans/modules/hudson/spi/BuilderConnector.java
+++ b/ide/hudson/src/org/netbeans/modules/hudson/spi/BuilderConnector.java
@@ -158,7 +158,7 @@ public abstract class BuilderConnector {
* A provider of console output of builds. They can
* be shown in output window, external browser, etc.
*/
- public static abstract class ConsoleDataProvider {
+ public abstract static class ConsoleDataProvider {
/**
* Show build console of a hudson job build using a displayer.
@@ -182,7 +182,7 @@ public abstract class BuilderConnector {
* A provider of info about test failures. They can be displayer
* in test results window, output window, external browser, etc.
*/
- public static abstract class FailureDataProvider {
+ public abstract static class FailureDataProvider {
/**
* Show failures of a hudson job build.
diff --git a/ide/ide.kit/test/qa-functional/src/org/netbeans/test/ide/BlacklistedClassesHandlerSingleton.java b/ide/ide.kit/test/qa-functional/src/org/netbeans/test/ide/BlacklistedClassesHandlerSingleton.java
index 25a965d..da3bf59 100644
--- a/ide/ide.kit/test/qa-functional/src/org/netbeans/test/ide/BlacklistedClassesHandlerSingleton.java
+++ b/ide/ide.kit/test/qa-functional/src/org/netbeans/test/ide/BlacklistedClassesHandlerSingleton.java
@@ -77,11 +77,11 @@ public class BlacklistedClassesHandlerSingleton extends Handler implements Black
private static BlacklistedClassesHandler instance = null;
private int violation;
// TODO: Is it necessary to use synchronizedMap? Should the list be synchronized?
- final private Map blacklist = Collections.synchronizedMap(new HashMap());
- final private Map<String, List<Exception>> whitelistViolators = Collections.synchronizedMap(new TreeMap<String, List<Exception>>());
- final private Set whitelist = Collections.synchronizedSortedSet(new TreeSet());
- final private Set previousWhitelist = Collections.synchronizedSortedSet(new TreeSet());
- final private Set newWhitelist = Collections.synchronizedSortedSet(new TreeSet());
+ private final Map blacklist = Collections.synchronizedMap(new HashMap());
+ private final Map<String, List<Exception>> whitelistViolators = Collections.synchronizedMap(new TreeMap<String, List<Exception>>());
+ private final Set whitelist = Collections.synchronizedSortedSet(new TreeSet());
+ private final Set previousWhitelist = Collections.synchronizedSortedSet(new TreeSet());
+ private final Set newWhitelist = Collections.synchronizedSortedSet(new TreeSet());
private boolean whitelistEnabled = false;
private boolean generatingWhitelist = false;
private String whitelistFileName;
diff --git a/ide/ide.kit/test/qa-functional/src/org/netbeans/test/ide/GeneralSanityTest.java b/ide/ide.kit/test/qa-functional/src/org/netbeans/test/ide/GeneralSanityTest.java
index 7a47dfb..bce8571 100644
--- a/ide/ide.kit/test/qa-functional/src/org/netbeans/test/ide/GeneralSanityTest.java
+++ b/ide/ide.kit/test/qa-functional/src/org/netbeans/test/ide/GeneralSanityTest.java
@@ -95,7 +95,7 @@ public class GeneralSanityTest extends NbTestCase {
countDown--;
}
- synchronized final void waitForAWT() throws InterruptedException {
+ final synchronized void waitForAWT() throws InterruptedException {
while (countDown > 0) {
WindowManager.getDefault().invokeWhenUIReady(this);
wait();
diff --git a/ide/jumpto/src/org/netbeans/modules/jumpto/common/AbstractModelFilter.java b/ide/jumpto/src/org/netbeans/modules/jumpto/common/AbstractModelFilter.java
index 8735e32..03049e0 100644
--- a/ide/jumpto/src/org/netbeans/modules/jumpto/common/AbstractModelFilter.java
+++ b/ide/jumpto/src/org/netbeans/modules/jumpto/common/AbstractModelFilter.java
@@ -93,7 +93,7 @@ public abstract class AbstractModelFilter<T> implements Models.Filter<T> {
}
@CheckForNull
- protected synchronized final String getSearchText() {
+ protected final synchronized String getSearchText() {
return searchText;
}
diff --git a/ide/jumpto/src/org/netbeans/modules/jumpto/file/Worker.java b/ide/jumpto/src/org/netbeans/modules/jumpto/file/Worker.java
index ae2393b..245532f 100644
--- a/ide/jumpto/src/org/netbeans/modules/jumpto/file/Worker.java
+++ b/ide/jumpto/src/org/netbeans/modules/jumpto/file/Worker.java
@@ -408,7 +408,7 @@ final class Worker implements Runnable {
}
}
- private static abstract class Strategy {
+ private abstract static class Strategy {
private volatile boolean cancelled;
@CheckForNull
diff --git a/ide/jumpto/src/org/netbeans/modules/jumpto/type/UiOptions.java b/ide/jumpto/src/org/netbeans/modules/jumpto/type/UiOptions.java
index 99b0c61..6c902b1 100644
--- a/ide/jumpto/src/org/netbeans/modules/jumpto/type/UiOptions.java
+++ b/ide/jumpto/src/org/netbeans/modules/jumpto/type/UiOptions.java
@@ -31,7 +31,7 @@ public final class UiOptions {
/** Creates a new instance of UiOptions */
private UiOptions() {}
- final static class GoToTypeDialog {
+ static final class GoToTypeDialog {
private static final String GO_TO_TYPE_DIALOG = "GoToTypeDialog"; // NOI18N
@@ -74,7 +74,7 @@ public final class UiOptions {
}
}
- public final static class GoToSymbolDialog {
+ public static final class GoToSymbolDialog {
private static final String GO_TO_SYMBOL_DIALOG = "GoToSymbolDialog"; // NOI18N
diff --git a/ide/jumpto/src/org/netbeans/spi/jumpto/support/NameMatcherFactory.java b/ide/jumpto/src/org/netbeans/spi/jumpto/support/NameMatcherFactory.java
index 6b67e35..5ba13c0 100644
--- a/ide/jumpto/src/org/netbeans/spi/jumpto/support/NameMatcherFactory.java
+++ b/ide/jumpto/src/org/netbeans/spi/jumpto/support/NameMatcherFactory.java
@@ -57,7 +57,7 @@ public final class NameMatcherFactory {
private NameMatcherFactory() {
}
- private static abstract class BaseNameMatcher implements NameMatcher {
+ private abstract static class BaseNameMatcher implements NameMatcher {
protected final String patternText;
diff --git a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlParser.java b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlParser.java
index 9ce1ecf..55d863d 100644
--- a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlParser.java
+++ b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlParser.java
@@ -130,7 +130,7 @@ public class YamlParser extends org.netbeans.modules.parsing.spi.Parser {
replaceWithSpaces(source, "{{", "}}");
}
- final static Pattern[] SPEC_PATTERN_REPLACEMENTS = new Pattern[]{
+ static final Pattern[] SPEC_PATTERN_REPLACEMENTS = new Pattern[]{
Pattern.compile("@"),
Pattern.compile("\\?"),
Pattern.compile("!(?!(omap|!omap))"),};
diff --git a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlStructureItem.java b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlStructureItem.java
index 4412d43..8ee8613 100644
--- a/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlStructureItem.java
+++ b/ide/languages.yaml/src/org/netbeans/modules/languages/yaml/YamlStructureItem.java
@@ -105,7 +105,7 @@ public abstract class YamlStructureItem implements StructureItem {
return "" + getPosition() + ": " + getName();
}
- public final static class Simple extends YamlStructureItem {
+ public static final class Simple extends YamlStructureItem {
final String name;
final long endMark;
@@ -133,7 +133,7 @@ public abstract class YamlStructureItem implements StructureItem {
}
- public final static class Collection extends YamlStructureItem {
+ public static final class Collection extends YamlStructureItem {
private final List<YamlStructureItem> children = new ArrayList<>();
private long endMark;
@@ -171,7 +171,7 @@ public abstract class YamlStructureItem implements StructureItem {
}
}
- public final static class MapEntry extends YamlStructureItem {
+ public static final class MapEntry extends YamlStructureItem {
final YamlStructureItem keyItem;
final YamlStructureItem valueItem;
diff --git a/ide/languages/src/org/netbeans/modules/languages/features/ASTBrowserTopComponent.java b/ide/languages/src/org/netbeans/modules/languages/features/ASTBrowserTopComponent.java
index 95b55cd..1c527eb 100644
--- a/ide/languages/src/org/netbeans/modules/languages/features/ASTBrowserTopComponent.java
+++ b/ide/languages/src/org/netbeans/modules/languages/features/ASTBrowserTopComponent.java
@@ -388,7 +388,7 @@ final class ASTBrowserTopComponent extends TopComponent {
}
}
- final static class ResolvableHelper implements Serializable {
+ static final class ResolvableHelper implements Serializable {
private static final long serialVersionUID = 1L;
public Object readResolve () {
return ASTBrowserTopComponent.getDefault ();
diff --git a/ide/languages/src/org/netbeans/modules/languages/features/TokensBrowserTopComponent.java b/ide/languages/src/org/netbeans/modules/languages/features/TokensBrowserTopComponent.java
index cfc6677..23652c4 100644
--- a/ide/languages/src/org/netbeans/modules/languages/features/TokensBrowserTopComponent.java
+++ b/ide/languages/src/org/netbeans/modules/languages/features/TokensBrowserTopComponent.java
@@ -567,7 +567,7 @@ final class TokensBrowserTopComponent extends TopComponent {
}
}
- final static class ResolvableHelper implements Serializable {
+ static final class ResolvableHelper implements Serializable {
private static final long serialVersionUID = 1L;
public Object readResolve () {
return TokensBrowserTopComponent.getDefault ();
diff --git a/ide/languages/test/qa-functional/src/org/netbeans/test/lib/BasicTokensTest.java b/ide/languages/test/qa-functional/src/org/netbeans/test/lib/BasicTokensTest.java
index 05207e1..f68727b 100644
--- a/ide/languages/test/qa-functional/src/org/netbeans/test/lib/BasicTokensTest.java
+++ b/ide/languages/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/ide/lexer/src/org/netbeans/spi/lexer/LanguageHierarchy.java b/ide/lexer/src/org/netbeans/spi/lexer/LanguageHierarchy.java
index 5105ad5..ed0f394 100644
--- a/ide/lexer/src/org/netbeans/spi/lexer/LanguageHierarchy.java
+++ b/ide/lexer/src/org/netbeans/spi/lexer/LanguageHierarchy.java
@@ -298,7 +298,7 @@ public abstract class LanguageHierarchy<T extends TokenId> {
*
* @return non-null language.
*/
- public synchronized final Language<T> language() {
+ public final synchronized Language<T> language() {
if (language == null) {
// Both tokenIds() and tokenCategories() should impose no locks
// so call in synchronized block
diff --git a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/Attr.java b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/Attr.java
index 1341931..d4c26ea 100644
--- a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/Attr.java
+++ b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/Attr.java
@@ -42,31 +42,31 @@ enum Attr {
// we get complaints from the compiler.
UNSET(30, 1);
- public final static int ALT;
+ public static final int ALT;
//
// Bases of various color ranges.
// These are indexes into Term.palette
//
// First 8 colors
- public final static int PAL_ANSI = 0;
+ public static final int PAL_ANSI = 0;
// Second "bright" 8 colors
- public final static int PAL_BRIGHT = 8;
+ public static final int PAL_BRIGHT = 8;
// 6x6x6 RGB cube (number = 16 + 36 * r + 6 * g + b)
// where r, g and b are in the range 0-5
- public final static int PAL_RGB = 16;
+ public static final int PAL_RGB = 16;
// 24 shades of grey from dark to light
- public final static int PAL_GREY = 232;
+ public static final int PAL_GREY = 232;
// Default foreground color
- public final static int PAL_FG = 256;
+ public static final int PAL_FG = 256;
// Default background color
- public final static int PAL_BG = 257;
+ public static final int PAL_BG = 257;
// Default bold color
- public final static int PAL_BOLD = 258;
+ public static final int PAL_BOLD = 258;
public static final int PAL_SIZE = 259;
diff --git a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/AttrSave.java b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/AttrSave.java
index 3bf60bf..a3f9c2a 100644
--- a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/AttrSave.java
+++ b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/AttrSave.java
@@ -25,50 +25,50 @@
package org.netbeans.lib.terminalemulator;
class AttrSave {
- private final static int BGCOLOR_OFF = 0;
- private final static int BGCOLOR_WIDTH = 5;
- private final static int BGCOLOR_MASK = 0xf;
+ private static final int BGCOLOR_OFF = 0;
+ private static final int BGCOLOR_WIDTH = 5;
+ private static final int BGCOLOR_MASK = 0xf;
@SuppressWarnings("PointlessBitwiseExpression")
- public final static int BGCOLOR = BGCOLOR_MASK << BGCOLOR_OFF;
+ public static final int BGCOLOR = BGCOLOR_MASK << BGCOLOR_OFF;
- private final static int FGCOLOR_OFF = BGCOLOR_OFF + BGCOLOR_WIDTH;
- private final static int FGCOLOR_WIDTH = 5;
- private final static int FGCOLOR_MASK = 0xf;
- public final static int FGCOLOR = FGCOLOR_MASK << FGCOLOR_OFF;
+ private static final int FGCOLOR_OFF = BGCOLOR_OFF + BGCOLOR_WIDTH;
+ private static final int FGCOLOR_WIDTH = 5;
+ private static final int FGCOLOR_MASK = 0xf;
+ public static final int FGCOLOR = FGCOLOR_MASK << FGCOLOR_OFF;
- private final static int HIDDEN_OFF = FGCOLOR_OFF + FGCOLOR_WIDTH;
- private final static int HIDDEN_WIDTH = 1;
- public final static int HIDDEN = 0x1 << HIDDEN_OFF;
+ private static final int HIDDEN_OFF = FGCOLOR_OFF + FGCOLOR_WIDTH;
+ private static final int HIDDEN_WIDTH = 1;
+ public static final int HIDDEN = 0x1 << HIDDEN_OFF;
- private final static int REVERSE_OFF = HIDDEN_OFF + HIDDEN_WIDTH;
- private final static int REVERSE_WIDTH = 1;
- public final static int REVERSE = 0x1 << REVERSE_OFF;
+ private static final int REVERSE_OFF = HIDDEN_OFF + HIDDEN_WIDTH;
+ private static final int REVERSE_WIDTH = 1;
+ public static final int REVERSE = 0x1 << REVERSE_OFF;
- private final static int BLINK_OFF = REVERSE_OFF + REVERSE_WIDTH;
- private final static int BLINK_WIDTH = 1;
- public final static int BLINK = 0x1 << BLINK_OFF;
+ private static final int BLINK_OFF = REVERSE_OFF + REVERSE_WIDTH;
+ private static final int BLINK_WIDTH = 1;
+ public static final int BLINK = 0x1 << BLINK_OFF;
- private final static int UNDERSCORE_OFF = BLINK_OFF + BLINK_WIDTH;
- private final static int UNDERSCORE_WIDTH = 1;
- public final static int UNDERSCORE = 0x1 << UNDERSCORE_OFF;
+ private static final int UNDERSCORE_OFF = BLINK_OFF + BLINK_WIDTH;
+ private static final int UNDERSCORE_WIDTH = 1;
+ public static final int UNDERSCORE = 0x1 << UNDERSCORE_OFF;
- private final static int BRIGHT_OFF = UNDERSCORE_OFF + UNDERSCORE_WIDTH;
- private final static int BRIGHT_WIDTH = 1;
- public final static int BRIGHT = 0x1 << BRIGHT_OFF;
+ private static final int BRIGHT_OFF = UNDERSCORE_OFF + UNDERSCORE_WIDTH;
+ private static final int BRIGHT_WIDTH = 1;
+ public static final int BRIGHT = 0x1 << BRIGHT_OFF;
- private final static int DIM_OFF = BRIGHT_OFF + BRIGHT_WIDTH;
- private final static int DIM_WIDTH = 1;
- public final static int DIM = 0x1 << DIM_OFF;
+ private static final int DIM_OFF = BRIGHT_OFF + BRIGHT_WIDTH;
+ private static final int DIM_WIDTH = 1;
+ public static final int DIM = 0x1 << DIM_OFF;
- private final static int ACTIVE_OFF = DIM_OFF + DIM_WIDTH;
- private final static int ACTIVE_WIDTH = 1;
- public final static int ACTIVE = 0x1 << ACTIVE_OFF;
+ private static final int ACTIVE_OFF = DIM_OFF + DIM_WIDTH;
+ private static final int ACTIVE_WIDTH = 1;
+ public static final int ACTIVE = 0x1 << ACTIVE_OFF;
// Since an attr value of 0 means render using default attributes
// We need a value that signifies that no attribute has been set.
// Can't use the highest (sign) bit since Java has no unsigned and
// we get complaints from the compiler.
- public final static int UNSET = 0x40000000;
+ public static final int UNSET = 0x40000000;
diff --git a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/Term.java b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/Term.java
index 5c9f73a..498ce6a 100644
--- a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/Term.java
+++ b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/Term.java
@@ -1513,10 +1513,10 @@ public class Term extends JComponent implements Accessible {
*/
private class Scroller extends Thread {
- public final static int UP = 1 << 1;
- public final static int DOWN = 1 << 2;
- public final static int LEFT = 1 << 3;
- public final static int RIGHT = 1 << 4;
+ public static final int UP = 1 << 1;
+ public static final int DOWN = 1 << 2;
+ public static final int LEFT = 1 << 3;
+ public static final int RIGHT = 1 << 4;
private int direction;
public Scroller(int direction) {
diff --git a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/ColorValue.java b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/ColorValue.java
index e34606b..22d7974 100644
--- a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/ColorValue.java
+++ b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/ColorValue.java
@@ -31,7 +31,7 @@ import java.util.Map;
*/
final class ColorValue {
- private final static Map<Color, String> colorMap = new HashMap<>();
+ private static final Map<Color, String> colorMap = new HashMap<>();
static {
colorMap.put (Color.BLACK, loc ("Black")); //NOI18N
colorMap.put (Color.BLUE, loc ("Blue")); //NOI18N
diff --git a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/FontPanel.java b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/FontPanel.java
index ebff590..fe83b50 100644
--- a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/FontPanel.java
+++ b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/FontPanel.java
@@ -150,7 +150,7 @@ class FontPanel extends JPanel {
/**
* Encapsulates the list of fonts the user can choose from.
*/
- private final static class Fonts {
+ private static final class Fonts {
private final List<FontDescr> fonts = new ArrayList<>();
public Fonts() {
diff --git a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/LineFilter.java b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/LineFilter.java
index c9ba2be..4980af1 100644
--- a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/LineFilter.java
+++ b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/LineFilter.java
@@ -131,7 +131,7 @@ public abstract class LineFilter {
* Sink for processed lines.
* Line should <u>not</u> be terminated with '\r' or '\n'.
*/
- static protected interface LineSink {
+ protected static interface LineSink {
public void forwardLine(String line);
};
diff --git a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/TermOptions.java b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/TermOptions.java
index 6298a55..7dcf652 100644
--- a/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/TermOptions.java
+++ b/ide/lib.terminalemulator/src/org/netbeans/lib/terminalemulator/support/TermOptions.java
@@ -149,7 +149,7 @@ public final class TermOptions {
return color;
}
- public synchronized static TermOptions getDefault(Preferences prefs) {
+ public static synchronized TermOptions getDefault(Preferences prefs) {
if (DEFAULT == null) {
DEFAULT = new TermOptions();
DEFAULT.loadFrom(prefs);
diff --git a/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/IgnoreUnignoreCommand.java b/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/IgnoreUnignoreCommand.java
index 255ef1b..778797b 100644
--- a/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/IgnoreUnignoreCommand.java
+++ b/ide/libs.git/src/org/netbeans/libs/git/jgit/commands/IgnoreUnignoreCommand.java
@@ -58,7 +58,7 @@ public abstract class IgnoreUnignoreCommand extends GitCommand {
private final ProgressMonitor monitor;
private final Set<File> ignoreFiles;
private final FileListener listener;
- protected final static Logger LOG = Logger.getLogger(IgnoreUnignoreCommand.class.getName());
+ protected static final Logger LOG = Logger.getLogger(IgnoreUnignoreCommand.class.getName());
public IgnoreUnignoreCommand (Repository repository, GitClassFactory gitFactory, File[] files, ProgressMonitor monitor, FileListener listener) {
super(repository, gitFactory, monitor);
diff --git a/ide/libs.graalsdk/src/org/netbeans/libs/graalsdk/impl/GraalContext.java b/ide/libs.graalsdk/src/org/netbeans/libs/graalsdk/impl/GraalContext.java
index 36afca4..c832dfe 100644
--- a/ide/libs.graalsdk/src/org/netbeans/libs/graalsdk/impl/GraalContext.java
+++ b/ide/libs.graalsdk/src/org/netbeans/libs/graalsdk/impl/GraalContext.java
@@ -38,7 +38,7 @@ import org.graalvm.polyglot.PolyglotAccess;
import org.openide.util.io.ReaderInputStream;
final class GraalContext implements ScriptContext {
- private final static String ALLOW_ALL_ACCESS = "allowAllAccess"; // NOI18N
+ private static final String ALLOW_ALL_ACCESS = "allowAllAccess"; // NOI18N
private Context ctx;
private final WriterOutputStream writer = new WriterOutputStream(new OutputStreamWriter(System.out));
private final WriterOutputStream errorWriter = new WriterOutputStream(new OutputStreamWriter(System.err));
@@ -65,7 +65,7 @@ final class GraalContext implements ScriptContext {
this.globals = globals;
}
- synchronized final Context ctx() {
+ final synchronized Context ctx() {
if (ctx == null) {
final Context.Builder b = Context.newBuilder();
b.out(writer);
diff --git a/ide/localhistory/src/org/netbeans/modules/localhistory/LocalHistory.java b/ide/localhistory/src/org/netbeans/modules/localhistory/LocalHistory.java
index f2199f1..cbce15b 100644
--- a/ide/localhistory/src/org/netbeans/modules/localhistory/LocalHistory.java
+++ b/ide/localhistory/src/org/netbeans/modules/localhistory/LocalHistory.java
@@ -84,8 +84,8 @@ public class LocalHistory {
private final Pattern metadataPattern = Pattern.compile(".*\\" + File.separatorChar + "((\\.|_)svn|.hg|CVS)(\\" + File.separatorChar + ".*|$)");
private final Pattern lhTmpFilePattern = Pattern.compile(".*\\.\\d+?\\" + LH_TMP_FILE_SUFFIX);
- public final static Object EVENT_FILE_CREATED = new Object();
- final static Object EVENT_PROJECTS_CHANGED = new Object();
+ public static final Object EVENT_FILE_CREATED = new Object();
+ static final Object EVENT_PROJECTS_CHANGED = new Object();
/** default logger for whole module */
public static final Logger LOG = Logger.getLogger("org.netbeans.modules.localhistory"); // NOI18N
diff --git a/ide/localhistory/src/org/netbeans/modules/localhistory/ui/view/HistoryTopComponent.java b/ide/localhistory/src/org/netbeans/modules/localhistory/ui/view/HistoryTopComponent.java
index f03131d..ef9eafd 100644
--- a/ide/localhistory/src/org/netbeans/modules/localhistory/ui/view/HistoryTopComponent.java
+++ b/ide/localhistory/src/org/netbeans/modules/localhistory/ui/view/HistoryTopComponent.java
@@ -32,7 +32,7 @@ import org.netbeans.modules.versioning.ui.history.HistoryComponent;
*
* @author Tomas Stupka
*/
-final public class HistoryTopComponent extends TopComponent {
+public final class HistoryTopComponent extends TopComponent {
static final String PREFERRED_ID = "text.history";
private HistoryComponent hc;
diff --git a/ide/localtasks/src/org/netbeans/modules/localtasks/task/LocalTask.java b/ide/localtasks/src/org/netbeans/modules/localtasks/task/LocalTask.java
index ae6b453..ea851ce 100644
--- a/ide/localtasks/src/org/netbeans/modules/localtasks/task/LocalTask.java
+++ b/ide/localtasks/src/org/netbeans/modules/localtasks/task/LocalTask.java
@@ -632,7 +632,7 @@ public final class LocalTask extends AbstractLocalTask {
}
}
- final static class TaskReference {
+ static final class TaskReference {
private final String repositoryId;
private final String taskId;
diff --git a/ide/lsp.client/test/unit/src/org/netbeans/modules/lsp/client/LSPBindingsTest.java b/ide/lsp.client/test/unit/src/org/netbeans/modules/lsp/client/LSPBindingsTest.java
index 619dfa7..1c7c2f4 100644
--- a/ide/lsp.client/test/unit/src/org/netbeans/modules/lsp/client/LSPBindingsTest.java
+++ b/ide/lsp.client/test/unit/src/org/netbeans/modules/lsp/client/LSPBindingsTest.java
@@ -87,7 +87,7 @@ public class LSPBindingsTest {
}
}
- public final static class MockMimeResolver extends MIMEResolver {
+ public static final class MockMimeResolver extends MIMEResolver {
public MockMimeResolver() {
}
diff --git a/ide/lsp.client/test/unit/src/org/netbeans/modules/lsp/client/TestUtils.java b/ide/lsp.client/test/unit/src/org/netbeans/modules/lsp/client/TestUtils.java
index 4ce03d3..34b9583 100644
--- a/ide/lsp.client/test/unit/src/org/netbeans/modules/lsp/client/TestUtils.java
+++ b/ide/lsp.client/test/unit/src/org/netbeans/modules/lsp/client/TestUtils.java
@@ -105,7 +105,7 @@ public class TestUtils {
}
}
- public final static class MockMimeResolver extends MIMEResolver {
+ public static final class MockMimeResolver extends MIMEResolver {
public MockMimeResolver() {
}
diff --git a/ide/mercurial/src/org/netbeans/modules/mercurial/ExceptionHandler.java b/ide/mercurial/src/org/netbeans/modules/mercurial/ExceptionHandler.java
index 1245fdd..46e9a9e 100644
--- a/ide/mercurial/src/org/netbeans/modules/mercurial/ExceptionHandler.java
+++ b/ide/mercurial/src/org/netbeans/modules/mercurial/ExceptionHandler.java
@@ -30,13 +30,13 @@ import org.openide.util.NbBundle;
*/
public class ExceptionHandler {
- public final static int EX_UNKNOWN = 0;
- public final static int EX_ACTION_CANCELED_BY_USER = 2;
- public final static int EX_NO_REPOSITORY = 4;
- public final static int EX_ALREADY_TRACKED = 8;
- public final static int EX_NOT_TRACKED = 16;
- public final static int EX_CANNOT_READ_COMMIT_MSG = 32;
- public final static int EX_UNABLE_EXECUTE_CMD = 64;
+ public static final int EX_UNKNOWN = 0;
+ public static final int EX_ACTION_CANCELED_BY_USER = 2;
+ public static final int EX_NO_REPOSITORY = 4;
+ public static final int EX_ALREADY_TRACKED = 8;
+ public static final int EX_NOT_TRACKED = 16;
+ public static final int EX_CANNOT_READ_COMMIT_MSG = 32;
+ public static final int EX_UNABLE_EXECUTE_CMD = 64;
static final String ACTION_CANCELED_BY_USER = org.openide.util.NbBundle.getMessage(ExceptionHandler.class, "MSG_ActionCanceledByUser"); // NOI18N
private final HgException exception;
diff --git a/ide/mercurial/src/org/netbeans/modules/mercurial/HistoryRegistry.java b/ide/mercurial/src/org/netbeans/modules/mercurial/HistoryRegistry.java
index 12e0b01..55d64df 100644
--- a/ide/mercurial/src/org/netbeans/modules/mercurial/HistoryRegistry.java
+++ b/ide/mercurial/src/org/netbeans/modules/mercurial/HistoryRegistry.java
@@ -60,7 +60,7 @@ public class HistoryRegistry {
private HistoryRegistry() {}
- public synchronized static HistoryRegistry getInstance() {
+ public static synchronized HistoryRegistry getInstance() {
if(instance == null) {
instance = new HistoryRegistry();
}
diff --git a/ide/mercurial/src/org/netbeans/modules/mercurial/options/PropertiesTable.java b/ide/mercurial/src/org/netbeans/modules/mercurial/options/PropertiesTable.java
index 622c79f..2917d66 100644
--- a/ide/mercurial/src/org/netbeans/modules/mercurial/options/PropertiesTable.java
+++ b/ide/mercurial/src/org/netbeans/modules/mercurial/options/PropertiesTable.java
@@ -44,7 +44,7 @@ import org.openide.util.NbBundle;
*/
public class PropertiesTable implements AncestorListener, TableModelListener {
- static public final String[] PROPERTIES_COLUMNS = new String[] {PropertiesTableModel.COLUMN_NAME_NAME, PropertiesTableModel.COLUMN_NAME_VALUE};
+ public static final String[] PROPERTIES_COLUMNS = new String[] {PropertiesTableModel.COLUMN_NAME_NAME, PropertiesTableModel.COLUMN_NAME_VALUE};
private PropertiesTableModel tableModel;
private JTable table;
diff --git a/ide/mercurial/src/org/netbeans/modules/mercurial/ui/commit/CommitAction.java b/ide/mercurial/src/org/netbeans/modules/mercurial/ui/commit/CommitAction.java
index 485fa40..df9305a 100644
--- a/ide/mercurial/src/org/netbeans/modules/mercurial/ui/commit/CommitAction.java
+++ b/ide/mercurial/src/org/netbeans/modules/mercurial/ui/commit/CommitAction.java
@@ -730,7 +730,7 @@ public class CommitAction extends ContextAction {
}
}
- private static abstract class Cmd {
+ private abstract static class Cmd {
protected final Map<File, List<File>> m;
protected final OutputLogger logger;
protected final String logMsgFormat;
diff --git a/ide/mercurial/src/org/netbeans/modules/mercurial/ui/diff/DiffFileTreeImpl.java b/ide/mercurial/src/org/netbeans/modules/mercurial/ui/diff/DiffFileTreeImpl.java
index 858eb7d..818c205 100644
--- a/ide/mercurial/src/org/netbeans/modules/mercurial/ui/diff/DiffFileTreeImpl.java
+++ b/ide/mercurial/src/org/netbeans/modules/mercurial/ui/diff/DiffFileTreeImpl.java
@@ -56,7 +56,7 @@ class DiffFileTreeImpl extends FileTreeView<DiffNode> {
private static final String ICON_KEY_UIMANAGER = "Tree.closedIcon"; //NOI18N
private static final String ICON_KEY_UIMANAGER_NB = "Nb.Explorer.Folder.icon"; //NOI18N
- private final static String PATH_SEPARATOR_REGEXP = File.separator.replace("\\", "\\\\"); //NOI18N
+ private static final String PATH_SEPARATOR_REGEXP = File.separator.replace("\\", "\\\\"); //NOI18N
/**
* Defines labels for Diff view table columns.
diff --git a/ide/mercurial/src/org/netbeans/modules/mercurial/ui/properties/PropertiesTable.java b/ide/mercurial/src/org/netbeans/modules/mercurial/ui/properties/PropertiesTable.java
index 86eff3a..1157dde 100644
--- a/ide/mercurial/src/org/netbeans/modules/mercurial/ui/properties/PropertiesTable.java
+++ b/ide/mercurial/src/org/netbeans/modules/mercurial/ui/properties/PropertiesTable.java
@@ -41,7 +41,7 @@ import org.openide.util.NbBundle;
*/
public class PropertiesTable implements AncestorListener, TableModelListener {
- static public final String[] PROPERTIES_COLUMNS = new String[] {PropertiesTableModel.COLUMN_NAME_NAME, PropertiesTableModel.COLUMN_NAME_VALUE};
+ public static final String[] PROPERTIES_COLUMNS = new String[] {PropertiesTableModel.COLUMN_NAME_NAME, PropertiesTableModel.COLUMN_NAME_VALUE};
private PropertiesTableModel tableModel;
private JTable table;
diff --git a/ide/mercurial/src/org/netbeans/modules/mercurial/ui/queues/CreateRefreshAction.java b/ide/mercurial/src/org/netbeans/modules/mercurial/ui/queues/CreateRefreshAction.java
index 5c1015b..3754d32 100644
--- a/ide/mercurial/src/org/netbeans/modules/mercurial/ui/queues/CreateRefreshAction.java
+++ b/ide/mercurial/src/org/netbeans/modules/mercurial/ui/queues/CreateRefreshAction.java
@@ -205,7 +205,7 @@ abstract class CreateRefreshAction extends ContextAction {
abstract void persistCanceledCommitMessage (QCreatePatchParameters parameters, String canceledCommitMessage);
- static abstract class Cmd {
+ abstract static class Cmd {
protected final List<File> candidates;
protected final OutputLogger logger;
protected final String logMsgFormat;
@@ -244,7 +244,7 @@ abstract class CreateRefreshAction extends ContextAction {
HgCommand.doRemove(repository, candidates, logger);
}
}
- static abstract class CreateRefreshPatchCmd extends Cmd {
+ abstract static class CreateRefreshPatchCmd extends Cmd {
private HgQueueHookContext context;
private Collection<HgQueueHook> hooks;
private File[] hookFiles;
diff --git a/ide/mercurial/src/org/netbeans/modules/mercurial/ui/repository/Repository.java b/ide/mercurial/src/org/netbeans/modules/mercurial/ui/repository/Repository.java
index bd982f6..fef5c48 100644
--- a/ide/mercurial/src/org/netbeans/modules/mercurial/ui/repository/Repository.java
+++ b/ide/mercurial/src/org/netbeans/modules/mercurial/ui/repository/Repository.java
@@ -75,16 +75,16 @@ import org.openide.util.NbBundle;
*/
public class Repository implements ActionListener, FocusListener, ItemListener {
- public final static int FLAG_URL_ENABLED = 4;
- public final static int FLAG_ACCEPT_REVISION = 8;
- public final static int FLAG_SHOW_HINTS = 32;
- public final static int FLAG_SHOW_PROXY = 64;
+ public static final int FLAG_URL_ENABLED = 4;
+ public static final int FLAG_ACCEPT_REVISION = 8;
+ public static final int FLAG_SHOW_HINTS = 32;
+ public static final int FLAG_SHOW_PROXY = 64;
- private final static String LOCAL_URL_HELP = "file:/repository_path"; // NOI18N
- private final static String HTTP_URL_HELP = "http://hostname/repository_path"; // NOI18N
- private final static String HTTPS_URL_HELP = "https://hostname/repository_path"; // NOI18N
- private final static String STATIC_HTTP_URL_HELP = "static-http://hostname/repository_path"; // NOI18N
- private final static String SSH_URL_HELP = "ssh://hostname/repository_path"; // NOI18N
+ private static final String LOCAL_URL_HELP = "file:/repository_path"; // NOI18N
+ private static final String HTTP_URL_HELP = "http://hostname/repository_path"; // NOI18N
+ private static final String HTTPS_URL_HELP = "https://hostname/repository_path"; // NOI18N
+ private static final String STATIC_HTTP_URL_HELP = "static-http://hostname/repository_path"; // NOI18N
+ private static final String SSH_URL_HELP = "ssh://hostname/repository_path"; // NOI18N
private RepositoryPanel repositoryPanel;
private boolean valid = true;
diff --git a/ide/mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java b/ide/mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java
index b7c4e05..89d5c83 100644
--- a/ide/mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java
+++ b/ide/mercurial/src/org/netbeans/modules/mercurial/util/HgCommand.java
@@ -271,21 +271,21 @@ public abstract class HgCommand<T> implements Callable<T> {
private static final String HG_MERGE_UNAVAILABLE_ERR = "is not recognized as an internal or external command";
private static final String HG_NO_CHANGES_ERR = "no changes found"; // NOI18N
- private final static String HG_CREATE_NEW_BRANCH_ERR = "abort: push creates new remote "; // NOI18N
- private final static String HG_HEADS_CREATED_ERR = "(+1 heads)"; // NOI18N
- private final static String HG_NO_HG_CMD_FOUND_ERR = "hg: not found";
- private final static String HG_ARG_LIST_TOO_LONG_ERR = "Arg list too long";
- private final static String HG_ARGUMENT_LIST_TOO_LONG_ERR = "Argument list too long"; //NOI18N
-
- private final static String HG_HEADS_CMD = "heads"; // NOI18N
- private final static String HG_BRANCHES_CMD = "branches"; // NOI18N
- private final static String HG_BRANCH_CMD = "branch"; // NOI18N
- private final static String HG_TAG_CMD = "tag"; // NOI18N
- private final static String HG_TAG_OPT_MESSAGE = "--message"; // NOI18N
- private final static String HG_TAG_OPT_REMOVE = "--remove"; // NOI18N
- private final static String HG_TAG_OPT_REVISION = "--rev"; // NOI18N
- private final static String HG_TAG_OPT_LOCAL = "--local"; // NOI18N
- private final static String HG_TAGS_CMD = "tags"; // NOI18N
+ private static final String HG_CREATE_NEW_BRANCH_ERR = "abort: push creates new remote "; // NOI18N
+ private static final String HG_HEADS_CREATED_ERR = "(+1 heads)"; // NOI18N
+ private static final String HG_NO_HG_CMD_FOUND_ERR = "hg: not found";
+ private static final String HG_ARG_LIST_TOO_LONG_ERR = "Arg list too long";
+ private static final String HG_ARGUMENT_LIST_TOO_LONG_ERR = "Argument list too long"; //NOI18N
+
+ private static final String HG_HEADS_CMD = "heads"; // NOI18N
+ private static final String HG_BRANCHES_CMD = "branches"; // NOI18N
+ private static final String HG_BRANCH_CMD = "branch"; // NOI18N
+ private static final String HG_TAG_CMD = "tag"; // NOI18N
+ private static final String HG_TAG_OPT_MESSAGE = "--message"; // NOI18N
+ private static final String HG_TAG_OPT_REMOVE = "--remove"; // NOI18N
+ private static final String HG_TAG_OPT_REVISION = "--rev"; // NOI18N
+ private static final String HG_TAG_OPT_LOCAL = "--local"; // NOI18N
+ private static final String HG_TAGS_CMD = "tags"; // NOI18N
private static final String HG_NO_REPOSITORY_ERR = "There is no Mercurial repository here"; // NOI18N
private static final String HG_NO_RESPONSE_ERR = "no suitable response from remote hg!"; // NOI18N
diff --git a/ide/mylyn.util/src/org/netbeans/modules/mylyn/util/WikiUtils.java b/ide/mylyn.util/src/org/netbeans/modules/mylyn/util/WikiUtils.java
index 6703e2d..5c05e71 100644
--- a/ide/mylyn.util/src/org/netbeans/modules/mylyn/util/WikiUtils.java
+++ b/ide/mylyn.util/src/org/netbeans/modules/mylyn/util/WikiUtils.java
@@ -32,7 +32,7 @@ import org.openide.util.Lookup;
*/
public class WikiUtils {
- private final static Logger LOG = Logger.getLogger("org.netbeans.mylym.utils.WikiUtils"); //NOI18N
+ private static final Logger LOG = Logger.getLogger("org.netbeans.mylym.utils.WikiUtils"); //NOI18N
private WikiUtils () {
}
diff --git a/ide/o.n.swing.dirchooser/src/org/netbeans/swing/dirchooser/DirectoryChooserUI.java b/ide/o.n.swing.dirchooser/src/org/netbeans/swing/dirchooser/DirectoryChooserUI.java
index 8a22592..a6de9dc 100644
--- a/ide/o.n.swing.dirchooser/src/org/netbeans/swing/dirchooser/DirectoryChooserUI.java
+++ b/ide/o.n.swing.dirchooser/src/org/netbeans/swing/dirchooser/DirectoryChooserUI.java
@@ -1807,7 +1807,7 @@ public class DirectoryChooserUI extends BasicFileChooserUI {
/*************** HELPER CLASSES ***************/
private class IconIndenter implements Icon {
- final static int space = 10;
+ static final int space = 10;
Icon icon = null;
int depth = 0;
diff --git a/ide/o.n.swing.dirchooser/src/org/netbeans/swing/dirchooser/DirectoryNode.java b/ide/o.n.swing.dirchooser/src/org/netbeans/swing/dirchooser/DirectoryNode.java
index 1b2d313..ddafd4e 100644
--- a/ide/o.n.swing.dirchooser/src/org/netbeans/swing/dirchooser/DirectoryNode.java
+++ b/ide/o.n.swing.dirchooser/src/org/netbeans/swing/dirchooser/DirectoryNode.java
@@ -42,9 +42,9 @@ import org.openide.util.Utilities;
*/
public class DirectoryNode extends DefaultMutableTreeNode {
- public final static int SINGLE_SELECTION = 0;
+ public static final int SINGLE_SELECTION = 0;
- public final static int DIG_IN_SELECTION = 4;
+ public static final int DIG_IN_SELECTION = 4;
/** case insensitive file name's comparator */
static final FileNameComparator FILE_NAME_COMPARATOR = new FileNameComparator();
diff --git a/ide/o.openidex.util/src/org/openidex/search/SearchHistory.java b/ide/o.openidex.util/src/org/openidex/search/SearchHistory.java
index 4258c51..9a300fe 100644
--- a/ide/o.openidex.util/src/org/openidex/search/SearchHistory.java
+++ b/ide/o.openidex.util/src/org/openidex/search/SearchHistory.java
@@ -67,14 +67,14 @@ public final class SearchHistory {
* @deprecated just changes in history
*/
@Deprecated
- public final static String LAST_SELECTED = "last-selected"; //NOI18N
+ public static final String LAST_SELECTED = "last-selected"; //NOI18N
/** Property name for adding pattern that was not in history
* Firing:
* oldValue - null
* newValue - added pattern
*/
- public final static String ADD_TO_HISTORY = "add-to-history"; //NOI18N
+ public static final String ADD_TO_HISTORY = "add-to-history"; //NOI18N
/** Preferences node for storing history info */
private static Preferences prefs;
@@ -89,7 +89,7 @@ public final class SearchHistory {
}
/** @return singleton instance of SearchHistory */
- public synchronized static SearchHistory getDefault(){
+ public static synchronized SearchHistory getDefault(){
if (INSTANCE == null) {
INSTANCE = new SearchHistory();
}
diff --git a/ide/o.openidex.util/src/org/openidex/search/SearchType.java b/ide/o.openidex.util/src/org/openidex/search/SearchType.java
index f1370b5..7a30958 100644
--- a/ide/o.openidex.util/src/org/openidex/search/SearchType.java
+++ b/ide/o.openidex.util/src/org/openidex/search/SearchType.java
@@ -61,7 +61,7 @@ public abstract class SearchType extends ServiceType implements Cloneable {
* object types to create <code>SearchGroup</code>.
* <em>Note: </em> the order of classes declares also priority.
*/
- public synchronized final Class[] getSearchTypeClasses() {
+ public final synchronized Class[] getSearchTypeClasses() {
if (searchTypeClasses == null) {
searchTypeClasses = createSearchTypeClasses();
}
diff --git a/ide/parsing.api/src/org/netbeans/modules/parsing/impl/RunWhenScanFinishedSupport.java b/ide/parsing.api/src/org/netbeans/modules/parsing/impl/RunWhenScanFinishedSupport.java
index ed22b62..7adac28 100644
--- a/ide/parsing.api/src/org/netbeans/modules/parsing/impl/RunWhenScanFinishedSupport.java
+++ b/ide/parsing.api/src/org/netbeans/modules/parsing/impl/RunWhenScanFinishedSupport.java
@@ -42,7 +42,7 @@ public class RunWhenScanFinishedSupport {
//Scan lock
private static final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
//Deferred task until scan is done
- private final static List<DeferredTask> todo = Collections.synchronizedList(new LinkedList<DeferredTask>());
+ private static final List<DeferredTask> todo = Collections.synchronizedList(new LinkedList<DeferredTask>());
private RunWhenScanFinishedSupport() {}
diff --git a/ide/parsing.api/src/org/netbeans/modules/parsing/impl/TaskProcessor.java b/ide/parsing.api/src/org/netbeans/modules/parsing/impl/TaskProcessor.java
index 57d2ee2..a84844b 100644
--- a/ide/parsing.api/src/org/netbeans/modules/parsing/impl/TaskProcessor.java
+++ b/ide/parsing.api/src/org/netbeans/modules/parsing/impl/TaskProcessor.java
@@ -77,13 +77,13 @@ public class TaskProcessor {
private static final int SLOW_CANCEL_LIMIT = 50;
//Scheduled requests waiting for execution
- private final static PriorityBlockingQueue<Request> requests = new PriorityBlockingQueue<> (10, new RequestPriorityComparator());
+ private static final PriorityBlockingQueue<Request> requests = new PriorityBlockingQueue<> (10, new RequestPriorityComparator());
//Finished requests waiting on reschedule by some scheduler or parser
- private final static Map<Source,Collection<Request>> finishedRequests = new WeakHashMap<>();
+ private static final Map<Source,Collection<Request>> finishedRequests = new WeakHashMap<>();
//Tasks which are scheduled (not yet executed) but blocked by expected event (waiting for event)
- private final static Map<Source,Collection<Request>> waitingRequests = new WeakHashMap<>();
+ private static final Map<Source,Collection<Request>> waitingRequests = new WeakHashMap<>();
//Tasked which should be cleared from requests or finieshedRequests
- private final static Collection<RemovedTask> toRemove = new LinkedList<> ();
+ private static final Collection<RemovedTask> toRemove = new LinkedList<> ();
//Worker thread factory - single worker thread
static final RequestProcessor WORKER = new RequestProcessor(
@@ -93,7 +93,7 @@ public class TaskProcessor {
false,
false);
//Currently running SchedulerTask
- private final static CurrentRequestReference currentRequest = new CurrentRequestReference ();
+ private static final CurrentRequestReference currentRequest = new CurrentRequestReference ();
//Internal lock used to synchronize parsing api iternal state (TaskProcessor, Source, SourceCache)
private static class InternalLock {};
@@ -101,7 +101,7 @@ public class TaskProcessor {
//Parser lock used to prevent other tasks to run in case when there is an active task
- private final static ReentrantLock parserLock = new ReentrantLock (true);
+ private static final ReentrantLock parserLock = new ReentrantLock (true);
private static int lockCount = 0;
//Regexp of class names of tasks which shouldn't be scheduled - used for debugging & performance testing
@@ -355,7 +355,7 @@ public class TaskProcessor {
//Changes handling
- private final static AtomicReference<Request> rst = new AtomicReference<Request>();
+ private static final AtomicReference<Request> rst = new AtomicReference<Request>();
//DO NOT CALL DIRECTLY - called by Source
public static Request resetState (final Source source,
diff --git a/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java b/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java
index a9c2968..0d8f9cf 100644
--- a/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java
+++ b/ide/parsing.indexing/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdater.java
@@ -1266,7 +1266,7 @@ public final class RepositoryUpdater implements PathRegistryListener, PropertyCh
/* test */ static final List<URL> UNKNOWN_ROOT = Collections.unmodifiableList(new LinkedList<>());
/* test */ static final List<URL> NONEXISTENT_ROOT = Collections.unmodifiableList(new LinkedList<>());
/* test */@SuppressWarnings("PackageVisibleField")
- volatile static Source unitTestActiveSource;
+ static volatile Source unitTestActiveSource;
@org.netbeans.api.annotations.common.SuppressWarnings(
value="DMI_COLLECTION_OF_URLS",
@@ -2142,7 +2142,7 @@ public final class RepositoryUpdater implements PathRegistryListener, PropertyCh
/* test */
- static abstract class Work {
+ abstract static class Work {
//@GuardedBy("org.netbeans.modules.parsing.impl.Taskprocessor.parserLock")
private static long lastScanEnded = -1L;
@@ -5270,7 +5270,7 @@ public final class RepositoryUpdater implements PathRegistryListener, PropertyCh
} // End of RootsScanningWork class
- private static abstract class AbstractRootsWork extends Work {
+ private abstract static class AbstractRootsWork extends Work {
private boolean logStatistics;
diff --git a/ide/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/PathRegistryTest.java b/ide/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/PathRegistryTest.java
index 3d742c4..a9feabd 100644
--- a/ide/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/PathRegistryTest.java
+++ b/ide/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/PathRegistryTest.java
@@ -603,8 +603,8 @@ public class PathRegistryTest extends IndexingTestBase {
public static class SFBQImpl implements SourceForBinaryQueryImplementation {
- final static Map<URL,FileObject> map = new HashMap<URL,FileObject> ();
- final static Map<URL,Result> results = new HashMap<URL,Result> ();
+ static final Map<URL,FileObject> map = new HashMap<URL,FileObject> ();
+ static final Map<URL,Result> results = new HashMap<URL,Result> ();
public SFBQImpl () {
@@ -694,7 +694,7 @@ public class PathRegistryTest extends IndexingTestBase {
public static class DeadLockSFBQImpl implements SourceForBinaryQueryImplementation {
- private final static Object lock = new String ("Lock");
+ private static final Object lock = new String ("Lock");
public DeadLockSFBQImpl () {
}
diff --git a/ide/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdaterTest.java b/ide/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdaterTest.java
index 7c70cf8..adb0262 100644
--- a/ide/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdaterTest.java
+++ b/ide/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/RepositoryUpdaterTest.java
@@ -2901,8 +2901,8 @@ public class RepositoryUpdaterTest extends IndexingTestBase {
public static class SFBQImpl implements SourceForBinaryQueryImplementation {
- final static Map<URL,FileObject> map = new HashMap<> ();
- final static Map<URL,Result> results = new HashMap<> ();
+ static final Map<URL,FileObject> map = new HashMap<> ();
+ static final Map<URL,Result> results = new HashMap<> ();
public SFBQImpl () {
diff --git a/ide/parsing.lucene/src/org/netbeans/modules/parsing/lucene/DocumentIndexImpl.java b/ide/parsing.lucene/src/org/netbeans/modules/parsing/lucene/DocumentIndexImpl.java
index 35db612..b4ca1b8 100644
--- a/ide/parsing.lucene/src/org/netbeans/modules/parsing/lucene/DocumentIndexImpl.java
+++ b/ide/parsing.lucene/src/org/netbeans/modules/parsing/lucene/DocumentIndexImpl.java
@@ -319,7 +319,7 @@ public class DocumentIndexImpl implements DocumentIndex2, Runnable {
return new DocumentIndexImpl.Transactional(index, cache);
}
- private final static class Transactional extends DocumentIndexImpl implements DocumentIndex2.Transactional {
+ private static final class Transactional extends DocumentIndexImpl implements DocumentIndex2.Transactional {
private Transactional(
@NonNull final Index.Transactional index,
diff --git a/ide/parsing.lucene/src/org/netbeans/modules/parsing/lucene/support/Queries.java b/ide/parsing.lucene/src/org/netbeans/modules/parsing/lucene/support/Queries.java
index cffec29..d56c389 100644
--- a/ide/parsing.lucene/src/org/netbeans/modules/parsing/lucene/support/Queries.java
+++ b/ide/parsing.lucene/src/org/netbeans/modules/parsing/lucene/support/Queries.java
@@ -388,11 +388,11 @@ public final class Queries {
return -1;
}
- private static abstract class TCFilter extends Filter {
+ private abstract static class TCFilter extends Filter {
public abstract void attach (TermCollector collector);
}
- private static abstract class AbstractTCFilter extends TCFilter {
+ private abstract static class AbstractTCFilter extends TCFilter {
private TermCollector termCollector;
diff --git a/ide/parsing.nb/src/org/netbeans/modules/parsing/nb/EventSupport.java b/ide/parsing.nb/src/org/netbeans/modules/parsing/nb/EventSupport.java
index 4163e25..ad6a045 100644
--- a/ide/parsing.nb/src/org/netbeans/modules/parsing/nb/EventSupport.java
+++ b/ide/parsing.nb/src/org/netbeans/modules/parsing/nb/EventSupport.java
@@ -397,7 +397,7 @@ final class EventSupport extends SourceEnvironment {
* changes, the scheduler fires a its tasks with the Source object created
* for the new file.
*/
- private final static Map<Scheduler, SchedL> scheduledSources = new HashMap<>(7);
+ private static final Map<Scheduler, SchedL> scheduledSources = new HashMap<>(7);
private static class SchedL implements PropertyChangeListener {
/**
diff --git a/ide/project.indexingbridge/src/org/netbeans/modules/project/indexingbridge/IndexingBridge.java b/ide/project.indexingbridge/src/org/netbeans/modules/project/indexingbridge/IndexingBridge.java
index 89c0adf..a2d859e 100644
--- a/ide/project.indexingbridge/src/org/netbeans/modules/project/indexingbridge/IndexingBridge.java
+++ b/ide/project.indexingbridge/src/org/netbeans/modules/project/indexingbridge/IndexingBridge.java
@@ -40,7 +40,7 @@ public abstract class IndexingBridge {
* to wait for not yet processed indexing tasks.
* @since 1.5
*/
- public static abstract class Ordering extends IndexingBridge {
+ public abstract static class Ordering extends IndexingBridge {
/**
* Waits until the non processes indexing tasks are done.
* @throws InterruptedException when the waiting thread is interrupted.
diff --git a/ide/project.spi.intern/src/org/netbeans/modules/project/spi/intern/ProjectIDEServices.java b/ide/project.spi.intern/src/org/netbeans/modules/project/spi/intern/ProjectIDEServices.java
index 43f4568..6d1d14d 100644
--- a/ide/project.spi.intern/src/org/netbeans/modules/project/spi/intern/ProjectIDEServices.java
+++ b/ide/project.spi.intern/src/org/netbeans/modules/project/spi/intern/ProjectIDEServices.java
@@ -30,7 +30,7 @@ import org.openide.util.Lookup;
public final class ProjectIDEServices {
private static ProjectIDEServicesImplementation impl;
- private synchronized static ProjectIDEServicesImplementation getImpl() {
+ private static synchronized ProjectIDEServicesImplementation getImpl() {
if(impl == null) {
impl = Lookup.getDefault().lookup(ProjectIDEServicesImplementation.class);
}
diff --git a/ide/projectapi/src/org/netbeans/spi/project/ProjectServiceProvider.java b/ide/projectapi/src/org/netbeans/spi/project/ProjectServiceProvider.java
index 5ac85b2..6d45545 100644
--- a/ide/projectapi/src/org/netbeans/spi/project/ProjectServiceProvider.java
+++ b/ide/projectapi/src/org/netbeans/spi/project/ProjectServiceProvider.java
@@ -46,7 +46,7 @@ public final class TestAction implements ActionListener {
}
}
}
- public static abstract class Service {
+ public abstract static class Service {
static {
System.err.println("===> loading Service");
}
diff --git a/ide/projectui/src/org/netbeans/modules/project/ui/ExitDialog.java b/ide/projectui/src/org/netbeans/modules/project/ui/ExitDialog.java
index 1c2c4e4..e3bc7c6 100644
--- a/ide/projectui/src/org/netbeans/modules/project/ui/ExitDialog.java
+++ b/ide/projectui/src/org/netbeans/modules/project/ui/ExitDialog.java
@@ -54,7 +54,7 @@ import org.openide.util.NbBundle;
*
* @author Ian Formanek, Petr Hrebejk
*/
-final public class ExitDialog extends JPanel implements ActionListener {
+public final class ExitDialog extends JPanel implements ActionListener {
/*for tests only!*/static boolean SAVE_ALL_UNCONDITIONALLY = false;
diff --git a/ide/projectui/src/org/netbeans/modules/project/ui/ProjectTab.java b/ide/projectui/src/org/netbeans/modules/project/ui/ProjectTab.java
index 1e8635d..caeb72a 100644
--- a/ide/projectui/src/org/netbeans/modules/project/ui/ProjectTab.java
+++ b/ide/projectui/src/org/netbeans/modules/project/ui/ProjectTab.java
@@ -135,11 +135,11 @@ public class ProjectTab extends TopComponent
private static Map<String, ProjectTab> tabs = new HashMap<String, ProjectTab>();
- private transient final ExplorerManager manager;
+ private final transient ExplorerManager manager;
private transient Node rootNode;
private String id;
- private transient final ProjectTreeView btv;
+ private final transient ProjectTreeView btv;
private final JLabel noProjectsLabel = new JLabel(NbBundle.getMessage(ProjectTab.class, "NO_PROJECT_OPEN"));
diff --git a/ide/projectui/src/org/netbeans/modules/project/ui/TemplatesPanelGUI.java b/ide/projectui/src/org/netbeans/modules/project/ui/TemplatesPanelGUI.java
index 4c5be56..32a8f3e 100644
--- a/ide/projectui/src/org/netbeans/modules/project/ui/TemplatesPanelGUI.java
+++ b/ide/projectui/src/org/netbeans/modules/project/ui/TemplatesPanelGUI.java
@@ -499,7 +499,7 @@ public class TemplatesPanelGUI extends javax.swing.JPanel implements PropertyCha
return desc;
}
- private static abstract class ExplorerProviderPanel extends JPanel implements ExplorerManager.Provider, PropertyChangeListener, VetoableChangeListener {
+ private abstract static class ExplorerProviderPanel extends JPanel implements ExplorerManager.Provider, PropertyChangeListener, VetoableChangeListener {
private ExplorerManager manager;
diff --git a/ide/projectui/src/org/netbeans/modules/project/ui/actions/VerticalGridLayout.java b/ide/projectui/src/org/netbeans/modules/project/ui/actions/VerticalGridLayout.java
index 97b8c0f..b31a178 100644
--- a/ide/projectui/src/org/netbeans/modules/project/ui/actions/VerticalGridLayout.java
+++ b/ide/projectui/src/org/netbeans/modules/project/ui/actions/VerticalGridLayout.java
@@ -49,7 +49,7 @@ public class VerticalGridLayout implements LayoutManager2 {
private final int screenHeight;
- final private Set<Component> components = new LinkedHashSet<Component>();
+ private final Set<Component> components = new LinkedHashSet<Component>();
@Override
public void addLayoutComponent(Component comp, Object constraints) {
diff --git a/ide/projectuiapi.base/src/org/netbeans/modules/project/uiapi/BaseUtilities.java b/ide/projectuiapi.base/src/org/netbeans/modules/project/uiapi/BaseUtilities.java
index 7aad523..c4fbdb5 100644
--- a/ide/projectuiapi.base/src/org/netbeans/modules/project/uiapi/BaseUtilities.java
+++ b/ide/projectuiapi.base/src/org/netbeans/modules/project/uiapi/BaseUtilities.java
@@ -69,7 +69,7 @@ public final class BaseUtilities {
}
}
- public static abstract class ProjectGroupAccessor {
+ public abstract static class ProjectGroupAccessor {
public abstract ProjectGroup createGroup(String name, Preferences prefs);
diff --git a/ide/projectuiapi/test/unit/src/org/netbeans/spi/project/ui/support/ProjectCustomizerTest.java b/ide/projectuiapi/test/unit/src/org/netbeans/spi/project/ui/support/ProjectCustomizerTest.java
index b95c696..c192e7f 100644
--- a/ide/projectuiapi/test/unit/src/org/netbeans/spi/project/ui/support/ProjectCustomizerTest.java
+++ b/ide/projectuiapi/test/unit/src/org/netbeans/spi/project/ui/support/ProjectCustomizerTest.java
@@ -119,7 +119,7 @@ public class ProjectCustomizerTest extends NbTestCase {
assertEquals("Four", subcategories[0].getDisplayName());
assertEquals("four", dcp.create(subcategories[0]).getName());
}
- private static abstract class TestCCP implements CompositeCategoryProvider {
+ private abstract static class TestCCP implements CompositeCategoryProvider {
final String name;
TestCCP(String name) {
this.name = name;
diff --git a/ide/properties.syntax/src/org/netbeans/modules/properties/syntax/EditorSettingsCopy.java b/ide/properties.syntax/src/org/netbeans/modules/properties/syntax/EditorSettingsCopy.java
index 912f936..a475b73 100644
--- a/ide/properties.syntax/src/org/netbeans/modules/properties/syntax/EditorSettingsCopy.java
+++ b/ide/properties.syntax/src/org/netbeans/modules/properties/syntax/EditorSettingsCopy.java
@@ -230,7 +230,7 @@ public class EditorSettingsCopy extends TableViewSettings {
* Gets only instance of <code>EditorSettindsCopy</code> that is also
* registered at layer to access it declaratively.
*/
- public synchronized static EditorSettingsCopy getLayerInstance() {
+ public static synchronized EditorSettingsCopy getLayerInstance() {
if(editorSettingsCopy == null) {
editorSettingsCopy = new EditorSettingsCopy();
}
diff --git a/ide/properties/src/org/netbeans/modules/properties/Element.java b/ide/properties/src/org/netbeans/modules/properties/Element.java
index 454dbaa..a9b0613 100644
--- a/ide/properties/src/org/netbeans/modules/properties/Element.java
+++ b/ide/properties/src/org/netbeans/modules/properties/Element.java
@@ -127,7 +127,7 @@ public abstract class Element implements Serializable {
/** General class for basic elements, which contain value directly. */
- public static abstract class Basic extends Element {
+ public abstract static class Basic extends Element {
private static final String hexaDigitChars
= "0123456789abcdefABCDEF"; //NOI18N
diff --git a/ide/properties/src/org/netbeans/modules/properties/LocalePanel.java b/ide/properties/src/org/netbeans/modules/properties/LocalePanel.java
index 671fd96..300a05b 100644
--- a/ide/properties/src/org/netbeans/modules/properties/LocalePanel.java
+++ b/ide/properties/src/org/netbeans/modules/properties/LocalePanel.java
@@ -488,7 +488,7 @@ public class LocalePanel extends JPanel {
private javax.swing.JLabel variantLabel;
// End of variables declaration//GEN-END:variables
- private static abstract class NbBasicComboBoxRenderer extends BasicComboBoxRenderer.UIResource {
+ private abstract static class NbBasicComboBoxRenderer extends BasicComboBoxRenderer.UIResource {
public Component getListCellRendererComponent(JList list, Object value,
int index, boolean isSelected, boolean cellHasFocus) {
diff --git a/ide/properties/src/org/netbeans/modules/properties/PresentableFileEntry.java b/ide/properties/src/org/netbeans/modules/properties/PresentableFileEntry.java
index 73bbe85..100c882 100644
--- a/ide/properties/src/org/netbeans/modules/properties/PresentableFileEntry.java
+++ b/ide/properties/src/org/netbeans/modules/properties/PresentableFileEntry.java
@@ -302,7 +302,7 @@ public abstract class PresentableFileEntry extends FileEntry
*
* @return support
*/
- private synchronized final PropertyChangeSupport getChangeSupport () {
+ private final synchronized PropertyChangeSupport getChangeSupport () {
if (changeSupport == null) {
changeSupport = new PropertyChangeSupport (this);
}
diff --git a/ide/properties/src/org/netbeans/modules/properties/PropertiesOpen.java b/ide/properties/src/org/netbeans/modules/properties/PropertiesOpen.java
index 814dfaf..768b9d5 100644
--- a/ide/properties/src/org/netbeans/modules/properties/PropertiesOpen.java
+++ b/ide/properties/src/org/netbeans/modules/properties/PropertiesOpen.java
@@ -954,12 +954,12 @@ public class PropertiesOpen extends CloneableOpenSupport
* Changes display name of components accordingly. */
private transient PropertyChangeListener nameUpdaterListener;
- private transient static HashMap<PropertiesDataObject,PropertyChangeListener> weakNameUpdateListeners;
+ private static transient HashMap<PropertiesDataObject,PropertyChangeListener> weakNameUpdateListeners;
/** Generated serial version UID. */
static final long serialVersionUID =2836248291419024296L;
- private final static transient Object UPDATE_LOCK = new Object();
+ private static final transient Object UPDATE_LOCK = new Object();
/** Default constructor for deserialization. */
public PropertiesCloneableTopComponent() {
}
diff --git a/ide/properties/src/org/netbeans/modules/properties/PropertiesRequestProcessor.java b/ide/properties/src/org/netbeans/modules/properties/PropertiesRequestProcessor.java
index b70f4a9..81c3e59 100644
--- a/ide/properties/src/org/netbeans/modules/properties/PropertiesRequestProcessor.java
+++ b/ide/properties/src/org/netbeans/modules/properties/PropertiesRequestProcessor.java
@@ -30,7 +30,7 @@ import org.openide.util.RequestProcessor;
public class PropertiesRequestProcessor {
/** the static {@link org.openide.util.RequestProcessor} instance */
- private final static RequestProcessor requestProcessor =
+ private static final RequestProcessor requestProcessor =
new RequestProcessor ("org.netbeans.modules.properties.PropertiesRequestProcessor");
/** Creates a new instance of PropertiesResourceProcessor */
diff --git a/ide/properties/src/org/netbeans/modules/properties/TableViewSettings.java b/ide/properties/src/org/netbeans/modules/properties/TableViewSettings.java
index f0503d7..1298976 100644
--- a/ide/properties/src/org/netbeans/modules/properties/TableViewSettings.java
+++ b/ide/properties/src/org/netbeans/modules/properties/TableViewSettings.java
@@ -77,7 +77,7 @@ public abstract class TableViewSettings {
* registration changes to firing PCEs on returned
* instance.
*/
- public synchronized static TableViewSettings getDefault() {
+ public static synchronized TableViewSettings getDefault() {
if (delegatingSettings == null) {
Lookup lookup = Lookup.getDefault();
diff --git a/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/CheckNode.java b/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/CheckNode.java
index c5401ea..1447d57 100644
--- a/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/CheckNode.java
+++ b/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/CheckNode.java
@@ -41,8 +41,8 @@ import org.openide.util.RequestProcessor;
*/
public final class CheckNode extends DefaultMutableTreeNode {
- public final static int SINGLE_SELECTION = 0;
- public final static int DIG_IN_SELECTION = 4;
+ public static final int SINGLE_SELECTION = 0;
+ public static final int DIG_IN_SELECTION = 4;
private int selectionMode;
private boolean isSelected;
diff --git a/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/ui/ScopeProvider.java b/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/ui/ScopeProvider.java
index 08731b9..8082baa 100644
--- a/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/ui/ScopeProvider.java
+++ b/ide/refactoring.api/src/org/netbeans/modules/refactoring/spi/ui/ScopeProvider.java
@@ -118,7 +118,7 @@ public abstract class ScopeProvider {
*
* @since 1.30
*/
- public static abstract class CustomScopeProvider extends ScopeProvider {
+ public abstract static class CustomScopeProvider extends ScopeProvider {
/**
* Set the scope to be customized. This method will be called right
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beans/AttrProp.java b/ide/schema2beans/src/org/netbeans/modules/schema2beans/AttrProp.java
index d7e768a..923e73b 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beans/AttrProp.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beans/AttrProp.java
@@ -33,16 +33,16 @@ import java.util.*;
*/
public class AttrProp implements BaseAttribute {
- static public final int MASK_KIND = 0x00FF;
- static public final int CDATA = 0x0001;
- static public final int ENUM = 0x0002;
- static public final int NMTOKEN = 0x0003;
- static public final int ID = 0x0004;
- static public final int IDREF = 0x0005;
- static public final int IDREFS = 0x0006;
- static public final int ENTITY = 0x0007;
- static public final int ENTITIES = 0x0008;
- static public final int NOTATION = 0x0009;
+ public static final int MASK_KIND = 0x00FF;
+ public static final int CDATA = 0x0001;
+ public static final int ENUM = 0x0002;
+ public static final int NMTOKEN = 0x0003;
+ public static final int ID = 0x0004;
+ public static final int IDREF = 0x0005;
+ public static final int IDREFS = 0x0006;
+ public static final int ENTITY = 0x0007;
+ public static final int ENTITIES = 0x0008;
+ public static final int NOTATION = 0x0009;
static final String[] kinds =
new String[] {"CDATA", "ENUM", "NMTOKEN", "ID", "IDREF", // NOI18N
@@ -52,12 +52,12 @@ public class AttrProp implements BaseAttribute {
new int[] {CDATA, ENUM, NMTOKEN, ID, IDREF,
IDREFS, ENTITY, ENTITIES, NOTATION};
- static public final int MASK_OPTION = 0x0F00;
- static public final int REQUIRED = 0x0100;
- static public final int IMPLIED = 0x0200;
- static public final int FIXED = 0x0300;
+ public static final int MASK_OPTION = 0x0F00;
+ public static final int REQUIRED = 0x0100;
+ public static final int IMPLIED = 0x0200;
+ public static final int FIXED = 0x0300;
- static public final int TRANSIENT = 0x1000;
+ public static final int TRANSIENT = 0x1000;
static final String[] options =
new String[] {"#REQUIRED", "#IMPLIED", "#FIXED"}; // NOI18N
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beans/BaseAttribute.java b/ide/schema2beans/src/org/netbeans/modules/schema2beans/BaseAttribute.java
index b02ae9b..af8d2ea 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beans/BaseAttribute.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beans/BaseAttribute.java
@@ -35,22 +35,22 @@ public interface BaseAttribute {
/**
* Values returned by getType()
**/
- static public final int TYPE_CDATA = AttrProp.CDATA;
- static public final int TYPE_ENUM = AttrProp.ENUM;
- static public final int TYPE_NMTOKEN = AttrProp.NMTOKEN;
- static public final int TYPE_ID = AttrProp.ID;
- static public final int TYPE_IDREF = AttrProp.IDREF;
- static public final int TYPE_IDREFS = AttrProp.IDREFS;
- static public final int TYPE_ENTITY = AttrProp.ENTITY;
- static public final int TYPE_ENTITIES = AttrProp.ENTITIES;
- static public final int TYPE_NOTATION = AttrProp.NOTATION;
+ public static final int TYPE_CDATA = AttrProp.CDATA;
+ public static final int TYPE_ENUM = AttrProp.ENUM;
+ public static final int TYPE_NMTOKEN = AttrProp.NMTOKEN;
+ public static final int TYPE_ID = AttrProp.ID;
+ public static final int TYPE_IDREF = AttrProp.IDREF;
+ public static final int TYPE_IDREFS = AttrProp.IDREFS;
+ public static final int TYPE_ENTITY = AttrProp.ENTITY;
+ public static final int TYPE_ENTITIES = AttrProp.ENTITIES;
+ public static final int TYPE_NOTATION = AttrProp.NOTATION;
/**
* Values returned by getOption()
*/
- static public final int OPTION_REQUIRED = AttrProp.REQUIRED;
- static public final int OPTION_IMPLIED = AttrProp.IMPLIED;
- static public final int OPTION_FIXED = AttrProp.FIXED;
+ public static final int OPTION_REQUIRED = AttrProp.REQUIRED;
+ public static final int OPTION_IMPLIED = AttrProp.IMPLIED;
+ public static final int OPTION_FIXED = AttrProp.FIXED;
/**
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beans/Common.java b/ide/schema2beans/src/org/netbeans/modules/schema2beans/Common.java
index c1e198d..f0c7236 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beans/Common.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beans/Common.java
@@ -31,52 +31,52 @@ import java.util.MissingResourceException;
public class Common {
// Constants
- static public final int NONE = 0x00000;
+ public static final int NONE = 0x00000;
- static public final int MASK_USER = 0xFFFF;
- static public final int USE_DEFAULT_VALUES = 0x0001;
- static public final int NO_DEFAULT_VALUES = 0x0002;
+ public static final int MASK_USER = 0xFFFF;
+ public static final int USE_DEFAULT_VALUES = 0x0001;
+ public static final int NO_DEFAULT_VALUES = 0x0002;
- static public final int MASK_SEQUENCE = 0x0000F;
- static public final int SEQUENCE_AND = 0x00001;
- static public final int SEQUENCE_OR = 0x00002;
-
- static public final int MASK_INSTANCE = 0x000F0;
- static public final int TYPE_0_1 = 0x00010;
- static public final int TYPE_1 = 0x00020;
- static public final int TYPE_0_N = 0x00030;
- static public final int TYPE_1_N = 0x00040;
-
- static public final int MASK_TYPE = 0x0FF00;
- static public final int TYPE_STRING = 0x00100;
- static public final int TYPE_BEAN = 0x00200;
- static public final int TYPE_BOOLEAN = 0x00300;
- static public final int TYPE_BYTE = 0x00400;
- static public final int TYPE_CHAR = 0x00500;
- static public final int TYPE_SHORT = 0x00600;
- static public final int TYPE_INT = 0x00700;
- static public final int TYPE_LONG = 0x00800;
- static public final int TYPE_FLOAT = 0x00900;
- static public final int TYPE_DOUBLE = 0x00a00;
- static public final int TYPE_COMMENT = 0x00f00;
+ public static final int MASK_SEQUENCE = 0x0000F;
+ public static final int SEQUENCE_AND = 0x00001;
+ public static final int SEQUENCE_OR = 0x00002;
+
+ public static final int MASK_INSTANCE = 0x000F0;
+ public static final int TYPE_0_1 = 0x00010;
+ public static final int TYPE_1 = 0x00020;
+ public static final int TYPE_0_N = 0x00030;
+ public static final int TYPE_1_N = 0x00040;
+
+ public static final int MASK_TYPE = 0x0FF00;
+ public static final int TYPE_STRING = 0x00100;
+ public static final int TYPE_BEAN = 0x00200;
+ public static final int TYPE_BOOLEAN = 0x00300;
+ public static final int TYPE_BYTE = 0x00400;
+ public static final int TYPE_CHAR = 0x00500;
+ public static final int TYPE_SHORT = 0x00600;
+ public static final int TYPE_INT = 0x00700;
+ public static final int TYPE_LONG = 0x00800;
+ public static final int TYPE_FLOAT = 0x00900;
+ public static final int TYPE_DOUBLE = 0x00a00;
+ public static final int TYPE_COMMENT = 0x00f00;
- static public final int MASK_PROP = 0xF0000;
- static public final int TYPE_KEY = 0x10000;
- static public final int TYPE_SHOULD_NOT_BE_EMPTY = 0x20000;
+ public static final int MASK_PROP = 0xF0000;
+ public static final int TYPE_KEY = 0x10000;
+ public static final int TYPE_SHOULD_NOT_BE_EMPTY = 0x20000;
- static public final int TYPE_VETOABLE = 0x100000;
+ public static final int TYPE_VETOABLE = 0x100000;
- static public final int COMMENT = 0x01;
- static public final int ELEMENT = 0x02;
- static public final int ATTLIST = 0x03;
+ public static final int COMMENT = 0x01;
+ public static final int ELEMENT = 0x02;
+ public static final int ATTLIST = 0x03;
- static public final String DTD_STRING = "#PCDATA"; // NOI18N
- static public final String DTD_EMPTY = "EMPTY"; // NOI18N
+ public static final String DTD_STRING = "#PCDATA"; // NOI18N
+ public static final String DTD_EMPTY = "EMPTY"; // NOI18N
- static public final String CLASS_STRING = "String"; // NOI18N
- static public final String CLASS_BOOLEAN = "Boolean"; // NOI18N
+ public static final String CLASS_STRING = "String"; // NOI18N
+ public static final String CLASS_BOOLEAN = "Boolean"; // NOI18N
- static public final String GENERATED_TAG = "Generated";
+ public static final String GENERATED_TAG = "Generated";
public static boolean isSequenceOr(int type) {
@@ -404,7 +404,7 @@ public class Common {
*/
//static private ResourceBundle rb = null;
- static private String rbName = "org.netbeans.modules.schema2beans.Bundle"; // NOI18N
+ private static String rbName = "org.netbeans.modules.schema2beans.Bundle"; // NOI18N
public static String getMessage(String key) {
return Common.getMessage(key, null);
@@ -465,7 +465,7 @@ public class Common {
}
}
- static public String instanceToString(int instance) {
+ public static String instanceToString(int instance) {
switch (instance) {
case Common.TYPE_0_1:
return "optional";
@@ -478,7 +478,7 @@ public class Common {
}
}
- static public String instanceToCommonString(int instance) {
+ public static String instanceToCommonString(int instance) {
switch (instance) {
case Common.TYPE_0_1:
return "TYPE_0_1";
@@ -495,7 +495,7 @@ public class Common {
* Return the widest instance set. Widest as in has the most elements.
* For instance, TYPE_0_N is widder than TYPE_1.
*/
- static public int widestInstance(int instance1, int instance2) {
+ public static int widestInstance(int instance1, int instance2) {
if (instance1 == TYPE_0_N || instance2 == TYPE_0_N)
return TYPE_0_N;
if (instance1 == TYPE_1_N || instance2 == TYPE_1_N)
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beans/DDFactory.java b/ide/schema2beans/src/org/netbeans/modules/schema2beans/DDFactory.java
index 30db887..e94c5ca 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beans/DDFactory.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beans/DDFactory.java
@@ -134,7 +134,7 @@ public class DDFactory extends Object {
* in order to instantiate the schema2beans graph. This should be the
* class name of the root of the schema2beans generated classes.
*/
- static public void register(String name, String className)
+ public static void register(String name, String className)
throws ClassNotFoundException {
Class c = null;
try {
@@ -156,7 +156,7 @@ public class DDFactory extends Object {
* @param clazz class to use in order to instantiate the schema2beans graph.
* This should be the class of the root of the schema2beans generated classes.
*/
- static public void register(String name, Class clazz) {
+ public static void register(String name, Class clazz) {
synchronized (beanClassMap) {
beanClassMap.put(name, clazz);
}
@@ -195,7 +195,7 @@ public class DDFactory extends Object {
/**
* Dump the whole content of a DOM tree as a String
*/
- static public String XmlToString(Node n) {
+ public static String XmlToString(Node n) {
return XmlToString(n, 9999, null);
}
@@ -203,7 +203,7 @@ public class DDFactory extends Object {
* Dump the content of a DOM tree as a String. This methods only
* recurses for the specified depth.
*/
- static public String XmlToString(Node n, int depth) {
+ public static String XmlToString(Node n, int depth) {
return XmlToString(n, depth, null);
}
@@ -213,7 +213,7 @@ public class DDFactory extends Object {
* recurses for the specified depth and only prints elements that
* match the filter.
*/
- static public String XmlToString(Node n, int depth, String filter) {
+ public static String XmlToString(Node n, int depth, String filter) {
StringBuffer str = new StringBuffer();
nodeToString("", str, n, depth, filter, true); // NOI18N
return str.toString();
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beans/DDRegistry.java b/ide/schema2beans/src/org/netbeans/modules/schema2beans/DDRegistry.java
index 05a2613..9a4b60a 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beans/DDRegistry.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beans/DDRegistry.java
@@ -601,7 +601,7 @@ public class DDRegistry extends Object {
return false;
}
- static public String createGraphName(String s) {
+ public static String createGraphName(String s) {
if (s != null) {
//s = s.trim();
int i = s.indexOf('[');
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beans/DDRegistryParser.java b/ide/schema2beans/src/org/netbeans/modules/schema2beans/DDRegistryParser.java
index 83cfa14..f7c92c6 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beans/DDRegistryParser.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beans/DDRegistryParser.java
@@ -46,7 +46,7 @@ public class DDRegistryParser implements Iterator {
/**
* Analyze and resolve the vriable references specified in the path
*/
- static public class PathResolver {
+ public static class PathResolver {
static final char VARBEGIN = '{';
static final char VAREND = '}';
@@ -224,7 +224,7 @@ public class DDRegistryParser implements Iterator {
* Note that DDCursor can be created in two different ways: from a schema2beans
* path or from a schema2beans node (BaseBean).
*/
- static public class DDCursor {
+ public static class DDCursor {
DDCursor parent;
BaseBean root;
DDRegistry registry;
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beans/GraphManager.java b/ide/schema2beans/src/org/netbeans/modules/schema2beans/GraphManager.java
index 36476e3..a71ef72 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beans/GraphManager.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beans/GraphManager.java
@@ -873,7 +873,7 @@ public class GraphManager extends Object {
//
/////////////////////////////
- static public void debug(boolean d) {
+ public static void debug(boolean d) {
DDLogFlags.debug = d;
}
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beans/JavaBeansUtil.java b/ide/schema2beans/src/org/netbeans/modules/schema2beans/JavaBeansUtil.java
index d8fdbfc..cd26351 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beans/JavaBeansUtil.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beans/JavaBeansUtil.java
@@ -72,7 +72,7 @@ public class JavaBeansUtil {
/**
* The methods in this class will do proper XML indention for you.
*/
- public static abstract class IndentingBeanWriter implements BeanWriter {
+ public abstract static class IndentingBeanWriter implements BeanWriter {
protected String indentBy;
protected String indent;
protected int indentLevel = 0;
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beans/TraceLogger.java b/ide/schema2beans/src/org/netbeans/modules/schema2beans/TraceLogger.java
index 9e5a9af..f93f8be 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beans/TraceLogger.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beans/TraceLogger.java
@@ -37,12 +37,12 @@ public class TraceLogger extends Object {
static DDLogFlags flags = new DDLogFlags();
- static public void put(int type, int service, int group, int level,
+ public static void put(int type, int service, int group, int level,
int msg) {
put(type, service, group, level, msg, null);
}
- static public void put(int type, int service, int group, int level,
+ public static void put(int type, int service, int group, int level,
int msg, Object obj) {
String strService = "DD "; // NOI18N
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beans/Version.java b/ide/schema2beans/src/org/netbeans/modules/schema2beans/Version.java
index f860d47..9071637 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beans/Version.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beans/Version.java
@@ -20,9 +20,9 @@
package org.netbeans.modules.schema2beans;
public class Version implements java.io.Serializable {
- public final static int MAJVER = 5;
- public final static int MINVER = 0;
- public final static int PTCVER = 0;
+ public static final int MAJVER = 5;
+ public static final int MINVER = 0;
+ public static final int PTCVER = 0;
private int major;
private int minor;
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beans/XMLUtil.java b/ide/schema2beans/src/org/netbeans/modules/schema2beans/XMLUtil.java
index 847b2e7..2412f5a 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beans/XMLUtil.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beans/XMLUtil.java
@@ -465,7 +465,7 @@ public class XMLUtil {
}
// Given @param doc what should it's DOCTYPE name be.
- static protected String getDocTypeName(Document doc) {
+ protected static String getDocTypeName(Document doc) {
// First look for a DOCTYPE
NodeList children = doc.getChildNodes();
int length = children.getLength();
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/AbstractCodeGeneratorClass.java b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/AbstractCodeGeneratorClass.java
index bd1f925..5720d77 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/AbstractCodeGeneratorClass.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/AbstractCodeGeneratorClass.java
@@ -620,20 +620,20 @@ public abstract class AbstractCodeGeneratorClass {
// parts of the class start at one tabulation
//
- static protected final int PUBLIC = 0;
- static protected final int PRIVATE = 1;
- static protected final int VOID = 2;
- static protected final int CLASS = 3;
- static protected final int IMPORT = 4;
- static protected final int PACKAGE = 5;
- static protected final int STRING = 6;
- static protected final int BOOLEAN = 7;
- static protected final int STATIC = 8;
- static protected final int FINAL = 9;
- static protected final int INT = 10;
- static protected final int PROTECTED = 11;
+ protected static final int PUBLIC = 0;
+ protected static final int PRIVATE = 1;
+ protected static final int VOID = 2;
+ protected static final int CLASS = 3;
+ protected static final int IMPORT = 4;
+ protected static final int PACKAGE = 5;
+ protected static final int STRING = 6;
+ protected static final int BOOLEAN = 7;
+ protected static final int STATIC = 8;
+ protected static final int FINAL = 9;
+ protected static final int INT = 10;
+ protected static final int PROTECTED = 11;
- static protected final String arrKeywords[] = {
+ protected static final String arrKeywords[] = {
"public",
"private",
"void",
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/BaseBeansFactory.java b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/BaseBeansFactory.java
index 7a7e318..8552fbd 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/BaseBeansFactory.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/BaseBeansFactory.java
@@ -23,7 +23,7 @@ public class BaseBeansFactory implements CodeGeneratorFactory {
private BaseBeansFactory() {
}
- static public BaseBeansFactory newInstance() {
+ public static BaseBeansFactory newInstance() {
return new BaseBeansFactory();
}
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/DocDefParser.java b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/DocDefParser.java
index 1acb44f..daa08c8 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/DocDefParser.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/DocDefParser.java
@@ -39,16 +39,16 @@ public class DocDefParser extends GeneralParser implements SchemaParser {
}
}
- static private final int WORD_NO_CONTEXT = 0;
- static private final int WORD_CHECK = 1;
- static private final int WORD_COMMENT = 2;
- static private final int WORD_ELEMENT1 = 3;
- static private final int WORD_ELEMENT = 4;
- static private final int WORD_ATTLIST1 = 5;
- static private final int WORD_ATTLIST = 6;
- static private final int WORD_PI = 7;
- static private final int WORD_ENTITY1 = 10;
- static private final int WORD_ENTITY = 11;
+ private static final int WORD_NO_CONTEXT = 0;
+ private static final int WORD_CHECK = 1;
+ private static final int WORD_COMMENT = 2;
+ private static final int WORD_ELEMENT1 = 3;
+ private static final int WORD_ELEMENT = 4;
+ private static final int WORD_ATTLIST1 = 5;
+ private static final int WORD_ATTLIST = 6;
+ private static final int WORD_PI = 7;
+ private static final int WORD_ENTITY1 = 10;
+ private static final int WORD_ENTITY = 11;
static String errHeader = "DTD parsing failed: "; // NOI18N
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/GenBeans.java b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/GenBeans.java
index b6bf2dd..939d62a 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/GenBeans.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/GenBeans.java
@@ -49,7 +49,7 @@ public class GenBeans {
* writing of the generated files.
* The caller of getStream will eventually run .close on the OutputStream
*/
- static public interface OutputStreamProvider {
+ public static interface OutputStreamProvider {
public OutputStream getStream(String dir, String name,
String extension)
throws java.io.IOException;
@@ -62,7 +62,7 @@ public class GenBeans {
long time) throws java.io.IOException;
}
- static public class DefaultOutputStreamProvider implements OutputStreamProvider {
+ public static class DefaultOutputStreamProvider implements OutputStreamProvider {
private Config config;
private List generatedFiles;
@@ -99,7 +99,7 @@ public class GenBeans {
}
}
- static public class Config extends S2bConfig {
+ public static class Config extends S2bConfig {
// What kind of schema is it coming in
public static final int XML_SCHEMA = 0;
public static final int DTD = 1;
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/JavaBeanClass.java b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/JavaBeanClass.java
index dab13e4..702c75c 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/JavaBeanClass.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/JavaBeanClass.java
@@ -28,7 +28,7 @@ import org.netbeans.modules.schema2beansdev.gen.*;
public class JavaBeanClass extends AbstractCodeGeneratorClass implements CodeGeneratorClass {
// No element type number can be this one.
- final protected int elementTypeSetnull = -1;
+ protected final int elementTypeSetnull = -1;
private Map/*QName, String*/ declaredQNames = new HashMap();
private boolean loggerDeclared = false;
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/JavaBeansFactory.java b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/JavaBeansFactory.java
index 3b22496..11650b1 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/JavaBeansFactory.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/JavaBeansFactory.java
@@ -23,7 +23,7 @@ public class JavaBeansFactory implements CodeGeneratorFactory {
private JavaBeansFactory() {
}
- static public JavaBeansFactory newInstance() {
+ public static JavaBeansFactory newInstance() {
return new JavaBeansFactory();
}
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/SchemaRep.java b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/SchemaRep.java
index 806e1b2..3deb0f2 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/SchemaRep.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/SchemaRep.java
@@ -624,7 +624,7 @@ public class SchemaRep implements PrefixGuesser {
return result;
}
}
- static private Map schemaValidSubElementTypeMap = null;
+ private static Map schemaValidSubElementTypeMap = null;
static {
schemaValidSubElementTypeMap = new HashMap();
schemaValidSubElementTypeMap.put(Annotation.class, null);
@@ -729,7 +729,7 @@ public class SchemaRep implements PrefixGuesser {
return result;
}
}
- static private Map complexTypeValidSubElementTypeMap = null;
+ private static Map complexTypeValidSubElementTypeMap = null;
static {
complexTypeValidSubElementTypeMap = new HashMap();
complexTypeValidSubElementTypeMap.put(Annotation.class, null);
@@ -779,7 +779,7 @@ public class SchemaRep implements PrefixGuesser {
return simpleContentValidSubElementTypeMap;
}
}
- static private Map simpleContentValidSubElementTypeMap = null;
+ private static Map simpleContentValidSubElementTypeMap = null;
static {
simpleContentValidSubElementTypeMap = new HashMap();
simpleContentValidSubElementTypeMap.put(Annotation.class, null);
@@ -848,7 +848,7 @@ public class SchemaRep implements PrefixGuesser {
return result;
}
}
- static private Map complexContentValidSubElementTypeMap = null;
+ private static Map complexContentValidSubElementTypeMap = null;
static {
complexContentValidSubElementTypeMap = new HashMap();
complexContentValidSubElementTypeMap.put(Annotation.class, null);
@@ -982,7 +982,7 @@ public class SchemaRep implements PrefixGuesser {
return result;
}
}
- static private Map simpleTypeValidSubElementTypeMap = null;
+ private static Map simpleTypeValidSubElementTypeMap = null;
static {
simpleTypeValidSubElementTypeMap = new HashMap();
simpleTypeValidSubElementTypeMap.put(Annotation.class, null);
@@ -1116,7 +1116,7 @@ public class SchemaRep implements PrefixGuesser {
return result;
}
}
- static private Map unionTypeValidSubElementTypeMap = null;
+ private static Map unionTypeValidSubElementTypeMap = null;
static {
unionTypeValidSubElementTypeMap = new HashMap();
unionTypeValidSubElementTypeMap.put(Annotation.class, null);
@@ -1258,7 +1258,7 @@ public class SchemaRep implements PrefixGuesser {
return result;
}
}
- static private Map restrictionValidSubElementTypeMap = null;
+ private static Map restrictionValidSubElementTypeMap = null;
static {
restrictionValidSubElementTypeMap = new HashMap();
restrictionValidSubElementTypeMap.put(Annotation.class, null);
@@ -1358,7 +1358,7 @@ public class SchemaRep implements PrefixGuesser {
return result;
}
}
- static private Map extensionValidSubElementTypeMap = null;
+ private static Map extensionValidSubElementTypeMap = null;
static {
extensionValidSubElementTypeMap = new HashMap();
extensionValidSubElementTypeMap.put(Annotation.class, null);
@@ -1445,7 +1445,7 @@ public class SchemaRep implements PrefixGuesser {
return result;
}
}
- static private Map listValidSubElementTypeMap = null;
+ private static Map listValidSubElementTypeMap = null;
static {
listValidSubElementTypeMap = new HashMap();
listValidSubElementTypeMap.put(Annotation.class, null);
@@ -1515,7 +1515,7 @@ public class SchemaRep implements PrefixGuesser {
return getName()+" ("+value+")";
}
}
- static private Map restrictionTypeValidSubElementTypeMap = null;
+ private static Map restrictionTypeValidSubElementTypeMap = null;
static {
restrictionTypeValidSubElementTypeMap = new HashMap();
restrictionTypeValidSubElementTypeMap.put(Annotation.class, null);
@@ -2017,7 +2017,7 @@ public class SchemaRep implements PrefixGuesser {
return new Key();
}
}
- static private Map keyValidSubElementTypeMap = null;
+ private static Map keyValidSubElementTypeMap = null;
static {
keyValidSubElementTypeMap = new HashMap();
keyValidSubElementTypeMap.put(Annotation.class, null);
@@ -2042,7 +2042,7 @@ public class SchemaRep implements PrefixGuesser {
return new Unique();
}
}
- static private Map uniqueValidSubElementTypeMap = null;
+ private static Map uniqueValidSubElementTypeMap = null;
static {
uniqueValidSubElementTypeMap = new HashMap();
uniqueValidSubElementTypeMap.put(Annotation.class, null);
@@ -2100,7 +2100,7 @@ public class SchemaRep implements PrefixGuesser {
return new KeyRef();
}
}
- static private Map keyrefValidSubElementTypeMap = null;
+ private static Map keyrefValidSubElementTypeMap = null;
static {
keyrefValidSubElementTypeMap = new HashMap();
keyrefValidSubElementTypeMap.put(Annotation.class, null);
@@ -2213,7 +2213,7 @@ public class SchemaRep implements PrefixGuesser {
return new Selector();
}
}
- static private Map selectorValidSubElementTypeMap = null;
+ private static Map selectorValidSubElementTypeMap = null;
static {
selectorValidSubElementTypeMap = new HashMap();
selectorValidSubElementTypeMap.put(Annotation.class, null);
@@ -2235,7 +2235,7 @@ public class SchemaRep implements PrefixGuesser {
return new Field();
}
}
- static private Map fieldValidSubElementTypeMap = null;
+ private static Map fieldValidSubElementTypeMap = null;
static {
fieldValidSubElementTypeMap = new HashMap();
fieldValidSubElementTypeMap.put(Annotation.class, null);
@@ -2567,7 +2567,7 @@ public class SchemaRep implements PrefixGuesser {
return new Sequence();
}
}
- static private Map sequenceValidSubElementTypeMap = null;
+ private static Map sequenceValidSubElementTypeMap = null;
static {
sequenceValidSubElementTypeMap = new HashMap();
sequenceValidSubElementTypeMap.put(Annotation.class, null);
@@ -2595,7 +2595,7 @@ public class SchemaRep implements PrefixGuesser {
return new Choice();
}
}
- static private Map choiceValidSubElementTypeMap = null;
+ private static Map choiceValidSubElementTypeMap = null;
static {
choiceValidSubElementTypeMap = new HashMap();
choiceValidSubElementTypeMap.put(Annotation.class, null);
@@ -2623,7 +2623,7 @@ public class SchemaRep implements PrefixGuesser {
return new All();
}
}
- static private Map allValidSubElementTypeMap = null;
+ private static Map allValidSubElementTypeMap = null;
static {
allValidSubElementTypeMap = new HashMap();
allValidSubElementTypeMap.put(Annotation.class, null);
@@ -2737,7 +2737,7 @@ public class SchemaRep implements PrefixGuesser {
return result;
}
}
- static private Map groupValidSubElementTypeMap = null;
+ private static Map groupValidSubElementTypeMap = null;
static {
groupValidSubElementTypeMap = new HashMap();
groupValidSubElementTypeMap.put(All.class, null);
@@ -2787,7 +2787,7 @@ public class SchemaRep implements PrefixGuesser {
return annotationValidSubElementTypeMap;
}
}
- static private Map annotationValidSubElementTypeMap = null;
+ private static Map annotationValidSubElementTypeMap = null;
static {
annotationValidSubElementTypeMap = new HashMap();
annotationValidSubElementTypeMap.put(AppInfo.class, null);
@@ -2839,7 +2839,7 @@ public class SchemaRep implements PrefixGuesser {
return appInfoValidSubElementTypeMap;
}
}
- static private Map appInfoValidSubElementTypeMap = null;
+ private static Map appInfoValidSubElementTypeMap = null;
static {
appInfoValidSubElementTypeMap = new HashMap();
appInfoValidSubElementTypeMap.put(AnyNode.class, null);
@@ -2884,7 +2884,7 @@ public class SchemaRep implements PrefixGuesser {
return documentationValidSubElementTypeMap;
}
}
- static private Map documentationValidSubElementTypeMap = null;
+ private static Map documentationValidSubElementTypeMap = null;
static {
documentationValidSubElementTypeMap = new HashMap();
documentationValidSubElementTypeMap.put(AnyNode.class, null);
@@ -2987,7 +2987,7 @@ public class SchemaRep implements PrefixGuesser {
return result;
}
}
- static private Map anyNodeValidSubElementTypeMap = null;
+ private static Map anyNodeValidSubElementTypeMap = null;
static {
anyNodeValidSubElementTypeMap = new HashMap();
anyNodeValidSubElementTypeMap.put(AnyNode.class, null);
@@ -3074,7 +3074,7 @@ public class SchemaRep implements PrefixGuesser {
return result;
}
}
- static private Map textNodeValidSubElementTypeMap = null;
+ private static Map textNodeValidSubElementTypeMap = null;
static {
textNodeValidSubElementTypeMap = new HashMap();
textNodeValidSubElementTypeMap.put(AnyNode.class, null);
@@ -3519,7 +3519,7 @@ public class SchemaRep implements PrefixGuesser {
return result;
}
}
- static private Map elementValidSubElementTypeMap = null;
+ private static Map elementValidSubElementTypeMap = null;
static {
elementValidSubElementTypeMap = new HashMap();
elementValidSubElementTypeMap.put(Annotation.class, null);
@@ -3653,7 +3653,7 @@ public class SchemaRep implements PrefixGuesser {
return result;
}
}
- static private Map anyValidSubElementTypeMap = null;
+ private static Map anyValidSubElementTypeMap = null;
static {
anyValidSubElementTypeMap = new HashMap();
anyValidSubElementTypeMap.put(Annotation.class, null);
@@ -3738,7 +3738,7 @@ public class SchemaRep implements PrefixGuesser {
return result;
}
}
- static private Map anyAttributeValidSubElementTypeMap = null;
+ private static Map anyAttributeValidSubElementTypeMap = null;
static {
anyAttributeValidSubElementTypeMap = new HashMap();
anyAttributeValidSubElementTypeMap.put(Annotation.class, null);
@@ -4005,7 +4005,7 @@ public class SchemaRep implements PrefixGuesser {
return result;
}
}
- static private Map attributeValidSubElementTypeMap = null;
+ private static Map attributeValidSubElementTypeMap = null;
static {
attributeValidSubElementTypeMap = new HashMap();
attributeValidSubElementTypeMap.put(Annotation.class, null);
@@ -4118,7 +4118,7 @@ public class SchemaRep implements PrefixGuesser {
return result;
}
}
- static private Map attributeGroupValidSubElementTypeMap = null;
+ private static Map attributeGroupValidSubElementTypeMap = null;
static {
attributeGroupValidSubElementTypeMap = new HashMap();
attributeGroupValidSubElementTypeMap.put(Annotation.class, null);
@@ -4859,11 +4859,11 @@ public class SchemaRep implements PrefixGuesser {
}
}
- static public String getXPathExpr(Node node) {
+ public static String getXPathExpr(Node node) {
return getXPathExpr(node, true);
}
- static public String getXPathExpr(Node node, boolean addDescription) {
+ public static String getXPathExpr(Node node, boolean addDescription) {
if (node instanceof Document)
return "/";
Node parentNode = node.getParentNode();
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/XMLSchemaParser.java b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/XMLSchemaParser.java
index 840c0e3..0f077bf 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/XMLSchemaParser.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/XMLSchemaParser.java
@@ -31,7 +31,7 @@ import org.netbeans.modules.schema2beansdev.gen.XMLWriter;
import org.netbeans.modules.schema2beansdev.metadd.*;
public class XMLSchemaParser extends GeneralParser implements SchemaParser {
- public final static String JAVA_TYPE_NS = "http://schema2beans.netbeans.org/javaTypes";
+ public static final String JAVA_TYPE_NS = "http://schema2beans.netbeans.org/javaTypes";
// Handler to callback with the tokens found in the Schema.
private DocDefHandler handler;
@@ -1031,7 +1031,7 @@ public class XMLSchemaParser extends GeneralParser implements SchemaParser {
}
}
- static protected int getInstanceValue(String minOccurs, String maxOccurs) {
+ protected static int getInstanceValue(String minOccurs, String maxOccurs) {
if (minOccurs == null)
minOccurs = "1";
if (maxOccurs == null)
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/JavaUtil.java b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/JavaUtil.java
index ba825f2..6b176c4 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/JavaUtil.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/JavaUtil.java
@@ -53,7 +53,7 @@ public class JavaUtil {
}
}
}
- static public String toObject(String expr, String classType, boolean j2me, boolean java5) {
+ public static String toObject(String expr, String classType, boolean j2me, boolean java5) {
if (j2me) {
if ("boolean".equals(classType))
return "new java.lang.Boolean("+expr+")";
@@ -61,7 +61,7 @@ public class JavaUtil {
return toObject(expr, classType, java5);
}
- static private Map toObjectType;
+ private static Map toObjectType;
static {
toObjectType = new HashMap();
toObjectType.put("int", "java.lang.Integer");
@@ -78,14 +78,14 @@ public class JavaUtil {
* Take a Java primitive and return it's object type.
* Return the same type if there isn't an object version.
*/
- static public String toObjectType(String classType) {
+ public static String toObjectType(String classType) {
String objClass = (String) toObjectType.get(classType);
if (objClass == null)
return classType;
return objClass;
}
- static private Map fromObjectType;
+ private static Map fromObjectType;
static {
fromObjectType = new HashMap();
fromObjectType.put("java.lang.Integer", "int");
@@ -110,7 +110,7 @@ public class JavaUtil {
* Take a Java boxed object (like Integer) and return it's primitive type.
* Return the same type if there isn't a primitive version.
*/
- static public String fromObjectType(String classType) {
+ public static String fromObjectType(String classType) {
String objClass = (String) fromObjectType.get(classType);
if (objClass == null)
return classType;
@@ -125,7 +125,7 @@ public class JavaUtil {
* ('int', '42') -> '""+42'
* ('Integer', 'age') -> 'age.toString()'
*/
- static public String typeToString(String type, String expr) {
+ public static String typeToString(String type, String expr) {
type = (type == null) ? null : type.intern();
if ("String" == type || "java.lang.String" == type)
return expr;
@@ -144,7 +144,7 @@ public class JavaUtil {
* eg: ('java.lang.Double', expr) -> '(java.lang.Double) expr'
* eg: ('int', 'obj') -> '((java.lang.Integer)obj).intValue()'
*/
- static public String fromObject(String type, String expr) {
+ public static String fromObject(String type, String expr) {
type = type.intern();
if (type == "int")
return "((java.lang.Integer)"+expr+").intValue()";
@@ -169,11 +169,11 @@ public class JavaUtil {
* Is @param className immutable? An immutable object can hold state,
* but after it's been constructed that state cannot change.
*/
- static public boolean isImmutable(String className) {
+ public static boolean isImmutable(String className) {
className = className.intern();
return immutableTable.containsKey(className);
}
- static private Map immutableTable;
+ private static Map immutableTable;
static {
immutableTable = new HashMap();
immutableTable.put("String", null);
@@ -406,7 +406,7 @@ public class JavaUtil {
* eg: ('java.lang.Integer', 'node.getNodeValue()')
* -> 'new java.lang.Integer(node.getNodeValue())'
*/
- static public String genParseTextME(String type, String name) {
+ public static String genParseTextME(String type, String name) {
String parm = name;
type = type.intern();
if (type == "String" || type == "java.lang.String")
@@ -601,7 +601,7 @@ public class JavaUtil {
* Given a scalar type, figure out how to make it into an int
* (ie, hash code).
*/
- static public String exprToInt(String type, String expr) {
+ public static String exprToInt(String type, String expr) {
type = type.intern();
if (type == "boolean")
return expr+" ? 0 : 1";
@@ -626,14 +626,14 @@ public class JavaUtil {
* ('String', 'word', '"hello"') -> 'word == null ? "hello" == null : word.equals("hello")'
* ('float', 'var1', 'var2') -> 'Float.floatToIntBits(var1) == Float.floatToIntBits(var2)'
*/
- static public String genEquals(String type, String attr1, String attr2) {
+ public static String genEquals(String type, String attr1, String attr2) {
return genEquals(type, attr1, attr2, true);
}
/**
* @param attr1CanBeNull whether or not attr1 could be null.
*/
- static public String genEquals(String type, String attr1, String attr2,
+ public static String genEquals(String type, String attr1, String attr2,
boolean attr1CanBeNull) {
type = type.intern();
if (type == "float") {
@@ -803,7 +803,7 @@ public class JavaUtil {
return true;
}
- static public String baseClassOfArray(String className) {
+ public static String baseClassOfArray(String className) {
// Does this handle more than 1 dimensional arrays correctly
if (className.startsWith("[L") && className.endsWith(";")) { // NOI18N
return className.substring(2, className.length()-1);
@@ -817,7 +817,7 @@ public class JavaUtil {
* eg: "java.lang.String[]" -> "String[]"
* "java.util.ArrayList" -> "ArrayList"
*/
- static public String baseName(String fullClassName) {
+ public static String baseName(String fullClassName) {
int pos = fullClassName.lastIndexOf('.');
if (pos == -1)
return fullClassName;
@@ -827,7 +827,7 @@ public class JavaUtil {
private static final Class charArrayClass =
java.lang.reflect.Array.newInstance(java.lang.Character.TYPE, 0).getClass();
- static public String getCanonicalClassName(Class cls) {
+ public static String getCanonicalClassName(Class cls) {
if (charArrayClass.isAssignableFrom(cls))
return "char[]"; // NOI18N
if (cls.isArray())
@@ -835,7 +835,7 @@ public class JavaUtil {
return cls.getName();
}
- static public int getOptimialHashMapSize(Object[] keys) {
+ public static int getOptimialHashMapSize(Object[] keys) {
return getOptimialHashMapSize(keys, keys.length * 8);
}
@@ -847,7 +847,7 @@ public class JavaUtil {
*
* @param maxSize the point at which to give up (the maximum size to try)
*/
- static public int getOptimialHashMapSize(Object[] keys, int maxSize) {
+ public static int getOptimialHashMapSize(Object[] keys, int maxSize) {
int keyLength = keys.length;
int defaultAnswer = keyLength + 1;
try {
@@ -884,12 +884,12 @@ public class JavaUtil {
// Convert the @param in stream using native2ascii, assuming it's already
// UTF-8 encoded.
- static public void native2ascii(Writer out, Reader in) throws java.io.IOException {
+ public static void native2ascii(Writer out, Reader in) throws java.io.IOException {
FilterWriter n2afilter = new N2AFilter(out);
copyStream(n2afilter, in);
}
- static public class N2AFilter extends FilterWriter {
+ public static class N2AFilter extends FilterWriter {
public N2AFilter(Writer writer) {
super(writer);
}
@@ -979,7 +979,7 @@ public class JavaUtil {
return totalLength;
}
- static public class InputMonitor implements Runnable {
+ public static class InputMonitor implements Runnable {
private InputStream is;
private OutputStream out;
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/JavaWriter.java b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/JavaWriter.java
index 03389dd..c7d1c71 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/JavaWriter.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/JavaWriter.java
@@ -30,21 +30,21 @@ public class JavaWriter extends IndentingWriter {
public int CONSTRUCTOR_SECTION = 2;
public int BODY_SECTION = 3;
public int TRAILER_SECTION = 4;
- static final protected int defaultSectionCount = 5;
+ protected static final int defaultSectionCount = 5;
- static public final int PUBLIC = 0x0;
- static public final int PROTECTED = 0x1;
- static public final int PACKAGE_LEVEL = 0x2;
- static public final int PRIVATE = 0x3;
- static public final int ACCESS_MASK = 0x3;
+ public static final int PUBLIC = 0x0;
+ public static final int PROTECTED = 0x1;
+ public static final int PACKAGE_LEVEL = 0x2;
+ public static final int PRIVATE = 0x3;
+ public static final int ACCESS_MASK = 0x3;
- static public final int STATIC = 0x10;
- static public final int FINAL = 0x20;
+ public static final int STATIC = 0x10;
+ public static final int FINAL = 0x20;
- static public final int BEANINFO = 0x100;
- static public final int IO = 0x200;
- static public final int UNSUPPORTED = 0x400;
- static public final int METHOD_SEMANTIC_MASK = 0xf00;
+ public static final int BEANINFO = 0x100;
+ public static final int IO = 0x200;
+ public static final int UNSUPPORTED = 0x400;
+ public static final int METHOD_SEMANTIC_MASK = 0xf00;
protected boolean newlineBeforeCurlyBrace = false;
public boolean storeMethods = true;
@@ -528,7 +528,7 @@ public class JavaWriter extends IndentingWriter {
beginIf(predicate);
}
- public final static int rightMarginColumn = 76;
+ public static final int rightMarginColumn = 76;
public void beginFor(String init, String predicate, String next) throws IOException {
int indentLength;
if ("\t".equals(indentString))
diff --git a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/XMLWriter.java b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/XMLWriter.java
index f7d9cca..c2f84f6 100644
--- a/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/XMLWriter.java
+++ b/ide/schema2beans/src/org/netbeans/modules/schema2beansdev/gen/XMLWriter.java
@@ -30,7 +30,7 @@ public class XMLWriter extends IndentingWriter {
public int HEADER_SECTION = 0;
public int BODY_SECTION = 1;
- static final protected int defaultSectionCount = 2;
+ protected static final int defaultSectionCount = 2;
public XMLWriter() {
super(defaultSectionCount);
diff --git a/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/annotations/WatchAnnotationProvider.java b/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/annotations/WatchAnnotationProvider.java
index db46d4d..afe97c1 100644
--- a/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/annotations/WatchAnnotationProvider.java
+++ b/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/annotations/WatchAnnotationProvider.java
@@ -972,7 +972,7 @@ public class WatchAnnotationProvider implements AnnotationProvider, LazyDebugger
return tf;
}
- public static abstract class PinSupportedAccessor {
+ public abstract static class PinSupportedAccessor {
public abstract ValueProvider getValueProvider(EditorPin pin);
diff --git a/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/eval/CodeEvaluatorUI.java b/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/eval/CodeEvaluatorUI.java
index 1f14379..a1ab1db 100644
--- a/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/eval/CodeEvaluatorUI.java
+++ b/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/eval/CodeEvaluatorUI.java
@@ -71,7 +71,7 @@ public class CodeEvaluatorUI extends TopComponent implements HelpCtx.Provider,
private static final String ID = "evaluatorPane"; //NOI18N
private static final String PROP_RESULT_CHANGED = "resultChanged"; // NOI18N
- final private PropertyChangeSupport pcs = new PropertyChangeSupport(this);
+ private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
private static WeakReference<CodeEvaluatorUI> instanceRef;
private JEditorPane codePane;
diff --git a/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/models/WatchesActionsProvider.java b/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/models/WatchesActionsProvider.java
index 41ceb2f..c3aec83 100644
--- a/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/models/WatchesActionsProvider.java
+++ b/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/models/WatchesActionsProvider.java
@@ -189,7 +189,7 @@ public class WatchesActionsProvider implements NodeActionsProvider {
w.setExpression(wp.getExpression());
}
- private static abstract class CheckBoxAction extends AbstractAction implements Presenter.Popup {
+ private abstract static class CheckBoxAction extends AbstractAction implements Presenter.Popup {
private JCheckBoxMenuItem popupItem;
diff --git a/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/views/debugging/FiltersDescriptor.java b/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/views/debugging/FiltersDescriptor.java
index 0682601..7df591b 100644
--- a/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/views/debugging/FiltersDescriptor.java
+++ b/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/views/debugging/FiltersDescriptor.java
@@ -97,7 +97,7 @@ public final class FiltersDescriptor {
filters = Collections.emptyList();
}
- public synchronized static FiltersDescriptor getInstance() {
+ public static synchronized FiltersDescriptor getInstance() {
if (instance == null) {
instance = new FiltersDescriptor();
//instance = createDebuggingViewFilters();
diff --git a/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/views/debugging/TapPanel.java b/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/views/debugging/TapPanel.java
index aa709aa..da0b675 100644
--- a/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/views/debugging/TapPanel.java
+++ b/ide/spi.debugger.ui/src/org/netbeans/modules/debugger/ui/views/debugging/TapPanel.java
@@ -278,7 +278,7 @@ public final class TapPanel extends javax.swing.JPanel {
}
- final static class TrivialLayout implements LayoutManager {
+ static final class TrivialLayout implements LayoutManager {
public void addLayoutComponent (String name, Component comp) {
//do nothing
diff --git a/ide/spi.debugger.ui/src/org/netbeans/spi/debugger/ui/CodeEvaluator.java b/ide/spi.debugger.ui/src/org/netbeans/spi/debugger/ui/CodeEvaluator.java
index 00d041b..b7144c5 100644
--- a/ide/spi.debugger.ui/src/org/netbeans/spi/debugger/ui/CodeEvaluator.java
+++ b/ide/spi.debugger.ui/src/org/netbeans/spi/debugger/ui/CodeEvaluator.java
@@ -95,7 +95,7 @@ public final class CodeEvaluator {
* Service handling evaluations in the code evaluator.
* Register an implementation of this class via {@link Registration} annotation.
*/
- public static abstract class EvaluatorService {
+ public abstract static class EvaluatorService {
/**
* Property name fired in order to refresh the evaluate button state.
diff --git a/ide/spi.debugger.ui/src/org/netbeans/spi/debugger/ui/DebuggingView.java b/ide/spi.debugger.ui/src/org/netbeans/spi/debugger/ui/DebuggingView.java
index cbf64c2..1c53aad 100644
--- a/ide/spi.debugger.ui/src/org/netbeans/spi/debugger/ui/DebuggingView.java
+++ b/ide/spi.debugger.ui/src/org/netbeans/spi/debugger/ui/DebuggingView.java
@@ -57,7 +57,7 @@ import org.openide.windows.TopComponent;
*/
public final class DebuggingView {
- private final static DebuggingView INSTANCE = new DebuggingView();
+ private static final DebuggingView INSTANCE = new DebuggingView();
private Reference<DebuggingViewComponent> dvcRef = new WeakReference<DebuggingViewComponent>(null);
@@ -100,7 +100,7 @@ public final class DebuggingView {
* Debugging view is created for the given debugger session only when an
* implementation of this class is found in the current session engine lookup.
*/
- public static abstract class DVSupport {
+ public abstract static class DVSupport {
/** Property name constant. */
public static final String PROP_THREAD_STARTED = "threadStarted"; // NOI18N
diff --git a/ide/spi.debugger.ui/src/org/netbeans/spi/debugger/ui/EditorContextDispatcher.java b/ide/spi.debugger.ui/src/org/netbeans/spi/debugger/ui/EditorContextDispatcher.java
index 2da7842..897eb84 100644
--- a/ide/spi.debugger.ui/src/org/netbeans/spi/debugger/ui/EditorContextDispatcher.java
+++ b/ide/spi.debugger.ui/src/org/netbeans/spi/debugger/ui/EditorContextDispatcher.java
@@ -884,7 +884,7 @@ public final class EditorContextDispatcher {
* Therefore it can block EventQueue for an unpredictable amount of time.
* This is why doing it in AWT can block UI. Use this class not to block the UI.
*/
- private final static class AddRemoveFileListenerInEQThread implements Runnable {
+ private static final class AddRemoveFileListenerInEQThread implements Runnable {
private enum AddRemove { ADD, REMOVE }
private static final Queue<Work> work = new LinkedList<Work>();
@@ -924,7 +924,7 @@ public final class EditorContextDispatcher {
}
}
- private synchronized static Work getWork() {
+ private static synchronized Work getWork() {
return work.poll();
}
diff --git a/ide/spi.editor.hints/src/org/netbeans/modules/editor/hints/borrowed/ListCompletionView.java b/ide/spi.editor.hints/src/org/netbeans/modules/editor/hints/borrowed/ListCompletionView.java
index d11c0f7..6fc2db8 100644
--- a/ide/spi.editor.hints/src/org/netbeans/modules/editor/hints/borrowed/ListCompletionView.java
+++ b/ide/spi.editor.hints/src/org/netbeans/modules/editor/hints/borrowed/ListCompletionView.java
@@ -70,8 +70,8 @@ public class ListCompletionView extends JList {
private static final Logger LOG = Logger.getLogger(ListCompletionView.class.getName());
public static final int COMPLETION_ITEM_HEIGHT = 16;
private static final int DARKER_COLOR_COMPONENT = 5;
- private final static Icon icon = ImageUtilities.loadImageIcon("org/netbeans/modules/editor/hints/resources/suggestion.gif", false); // NOI18N
- private final static Icon subMenuIcon;
+ private static final Icon icon = ImageUtilities.loadImageIcon("org/netbeans/modules/editor/hints/resources/suggestion.gif", false); // NOI18N
+ private static final Icon subMenuIcon;
private final int fixedItemHeight;
private final HtmlRenderer.Renderer defaultRenderer = HtmlRenderer.createRenderer();
private Font font;
diff --git a/ide/spi.navigator/test/unit/src/org/netbeans/modules/navigator/NavigatorTCTest.java b/ide/spi.navigator/test/unit/src/org/netbeans/modules/navigator/NavigatorTCTest.java
index 6685b36..99efa8d 100644
--- a/ide/spi.navigator/test/unit/src/org/netbeans/modules/navigator/NavigatorTCTest.java
+++ b/ide/spi.navigator/test/unit/src/org/netbeans/modules/navigator/NavigatorTCTest.java
@@ -702,7 +702,7 @@ public class NavigatorTCTest extends NbTestCase {
/** Test provider base, to test that infrastucture calls correct
* methods in correct order.
*/
- private static abstract class CorrectCallsProvider implements NavigatorPanel {
+ private abstract static class CorrectCallsProvider implements NavigatorPanel {
private int panelActCalls = 0;
private int panelDeactCalls = 0;
@@ -965,7 +965,7 @@ public class NavigatorTCTest extends NbTestCase {
}
}
- public static abstract class LastSelBase implements NavigatorPanel {
+ public abstract static class LastSelBase implements NavigatorPanel {
public Lookup getLookup () {
return null;
diff --git a/ide/spi.palette/src/org/netbeans/modules/palette/ui/DnDSupport.java b/ide/spi.palette/src/org/netbeans/modules/palette/ui/DnDSupport.java
index 78cc678..808e428 100644
--- a/ide/spi.palette/src/org/netbeans/modules/palette/ui/DnDSupport.java
+++ b/ide/spi.palette/src/org/netbeans/modules/palette/ui/DnDSupport.java
@@ -59,7 +59,7 @@ import org.netbeans.modules.palette.Item;
*/
public class DnDSupport implements DragGestureListener, DropTargetListener {
- final static private int DELAY_TIME_FOR_EXPAND = 1000;
+ private static final int DELAY_TIME_FOR_EXPAND = 1000;
private Set<DragGestureRecognizer> recognizers = new HashSet<DragGestureRecognizer>( 5 );
private Set<DropTarget> dropTargets = new HashSet<DropTarget>( 5 );
@@ -230,7 +230,7 @@ public class DnDSupport implements DragGestureListener, DropTargetListener {
timer = new Timer(
DELAY_TIME_FOR_EXPAND,
new ActionListener() {
- final public void actionPerformed(ActionEvent e) {
+ public final void actionPerformed(ActionEvent e) {
button.setExpanded( true );
}
}
diff --git a/ide/spi.palette/src/org/netbeans/modules/palette/ui/DropGlassPane.java b/ide/spi.palette/src/org/netbeans/modules/palette/ui/DropGlassPane.java
index 6354dcb..06ba78b 100644
--- a/ide/spi.palette/src/org/netbeans/modules/palette/ui/DropGlassPane.java
+++ b/ide/spi.palette/src/org/netbeans/modules/palette/ui/DropGlassPane.java
@@ -39,14 +39,14 @@ import javax.swing.JTree;
* @see org.openide.explorer.view.TreeViewDropSupport
*/
final class DropGlassPane extends JPanel {
- static private HashMap<Integer,DropGlassPane> map = new HashMap<Integer,DropGlassPane>();
- final static private int MIN_X = 0;//5;
- final static private int MIN_Y = 0;//3;
- final static private int MIN_WIDTH = 0;//10;
- final static private int MIN_HEIGTH = 0;//3;
- static private Component oldPane;
- static private JComponent originalSource;
- static private boolean wasVisible;
+ private static HashMap<Integer,DropGlassPane> map = new HashMap<Integer,DropGlassPane>();
+ private static final int MIN_X = 0;//5;
+ private static final int MIN_Y = 0;//3;
+ private static final int MIN_WIDTH = 0;//10;
+ private static final int MIN_HEIGTH = 0;//3;
+ private static Component oldPane;
+ private static JComponent originalSource;
+ private static boolean wasVisible;
Line2D line = null;
Rectangle prevLineRect = null;
@@ -57,7 +57,7 @@ final class DropGlassPane extends JPanel {
* calculate the new bounds in current pane's boundary.
* @param comp
* @return */
- synchronized static public DropGlassPane getDefault(JComponent comp) {
+ public static synchronized DropGlassPane getDefault(JComponent comp) {
Integer id = Integer.valueOf(System.identityHashCode(comp));
if ((map.get(id)) == null) {
diff --git a/ide/spi.palette/src/org/netbeans/spi/palette/PaletteSwitch.java b/ide/spi.palette/src/org/netbeans/spi/palette/PaletteSwitch.java
index 7c73487..c636ea6 100644
--- a/ide/spi.palette/src/org/netbeans/spi/palette/PaletteSwitch.java
+++ b/ide/spi.palette/src/org/netbeans/spi/palette/PaletteSwitch.java
@@ -74,7 +74,7 @@ final class PaletteSwitch implements Runnable, LookupListener {
propertySupport = new PropertyChangeSupport( this );
}
- public synchronized static PaletteSwitch getDefault() {
+ public static synchronized PaletteSwitch getDefault() {
if( null == theInstance ) {
theInstance = new PaletteSwitch();
}
diff --git a/ide/spi.palette/src/org/netbeans/spi/palette/PaletteTopComponent.java b/ide/spi.palette/src/org/netbeans/spi/palette/PaletteTopComponent.java
index 37ece1f..0651ef7 100644
--- a/ide/spi.palette/src/org/netbeans/spi/palette/PaletteTopComponent.java
+++ b/ide/spi.palette/src/org/netbeans/spi/palette/PaletteTopComponent.java
@@ -163,7 +163,7 @@ final class PaletteTopComponent extends TopComponent implements PropertyChangeLi
}
}
- final static class ResolvableHelper implements java.io.Serializable {
+ static final class ResolvableHelper implements java.io.Serializable {
static final long serialVersionUID = 7424646018839457788L;
public Object readResolve() {
return PaletteTopComponent.getDefault();
diff --git a/ide/spi.palette/test/unit/src/org/netbeans/spi/palette/PaletteSwitchTest.java b/ide/spi.palette/test/unit/src/org/netbeans/spi/palette/PaletteSwitchTest.java
index 4654fc5..44e089e 100644
--- a/ide/spi.palette/test/unit/src/org/netbeans/spi/palette/PaletteSwitchTest.java
+++ b/ide/spi.palette/test/unit/src/org/netbeans/spi/palette/PaletteSwitchTest.java
@@ -51,7 +51,7 @@ public class PaletteSwitchTest extends AbstractPaletteTestHid {
private static final String MIME_TYPE_NAME = "text/x-paletteswitchtest";
private FileObject dummyDocumentFile;
- private final static String DUMMY_DOCUMENT_FILE_EXTENSION = "junitPaletteSwitchTest";
+ private static final String DUMMY_DOCUMENT_FILE_EXTENSION = "junitPaletteSwitchTest";
static {
String[] layers = new String[] {"org/netbeans/spi/palette/mf-layer.xml"};//NOI18N
diff --git a/ide/spi.viewmodel/src/org/netbeans/spi/viewmodel/CachedChildrenTreeModel.java b/ide/spi.viewmodel/src/org/netbeans/spi/viewmodel/CachedChildrenTreeModel.java
index 30ebe9a..8d67a0f 100644
--- a/ide/spi.viewmodel/src/org/netbeans/spi/viewmodel/CachedChildrenTreeModel.java
+++ b/ide/spi.viewmodel/src/org/netbeans/spi/viewmodel/CachedChildrenTreeModel.java
@@ -191,7 +191,7 @@ public abstract class CachedChildrenTreeModel extends Object implements TreeMode
}
}
- private final static class ChildrenTree {
+ private static final class ChildrenTree {
//private Object node;
private Object[] ch;
diff --git a/ide/spi.viewmodel/src/org/netbeans/spi/viewmodel/Models.java b/ide/spi.viewmodel/src/org/netbeans/spi/viewmodel/Models.java
index 4ff3933..e625892 100644
--- a/ide/spi.viewmodel/src/org/netbeans/spi/viewmodel/Models.java
+++ b/ide/spi.viewmodel/src/org/netbeans/spi/viewmodel/Models.java
@@ -883,7 +883,7 @@ public final class Models {
*
* @author Jan Jancura
*/
- private final static class CompoundTreeModel implements ReorderableTreeModel, ModelListener {
+ private static final class CompoundTreeModel implements ReorderableTreeModel, ModelListener {
private ReorderableTreeModel model;
@@ -1083,7 +1083,7 @@ public final class Models {
*
* @author Jan Jancura
*/
- private final static class CompoundNodeModel implements SuperNodeModel,
+ private static final class CompoundNodeModel implements SuperNodeModel,
ModelListener {
@@ -1395,7 +1395,7 @@ public final class Models {
*
* @author Jan Jancura
*/
- private final static class CompoundTableModel implements TableHTMLModel, ModelListener {
+ private static final class CompoundTableModel implements TableHTMLModel, ModelListener {
private TableHTMLModel model;
@@ -1587,7 +1587,7 @@ public final class Models {
* Creates {@link org.netbeans.spi.viewmodel.TableRendererModel} for given TableRendererModel and
* {@link org.netbeans.spi.viewmodel.TableRendererModelFilter}.
*/
- private final static class CompoundTableRendererModel implements TableRendererModel, ModelListener {
+ private static final class CompoundTableRendererModel implements TableRendererModel, ModelListener {
private TableRendererModel model;
@@ -1706,7 +1706,7 @@ public final class Models {
*
* @author Jan Jancura
*/
- private final static class DelegatingTreeModel implements ReorderableTreeModel {
+ private static final class DelegatingTreeModel implements ReorderableTreeModel {
private TreeModel[] models;
private HashMap<String, TreeModel> classNameToModel = new HashMap<String, TreeModel>();
@@ -1980,7 +1980,7 @@ public final class Models {
}
}
- private final static class CompoundTablePropertyEditorsModel implements TablePropertyEditorsModel {
+ private static final class CompoundTablePropertyEditorsModel implements TablePropertyEditorsModel {
private TablePropertyEditorsModel model;
private TablePropertyEditorsModelFilter filter;
@@ -2021,7 +2021,7 @@ public final class Models {
*
* @author Jan Jancura
*/
- private final static class CompoundNodeActionsProvider
+ private static final class CompoundNodeActionsProvider
implements NodeActionsProvider {
@@ -2088,7 +2088,7 @@ public final class Models {
}
}
- private final static class CompoundTreeExpansionModel implements TreeExpansionModel, ModelListener {
+ private static final class CompoundTreeExpansionModel implements TreeExpansionModel, ModelListener {
private TreeExpansionModel expansionModel;
private TreeExpansionModelFilter expansionFilter;
@@ -2171,7 +2171,7 @@ public final class Models {
}
- private final static class CompoundAsynchronousModel implements AsynchronousModel {
+ private static final class CompoundAsynchronousModel implements AsynchronousModel {
private AsynchronousModel asynchModel;
private AsynchronousModelFilter asynchModelFilter;
@@ -2194,7 +2194,7 @@ public final class Models {
*
* @author Jan Jancura
*/
- private final static class DelegatingTableModel implements TableModel, TableHTMLModel {
+ private static final class DelegatingTableModel implements TableModel, TableHTMLModel {
private TableModel[] models;
private HashMap<String, TableModel> classNameToModel = new HashMap<String, TableModel>();
@@ -2497,7 +2497,7 @@ public final class Models {
* from given list of TableRendererModel. DelegatingTableRendererModel asks all underlaying
* models for each concrete parameter, and returns first returned value.
*/
- private final static class DelegatingTableRendererModel implements TableRendererModel {
+ private static final class DelegatingTableRendererModel implements TableRendererModel {
private TableRendererModel[] models;
private HashMap<String, TableRendererModel> classNameToModel = new HashMap<String, TableRendererModel>();
@@ -2689,7 +2689,7 @@ public final class Models {
}
- private final static class DelegatingTablePropertyEditorsModel implements TablePropertyEditorsModel {
+ private static final class DelegatingTablePropertyEditorsModel implements TablePropertyEditorsModel {
private TablePropertyEditorsModel[] models;
private HashMap<String, TablePropertyEditorsModel> classNameToModel = new HashMap<String, TablePropertyEditorsModel>();
@@ -2769,7 +2769,7 @@ public final class Models {
*
* @author Jan Jancura
*/
- private final static class DelegatingTreeExpansionModel implements TreeExpansionModel {
+ private static final class DelegatingTreeExpansionModel implements TreeExpansionModel {
private TreeExpansionModel[] models;
private HashMap<String, TreeExpansionModel> classNameToModel = new HashMap<String, TreeExpansionModel>();
@@ -4146,7 +4146,7 @@ public final class Models {
* Tree expansion control.
* @since 1.15
*/
- public static abstract class TreeFeatures {
+ public abstract static class TreeFeatures {
/**
* Returns <code>true</code> if given node is expanded.
diff --git a/ide/subversion/src/org/netbeans/modules/subversion/client/SvnClientExceptionHandler.java b/ide/subversion/src/org/netbeans/modules/subversion/client/SvnClientExceptionHandler.java
index 8f4bcdc..70fea92 100644
--- a/ide/subversion/src/org/netbeans/modules/subversion/client/SvnClientExceptionHandler.java
+++ b/ide/subversion/src/org/netbeans/modules/subversion/client/SvnClientExceptionHandler.java
@@ -118,28 +118,28 @@ public class SvnClientExceptionHandler {
new CertificateFailure (8, "issuer is not trusted" , NbBundle.getMessage(SvnClientExceptionHandler.class, "MSG_CertFailureNotTrusted")) // NOI18N
};
- public final static int EX_UNKNOWN = 0;
- public final static int EX_ACTION_CANCELED_BY_USER = 2;
- public final static int EX_AUTHENTICATION = 4;
- public final static int EX_NO_CERTIFICATE = 8;
- public final static int EX_WRONG_URL = 16;
- public final static int EX_NO_HOST_CONNECTION = 32;
- public final static int EX_UNVERSIONED_RESOURCE = 64;
- public final static int EX_WRONG_URL_IN_REVISION = 128;
- public final static int EX_URL_NON_EXISTENT = 256;
- public final static int EX_HTTP_405 = 512;
- public final static int EX_IS_ALREADY_WC = 1024;
- public final static int EX_CLOSED_CONNECTION = 2048;
- public final static int EX_COMMIT_FAILED = 4096;
- public final static int EX_FILE_ALREADY_EXISTS = 8192;
- public final static int EX_IS_OUT_OF_DATE = 16384;
- public final static int EX_NO_SVN_CLIENT = 32768;
- public final static int EX_HTTP_FORBIDDEN = 65536;
- public final static int EX_SSL_NEGOTIATION_FAILED = 131072;
+ public static final int EX_UNKNOWN = 0;
+ public static final int EX_ACTION_CANCELED_BY_USER = 2;
+ public static final int EX_AUTHENTICATION = 4;
+ public static final int EX_NO_CERTIFICATE = 8;
+ public static final int EX_WRONG_URL = 16;
+ public static final int EX_NO_HOST_CONNECTION = 32;
+ public static final int EX_UNVERSIONED_RESOURCE = 64;
+ public static final int EX_WRONG_URL_IN_REVISION = 128;
+ public static final int EX_URL_NON_EXISTENT = 256;
+ public static final int EX_HTTP_405 = 512;
+ public static final int EX_IS_ALREADY_WC = 1024;
+ public static final int EX_CLOSED_CONNECTION = 2048;
+ public static final int EX_COMMIT_FAILED = 4096;
+ public static final int EX_FILE_ALREADY_EXISTS = 8192;
+ public static final int EX_IS_OUT_OF_DATE = 16384;
+ public static final int EX_NO_SVN_CLIENT = 32768;
+ public static final int EX_HTTP_FORBIDDEN = 65536;
+ public static final int EX_SSL_NEGOTIATION_FAILED = 131072;
- public final static int EX_HANDLED_EXCEPTIONS = EX_AUTHENTICATION | EX_NO_CERTIFICATE | EX_NO_HOST_CONNECTION | EX_SSL_NEGOTIATION_FAILED | EX_HTTP_FORBIDDEN;
- public final static int EX_DEFAULT_HANDLED_EXCEPTIONS = EX_HANDLED_EXCEPTIONS;
+ public static final int EX_HANDLED_EXCEPTIONS = EX_AUTHENTICATION | EX_NO_CERTIFICATE | EX_NO_HOST_CONNECTION | EX_SSL_NEGOTIATION_FAILED | EX_HTTP_FORBIDDEN;
+ public static final int EX_DEFAULT_HANDLED_EXCEPTIONS = EX_HANDLED_EXCEPTIONS;
private final SVNClientException exception;
private final int exceptionMask;
diff --git a/ide/subversion/src/org/netbeans/modules/subversion/client/SvnClientFactory.java b/ide/subversion/src/org/netbeans/modules/subversion/client/SvnClientFactory.java
index 18272c9..923d0b8 100644
--- a/ide/subversion/src/org/netbeans/modules/subversion/client/SvnClientFactory.java
+++ b/ide/subversion/src/org/netbeans/modules/subversion/client/SvnClientFactory.java
@@ -56,8 +56,8 @@ public class SvnClientFactory {
/** indicates that something went terribly wrong with javahl init during the previous nb session */
private static boolean javahlCrash = false;
- private final static int JAVAHL_INIT_NOCRASH = 1;
- private final static int JAVAHL_INIT_STOP_REPORTING = 2;
+ private static final int JAVAHL_INIT_NOCRASH = 1;
+ private static final int JAVAHL_INIT_STOP_REPORTING = 2;
private static final Logger LOG = Logger.getLogger("org.netbeans.modules.subversion.client.SvnClientFactory");
public static final String FACTORY_TYPE_COMMANDLINE = "commandline"; //NOI18N
@@ -81,7 +81,7 @@ public class SvnClientFactory {
*
* @return the SvnClientFactory instance
*/
- public synchronized static SvnClientFactory getInstance() {
+ public static synchronized SvnClientFactory getInstance() {
init();
return instance;
}
@@ -89,7 +89,7 @@ public class SvnClientFactory {
/**
* Initializes the SvnClientFactory instance
*/
- public synchronized static void init() {
+ public static synchronized void init() {
if(instance == null) {
SvnClientFactory fac = new SvnClientFactory();
fac.setup();
@@ -101,7 +101,7 @@ public class SvnClientFactory {
* Resets the SvnClientFactory instance.
* Call this method if user's preferences regarding used client change.
*/
- public synchronized static void resetClient() {
+ public static synchronized void resetClient() {
instance = null;
SvnConfigFiles.getInstance().reset();
}
@@ -510,10 +510,10 @@ public class SvnClientFactory {
private abstract class ClientAdapterFactory {
- abstract protected ISVNClientAdapter createAdapter();
- abstract protected SvnClientInvocationHandler getInvocationHandler(ISVNClientAdapter adapter, SvnClientDescriptor desc, SvnProgressSupport support, int handledExceptions);
- abstract protected ISVNPromptUserPassword createCallback(SVNUrl repositoryUrl, int handledExceptions);
- abstract protected ConnectionType connectionType();
+ protected abstract ISVNClientAdapter createAdapter();
+ protected abstract SvnClientInvocationHandler getInvocationHandler(ISVNClientAdapter adapter, SvnClientDescriptor desc, SvnProgressSupport support, int handledExceptions);
+ protected abstract ISVNPromptUserPassword createCallback(SVNUrl repositoryUrl, int handledExceptions);
+ protected abstract ConnectionType connectionType();
SvnClient createSvnClient() {
SvnClientInvocationHandler handler = getInvocationHandler(createAdapter(), createDescriptor(null), null, -1);
diff --git a/ide/subversion/src/org/netbeans/modules/subversion/client/parser/EntriesCache.java b/ide/subversion/src/org/netbeans/modules/subversion/client/parser/EntriesCache.java
index eefbee8..1b4517c 100644
--- a/ide/subversion/src/org/netbeans/modules/subversion/client/parser/EntriesCache.java
+++ b/ide/subversion/src/org/netbeans/modules/subversion/client/parser/EntriesCache.java
@@ -111,7 +111,7 @@ public class EntriesCache {
DATE_ATTRIBUTES.add("text-time");
}
- private final static int MAX_SIZE;
+ private static final int MAX_SIZE;
static {
int ms;
diff --git a/ide/subversion/src/org/netbeans/modules/subversion/config/CertificateFile.java b/ide/subversion/src/org/netbeans/modules/subversion/config/CertificateFile.java
index 1f3f126..29cf090 100644
--- a/ide/subversion/src/org/netbeans/modules/subversion/config/CertificateFile.java
+++ b/ide/subversion/src/org/netbeans/modules/subversion/config/CertificateFile.java
@@ -33,9 +33,9 @@ import org.openide.filesystems.FileUtil;
*/
public class CertificateFile extends SVNCredentialFile {
- private final static Key CERT = new Key(0, "ascii_cert"); // NOI18N
- private final static Key FAILURES = new Key(1, "failures"); // NOI18N
- private final static Key REALMSTRING = new Key(2, "svn:realmstring"); // NOI18N
+ private static final Key CERT = new Key(0, "ascii_cert"); // NOI18N
+ private static final Key FAILURES = new Key(1, "failures"); // NOI18N
+ private static final Key REALMSTRING = new Key(2, "svn:realmstring"); // NOI18N
private static final String NEWLINE = System.getProperty("line.separator"); // NOI18N
diff --git a/ide/subversion/src/org/netbeans/modules/subversion/config/PasswordFile.java b/ide/subversion/src/org/netbeans/modules/subversion/config/PasswordFile.java
index 2ac1600..20b89e9 100644
--- a/ide/subversion/src/org/netbeans/modules/subversion/config/PasswordFile.java
+++ b/ide/subversion/src/org/netbeans/modules/subversion/config/PasswordFile.java
@@ -38,7 +38,7 @@ public class PasswordFile extends SVNCredentialFile {
private static final Key REALMSTRING_KEY = new Key(2, "svn:realmstring"); // NOI18N
private static final Key USERNAME_KEY = new Key(3, "username"); // NOI18N
- private final static String PASSTYPE_SIMPLE = "simple"; // NOI18N
+ private static final String PASSTYPE_SIMPLE = "simple"; // NOI18N
private static Map<String, PasswordFile> files;
public PasswordFile (String realmString) {
diff --git a/ide/subversion/src/org/netbeans/modules/subversion/ui/browser/Browser.java b/ide/subversion/src/org/netbeans/modules/subversion/ui/browser/Browser.java
index ebb4120..7ba07c5 100644
--- a/ide/subversion/src/org/netbeans/modules/subversion/ui/browser/Browser.java
+++ b/ide/subversion/src/org/netbeans/modules/subversion/ui/browser/Browser.java
@@ -56,21 +56,21 @@ import org.tigris.subversion.svnclientadapter.SVNUrl;
*/
public final class Browser implements VetoableChangeListener, BrowserClient, TreeExpansionListener {
- public final static int BROWSER_SHOW_FILES = 1;
- public final static int BROWSER_SINGLE_SELECTION_ONLY = 2;
- public final static int BROWSER_FILES_SELECTION_ONLY = 4;
- public final static int BROWSER_FOLDERS_SELECTION_ONLY = 8;
- public final static int BROWSER_SELECT_ANYTHING = BROWSER_FOLDERS_SELECTION_ONLY | BROWSER_FILES_SELECTION_ONLY;
-
- public final static String BROWSER_HELP_ID_SEARCH_HISTORY = "org.netbeans.modules.subversion.ui.browser.searchhistory"; // NOI18N
- public final static String BROWSER_HELP_ID_CHECKOUT = "org.netbeans.modules.subversion.ui.browser.checkout"; // NOI18N
- public final static String BROWSER_HELP_ID_URL_PATTERN = "org.netbeans.modules.subversion.ui.browser.urlpattern"; // NOI18N
- public final static String BROWSER_HELP_ID_MERGE = "org.netbeans.modules.subversion.ui.browser.merge"; // NOI18N
- public final static String BROWSER_HELP_ID_MERGE_TAG = "org.netbeans.modules.subversion.ui.browser.mergetag"; // NOI18N
- public final static String BROWSER_HELP_ID_SWITCH_TO = "org.netbeans.modules.subversion.ui.browser.switchto"; // NOI18N
- public final static String BROWSER_HELP_ID_COPY = "org.netbeans.modules.subversion.ui.browser.copy"; // NOI18N
- public final static String BROWSER_HELP_ID_IMPORT = "org.netbeans.modules.subversion.ui.browser.import"; // NOI18N
- public final static String BROWSER_HELP_ID_SELECT_DIFF_TREE = "org.netbeans.modules.subversion.ui.browser.selectdifftree"; // NOI18N
+ public static final int BROWSER_SHOW_FILES = 1;
+ public static final int BROWSER_SINGLE_SELECTION_ONLY = 2;
+ public static final int BROWSER_FILES_SELECTION_ONLY = 4;
+ public static final int BROWSER_FOLDERS_SELECTION_ONLY = 8;
+ public static final int BROWSER_SELECT_ANYTHING = BROWSER_FOLDERS_SELECTION_ONLY | BROWSER_FILES_SELECTION_ONLY;
+
+ public static final String BROWSER_HELP_ID_SEARCH_HISTORY = "org.netbeans.modules.subversion.ui.browser.searchhistory"; // NOI18N
+ public static final String BROWSER_HELP_ID_CHECKOUT = "org.netbeans.modules.subversion.ui.browser.checkout"; // NOI18N
+ public static final String BROWSER_HELP_ID_URL_PATTERN = "org.netbeans.modules.subversion.ui.browser.urlpattern"; // NOI18N
+ public static final String BROWSER_HELP_ID_MERGE = "org.netbeans.modules.subversion.ui.browser.merge"; // NOI18N
+ public static final String BROWSER_HELP_ID_MERGE_TAG = "org.netbeans.modules.subversion.ui.browser.mergetag"; // NOI18N
+ public static final String BROWSER_HELP_ID_SWITCH_TO = "org.netbeans.modules.subversion.ui.browser.switchto"; // NOI18N
+ public static final String BROWSER_HELP_ID_COPY = "org.netbeans.modules.subversion.ui.browser.copy"; // NOI18N
+ public static final String BROWSER_HELP_ID_IMPORT = "org.netbeans.modules.subversion.ui.browser.import"; // NOI18N
+ public static final String BROWSER_HELP_ID_SELECT_DIFF_TREE = "org.netbeans.modules.subversion.ui.browser.selectdifftree"; // NOI18N
private final int mode;
diff --git a/ide/subversion/src/org/netbeans/modules/subversion/ui/browser/RepositoryPathNode.java b/ide/subversion/src/org/netbeans/modules/subversion/ui/browser/RepositoryPathNode.java
index a30bdd0..ba56d1c 100644
--- a/ide/subversion/src/org/netbeans/modules/subversion/ui/browser/RepositoryPathNode.java
+++ b/ide/subversion/src/org/netbeans/modules/subversion/ui/browser/RepositoryPathNode.java
@@ -420,8 +420,8 @@ public class RepositoryPathNode extends AbstractNode {
static final String PROPERTY_NAME_AUTHOR = "author"; // NOI18N
static final String PROPERTY_NAME_HISTORY = "history"; // NOI18N
- private final static String HISTORY_DISPLAY_NAME = org.openide.util.NbBundle.getMessage(RepositoryPathNode.class, "LBL_BrowserTree_History_Name");
- private final static String HISTORY_SHORT_DESC = org.openide.util.NbBundle.getMessage(RepositoryPathNode.class, "LBL_BrowserTree_History_Short_Desc");
+ private static final String HISTORY_DISPLAY_NAME = org.openide.util.NbBundle.getMessage(RepositoryPathNode.class, "LBL_BrowserTree_History_Name");
+ private static final String HISTORY_SHORT_DESC = org.openide.util.NbBundle.getMessage(RepositoryPathNode.class, "LBL_BrowserTree_History_Short_Desc");
private class RevisionProperty extends NodeProperty<Object> {
public RevisionProperty() {
diff --git a/ide/subversion/src/org/netbeans/modules/subversion/ui/browser/RepositoryPaths.java b/ide/subversion/src/org/netbeans/modules/subversion/ui/browser/RepositoryPaths.java
index f80279d..4dc4d87 100644
--- a/ide/subversion/src/org/netbeans/modules/subversion/ui/browser/RepositoryPaths.java
+++ b/ide/subversion/src/org/netbeans/modules/subversion/ui/browser/RepositoryPaths.java
@@ -54,7 +54,7 @@ import org.tigris.subversion.svnclientadapter.SVNUrl;
*/
public class RepositoryPaths implements ActionListener, DocumentListener {
- private final static RepositoryFile[] EMPTY_REPOSITORY_FILES = new RepositoryFile[0];
+ private static final RepositoryFile[] EMPTY_REPOSITORY_FILES = new RepositoryFile[0];
private RepositoryFile repositoryFile;
diff --git a/ide/subversion/src/org/netbeans/modules/subversion/ui/browser/SelectPathAction.java b/ide/subversion/src/org/netbeans/modules/subversion/ui/browser/SelectPathAction.java
index 0bf4891..4491957 100644
--- a/ide/subversion/src/org/netbeans/modules/subversion/ui/browser/SelectPathAction.java
+++ b/ide/subversion/src/org/netbeans/modules/subversion/ui/browser/SelectPathAction.java
@@ -37,7 +37,7 @@ public class SelectPathAction extends AbstractAction {
private final SVNUrl selectionUrl;
private Node[] selectionNodes;
private final Browser browser;
- private final static Node[] EMPTY_NODES = new Node[0];
+ private static final Node[] EMPTY_NODES = new Node[0];
public SelectPathAction(Browser browser, SVNUrl selection) {
this.browser = browser;
diff --git a/ide/subversion/src/org/netbeans/modules/subversion/ui/lock/LockAction.java b/ide/subversion/src/org/netbeans/modules/subversion/ui/lock/LockAction.java
index f405d55..d2227f7 100644
--- a/ide/subversion/src/org/netbeans/modules/subversion/ui/lock/LockAction.java
+++ b/ide/subversion/src/org/netbeans/modules/subversion/ui/lock/LockAction.java
@@ -54,7 +54,7 @@ import org.tigris.subversion.svnclientadapter.SVNUrl;
*/
public class LockAction extends ContextAction {
- private final static Logger LOG = Logger.getLogger(LockAction.class.getName());
+ private static final Logger LOG = Logger.getLogger(LockAction.class.getName());
@Override
protected int getDirectoryEnabledStatus () {
diff --git a/ide/subversion/src/org/netbeans/modules/subversion/ui/lock/UnlockAction.java b/ide/subversion/src/org/netbeans/modules/subversion/ui/lock/UnlockAction.java
index a6f3959..da9b6a8 100644
--- a/ide/subversion/src/org/netbeans/modules/subversion/ui/lock/UnlockAction.java
+++ b/ide/subversion/src/org/netbeans/modules/subversion/ui/lock/UnlockAction.java
@@ -54,7 +54,7 @@ import org.tigris.subversion.svnclientadapter.SVNUrl;
*/
public class UnlockAction extends ContextAction {
- private final static Logger LOG = Logger.getLogger(UnlockAction.class.getName());
+ private static final Logger LOG = Logger.getLogger(UnlockAction.class.getName());
@Override
protected int getDirectoryEnabledStatus () {
diff --git a/ide/subversion/src/org/netbeans/modules/subversion/ui/repository/ConnectionType.java b/ide/subversion/src/org/netbeans/modules/subversion/ui/repository/ConnectionType.java
index 78a963a..dd59c89 100644
--- a/ide/subversion/src/org/netbeans/modules/subversion/ui/repository/ConnectionType.java
+++ b/ide/subversion/src/org/netbeans/modules/subversion/ui/repository/ConnectionType.java
@@ -53,11 +53,11 @@ import org.tigris.subversion.svnclientadapter.SVNUrl;
*/
public abstract class ConnectionType implements ActionListener, DocumentListener, FocusListener {
- private final static String LOCAL_URL_HELP = "file:///repository_path[@REV]"; // NOI18N
- private final static String HTTP_URL_HELP = "http://hostname/repository_path[@REV]"; // NOI18N
- private final static String HTTPS_URL_HELP = "https://hostname/repository_path[@REV]"; // NOI18N
- private final static String SVN_URL_HELP = "svn://hostname/repository_path[@REV]"; // NOI18N
- private final static String SVN_SSH_URL_HELP = "svn+{0}://hostname/repository_path[@REV]"; // NOI18N
+ private static final String LOCAL_URL_HELP = "file:///repository_path[@REV]"; // NOI18N
+ private static final String HTTP_URL_HELP = "http://hostname/repository_path[@REV]"; // NOI18N
+ private static final String HTTPS_URL_HELP = "https://hostname/repository_path[@REV]"; // NOI18N
+ private static final String SVN_URL_HELP = "svn://hostname/repository_path[@REV]"; // NOI18N
+ private static final String SVN_SSH_URL_HELP = "svn+{0}://hostname/repository_path[@REV]"; // NOI18N
protected final Repository repository;
private List<JTextField> selectOnFocusFields = null;
diff --git a/ide/subversion/src/org/netbeans/modules/subversion/ui/repository/Repository.java b/ide/subversion/src/org/netbeans/modules/subversion/ui/repository/Repository.java
index cd8da73..b7d297b 100644
--- a/ide/subversion/src/org/netbeans/modules/subversion/ui/repository/Repository.java
+++ b/ide/subversion/src/org/netbeans/modules/subversion/ui/repository/Repository.java
@@ -72,12 +72,12 @@ import org.tigris.subversion.svnclientadapter.SVNUrl;
*/
public class Repository implements ActionListener, DocumentListener, ItemListener {
- public final static int FLAG_URL_EDITABLE = 2;
- public final static int FLAG_URL_ENABLED = 4;
- public final static int FLAG_ACCEPT_REVISION = 8;
- public final static int FLAG_SHOW_REMOVE = 16;
- public final static int FLAG_SHOW_HINTS = 32;
- public final static int FLAG_SHOW_PROXY = 64;
+ public static final int FLAG_URL_EDITABLE = 2;
+ public static final int FLAG_URL_ENABLED = 4;
+ public static final int FLAG_ACCEPT_REVISION = 8;
+ public static final int FLAG_SHOW_REMOVE = 16;
+ public static final int FLAG_SHOW_HINTS = 32;
+ public static final int FLAG_SHOW_PROXY = 64;
private static final String FILE_PANEL = "file-panel"; //NOI18N
private static final String HTTP_PANEL = "http-panel"; //NOI18N
diff --git a/ide/subversion/src/org/netbeans/modules/subversion/ui/search/SvnSearch.java b/ide/subversion/src/org/netbeans/modules/subversion/ui/search/SvnSearch.java
index cebaa74..7391be4 100644
--- a/ide/subversion/src/org/netbeans/modules/subversion/ui/search/SvnSearch.java
+++ b/ide/subversion/src/org/netbeans/modules/subversion/ui/search/SvnSearch.java
@@ -56,14 +56,14 @@ import org.tigris.subversion.svnclientadapter.SVNUrl;
*/
public class SvnSearch implements ActionListener, DocumentListener {
- public final static String SEACRH_HELP_ID_CHECKOUT = "org.netbeans.modules.subversion.ui.search.checkout";
- public final static String SEACRH_HELP_ID_SWITCH = "org.netbeans.modules.subversion.ui.search.switch";
- public final static String SEACRH_HELP_ID_COPY = "org.netbeans.modules.subversion.ui.search.copy";
- public final static String SEACRH_HELP_ID_URL_PATTERN = "org.netbeans.modules.subversion.ui.search.urlpattern";
- public final static String SEACRH_HELP_ID_MERGE = "org.netbeans.modules.subversion.ui.search.merge";
- public final static String SEACRH_HELP_ID_REVERT = "org.netbeans.modules.subversion.ui.search.revert";
- public final static String SEARCH_HELP_ID_UPDATE = "org.netbeans.modules.subversion.ui.search.update";
- public final static String SEARCH_HELP_ID_SELECT_DIFF_TREE = "org.netbeans.modules.subversion.ui.search.selectdifftree"; //NOI18N
+ public static final String SEACRH_HELP_ID_CHECKOUT = "org.netbeans.modules.subversion.ui.search.checkout";
+ public static final String SEACRH_HELP_ID_SWITCH = "org.netbeans.modules.subversion.ui.search.switch";
+ public static final String SEACRH_HELP_ID_COPY = "org.netbeans.modules.subversion.ui.search.copy";
+ public static final String SEACRH_HELP_ID_URL_PATTERN = "org.netbeans.modules.subversion.ui.search.urlpattern";
+ public static final String SEACRH_HELP_ID_MERGE = "org.netbeans.modules.subversion.ui.search.merge";
+ public static final String SEACRH_HELP_ID_REVERT = "org.netbeans.modules.subversion.ui.search.revert";
+ public static final String SEARCH_HELP_ID_UPDATE = "org.netbeans.modules.subversion.ui.search.update";
+ public static final String SEARCH_HELP_ID_SELECT_DIFF_TREE = "org.netbeans.modules.subversion.ui.search.selectdifftree"; //NOI18N
private static final String DATE_FROM = "svnSearch.dateFrom"; // NOI18N
private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd"); // NOI18N
diff --git a/ide/subversion/test/qa-functional/src/org/netbeans/test/subversion/utils/TestKit.java b/ide/subversion/test/qa-functional/src/org/netbeans/test/subversion/utils/TestKit.java
index f00caee..22a5cc5 100644
--- a/ide/subversion/test/qa-functional/src/org/netbeans/test/subversion/utils/TestKit.java
+++ b/ide/subversion/test/qa-functional/src/org/netbeans/test/subversion/utils/TestKit.java
@@ -52,17 +52,17 @@ import org.netbeans.modules.versioning.util.IndexingBridge;
* @author peter
*/
public final class TestKit {
- public final static String MODIFIED_COLOR = "#0000ff";
- public final static String NEW_COLOR = "#008000";
- public final static String CONFLICT_COLOR = "#ff0000";
- public final static String IGNORED_COLOR = "#999999";
+ public static final String MODIFIED_COLOR = "#0000ff";
+ public static final String NEW_COLOR = "#008000";
+ public static final String CONFLICT_COLOR = "#ff0000";
+ public static final String IGNORED_COLOR = "#999999";
- public final static String MODIFIED_STATUS = "[Modified ]";
- public final static String NEW_STATUS = "[New ]";
- public final static String CONFLICT_STATUS = "[Conflict ]";
- public final static String IGNORED_STATUS = "[Ignored ]";
- public final static String UPTODATE_STATUS = "";
- public final static String LOGGER_NAME = "org.netbeans.modules.subversion.t9y";
+ public static final String MODIFIED_STATUS = "[Modified ]";
+ public static final String NEW_STATUS = "[New ]";
+ public static final String CONFLICT_STATUS = "[Conflict ]";
+ public static final String IGNORED_STATUS = "[Ignored ]";
+ public static final String UPTODATE_STATUS = "";
+ public static final String LOGGER_NAME = "org.netbeans.modules.subversion.t9y";
public static int TIME_OUT = 15;
public static File prepareProject(String category, String project, String project_name) throws Exception {
diff --git a/ide/subversion/test/unit/src/org/netbeans/modules/subversion/AbstractSvnTestCase.java b/ide/subversion/test/unit/src/org/netbeans/modules/subversion/AbstractSvnTestCase.java
index 354faad..b15b8b4 100644
--- a/ide/subversion/test/unit/src/org/netbeans/modules/subversion/AbstractSvnTestCase.java
+++ b/ide/subversion/test/unit/src/org/netbeans/modules/subversion/AbstractSvnTestCase.java
@@ -66,7 +66,7 @@ public abstract class AbstractSvnTestCase extends NbTestCase {
protected static final String SUBVERSION_1_6 = "1.6";
protected static final String SUBVERSION_1_7 = "1.7";
protected static final String SUBVERSION_1_8 = "1.8";
- private final static String JAVAHL = "javahl";
+ private static final String JAVAHL = "javahl";
public AbstractSvnTestCase(String testName) throws MalformedURLException, SVNClientException {
super(testName);
diff --git a/ide/tasklist.todo/src/org/netbeans/modules/tasklist/todo/settings/Settings.java b/ide/tasklist.todo/src/org/netbeans/modules/tasklist/todo/settings/Settings.java
index 701f564..2a76264 100644
--- a/ide/tasklist.todo/src/org/netbeans/modules/tasklist/todo/settings/Settings.java
+++ b/ide/tasklist.todo/src/org/netbeans/modules/tasklist/todo/settings/Settings.java
@@ -35,7 +35,7 @@ import org.openide.util.NbPreferences;
*
* @author S. Aubrecht
*/
-final public class Settings {
+public final class Settings {
public static final String PROP_PATTERN_LIST = "patternList"; //NOI18N
public static final String PROP_SCAN_COMMENTS_ONLY = "scanCommentsOnly"; //NOI18N
diff --git a/ide/tasklist.todo/src/org/netbeans/modules/tasklist/todo/settings/ToDoCustomizer.java b/ide/tasklist.todo/src/org/netbeans/modules/tasklist/todo/settings/ToDoCustomizer.java
index fbf7dc4..92737c6 100644
--- a/ide/tasklist.todo/src/org/netbeans/modules/tasklist/todo/settings/ToDoCustomizer.java
+++ b/ide/tasklist.todo/src/org/netbeans/modules/tasklist/todo/settings/ToDoCustomizer.java
@@ -78,7 +78,7 @@ class ToDoCustomizer extends javax.swing.JPanel implements DocumentListener{
private boolean detailsValid;
/* Contains all modified comments and is used to enable/disable the Apply button.
All the mappings are saved when OK or Apply buttons are pressed.*/
- private final static Map<String, CommentTags> id2comments = new HashMap<String, CommentTags>();
+ private static final Map<String, CommentTags> id2comments = new HashMap<String, CommentTags>();
/** Creates new form ToDoCustomizer */
public ToDoCustomizer() {
diff --git a/ide/tasklist.ui/src/org/netbeans/modules/tasklist/filter/TaskProperty.java b/ide/tasklist.ui/src/org/netbeans/modules/tasklist/filter/TaskProperty.java
index 53c3985..c34c182 100644
--- a/ide/tasklist.ui/src/org/netbeans/modules/tasklist/filter/TaskProperty.java
+++ b/ide/tasklist.ui/src/org/netbeans/modules/tasklist/filter/TaskProperty.java
@@ -78,7 +78,7 @@ abstract class TaskProperty {
///////
private String id;
- transient private String name;
+ private transient String name;
private Class valueClass;
}
diff --git a/ide/tasklist.ui/src/org/netbeans/modules/tasklist/impl/TaskIndexer.java b/ide/tasklist.ui/src/org/netbeans/modules/tasklist/impl/TaskIndexer.java
index 65de9c5..2308c61 100644
--- a/ide/tasklist.ui/src/org/netbeans/modules/tasklist/impl/TaskIndexer.java
+++ b/ide/tasklist.ui/src/org/netbeans/modules/tasklist/impl/TaskIndexer.java
@@ -47,7 +47,7 @@ import org.openide.filesystems.FileObject;
public class TaskIndexer extends CustomIndexer {
private final TaskList taskList;
- private final static Logger LOG = Logger.getLogger(TaskIndexer.class.getName());
+ private static final Logger LOG = Logger.getLogger(TaskIndexer.class.getName());
static final String KEY_SCANNER = "scanner"; //NOI18N
static final String KEY_TASK = "task"; //NOI18N
diff --git a/ide/tasklist.ui/src/org/netbeans/modules/tasklist/ui/TaskListTopComponent.java b/ide/tasklist.ui/src/org/netbeans/modules/tasklist/ui/TaskListTopComponent.java
index 7cef24a..81c8b30 100644
--- a/ide/tasklist.ui/src/org/netbeans/modules/tasklist/ui/TaskListTopComponent.java
+++ b/ide/tasklist.ui/src/org/netbeans/modules/tasklist/ui/TaskListTopComponent.java
@@ -496,7 +496,7 @@ final class TaskListTopComponent extends TopComponent {
statusSeparator.setVisible( !useFoldingModel );
}
- static private Logger getLogger() {
+ private static Logger getLogger() {
return Logger.getLogger( TaskListTopComponent.class.getName() );
}
@@ -530,7 +530,7 @@ final class TaskListTopComponent extends TopComponent {
};
}
- final static class ResolvableHelper implements Serializable {
+ static final class ResolvableHelper implements Serializable {
private static final long serialVersionUID = 1L;
public Object readResolve() {
return TaskListTopComponent.getDefault();
diff --git a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/AttachmentsPanel.java b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/AttachmentsPanel.java
index 79553f9..dabba59 100644
--- a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/AttachmentsPanel.java
+++ b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/AttachmentsPanel.java
@@ -649,7 +649,7 @@ public class AttachmentsPanel extends JPanel {
}
- public static abstract class AbstractAttachment implements Attachment {
+ public abstract static class AbstractAttachment implements Attachment {
private OpenAttachmentAction openAttachmentAction;
private SaveAttachmentAction saveAttachmentAction;
private ApplyPatchAction applyPatchAction;
diff --git a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/AutoupdateSupport.java b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/AutoupdateSupport.java
index 63d8acd..ed14cbe 100644
--- a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/AutoupdateSupport.java
+++ b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/AutoupdateSupport.java
@@ -36,7 +36,7 @@ import org.openide.util.NbBundle;
public final class AutoupdateSupport {
private static final String CHECK_UPDATES = ".check_updates"; // NOI18N
- private final static Logger LOG = Logger.getLogger(AutoupdateSupport.class.getName());
+ private static final Logger LOG = Logger.getLogger(AutoupdateSupport.class.getName());
private Map<String, Long> lastChecks = null;
private Set<String> loggedUrls;
diff --git a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/FileToRepoMappingStorage.java b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/FileToRepoMappingStorage.java
index 4bb94ad..8e39db5 100644
--- a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/FileToRepoMappingStorage.java
+++ b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/FileToRepoMappingStorage.java
@@ -47,7 +47,7 @@ public class FileToRepoMappingStorage {
private static FileToRepoMappingStorage instance;
- public synchronized static FileToRepoMappingStorage getInstance() {
+ public static synchronized FileToRepoMappingStorage getInstance() {
if (instance == null) {
instance = new FileToRepoMappingStorage();
}
diff --git a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/FindTypesSupport.java b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/FindTypesSupport.java
index 8e73db5..e6eb19d 100644
--- a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/FindTypesSupport.java
+++ b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/FindTypesSupport.java
@@ -51,10 +51,10 @@ import org.openide.util.NbBundle;
*/
final class FindTypesSupport implements MouseMotionListener, MouseListener {
- private final static Pattern JAVA_CLASS_NAME_PATTERN = Pattern.compile("\\.?([a-z0-9\\.]*)([A-Z]\\w+)+"); // NOI18N
- private final static String HIGHLIGHTS_PROPERTY = "highlights.property"; // NOI18N
- private final static String PREV_HIGHLIGHT_PROPERTY = "prev.highlights.property"; // NOI18N
- private final static String PREV_HIGHLIGHT_ATTRIBUTES = "prev.highlights.attributes"; // NOI18N
+ private static final Pattern JAVA_CLASS_NAME_PATTERN = Pattern.compile("\\.?([a-z0-9\\.]*)([A-Z]\\w+)+"); // NOI18N
+ private static final String HIGHLIGHTS_PROPERTY = "highlights.property"; // NOI18N
+ private static final String PREV_HIGHLIGHT_PROPERTY = "prev.highlights.property"; // NOI18N
+ private static final String PREV_HIGHLIGHT_ATTRIBUTES = "prev.highlights.attributes"; // NOI18N
private static FindTypesSupport instance;
private final Style defStyle;
diff --git a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/HyperlinkSupport.java b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/HyperlinkSupport.java
index 167dc14..f763fa5 100644
--- a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/HyperlinkSupport.java
+++ b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/HyperlinkSupport.java
@@ -51,10 +51,10 @@ public final class HyperlinkSupport {
private static final HyperlinkSupport instance = new HyperlinkSupport();
- final static String STACKTRACE_ATTRIBUTE = "attribute.stacktrace.link"; // NOI18N
- final static String TYPE_ATTRIBUTE = "attribute.type.link"; // NOI18N
- final static String URL_ATTRIBUTE = "attribute.url.link"; // NOI18N
- public final static String LINK_ATTRIBUTE = "attribute.simple.link"; // NOI18N
+ static final String STACKTRACE_ATTRIBUTE = "attribute.stacktrace.link"; // NOI18N
+ static final String TYPE_ATTRIBUTE = "attribute.type.link"; // NOI18N
+ static final String URL_ATTRIBUTE = "attribute.url.link"; // NOI18N
+ public static final String LINK_ATTRIBUTE = "attribute.simple.link"; // NOI18N
private final MotionListener motionListener;
private final java.awt.event.MouseListener mouseListener;
private final RequestProcessor rp = new RequestProcessor("Bugtracking hyperlinks", 50); // NOI18N
diff --git a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/IssueSettingsStorage.java b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/IssueSettingsStorage.java
index a9f62bc..d654238 100644
--- a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/IssueSettingsStorage.java
+++ b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/IssueSettingsStorage.java
@@ -53,7 +53,7 @@ public class IssueSettingsStorage {
}
}
- public synchronized static IssueSettingsStorage getInstance() {
+ public static synchronized IssueSettingsStorage getInstance() {
if(instance == null) {
instance = new IssueSettingsStorage();
}
@@ -162,7 +162,7 @@ public class IssueSettingsStorage {
private static class FileLocks {
private static FileLocks instance;
- private synchronized static FileLocks getInstance() {
+ private static synchronized FileLocks getInstance() {
if(instance == null) {
instance = new FileLocks();
}
diff --git a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/JiraUpdater.java b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/JiraUpdater.java
index a905879..699a2aa 100644
--- a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/JiraUpdater.java
+++ b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/JiraUpdater.java
@@ -50,7 +50,7 @@ public class JiraUpdater {
private JiraUpdater() {
}
- public synchronized static JiraUpdater getInstance() {
+ public static synchronized JiraUpdater getInstance() {
if(instance == null) {
instance = new JiraUpdater();
}
diff --git a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/SaveQueryPanel.java b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/SaveQueryPanel.java
index 35e13d9..98cbd4b 100644
--- a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/SaveQueryPanel.java
+++ b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/SaveQueryPanel.java
@@ -171,7 +171,7 @@ public class SaveQueryPanel extends javax.swing.JPanel implements DocumentListen
}
}
- public static abstract class QueryNameValidator {
+ public abstract static class QueryNameValidator {
public abstract String isValid(String name);
}
}
diff --git a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/SimpleIssueFinder.java b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/SimpleIssueFinder.java
index 3e8a7ac..5fa064c 100644
--- a/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/SimpleIssueFinder.java
+++ b/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/SimpleIssueFinder.java
@@ -37,7 +37,7 @@ public class SimpleIssueFinder {
private SimpleIssueFinder() {}
- public synchronized static SimpleIssueFinder getInstance() {
+ public static synchronized SimpleIssueFinder getInstance() {
if(instance == null) {
instance = new SimpleIssueFinder();
}
diff --git a/ide/team.commons/src/org/netbeans/modules/team/commons/LogUtils.java b/ide/team.commons/src/org/netbeans/modules/team/commons/LogUtils.java
index 221673d..9059007 100644
--- a/ide/team.commons/src/org/netbeans/modules/team/commons/LogUtils.java
+++ b/ide/team.commons/src/org/netbeans/modules/team/commons/LogUtils.java
@@ -33,7 +33,7 @@ public final class LogUtils {
/**
* Metrics logger
*/
- private final static Logger METRICS_LOG = Logger.getLogger("org.netbeans.ui.metrics.bugtracking"); // NOI18N
+ private static final Logger METRICS_LOG = Logger.getLogger("org.netbeans.ui.metrics.bugtracking"); // NOI18N
/**
* The automatic refresh was set on or off.<br>
@@ -78,7 +78,7 @@ public final class LogUtils {
*/
private static final String USG_ISSUE_TRACKING_REPOSITORY = "USG_ISSUE_TRACKING_REPOSITORY"; // NOI18N
- private final static Set<String> loggedParams = new HashSet<String>(1); // to avoid logging same params more than once in a session
+ private static final Set<String> loggedParams = new HashSet<String>(1); // to avoid logging same params more than once in a session
public static void logQueryEvent(String connector, String name, int count, boolean isFromTeamServer, boolean isAutoRefresh) {
name = obfuscateQueryName(name);
diff --git a/ide/team.commons/src/org/netbeans/modules/team/commons/treelist/ListRendererPanel.java b/ide/team.commons/src/org/netbeans/modules/team/commons/treelist/ListRendererPanel.java
index 218298d..b0da9fd 100644
--- a/ide/team.commons/src/org/netbeans/modules/team/commons/treelist/ListRendererPanel.java
+++ b/ide/team.commons/src/org/netbeans/modules/team/commons/treelist/ListRendererPanel.java
@@ -38,7 +38,7 @@ import javax.swing.border.Border;
*
* @author S. Aubrecht
*/
-final public class ListRendererPanel extends JPanel {
+public final class ListRendererPanel extends JPanel {
private final ListNode node;
diff --git a/ide/team.commons/src/org/netbeans/modules/team/commons/treelist/TreeListNode.java b/ide/team.commons/src/org/netbeans/modules/team/commons/treelist/TreeListNode.java
index 1948dae..55012d5 100644
--- a/ide/team.commons/src/org/netbeans/modules/team/commons/treelist/TreeListNode.java
+++ b/ide/team.commons/src/org/netbeans/modules/team/commons/treelist/TreeListNode.java
@@ -289,7 +289,7 @@ public abstract class TreeListNode extends ListNode {
}
@Override
- final protected void fireContentChanged() {
+ protected final void fireContentChanged() {
synchronized (this) {
renderer = null;
}
@@ -297,18 +297,18 @@ public abstract class TreeListNode extends ListNode {
}
@Override
- final protected void fireContentSizeChanged() {
+ protected final void fireContentSizeChanged() {
synchronized (this) {
renderer = null;
}
super.fireContentSizeChanged();
}
- final protected ProgressLabel createProgressLabel() {
+ protected final ProgressLabel createProgressLabel() {
return createProgressLabel(NbBundle.getMessage(TreeListNode.class, "LBL_LoadingInProgress")); //NOI18N
}
- final protected ProgressLabel createProgressLabel(String text) {
+ protected final ProgressLabel createProgressLabel(String text) {
return new ProgressLabel(text, this);
}
diff --git a/ide/terminal.nb/src/org/netbeans/modules/terminal/api/ui/IOTerm.java b/ide/terminal.nb/src/org/netbeans/modules/terminal/api/ui/IOTerm.java
index ddc73be..b6dc601 100644
--- a/ide/terminal.nb/src/org/netbeans/modules/terminal/api/ui/IOTerm.java
+++ b/ide/terminal.nb/src/org/netbeans/modules/terminal/api/ui/IOTerm.java
@@ -26,7 +26,7 @@ import org.openide.windows.InputOutput;
*
* @author masha
*/
-abstract public class IOTerm extends org.netbeans.modules.terminal.api.IOTerm {
+public abstract class IOTerm extends org.netbeans.modules.terminal.api.IOTerm {
private static IOTerm find(InputOutput io) {
if (io instanceof Lookup.Provider) {
@@ -49,6 +49,6 @@ abstract public class IOTerm extends org.netbeans.modules.terminal.api.IOTerm {
*
* @return underlying Term associatd with io.
*/
- abstract protected Term term();
+ protected abstract Term term();
}
diff --git a/ide/terminal.nb/src/org/netbeans/modules/terminal/api/ui/IOVisibility.java b/ide/terminal.nb/src/org/netbeans/modules/terminal/api/ui/IOVisibility.java
index c2a476b..621d7f3 100644
--- a/ide/terminal.nb/src/org/netbeans/modules/terminal/api/ui/IOVisibility.java
+++ b/ide/terminal.nb/src/org/netbeans/modules/terminal/api/ui/IOVisibility.java
@@ -99,8 +99,8 @@ public abstract class IOVisibility {
return iov.isSupported();
}
- abstract protected void setVisible(boolean visible);
- abstract protected void setClosable(boolean closable);
- abstract protected boolean isClosable();
- abstract protected boolean isSupported();
+ protected abstract void setVisible(boolean visible);
+ protected abstract void setClosable(boolean closable);
+ protected abstract boolean isClosable();
+ protected abstract boolean isSupported();
}
diff --git a/ide/terminal.nb/src/org/netbeans/modules/terminal/api/ui/IOVisibilityControl.java b/ide/terminal.nb/src/org/netbeans/modules/terminal/api/ui/IOVisibilityControl.java
index 6f66255..1248bcc 100644
--- a/ide/terminal.nb/src/org/netbeans/modules/terminal/api/ui/IOVisibilityControl.java
+++ b/ide/terminal.nb/src/org/netbeans/modules/terminal/api/ui/IOVisibilityControl.java
@@ -105,7 +105,7 @@ public abstract class IOVisibilityControl {
return find(cbs) != null;
}
- abstract protected boolean isClosable();
- abstract protected boolean okToClose();
+ protected abstract boolean isClosable();
+ protected abstract boolean okToClose();
}
diff --git a/ide/terminal.nb/src/org/netbeans/modules/terminal/iocontainer/TerminalContainerCommon.java b/ide/terminal.nb/src/org/netbeans/modules/terminal/iocontainer/TerminalContainerCommon.java
index caedb3b..982056a 100644
--- a/ide/terminal.nb/src/org/netbeans/modules/terminal/iocontainer/TerminalContainerCommon.java
+++ b/ide/terminal.nb/src/org/netbeans/modules/terminal/iocontainer/TerminalContainerCommon.java
@@ -46,7 +46,7 @@ import org.netbeans.modules.terminal.ioprovider.Terminal;
abstract class TerminalContainerCommon extends TerminalContainer implements IOContainer.Provider {
- private final static String PROP_ATTRIBUTES =
+ private static final String PROP_ATTRIBUTES =
"TerminalContainerCommonImpl.ATTRIBUTES"; // NOI18N
protected final TopComponent owner;
@@ -80,7 +80,7 @@ abstract class TerminalContainerCommon extends TerminalContainer implements IOCo
this.originalName = originalName;
}
- final protected TopComponent topComponent() {
+ protected final TopComponent topComponent() {
return owner;
}
@@ -117,7 +117,7 @@ abstract class TerminalContainerCommon extends TerminalContainer implements IOCo
* Handle delegation from containing TopComponent.
*/
@Override
- final public void componentActivated() {
+ public final void componentActivated() {
// Up to the client of TerminalContainer:
// owner.componentActivated();
activated = true;
@@ -133,7 +133,7 @@ abstract class TerminalContainerCommon extends TerminalContainer implements IOCo
* Handle delegation from containing TopComponent.
*/
@Override
- final public void componentDeactivated() {
+ public final void componentDeactivated() {
// Up to the client of TerminalContainer:
// owner.componentDeactivated();
activated = false;
@@ -149,40 +149,40 @@ abstract class TerminalContainerCommon extends TerminalContainer implements IOCo
// Overrides of IOContainer.Provider
//
@Override
- final public void open() {
+ public final void open() {
if (owner != null)
owner.open();
}
@Override
- final public void requestActive() {
+ public final void requestActive() {
if (owner != null)
owner.requestActive();
}
@Override
- final public void requestVisible() {
+ public final void requestVisible() {
if (owner != null)
owner.requestVisible();
}
@Override
- final public boolean isActivated() {
+ public final boolean isActivated() {
return activated;
}
@Override
- final public void add(JComponent comp, CallBacks cb) {
+ public final void add(JComponent comp, CallBacks cb) {
addTab(comp, cb);
}
@Override
- final public void remove(JComponent comp) {
+ public final void remove(JComponent comp) {
removeTab(comp);
}
@Override
- final public void select(JComponent comp) {
+ public final void select(JComponent comp) {
selectLite(comp);
}
@@ -253,7 +253,7 @@ abstract class TerminalContainerCommon extends TerminalContainer implements IOCo
}
@Override
- final public boolean isCloseable(JComponent comp) {
+ public final boolean isCloseable(JComponent comp) {
CallBacks cb = attributesFor(comp).cb;
if (cb != null && IOVisibilityControl.isSupported(cb)) {
return IOVisibilityControl.isClosable(cb);
@@ -292,20 +292,20 @@ abstract class TerminalContainerCommon extends TerminalContainer implements IOCo
//
// Methods to be implemented in implementation
//
- abstract protected void addTabWork(JComponent comp);
+ protected abstract void addTabWork(JComponent comp);
- abstract protected void removeTabWork(JComponent comp);
+ protected abstract void removeTabWork(JComponent comp);
- abstract protected void setTitleWork(JComponent comp, String title);
+ protected abstract void setTitleWork(JComponent comp, String title);
- abstract protected boolean contains(JComponent comp);
+ protected abstract boolean contains(JComponent comp);
- abstract protected void restoreAttrsFor(JComponent comp);
+ protected abstract void restoreAttrsFor(JComponent comp);
- abstract protected void selectLite(JComponent comp);
+ protected abstract void selectLite(JComponent comp);
@Override
- abstract public JComponent getSelected();
+ public abstract JComponent getSelected();
@Override
public abstract List<? extends Component> getAllTabs();
@@ -313,14 +313,14 @@ abstract class TerminalContainerCommon extends TerminalContainer implements IOCo
//
// Implementation support
//
- final protected void addTab(JComponent comp, CallBacks cb) {
+ protected final void addTab(JComponent comp, CallBacks cb) {
Attributes attr = attributesFor(comp);
attr.cb = cb;
addTabWork(comp);
}
- final protected void removeTab(JComponent comp) {
+ protected final void removeTab(JComponent comp) {
if (comp == null)
return;
@@ -386,7 +386,7 @@ abstract class TerminalContainerCommon extends TerminalContainer implements IOCo
* Update out containing TC's window name.
* @param title
*/
- final protected void updateWindowName(String title) {
+ protected final void updateWindowName(String title) {
if (owner == null)
return;
@@ -416,7 +416,7 @@ abstract class TerminalContainerCommon extends TerminalContainer implements IOCo
* Update anything that needs to be updated.
*/
- final protected void checkSelectionChange() {
+ protected final void checkSelectionChange() {
// outptu2 calls this checkTabSelChange().
JComponent selection = getSelected();
if (selection != lastSelection) {
diff --git a/ide/terminal.nb/src/org/netbeans/modules/terminal/iocontainer/TerminalContainerMuxable.java b/ide/terminal.nb/src/org/netbeans/modules/terminal/iocontainer/TerminalContainerMuxable.java
index 79eda69..39cd23e 100644
--- a/ide/terminal.nb/src/org/netbeans/modules/terminal/iocontainer/TerminalContainerMuxable.java
+++ b/ide/terminal.nb/src/org/netbeans/modules/terminal/iocontainer/TerminalContainerMuxable.java
@@ -34,7 +34,7 @@ import org.openide.windows.TopComponent;
* Corresponds to core.io.ui...IOWindow.
* @author ivan
*/
-final public class TerminalContainerMuxable extends TerminalContainerCommon {
+public final class TerminalContainerMuxable extends TerminalContainerCommon {
private final JPanel cardContainer = new JPanel();
private final CardLayout cardLayout = new CardLayout();
@@ -67,7 +67,7 @@ final public class TerminalContainerMuxable extends TerminalContainerCommon {
}
@Override
- final protected void addTabWork(JComponent comp) {
+ protected final void addTabWork(JComponent comp) {
final String cardName = cardName(comp);
cardContainer.add(cardName, comp);
cardLayout.addLayoutComponent(comp, cardName);
@@ -76,7 +76,7 @@ final public class TerminalContainerMuxable extends TerminalContainerCommon {
}
@Override
- final protected void removeTabWork(JComponent comp) {
+ protected final void removeTabWork(JComponent comp) {
cardContainer.remove(comp);
cardLayout.removeLayoutComponent(comp);
components.remove(comp);
diff --git a/ide/terminal.nb/src/org/netbeans/modules/terminal/iocontainer/TerminalContainerTabbed.java b/ide/terminal.nb/src/org/netbeans/modules/terminal/iocontainer/TerminalContainerTabbed.java
index d38e545..6101d07 100644
--- a/ide/terminal.nb/src/org/netbeans/modules/terminal/iocontainer/TerminalContainerTabbed.java
+++ b/ide/terminal.nb/src/org/netbeans/modules/terminal/iocontainer/TerminalContainerTabbed.java
@@ -50,7 +50,7 @@ import org.openide.windows.TopComponent;
* Corresponds to core.io.ui...IOWindow.
* @author ivan
*/
-final public class TerminalContainerTabbed extends TerminalContainerCommon {
+public final class TerminalContainerTabbed extends TerminalContainerCommon {
private JTabbedPane tabbedPane;
private JComponent soleComponent;
@@ -127,7 +127,7 @@ final public class TerminalContainerTabbed extends TerminalContainerCommon {
}
@Override
- final protected void addTabWork(JComponent comp) {
+ protected final void addTabWork(JComponent comp) {
if (soleComponent != null) {
// only single tab, remove it from TopComp. and add it to tabbed pane
assert tabbedPane.getParent() == null;
@@ -169,7 +169,7 @@ final public class TerminalContainerTabbed extends TerminalContainerCommon {
}
@Override
- final protected void removeTabWork(final JComponent comp) {
+ protected final void removeTabWork(final JComponent comp) {
if (soleComponent != null) {
// removing the last one
assert soleComponent == comp;
diff --git a/ide/terminal.nb/src/org/netbeans/modules/terminal/ioprovider/Task.java b/ide/terminal.nb/src/org/netbeans/modules/terminal/ioprovider/Task.java
index 6e584b9..c27dc2e 100644
--- a/ide/terminal.nb/src/org/netbeans/modules/terminal/ioprovider/Task.java
+++ b/ide/terminal.nb/src/org/netbeans/modules/terminal/ioprovider/Task.java
@@ -57,7 +57,7 @@ import org.netbeans.modules.terminal.api.ui.TerminalContainer;
* using the get() method which uses futures until the value is available.
* @param <V>
*/
- public static abstract class ValueTask<V> extends Task implements Callable<V> {
+ public abstract static class ValueTask<V> extends Task implements Callable<V> {
private final FutureTask<V> future;
protected ValueTask(Terminal terminal) {
diff --git a/ide/terminal.nb/src/org/netbeans/modules/terminal/ioprovider/Terminal.java b/ide/terminal.nb/src/org/netbeans/modules/terminal/ioprovider/Terminal.java
index 7c42c82..2574aa5 100644
--- a/ide/terminal.nb/src/org/netbeans/modules/terminal/ioprovider/Terminal.java
+++ b/ide/terminal.nb/src/org/netbeans/modules/terminal/ioprovider/Terminal.java
@@ -269,9 +269,9 @@ public final class Terminal extends JComponent {
*/
private class MyTermListener implements TermListener {
- private final static int MAX_TITLE_LENGTH = 35;
- private final static String PREFIX = "..."; // NOI18N
- private final static String INFIX = " - "; // NOI18N
+ private static final int MAX_TITLE_LENGTH = 35;
+ private static final String PREFIX = "..."; // NOI18N
+ private static final String INFIX = " - "; // NOI18N
@Override
public void sizeChanged(Dimension cells, Dimension pixels) {
diff --git a/ide/terminal.nb/test/unit/src/org/netbeans/modules/terminal/T5_MTStress_Test.java b/ide/terminal.nb/test/unit/src/org/netbeans/modules/terminal/T5_MTStress_Test.java
index 6b44660..86b139c 100644
--- a/ide/terminal.nb/test/unit/src/org/netbeans/modules/terminal/T5_MTStress_Test.java
+++ b/ide/terminal.nb/test/unit/src/org/netbeans/modules/terminal/T5_MTStress_Test.java
@@ -29,8 +29,8 @@ import org.openide.windows.OutputWriter;
public class T5_MTStress_Test extends TestSupport {
- private final static int NCREATORS = 10;
- private final static int NWRITERS = 10;
+ private static final int NCREATORS = 10;
+ private static final int NWRITERS = 10;
public T5_MTStress_Test(String testName) {
super(testName);
diff --git a/ide/terminal/src/org/netbeans/modules/terminal/api/IOConnect.java b/ide/terminal/src/org/netbeans/modules/terminal/api/IOConnect.java
index f1cb5eb..016433f 100644
--- a/ide/terminal/src/org/netbeans/modules/terminal/api/IOConnect.java
+++ b/ide/terminal/src/org/netbeans/modules/terminal/api/IOConnect.java
@@ -84,7 +84,7 @@ public abstract class IOConnect {
return find(io) != null;
}
- abstract protected boolean isConnected();
+ protected abstract boolean isConnected();
- abstract protected void disconnectAll(Runnable continuation);
+ protected abstract void disconnectAll(Runnable continuation);
}
diff --git a/ide/terminal/src/org/netbeans/modules/terminal/api/IOEmulation.java b/ide/terminal/src/org/netbeans/modules/terminal/api/IOEmulation.java
index 304f829..83bbbde 100644
--- a/ide/terminal/src/org/netbeans/modules/terminal/api/IOEmulation.java
+++ b/ide/terminal/src/org/netbeans/modules/terminal/api/IOEmulation.java
@@ -106,16 +106,16 @@ public abstract class IOEmulation {
* Return the terminal type supported by this IO.
* @return terminal type.
*/
- abstract protected String getEmulation();
+ protected abstract String getEmulation();
/**
* Return whether this IO implements it's own line discipline.
* @return If true this IO implements it's own line discipline.
*/
- abstract protected boolean isDisciplined();
+ protected abstract boolean isDisciplined();
/**
* Declare that this IO should implement it's own line discipline.
*/
- abstract protected void setDisciplined();
+ protected abstract void setDisciplined();
}
diff --git a/ide/terminal/src/org/netbeans/modules/terminal/api/IONotifier.java b/ide/terminal/src/org/netbeans/modules/terminal/api/IONotifier.java
index 6b80496..280b697 100644
--- a/ide/terminal/src/org/netbeans/modules/terminal/api/IONotifier.java
+++ b/ide/terminal/src/org/netbeans/modules/terminal/api/IONotifier.java
@@ -73,11 +73,11 @@ public abstract class IONotifier {
return find(io) != null;
}
- abstract protected void addPropertyChangeListener(PropertyChangeListener listener);
+ protected abstract void addPropertyChangeListener(PropertyChangeListener listener);
- abstract protected void removePropertyChangeListener(PropertyChangeListener listener);
+ protected abstract void removePropertyChangeListener(PropertyChangeListener listener);
- abstract protected void addVetoableChangeListener(VetoableChangeListener listener );
+ protected abstract void addVetoableChangeListener(VetoableChangeListener listener );
- abstract protected void removeVetoableChangeListener(VetoableChangeListener listener );
+ protected abstract void removeVetoableChangeListener(VetoableChangeListener listener );
}
diff --git a/ide/terminal/src/org/netbeans/modules/terminal/api/IOTerm.java b/ide/terminal/src/org/netbeans/modules/terminal/api/IOTerm.java
index 5ee112f..f12cd80 100644
--- a/ide/terminal/src/org/netbeans/modules/terminal/api/IOTerm.java
+++ b/ide/terminal/src/org/netbeans/modules/terminal/api/IOTerm.java
@@ -148,11 +148,11 @@ public abstract class IOTerm {
* {@link java.nio.charset.Charset </code>charset<code>}, null for system default
* @param postConnectTask the task to be executed *after* the connection is established
*/
- abstract protected void connect(OutputStream pin, InputStream pout, InputStream perr, String charset, Runnable postConnectTask);
+ protected abstract void connect(OutputStream pin, InputStream pout, InputStream perr, String charset, Runnable postConnectTask);
- abstract protected void disconnect(Runnable continuation);
+ protected abstract void disconnect(Runnable continuation);
- abstract protected void setReadOnly(boolean isReadOnly);
+ protected abstract void setReadOnly(boolean isReadOnly);
- abstract protected void requestFocus();
+ protected abstract void requestFocus();
}
diff --git a/ide/terminal/src/org/netbeans/modules/terminal/test/IOTest.java b/ide/terminal/src/org/netbeans/modules/terminal/test/IOTest.java
index 5f16978..14885b3 100644
--- a/ide/terminal/src/org/netbeans/modules/terminal/test/IOTest.java
+++ b/ide/terminal/src/org/netbeans/modules/terminal/test/IOTest.java
@@ -77,6 +77,6 @@ public abstract class IOTest {
return find(io) != null;
}
- abstract protected boolean isQuiescent();
- abstract protected void performCloseAction();
+ protected abstract boolean isQuiescent();
+ protected abstract void performCloseAction();
}
diff --git a/ide/utilities/src/org/netbeans/modules/openfile/OpenFileDialogFilter.java b/ide/utilities/src/org/netbeans/modules/openfile/OpenFileDialogFilter.java
index 24863c1..01ba1aa 100644
--- a/ide/utilities/src/org/netbeans/modules/openfile/OpenFileDialogFilter.java
+++ b/ide/utilities/src/org/netbeans/modules/openfile/OpenFileDialogFilter.java
@@ -242,7 +242,7 @@ public abstract class OpenFileDialogFilter extends FileFilter {
* parameter {@code showInFileChooser}.
*/
@Deprecated
- public static abstract class ExtensionFilter extends OpenFileDialogFilter {
+ public abstract static class ExtensionFilter extends OpenFileDialogFilter {
private static final char EXTENSION_SEPARATOR = '.';
diff --git a/ide/versioning.core/src/org/netbeans/modules/versioning/core/VersioningManager.java b/ide/versioning.core/src/org/netbeans/modules/versioning/core/VersioningManager.java
index 787bb8d..9831d09 100644
--- a/ide/versioning.core/src/org/netbeans/modules/versioning/core/VersioningManager.java
+++ b/ide/versioning.core/src/org/netbeans/modules/versioning/core/VersioningManager.java
@@ -637,7 +637,7 @@ public class VersioningManager implements PropertyChangeListener, ChangeListener
}
}
- public synchronized static void statusListener(VCSAnnotationListener listener, boolean add) {
+ public static synchronized void statusListener(VCSAnnotationListener listener, boolean add) {
WeakSet<VCSAnnotationListener> newSet = new WeakSet<VCSAnnotationListener>(statusListeners);
if (add) {
newSet.add(listener);
diff --git a/ide/versioning.core/src/org/netbeans/modules/versioning/core/filesystems/VCSFilesystemInterceptor.java b/ide/versioning.core/src/org/netbeans/modules/versioning/core/filesystems/VCSFilesystemInterceptor.java
index 5cb899e..607cd19 100644
--- a/ide/versioning.core/src/org/netbeans/modules/versioning/core/filesystems/VCSFilesystemInterceptor.java
+++ b/ide/versioning.core/src/org/netbeans/modules/versioning/core/filesystems/VCSFilesystemInterceptor.java
@@ -406,7 +406,7 @@ public final class VCSFilesystemInterceptor {
* Stores files that are being created inside the IDE and the owner interceptor wants to handle the creation. Entries
* are added in beforeCreate() and removed in fileDataCreated() or createFailure().
*/
- private final static Map<FileEx, DelegatingInterceptor> filesBeingCreated = new HashMap<FileEx, DelegatingInterceptor>(10);
+ private static final Map<FileEx, DelegatingInterceptor> filesBeingCreated = new HashMap<FileEx, DelegatingInterceptor>(10);
private static class FileEx {
final VCSFileProxy parent;
final String name;
@@ -488,7 +488,7 @@ public final class VCSFilesystemInterceptor {
public void afterMove() { }
};
- private final static VCSInterceptor nullInterceptor = new VCSInterceptor() {
+ private static final VCSInterceptor nullInterceptor = new VCSInterceptor() {
@Override
public boolean isMutable(VCSFileProxy file) {
diff --git a/ide/versioning.core/src/org/netbeans/modules/versioning/core/spi/VCSContext.java b/ide/versioning.core/src/org/netbeans/modules/versioning/core/spi/VCSContext.java
index 17626db..cc4a0fa 100644
--- a/ide/versioning.core/src/org/netbeans/modules/versioning/core/spi/VCSContext.java
+++ b/ide/versioning.core/src/org/netbeans/modules/versioning/core/spi/VCSContext.java
@@ -117,7 +117,7 @@ public final class VCSContext {
* @return VCSContext containing nodes and corresponding files they represent
*/
// XXX any chance to replace with lookup?
- public synchronized static VCSContext forNodes(Node[] nodes) {
+ public static synchronized VCSContext forNodes(Node[] nodes) {
if (Arrays.equals(contextNodesCached.get(), nodes)) {
VCSContext ctx = contextCached.get();
if (ctx != null) return ctx;
diff --git a/ide/versioning.core/test/unit/src/org/netbeans/modules/versioning/VCSFilesystemTestFactory.java b/ide/versioning.core/test/unit/src/org/netbeans/modules/versioning/VCSFilesystemTestFactory.java
index 66a9ab8..99c8dff 100644
--- a/ide/versioning.core/test/unit/src/org/netbeans/modules/versioning/VCSFilesystemTestFactory.java
+++ b/ide/versioning.core/test/unit/src/org/netbeans/modules/versioning/VCSFilesystemTestFactory.java
@@ -134,7 +134,7 @@ public abstract class VCSFilesystemTestFactory extends NbTestSetup {
map.put(test ,s );
}
- private synchronized static VCSFilesystemTestFactory getFromMap (Test test) {
+ private static synchronized VCSFilesystemTestFactory getFromMap (Test test) {
LinkedList s = (LinkedList) map.get (test);
VCSFilesystemTestFactory retVal;
try {
diff --git a/ide/versioning.ui/src/org/netbeans/modules/versioning/ui/history/HistoryComponent.java b/ide/versioning.ui/src/org/netbeans/modules/versioning/ui/history/HistoryComponent.java
index 442d677..845eb49 100644
--- a/ide/versioning.ui/src/org/netbeans/modules/versioning/ui/history/HistoryComponent.java
+++ b/ide/versioning.ui/src/org/netbeans/modules/versioning/ui/history/HistoryComponent.java
@@ -84,7 +84,7 @@ import org.openide.util.lookup.ProxyLookup;
mimeType="",
position=1000000 // lets leave some space in case somebody really wants to be the last
)
-final public class HistoryComponent extends JPanel implements MultiViewElement, HelpCtx.Provider, PropertyChangeListener {
+public final class HistoryComponent extends JPanel implements MultiViewElement, HelpCtx.Provider, PropertyChangeListener {
private HistoryFileView masterView;
static final String PREFERRED_ID = "text.history"; // NOI18N
@@ -894,7 +894,7 @@ final public class HistoryComponent extends JPanel implements MultiViewElement,
return new HelpCtx("org.netbeans.modules.localhistory.ui.view.LHHistoryTab"); // NO18N
}
- static abstract class Filter implements QuickFilter {
+ abstract static class Filter implements QuickFilter {
public boolean filtersProperty(Property property) {
return false;
}
diff --git a/ide/versioning.ui/src/org/netbeans/modules/versioning/ui/history/HistoryDiffView.java b/ide/versioning.ui/src/org/netbeans/modules/versioning/ui/history/HistoryDiffView.java
index f028f97..9bac954 100644
--- a/ide/versioning.ui/src/org/netbeans/modules/versioning/ui/history/HistoryDiffView.java
+++ b/ide/versioning.ui/src/org/netbeans/modules/versioning/ui/history/HistoryDiffView.java
@@ -658,7 +658,7 @@ public class HistoryDiffView implements PropertyChangeListener {
task.schedule(500);
}
- synchronized protected boolean isCancelled() {
+ protected synchronized boolean isCancelled() {
if(cancelled) {
History.LOG.finer("DiffTask is cancelled"); // NOI18N
}
diff --git a/ide/versioning.util/src/org/netbeans/modules/turbo/Memory.java b/ide/versioning.util/src/org/netbeans/modules/turbo/Memory.java
index 6c94017..86493c4 100644
--- a/ide/versioning.util/src/org/netbeans/modules/turbo/Memory.java
+++ b/ide/versioning.util/src/org/netbeans/modules/turbo/Memory.java
@@ -229,7 +229,7 @@ final class Memory {
}
/** Limited size LRU map implementation. */
- private final static class LRU extends LinkedHashMap {
+ private static final class LRU extends LinkedHashMap {
private final int maxSize;
diff --git a/ide/versioning.util/src/org/netbeans/modules/turbo/Turbo.java b/ide/versioning.util/src/org/netbeans/modules/turbo/Turbo.java
index 86a31d5..340518c 100644
--- a/ide/versioning.util/src/org/netbeans/modules/turbo/Turbo.java
+++ b/ide/versioning.util/src/org/netbeans/modules/turbo/Turbo.java
@@ -429,7 +429,7 @@ public final class Turbo {
}
/** Requests queue entry featuring value based identity. */
- private final static class Request {
+ private static final class Request {
private final Object key;
private final String name;
diff --git a/ide/versioning.util/src/org/netbeans/modules/versioning/history/AbstractSummaryView.java b/ide/versioning.util/src/org/netbeans/modules/versioning/history/AbstractSummaryView.java
index e07ec53..29e982f 100644
--- a/ide/versioning.util/src/org/netbeans/modules/versioning/history/AbstractSummaryView.java
+++ b/ide/versioning.util/src/org/netbeans/modules/versioning/history/AbstractSummaryView.java
@@ -354,7 +354,7 @@ public abstract class AbstractSummaryView implements MouseListener, MouseMotionL
public void getMoreResults(PropertyChangeListener callback, int count);
public boolean hasMoreResults ();
- public final static class SearchHighlight {
+ public static final class SearchHighlight {
public static enum Kind {
MESSAGE,
AUTHOR,
@@ -403,7 +403,7 @@ public abstract class AbstractSummaryView implements MouseListener, MouseMotionL
private final SummaryViewMaster master;
- public static abstract class LogEntry {
+ public abstract static class LogEntry {
public static final String PROP_EVENTS_CHANGED = "propEventsChanged"; //NOI18N
private final PropertyChangeSupport support;
@@ -449,7 +449,7 @@ public abstract class AbstractSummaryView implements MouseListener, MouseMotionL
*/
protected abstract Collection<RevisionHighlight> getRevisionHighlights ();
- public static abstract class Event {
+ public abstract static class Event {
public abstract String getPath();
public abstract String getOriginalPath ();
public abstract String getAction();
diff --git a/ide/versioning.util/src/org/netbeans/modules/versioning/shelve/ShelveChangesActionsRegistry.java b/ide/versioning.util/src/org/netbeans/modules/versioning/shelve/ShelveChangesActionsRegistry.java
index 0a1db65..f9b214f 100644
--- a/ide/versioning.util/src/org/netbeans/modules/versioning/shelve/ShelveChangesActionsRegistry.java
+++ b/ide/versioning.util/src/org/netbeans/modules/versioning/shelve/ShelveChangesActionsRegistry.java
@@ -57,7 +57,7 @@ public final class ShelveChangesActionsRegistry {
}
}
- public static abstract class ShelveChangesActionProvider {
+ public abstract static class ShelveChangesActionProvider {
public abstract Action getAction ();
diff --git a/ide/versioning.util/src/org/netbeans/modules/versioning/shelve/ShelveChangesSupport.java b/ide/versioning.util/src/org/netbeans/modules/versioning/shelve/ShelveChangesSupport.java
index c9da828..e22763d 100644
--- a/ide/versioning.util/src/org/netbeans/modules/versioning/shelve/ShelveChangesSupport.java
+++ b/ide/versioning.util/src/org/netbeans/modules/versioning/shelve/ShelveChangesSupport.java
@@ -50,7 +50,7 @@ import org.openide.util.NbBundle;
public abstract class ShelveChangesSupport {
private String patchName;
- private final static Pattern PATCH_NAME_PATTERN = Pattern.compile("^(.*)-(\\d+)$"); //NOI18N
+ private static final Pattern PATCH_NAME_PATTERN = Pattern.compile("^(.*)-(\\d+)$"); //NOI18N
protected abstract void exportPatch (File toFile, File commonParent) throws IOException;
diff --git a/ide/versioning.util/src/org/netbeans/modules/versioning/util/ExportDiffSupport.java b/ide/versioning.util/src/org/netbeans/modules/versioning/util/ExportDiffSupport.java
index 3e713d9..322229a 100644
--- a/ide/versioning.util/src/org/netbeans/modules/versioning/util/ExportDiffSupport.java
+++ b/ide/versioning.util/src/org/netbeans/modules/versioning/util/ExportDiffSupport.java
@@ -293,9 +293,9 @@ public abstract class ExportDiffSupport {
return chooser;
}
- public static abstract class ExportDiffProvider {
+ public abstract static class ExportDiffProvider {
private PropertyChangeSupport support = new PropertyChangeSupport(this);
- private final static String EVENT_DATA_CHANGED = "ExportDiff.data.changed";
+ private static final String EVENT_DATA_CHANGED = "ExportDiff.data.changed";
/**
* Sets the files for which this provider should provide
@@ -341,7 +341,7 @@ public abstract class ExportDiffSupport {
* Abstract ancestor of an output diff panel.
* @author Ondra Vrabec
*/
- public static abstract class AbstractExportDiffPanel extends JPanel {
+ public abstract static class AbstractExportDiffPanel extends JPanel {
/**
* Implement this method to access diff output file path field's text.
diff --git a/ide/versioning.util/src/org/netbeans/modules/versioning/util/SimpleLookup.java b/ide/versioning.util/src/org/netbeans/modules/versioning/util/SimpleLookup.java
index a5b6e4d..10c54d8 100644
--- a/ide/versioning.util/src/org/netbeans/modules/versioning/util/SimpleLookup.java
+++ b/ide/versioning.util/src/org/netbeans/modules/versioning/util/SimpleLookup.java
@@ -98,7 +98,7 @@ public class SimpleLookup extends AbstractLookup {
}
/** Copy from AbstractLookup.SimpleItem */
- private final static class SimpleItem<T> extends Pair<T> {
+ private static final class SimpleItem<T> extends Pair<T> {
private T obj;
/** Create an item.
diff --git a/ide/versioning.util/src/org/netbeans/modules/versioning/util/VCSHyperlinkSupport.java b/ide/versioning.util/src/org/netbeans/modules/versioning/util/VCSHyperlinkSupport.java
index 4b67213..4d93b0a 100644
--- a/ide/versioning.util/src/org/netbeans/modules/versioning/util/VCSHyperlinkSupport.java
+++ b/ide/versioning.util/src/org/netbeans/modules/versioning/util/VCSHyperlinkSupport.java
@@ -140,13 +140,13 @@ public class VCSHyperlinkSupport {
}
}
- public static abstract class Hyperlink {
+ public abstract static class Hyperlink {
public abstract boolean mouseMoved(Point p, JComponent component);
public abstract boolean mouseClicked(Point p);
public abstract void computeBounds(JTextPane textPane);
}
- public static abstract class StyledDocumentHyperlink extends Hyperlink {
+ public abstract static class StyledDocumentHyperlink extends Hyperlink {
public abstract void insertString(StyledDocument sd, Style style) throws BadLocationException;
}
diff --git a/ide/versioning.util/src/org/netbeans/modules/versioning/util/VCSKenaiAccessor.java b/ide/versioning.util/src/org/netbeans/modules/versioning/util/VCSKenaiAccessor.java
index db058ce..1a74f15 100644
--- a/ide/versioning.util/src/org/netbeans/modules/versioning/util/VCSKenaiAccessor.java
+++ b/ide/versioning.util/src/org/netbeans/modules/versioning/util/VCSKenaiAccessor.java
@@ -47,7 +47,7 @@ public abstract class VCSKenaiAccessor {
/**
* Some kenai vcs repository was changed
*/
- public final static String PROP_KENAI_VCS_NOTIFICATION = "kenai.vcs.notification"; // NOI18N
+ public static final String PROP_KENAI_VCS_NOTIFICATION = "kenai.vcs.notification"; // NOI18N
protected static final Logger LOG = Logger.getLogger("org.netbeans.modules.versioning.util.VCSKenaiSupport");
@@ -167,7 +167,7 @@ public abstract class VCSKenaiAccessor {
/**
* Repesents a Kenai user
*/
- public static abstract class KenaiUser {
+ public abstract static class KenaiUser {
/**
* Determines wheter the {@link KenaiUser} is online or not
@@ -240,7 +240,7 @@ public abstract class VCSKenaiAccessor {
/**
* Represents a change in a kenai VCS repository
*/
- public static abstract class VCSKenaiNotification {
+ public abstract static class VCSKenaiNotification {
/**
* The repository uri
diff --git a/ide/versioning.util/src/org/netbeans/modules/versioning/util/common/FileTreeView.java b/ide/versioning.util/src/org/netbeans/modules/versioning/util/common/FileTreeView.java
index dcbd55a..e6fb610 100644
--- a/ide/versioning.util/src/org/netbeans/modules/versioning/util/common/FileTreeView.java
+++ b/ide/versioning.util/src/org/netbeans/modules/versioning/util/common/FileTreeView.java
@@ -100,7 +100,7 @@ public abstract class FileTreeView<T extends VCSStatusNode> implements FileViewC
private static final String ICON_KEY_UIMANAGER = "Tree.closedIcon"; //NOI18N
private static final String ICON_KEY_UIMANAGER_NB = "Nb.Explorer.Folder.icon"; //NOI18N
- private final static String PATH_SEPARATOR_REGEXP = File.separator.replace("\\", "\\\\"); //NOI18N
+ private static final String PATH_SEPARATOR_REGEXP = File.separator.replace("\\", "\\\\"); //NOI18N
private static Image FOLDER_ICON;
@@ -715,7 +715,7 @@ public abstract class FileTreeView<T extends VCSStatusNode> implements FileViewC
}
}
- private static abstract class TreeViewChildren extends Children.Array {
+ private abstract static class TreeViewChildren extends Children.Array {
abstract void buildSubNodes (Class<?> type);
}
diff --git a/ide/versioning.util/src/org/netbeans/modules/versioning/util/projects/ProjectsView.java b/ide/versioning.util/src/org/netbeans/modules/versioning/util/projects/ProjectsView.java
index d5c4a01..f5909f0 100644
--- a/ide/versioning.util/src/org/netbeans/modules/versioning/util/projects/ProjectsView.java
+++ b/ide/versioning.util/src/org/netbeans/modules/versioning/util/projects/ProjectsView.java
@@ -249,7 +249,7 @@ class ProjectsView extends JPanel implements ExplorerManager.Provider, VetoableC
*/
private final class ProjectNode extends AbstractNode {
static final String PROPERTY_NAME_PATH = "path"; // NOI18N
- final private ProjectInformation info;
+ private final ProjectInformation info;
public ProjectNode(Project p, Children children) {
super(children, Lookups.singleton(p));
diff --git a/ide/versioning.util/src/org/netbeans/modules/versioning/util/status/VCSStatusNode.java b/ide/versioning.util/src/org/netbeans/modules/versioning/util/status/VCSStatusNode.java
index f451939..34541cc 100644
--- a/ide/versioning.util/src/org/netbeans/modules/versioning/util/status/VCSStatusNode.java
+++ b/ide/versioning.util/src/org/netbeans/modules/versioning/util/status/VCSStatusNode.java
@@ -89,7 +89,7 @@ public abstract class VCSStatusNode<T extends VCSFileNode> extends AbstractNode
public abstract void refresh ();
- protected static abstract class NodeProperty<T> extends ReadOnly<T> {
+ protected abstract static class NodeProperty<T> extends ReadOnly<T> {
protected NodeProperty (String name, Class<T> type, String displayName, String description) {
super(name, type, displayName, description);
}
diff --git a/ide/versioning.util/test/unit/src/org/netbeans/modules/versioning/hooks/VCSHookTest.java b/ide/versioning.util/test/unit/src/org/netbeans/modules/versioning/hooks/VCSHookTest.java
index 3c8235a..fa4b3b4 100644
--- a/ide/versioning.util/test/unit/src/org/netbeans/modules/versioning/hooks/VCSHookTest.java
+++ b/ide/versioning.util/test/unit/src/org/netbeans/modules/versioning/hooks/VCSHookTest.java
@@ -68,11 +68,11 @@ public class VCSHookTest extends NbTestCase {
assertTrue(b);
}
- public static abstract class TestVCSHook<TestVCSHookContext> extends VCSHook {
+ public abstract static class TestVCSHook<TestVCSHookContext> extends VCSHook {
}
- public static abstract class TestVCSHookContext extends VCSHookContext {
+ public abstract static class TestVCSHookContext extends VCSHookContext {
public TestVCSHookContext(File[] files) {
super(files);
}
diff --git a/ide/versioning/src/org/netbeans/modules/versioning/spi/VCSContext.java b/ide/versioning/src/org/netbeans/modules/versioning/spi/VCSContext.java
index ed44ab0..7123012 100644
--- a/ide/versioning/src/org/netbeans/modules/versioning/spi/VCSContext.java
+++ b/ide/versioning/src/org/netbeans/modules/versioning/spi/VCSContext.java
@@ -72,7 +72,7 @@ public final class VCSContext {
* @param nodes array of Nodes
* @return VCSContext containing nodes and corresponding files they represent
*/
- public synchronized static VCSContext forNodes(Node[] nodes) {
+ public static synchronized VCSContext forNodes(Node[] nodes) {
final org.netbeans.modules.versioning.core.spi.VCSContext delegate = org.netbeans.modules.versioning.core.spi.VCSContext.forNodes(nodes);
return accept(delegate) ? new VCSContext(delegate) : EMPTY;
}
diff --git a/ide/web.browser.api/src/org/netbeans/modules/web/browser/api/WebBrowserPane.java b/ide/web.browser.api/src/org/netbeans/modules/web/browser/api/WebBrowserPane.java
index 3e6a8e2..407da89 100644
--- a/ide/web.browser.api/src/org/netbeans/modules/web/browser/api/WebBrowserPane.java
+++ b/ide/web.browser.api/src/org/netbeans/modules/web/browser/api/WebBrowserPane.java
@@ -303,7 +303,7 @@ public final class WebBrowserPane {
/**
* Marker interface for all browser events.
*/
- public static abstract class WebBrowserPaneEvent {
+ public abstract static class WebBrowserPaneEvent {
private WebBrowserPane pane;
diff --git a/ide/web.browser.api/src/org/netbeans/modules/web/browser/spi/ExternalModificationsSupport.java b/ide/web.browser.api/src/org/netbeans/modules/web/browser/spi/ExternalModificationsSupport.java
index a447923..28bba58 100644
--- a/ide/web.browser.api/src/org/netbeans/modules/web/browser/spi/ExternalModificationsSupport.java
+++ b/ide/web.browser.api/src/org/netbeans/modules/web/browser/spi/ExternalModificationsSupport.java
@@ -60,7 +60,7 @@ public final class ExternalModificationsSupport {
* difference from url param is that currentBrowserURL can be index.html
* while url might be some.js file on which index.html depends
*/
- public synchronized static void handle(String url, String type, String content, URL currentBrowserURL) {
+ public static synchronized void handle(String url, String type, String content, URL currentBrowserURL) {
Helper.urlBeingRefreshedFromBrowser.set(currentBrowserURL != null ? currentBrowserURL.toExternalForm() : null);
try {
URL u = WebUtils.stringToUrl(url);
diff --git a/ide/web.browser.api/src/org/netbeans/modules/web/browser/ui/picker/RendererImpl.java b/ide/web.browser.api/src/org/netbeans/modules/web/browser/ui/picker/RendererImpl.java
index ffc4f5f..69aec33 100644
--- a/ide/web.browser.api/src/org/netbeans/modules/web/browser/ui/picker/RendererImpl.java
+++ b/ide/web.browser.api/src/org/netbeans/modules/web/browser/ui/picker/RendererImpl.java
@@ -30,7 +30,7 @@ import javax.swing.border.Border;
*/
class RendererImpl extends DefaultListCellRenderer {
- private final static Border emptyBorder = BorderFactory.createEmptyBorder( 5, 5, 5, 5 );
+ private static final Border emptyBorder = BorderFactory.createEmptyBorder( 5, 5, 5, 5 );
public RendererImpl() {
setIconTextGap( 5 );
diff --git a/ide/web.indent/src/org/netbeans/modules/web/indent/api/support/AbstractIndenter.java b/ide/web.indent/src/org/netbeans/modules/web/indent/api/support/AbstractIndenter.java
index bf12736..9a41f0c 100644
--- a/ide/web.indent/src/org/netbeans/modules/web/indent/api/support/AbstractIndenter.java
+++ b/ide/web.indent/src/org/netbeans/modules/web/indent/api/support/AbstractIndenter.java
@@ -56,7 +56,7 @@ import org.openide.util.Lookup;
*
* @since org.netbeans.modules.css.editor/1 1.3
*/
-abstract public class AbstractIndenter<T1 extends TokenId> {
+public abstract class AbstractIndenter<T1 extends TokenId> {
private Language<T1> language;
private Context context;
@@ -152,7 +152,7 @@ abstract public class AbstractIndenter<T1 extends TokenId> {
*
* @return offset representing stable start for formatting
*/
- abstract protected int getFormatStableStart(JoinedTokenSequence<T1> ts, int startOffset, int endOffset,
+ protected abstract int getFormatStableStart(JoinedTokenSequence<T1> ts, int startOffset, int endOffset,
AbstractIndenter.OffsetRanges rangesToIgnore) throws BadLocationException;
/**
@@ -164,15 +164,15 @@ abstract public class AbstractIndenter<T1 extends TokenId> {
* is known about next line yet
* @return list of indentation commands to apply when formatting this line
*/
- abstract protected List<IndentCommand> getLineIndent(IndenterContextData<T1> context,
+ protected abstract List<IndentCommand> getLineIndent(IndenterContextData<T1> context,
List<IndentCommand> preliminaryNextLineIndent) throws BadLocationException;
/**
* Is this whitespace token?
*/
- abstract protected boolean isWhiteSpaceToken(Token<T1> token);
+ protected abstract boolean isWhiteSpaceToken(Token<T1> token);
- abstract protected void reset();
+ protected abstract void reset();
// private boolean isWithinLanguage(int startOffset, int endOffset) {
// for (Context.Region r : context.indentRegions()) {
diff --git a/ide/web.indent/src/org/netbeans/modules/web/indent/api/support/MarkupAbstractIndenter.java b/ide/web.indent/src/org/netbeans/modules/web/indent/api/support/MarkupAbstractIndenter.java
index 4982553..fef8843 100644
--- a/ide/web.indent/src/org/netbeans/modules/web/indent/api/support/MarkupAbstractIndenter.java
+++ b/ide/web.indent/src/org/netbeans/modules/web/indent/api/support/MarkupAbstractIndenter.java
@@ -41,7 +41,7 @@ import org.netbeans.modules.web.indent.api.LexUtilities;
*
* @since org.netbeans.modules.css.editor/1 1.3
*/
-abstract public class MarkupAbstractIndenter<T1 extends TokenId> extends AbstractIndenter<T1> {
+public abstract class MarkupAbstractIndenter<T1 extends TokenId> extends AbstractIndenter<T1> {
private Stack<MarkupItem> stack = null;
private List<EliminatedTag> eliminatedTags;
@@ -55,44 +55,44 @@ abstract public class MarkupAbstractIndenter<T1 extends TokenId> extends Abstrac
super(language, context);
}
- abstract protected boolean isOpenTagNameToken(Token<T1> token);
- abstract protected boolean isCloseTagNameToken(Token<T1> token);
+ protected abstract boolean isOpenTagNameToken(Token<T1> token);
+ protected abstract boolean isCloseTagNameToken(Token<T1> token);
/** < */
- abstract protected boolean isStartTagSymbol(Token<T1> token);
+ protected abstract boolean isStartTagSymbol(Token<T1> token);
/** </ */
- abstract protected boolean isStartTagClosingSymbol(Token<T1> token);
+ protected abstract boolean isStartTagClosingSymbol(Token<T1> token);
/** > */
- abstract protected boolean isEndTagSymbol(Token<T1> token);
+ protected abstract boolean isEndTagSymbol(Token<T1> token);
/** /> */
- abstract protected boolean isEndTagClosingSymbol(Token<T1> token);
+ protected abstract boolean isEndTagClosingSymbol(Token<T1> token);
- abstract protected boolean isTagArgumentToken(Token<T1> token);
+ protected abstract boolean isTagArgumentToken(Token<T1> token);
- abstract protected boolean isBlockCommentToken(Token<T1> token);
+ protected abstract boolean isBlockCommentToken(Token<T1> token);
- abstract protected boolean isTagContentToken(Token<T1> token);
+ protected abstract boolean isTagContentToken(Token<T1> token);
- abstract protected boolean isClosingTagOptional(CharSequence tagName);
+ protected abstract boolean isClosingTagOptional(CharSequence tagName);
- abstract protected boolean isOpeningTagOptional(CharSequence tagName);
+ protected abstract boolean isOpeningTagOptional(CharSequence tagName);
- abstract protected Boolean isEmptyTag(CharSequence tagName);
+ protected abstract Boolean isEmptyTag(CharSequence tagName);
- abstract protected boolean isTagContentUnformattable(CharSequence tagName);
+ protected abstract boolean isTagContentUnformattable(CharSequence tagName);
- abstract protected Set<String> getTagChildren(CharSequence tagName);
+ protected abstract Set<String> getTagChildren(CharSequence tagName);
- abstract protected boolean isPreservedLine(Token<T1> token, IndenterContextData<T1> context);
+ protected abstract boolean isPreservedLine(Token<T1> token, IndenterContextData<T1> context);
- abstract protected int getPreservedLineInitialIndentation(JoinedTokenSequence<T1> ts) throws BadLocationException;
+ protected abstract int getPreservedLineInitialIndentation(JoinedTokenSequence<T1> ts) throws BadLocationException;
protected boolean isStableFormattingStartToken(Token<T1> token, JoinedTokenSequence<T1> ts) {
return false;
}
- abstract protected boolean isForeignLanguageStartToken(Token<T1> token, JoinedTokenSequence<T1> ts);
+ protected abstract boolean isForeignLanguageStartToken(Token<T1> token, JoinedTokenSequence<T1> ts);
- abstract protected boolean isForeignLanguageEndToken(Token<T1> token, JoinedTokenSequence<T1> ts);
+ protected abstract boolean isForeignLanguageEndToken(Token<T1> token, JoinedTokenSequence<T1> ts);
private Stack<MarkupItem> getStack() {
return stack;
diff --git a/ide/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/debugger/AbstractObject.java b/ide/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/debugger/AbstractObject.java
index 84d9e7d..b96862e 100644
--- a/ide/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/debugger/AbstractObject.java
+++ b/ide/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/debugger/AbstractObject.java
@@ -26,7 +26,7 @@ import org.netbeans.modules.web.webkit.debugging.api.WebKitDebugging;
/**
*
*/
-abstract public class AbstractObject {
+public abstract class AbstractObject {
private JSONObject object;
private WebKitDebugging webkit;
diff --git a/ide/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/dom/Node.java b/ide/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/dom/Node.java
index 7ddcaa5..de56fac 100644
--- a/ide/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/dom/Node.java
+++ b/ide/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/dom/Node.java
@@ -215,7 +215,7 @@ public class Node {
*
* @param newChildren new children to add.
*/
- synchronized final void addChildren(List<Node> newChildren) {
+ final synchronized void addChildren(List<Node> newChildren) {
if (children == null) {
initChildren();
}
@@ -230,7 +230,7 @@ public class Node {
*
* @param child child to remove.
*/
- synchronized final void removeChild(Node child) {
+ final synchronized void removeChild(Node child) {
children.remove(child);
child.parent = null;
}
@@ -242,7 +242,7 @@ public class Node {
* @param previousChild previous child ({@code null} when the new child
* should be the first one).
*/
- synchronized final void insertChild(Node child, Node previousChild) {
+ final synchronized void insertChild(Node child, Node previousChild) {
if (children == null) {
initChildren();
}
@@ -270,7 +270,7 @@ public class Node {
*
* @param shadowRoot shadow root to add.
*/
- synchronized final void addShadowRoot(Node shadowRoot) {
+ final synchronized void addShadowRoot(Node shadowRoot) {
if (shadowRoots == null) {
shadowRoots = new LinkedList<Node>();
}
@@ -283,7 +283,7 @@ public class Node {
*
* @param shadowRoot shadow root to remove.
*/
- synchronized final void removeShadowRoot(Node shadowRoot) {
+ final synchronized void removeShadowRoot(Node shadowRoot) {
shadowRoots.remove(shadowRoot);
}
diff --git a/ide/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/network/Network.java b/ide/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/network/Network.java
index f8a7caa..9e7d92c 100644
--- a/ide/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/network/Network.java
+++ b/ide/web.webkit.debugging/src/org/netbeans/modules/web/webkit/debugging/api/network/Network.java
@@ -265,7 +265,7 @@ public class Network {
}
- public final static class Request {
+ public static final class Request {
public static final String PROP_RESPONSE = "Network.Request.Response"; // NOI18N
public static final String PROP_RESPONSE_DATA = "Network.Request.Response.Data"; // NOI18N
@@ -395,7 +395,7 @@ public class Network {
}
- public final static class WebSocketRequest {
+ public static final class WebSocketRequest {
public static final String PROP_HANDSHAKE_REQUEST = "Network.WebSocketRequest.Handshake.Request"; // NOI18N
public static final String PROP_HANDSHAKE_RESPONSE = "Network.WebSocketRequest.Handshake.Response"; // NOI18N
@@ -487,7 +487,7 @@ public class Network {
RECEIVED,
}
- public final static class WebSocketFrame {
+ public static final class WebSocketFrame {
private final Direction direction;
private final JSONObject data;
diff --git a/ide/xml.axi/src/org/netbeans/modules/xml/axi/datatype/NumberBase.java b/ide/xml.axi/src/org/netbeans/modules/xml/axi/datatype/NumberBase.java
index 2da369b..6bce518 100644
--- a/ide/xml.axi/src/org/netbeans/modules/xml/axi/datatype/NumberBase.java
+++ b/ide/xml.axi/src/org/netbeans/modules/xml/axi/datatype/NumberBase.java
@@ -32,9 +32,9 @@ import org.netbeans.modules.xml.schema.model.Whitespace;
*/
public abstract class NumberBase extends Datatype {
- public final static Number UNBOUNDED_VALUE = Double.MAX_VALUE;
+ public static final Number UNBOUNDED_VALUE = Double.MAX_VALUE;
- public final static String UNBOUNDED_STRING = "unbounded"; //NoI18n
+ public static final String UNBOUNDED_STRING = "unbounded"; //NoI18n
static List<Facet> applicableFacets;
diff --git a/ide/xml.axi/src/org/netbeans/modules/xml/axi/impl/DefaultSchemaGenerator.java b/ide/xml.axi/src/org/netbeans/modules/xml/axi/impl/DefaultSchemaGenerator.java
index dc287a3..2392213 100644
--- a/ide/xml.axi/src/org/netbeans/modules/xml/axi/impl/DefaultSchemaGenerator.java
+++ b/ide/xml.axi/src/org/netbeans/modules/xml/axi/impl/DefaultSchemaGenerator.java
@@ -86,7 +86,7 @@ public abstract class DefaultSchemaGenerator extends SchemaGenerator {
private int fgeCount;
- public final static int commitRange = Integer.getInteger("schematools.axi.adp", 0);
+ public static final int commitRange = Integer.getInteger("schematools.axi.adp", 0);
/**
* Creates a new instance of DefaultSchemaGenerator
diff --git a/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogAction.java b/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogAction.java
index a6e6f130..4cc1097 100644
--- a/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogAction.java
+++ b/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogAction.java
@@ -137,7 +137,7 @@ public class CatalogAction implements ActionListener {
}
}
- static private Set<Node> getNodes2Open (Node [] nodes) {
+ private static Set<Node> getNodes2Open (Node [] nodes) {
Set<Node> nodes2open = new HashSet<Node> (nodes.length);
for (int i = 0; i < nodes.length; i++) {
if (nodes [i].isLeaf ()) {
diff --git a/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogPanel.java b/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogPanel.java
index b13be96..3f40d6e 100644
--- a/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogPanel.java
+++ b/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogPanel.java
@@ -54,9 +54,9 @@ public class CatalogPanel extends TopComponent implements ExplorerManager.Provid
private ExplorerManager manager;
private CatalogTreeView view;
private JTree tree;
- static private Set newlyCreatedFolders;
+ private static Set newlyCreatedFolders;
- static private FileObject catalogRoot;
+ private static FileObject catalogRoot;
/** Creates new form CatalogPanel */
public CatalogPanel() {
@@ -143,7 +143,7 @@ public class CatalogPanel extends TopComponent implements ExplorerManager.Provid
return new CatalogRootNode();
}
- static private final class TemplateFilter implements DataFilter {
+ private static final class TemplateFilter implements DataFilter {
public boolean acceptDataObject(DataObject obj) {
return acceptTemplate(obj);
}
@@ -298,13 +298,13 @@ public class CatalogPanel extends TopComponent implements ExplorerManager.Provid
private javax.swing.JPanel treePanel;
// End of variables declaration//GEN-END:variables
- static private DataObject getDOFromNode(Node n) {
+ private static DataObject getDOFromNode(Node n) {
DataObject dobj = n.getLookup().lookup(DataObject.class);
assert dobj != null : "DataObject for node " + n;
return dobj;
}
- static private DataFolder getTargetFolder(Node [] nodes) {
+ private static DataFolder getTargetFolder(Node [] nodes) {
DataFolder folder = null;
if (nodes == null || nodes.length == 0) {
folder = DataFolder.findFolder(getCatalogRoot());
diff --git a/ide/xml.core/src/org/netbeans/modules/xml/api/EncodingUtil.java b/ide/xml.core/src/org/netbeans/modules/xml/api/EncodingUtil.java
index fe87014..9b96dfd 100644
--- a/ide/xml.core/src/org/netbeans/modules/xml/api/EncodingUtil.java
+++ b/ide/xml.core/src/org/netbeans/modules/xml/api/EncodingUtil.java
@@ -389,10 +389,10 @@ public class EncodingUtil {
/**
* IANA to Java encoding mappings
*/
- final static Map<String, String> encodingIANA2JavaMap = new TreeMap<String, String>();
- final static Map<String, String> encodingIANADescriptionMap = new TreeMap<String, String>();
- final static Map<String, String> encodingIANAAliasesMap = new TreeMap<String, String>();
- final static Map<String, String> encodingJava2IANAMap = new TreeMap<String, String>();
+ static final Map<String, String> encodingIANA2JavaMap = new TreeMap<String, String>();
+ static final Map<String, String> encodingIANADescriptionMap = new TreeMap<String, String>();
+ static final Map<String, String> encodingIANAAliasesMap = new TreeMap<String, String>();
+ static final Map<String, String> encodingJava2IANAMap = new TreeMap<String, String>();
/**
* Static initialization
diff --git a/ide/xml.core/src/org/netbeans/modules/xml/core/lib/EncodingHelper.java b/ide/xml.core/src/org/netbeans/modules/xml/core/lib/EncodingHelper.java
index 7b7c7c9..08931b1 100644
--- a/ide/xml.core/src/org/netbeans/modules/xml/core/lib/EncodingHelper.java
+++ b/ide/xml.core/src/org/netbeans/modules/xml/core/lib/EncodingHelper.java
@@ -302,10 +302,10 @@ public class EncodingHelper extends Object {
/**
* IANA to Java encoding mappings
*/
- final static Map<String, String> encodingIANA2JavaMap = new TreeMap<String, String>();
- final static Map<String, String> encodingIANADescriptionMap = new TreeMap<String, String>();
- final static Map<String, String> encodingIANAAliasesMap = new TreeMap<String, String>();
- final static Map<String, String> encodingJava2IANAMap = new TreeMap<String, String>();
+ static final Map<String, String> encodingIANA2JavaMap = new TreeMap<String, String>();
+ static final Map<String, String> encodingIANADescriptionMap = new TreeMap<String, String>();
+ static final Map<String, String> encodingIANAAliasesMap = new TreeMap<String, String>();
+ static final Map<String, String> encodingJava2IANAMap = new TreeMap<String, String>();
/**
* Static initialization
diff --git a/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/DTDGrammar.java b/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/DTDGrammar.java
index da36c98..2d21b3d 100644
--- a/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/DTDGrammar.java
+++ b/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/DTDGrammar.java
@@ -401,7 +401,7 @@ class DTDGrammar implements ExtendedGrammarQuery {
// Result classes ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- private static abstract class AbstractResultNode extends AbstractNode implements GrammarResult {
+ private abstract static class AbstractResultNode extends AbstractNode implements GrammarResult {
public Icon getIcon(int kind) {
return null;
diff --git a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ItemEditorHelper.java b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ItemEditorHelper.java
index 4673959..90714f9 100644
--- a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ItemEditorHelper.java
+++ b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ItemEditorHelper.java
@@ -36,7 +36,7 @@ public class ItemEditorHelper implements Refreshable {
/**
* Model of item providing unified interface between text component and item data
*/
- public static abstract class ItemEditorModel {
+ public abstract static class ItemEditorModel {
private ItemEditorHelper itemEditorHelper;
diff --git a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/AbstractDesignEditor.java b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/AbstractDesignEditor.java
index 1de0746..da26704 100644
--- a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/AbstractDesignEditor.java
+++ b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/AbstractDesignEditor.java
@@ -151,9 +151,9 @@ public abstract class AbstractDesignEditor extends TopComponent implements Explo
* Used to create an instance of the JComponent used for the structure component. Usually a subclass of BeanTreeView.
* @return the JComponent
*/
- abstract public JComponent createStructureComponent() ;
+ public abstract JComponent createStructureComponent() ;
- abstract public ErrorPanel getErrorPanel();
+ public abstract ErrorPanel getErrorPanel();
/**
* A parent TopComponent can use this method to notify the ComponentPanel and it PanelView children that it was opened
diff --git a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/PanelView.java b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/PanelView.java
index 6abd883..70a99b3 100644
--- a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/PanelView.java
+++ b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/PanelView.java
@@ -50,7 +50,7 @@ public abstract class PanelView extends javax.swing.JPanel {
//transient NodeSelectedListener nodeListener = null;
/** Explorer manager, valid when this view is showing */
- transient private ExplorerManager manager;
+ private transient ExplorerManager manager;
/** weak variation of the listener for property change on the explorer manager */
transient PropertyChangeListener wlpc;
/** weak variation of the listener for vetoable change on the explorer manager */
@@ -142,7 +142,7 @@ public abstract class PanelView extends javax.swing.JPanel {
* The view should display the panel corresponding to the selected nodes
* @param nodes the nodes used to update the view
*/
- abstract public void showSelection(Node[] nodes) ;
+ public abstract void showSelection(Node[] nodes) ;
/** The view can change the explorer manager's current selection.
* @param value the new node to explore
diff --git a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionVisualTheme.java b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionVisualTheme.java
index 5929d13..a801b42 100644
--- a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionVisualTheme.java
+++ b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionVisualTheme.java
@@ -51,56 +51,56 @@ public class SectionVisualTheme {
public SectionVisualTheme() {
}
- static public Color getDocumentBackgroundColor(){
+ public static Color getDocumentBackgroundColor(){
return documentBackgroundColor;
}
- static public Color getMarginColor(){
+ public static Color getMarginColor(){
return documentMarginColor;
}
- static public Color getSectionHeaderColor(){
+ public static Color getSectionHeaderColor(){
return sectionHeaderColor;
}
- static public Color getContainerHeaderColor(){
+ public static Color getContainerHeaderColor(){
return containerHeaderColor;
}
- static public Color getSectionHeaderActiveColor(){
+ public static Color getSectionHeaderActiveColor(){
return sectionHeaderActiveColor;
}
- static public Color getSectionActiveBackgroundColor(){
+ public static Color getSectionActiveBackgroundColor(){
return sectionActiveBackgroundColor;
}
- static public Color getTableHeaderColor(){
+ public static Color getTableHeaderColor(){
return tableHeaderColor;
}
- static public Color getTableGridColor(){
+ public static Color getTableGridColor(){
return tableGridColor;
}
- static public Color getSectionHeaderLineColor(){
+ public static Color getSectionHeaderLineColor(){
return sectionHeaderLineColor;
}
- static public Color getHyperlinkColor(){
+ public static Color getHyperlinkColor(){
return hyperlinkColor;
}
- static public Color getHyperlinkColorFocused(){
+ public static Color getHyperlinkColorFocused(){
return hyperlinkColorFocused;
}
- static public Color getTextColor(){
+ public static Color getTextColor(){
return textColor;
}
- static public Color getFillerColor(){
+ public static Color getFillerColor(){
return fillerColor;
}
- static public Color getErrorLabelColor(){
+ public static Color getErrorLabelColor(){
return errorLabelColor;
}
- static public Color getFoldLineColor(){
+ public static Color getFoldLineColor(){
return foldLineColor;
}
diff --git a/ide/xml.retriever/src/org/netbeans/modules/xml/retriever/catalog/model/impl/CatalogComponentImpl.java b/ide/xml.retriever/src/org/netbeans/modules/xml/retriever/catalog/model/impl/CatalogComponentImpl.java
index c5ecef4..53f3ae0 100644
--- a/ide/xml.retriever/src/org/netbeans/modules/xml/retriever/catalog/model/impl/CatalogComponentImpl.java
+++ b/ide/xml.retriever/src/org/netbeans/modules/xml/retriever/catalog/model/impl/CatalogComponentImpl.java
@@ -40,7 +40,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/ide/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/spi/CompletionModelProvider.java b/ide/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/spi/CompletionModelProvider.java
index 96f8500..49183da 100644
--- a/ide/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/spi/CompletionModelProvider.java
+++ b/ide/xml.schema.completion/src/org/netbeans/modules/xml/schema/completion/spi/CompletionModelProvider.java
@@ -61,7 +61,7 @@ public abstract class CompletionModelProvider {
* A model that describes a schema that applies to an XML document at a
* point where code completion is requested.
*/
- public static abstract class CompletionModel {
+ public abstract static class CompletionModel {
/**
* Returns the suggested prefix to be used for completion.
diff --git a/ide/xml.schema.model/src/org/netbeans/modules/xml/schema/model/impl/SyncUnitReviewVisitor.java b/ide/xml.schema.model/src/org/netbeans/modules/xml/schema/model/impl/SyncUnitReviewVisitor.java
index b40746e..235d615 100644
--- a/ide/xml.schema.model/src/org/netbeans/modules/xml/schema/model/impl/SyncUnitReviewVisitor.java
+++ b/ide/xml.schema.model/src/org/netbeans/modules/xml/schema/model/impl/SyncUnitReviewVisitor.java
@@ -42,7 +42,7 @@ public class SyncUnitReviewVisitor extends DefaultSchemaVisitor {
return unit;
}
- static private SchemaModelImpl getSchemaModel(SchemaComponent c) {
+ private static SchemaModelImpl getSchemaModel(SchemaComponent c) {
return (SchemaModelImpl) c.getModel();
}
diff --git a/ide/xml.tax/lib/src/org/netbeans/tax/TreeName.java b/ide/xml.tax/lib/src/org/netbeans/tax/TreeName.java
index 87d2f6c..a2bb4c3 100644
--- a/ide/xml.tax/lib/src/org/netbeans/tax/TreeName.java
+++ b/ide/xml.tax/lib/src/org/netbeans/tax/TreeName.java
@@ -30,20 +30,20 @@ public final class TreeName {
* The treeName prefix. For example, the prefix for the treeName "a:foo"
* is "a".
*/
- final private String prefix;
+ private final String prefix;
/**
* The treeName name. For example, the name for the treeName "a:foo"
* is "foo".
*/
- final private String name;
+ private final String name;
/**
* The treeName rawName. For example, the rawName for the treeName "a:foo"
* is "a:foo".
*/
- final private String rawName;
+ private final String rawName;
//
diff --git a/ide/xml.tax/lib/src/org/netbeans/tax/TreeNamedObjectMap.java b/ide/xml.tax/lib/src/org/netbeans/tax/TreeNamedObjectMap.java
index 1083e5e..eb44e36 100644
--- a/ide/xml.tax/lib/src/org/netbeans/tax/TreeNamedObjectMap.java
+++ b/ide/xml.tax/lib/src/org/netbeans/tax/TreeNamedObjectMap.java
@@ -352,7 +352,7 @@ public class TreeNamedObjectMap extends TreeObjectList {
/**
*
*/
- protected static abstract class ContentManager extends TreeObjectList.ContentManager {
+ protected abstract static class ContentManager extends TreeObjectList.ContentManager {
/** @throws ClassCastException
*/
diff --git a/ide/xml.tax/lib/src/org/netbeans/tax/TreeObject.java b/ide/xml.tax/lib/src/org/netbeans/tax/TreeObject.java
index 6e9cb99..d0d26df 100644
--- a/ide/xml.tax/lib/src/org/netbeans/tax/TreeObject.java
+++ b/ide/xml.tax/lib/src/org/netbeans/tax/TreeObject.java
@@ -51,7 +51,7 @@ public abstract class TreeObject implements TreeEventModel {
private boolean readOnly;
/** */
- transient private TreeEventChangeSupport eventChangeSupport;
+ private transient TreeEventChangeSupport eventChangeSupport;
//
@@ -102,11 +102,11 @@ public abstract class TreeObject implements TreeEventModel {
/**
*/
- abstract public boolean isInContext ();
+ public abstract boolean isInContext ();
/**
*/
- abstract public void removeFromContext () throws ReadOnlyException;
+ public abstract void removeFromContext () throws ReadOnlyException;
//
diff --git a/ide/xml.tax/lib/src/org/netbeans/tax/TreeObjectList.java b/ide/xml.tax/lib/src/org/netbeans/tax/TreeObjectList.java
index b95ae44..bc54456 100644
--- a/ide/xml.tax/lib/src/org/netbeans/tax/TreeObjectList.java
+++ b/ide/xml.tax/lib/src/org/netbeans/tax/TreeObjectList.java
@@ -796,7 +796,7 @@ public class TreeObjectList extends TreeObject implements TreeNodeContentEventMo
/**
*
*/
- public static abstract class ContentManager {
+ public abstract static class ContentManager {
/**
* @return reference to the particular object list owner that created us
diff --git a/ide/xml.tax/lib/src/org/netbeans/tax/TreeUtilities.java b/ide/xml.tax/lib/src/org/netbeans/tax/TreeUtilities.java
index 3538ed0..17d20af 100644
--- a/ide/xml.tax/lib/src/org/netbeans/tax/TreeUtilities.java
+++ b/ide/xml.tax/lib/src/org/netbeans/tax/TreeUtilities.java
@@ -1645,13 +1645,13 @@ public final class TreeUtilities {
static class EncodingUtil {
/** IANA to Java encoding mappings */
- protected final static Map encodingIANA2JavaMap = new TreeMap ();
+ protected static final Map encodingIANA2JavaMap = new TreeMap ();
/** */
- protected final static Map encodingIANADescriptionMap = new TreeMap ();
+ protected static final Map encodingIANADescriptionMap = new TreeMap ();
/** */
- protected final static Map encodingIANAAliasesMap = new TreeMap ();
+ protected static final Map encodingIANAAliasesMap = new TreeMap ();
//
// Static initialization
diff --git a/ide/xml.tax/lib/src/org/netbeans/tax/io/TreeStreamResult.java b/ide/xml.tax/lib/src/org/netbeans/tax/io/TreeStreamResult.java
index 14509f7..1220d47 100644
--- a/ide/xml.tax/lib/src/org/netbeans/tax/io/TreeStreamResult.java
+++ b/ide/xml.tax/lib/src/org/netbeans/tax/io/TreeStreamResult.java
@@ -135,7 +135,7 @@ public class TreeStreamResult implements TreeOutputResult {
/**
*
*/
- public final static class TreeStreamWriter
+ public static final class TreeStreamWriter
implements TreeWriter,
AttlistDecl.Writer,
Attribute.Writer,
diff --git a/ide/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/AbstractFactoryTest.java b/ide/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/AbstractFactoryTest.java
index 7194d59..9c42ba7 100644
--- a/ide/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/AbstractFactoryTest.java
+++ b/ide/xml.tax/lib/test/qa-functional/src/org/netbeans/tax/AbstractFactoryTest.java
@@ -23,7 +23,7 @@ import org.netbeans.tests.xml.XTest;
import org.openide.util.Utilities;
abstract class AbstractFactoryTest extends XTest {
- final private static String NOT_EXCEPTION = "The InvalidArgumetException wasn't throwed ";
+ private static final String NOT_EXCEPTION = "The InvalidArgumetException wasn't throwed ";
public AbstractFactoryTest(String testName) {
super(testName);
diff --git a/ide/xml.tax/src/org/netbeans/modules/xml/tax/beans/customizer/AbstractTreeCustomizer.java b/ide/xml.tax/src/org/netbeans/modules/xml/tax/beans/customizer/AbstractTreeCustomizer.java
index 573dfdc..11e1460 100644
--- a/ide/xml.tax/src/org/netbeans/modules/xml/tax/beans/customizer/AbstractTreeCustomizer.java
+++ b/ide/xml.tax/src/org/netbeans/modules/xml/tax/beans/customizer/AbstractTreeCustomizer.java
@@ -118,7 +118,7 @@ public abstract class AbstractTreeCustomizer extends JPanel implements Customize
/**
*/
- abstract protected void initComponentValues ();
+ protected abstract void initComponentValues ();
/**
*/
@@ -133,7 +133,7 @@ public abstract class AbstractTreeCustomizer extends JPanel implements Customize
/**
*/
- abstract protected void updateReadOnlyStatus (boolean editable);
+ protected abstract void updateReadOnlyStatus (boolean editable);
//
diff --git a/ide/xml.tax/src/org/netbeans/modules/xml/tax/traversal/TreeNodeFilterHandle.java b/ide/xml.tax/src/org/netbeans/modules/xml/tax/traversal/TreeNodeFilterHandle.java
index bb17cb8..ddd7fd2 100644
--- a/ide/xml.tax/src/org/netbeans/modules/xml/tax/traversal/TreeNodeFilterHandle.java
+++ b/ide/xml.tax/src/org/netbeans/modules/xml/tax/traversal/TreeNodeFilterHandle.java
@@ -36,7 +36,7 @@ public final class TreeNodeFilterHandle implements Serializable {
private short acceptPolicy;
/** */
- transient private TreeNodeFilter nodeFilter;
+ private transient TreeNodeFilter nodeFilter;
//
diff --git a/ide/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/indent/XMLFormatterTest.java b/ide/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/indent/XMLFormatterTest.java
index 371554d..b48c7cc 100644
--- a/ide/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/indent/XMLFormatterTest.java
+++ b/ide/xml.text.obsolete90/test/unit/src/org/netbeans/modules/xml/text/indent/XMLFormatterTest.java
@@ -37,7 +37,7 @@ public class XMLFormatterTest extends NbTestCase {
/**
* Used for testing dynamic indentation ("smart enter")
*/
- public final static String LINE_BREAK_METATAG = "|";
+ public static final String LINE_BREAK_METATAG = "|";
public XMLFormatterTest(String testName) {
super(testName);
diff --git a/ide/xml.text/src/org/netbeans/modules/xml/text/api/dom/XMLSyntaxSupport.java b/ide/xml.text/src/org/netbeans/modules/xml/text/api/dom/XMLSyntaxSupport.java
index 6ba7f30..530409a 100644
--- a/ide/xml.text/src/org/netbeans/modules/xml/text/api/dom/XMLSyntaxSupport.java
+++ b/ide/xml.text/src/org/netbeans/modules/xml/text/api/dom/XMLSyntaxSupport.java
@@ -100,7 +100,7 @@ public final class XMLSyntaxSupport {
/** Holds last character user have typed. */
private final DocumentMonitor documentMonitor;
private final BaseDocument document;
- private final static Map<BaseDocument, Reference<XMLSyntaxSupport>> supportMap =
+ private static final Map<BaseDocument, Reference<XMLSyntaxSupport>> supportMap =
new WeakHashMap<>();
/** Creates new XMLSyntaxSupport */
diff --git a/ide/xml.text/src/org/netbeans/modules/xml/text/breadcrumbs/EditorRegistryMonitor.java b/ide/xml.text/src/org/netbeans/modules/xml/text/breadcrumbs/EditorRegistryMonitor.java
index 9eaff07..7e625cf 100644
--- a/ide/xml.text/src/org/netbeans/modules/xml/text/breadcrumbs/EditorRegistryMonitor.java
+++ b/ide/xml.text/src/org/netbeans/modules/xml/text/breadcrumbs/EditorRegistryMonitor.java
@@ -39,7 +39,7 @@ import org.openide.util.Exceptions;
* @author sdedic
*/
@OnStart
-final public class EditorRegistryMonitor implements PropertyChangeListener, Runnable {
+public final class EditorRegistryMonitor implements PropertyChangeListener, Runnable {
public void run() {
EditorRegistry.addPropertyChangeListener(this);
diff --git a/ide/xml.text/src/org/netbeans/modules/xml/text/completion/SyntaxQueryHelper.java b/ide/xml.text/src/org/netbeans/modules/xml/text/completion/SyntaxQueryHelper.java
index a7be652..de8dd2e 100644
--- a/ide/xml.text/src/org/netbeans/modules/xml/text/completion/SyntaxQueryHelper.java
+++ b/ide/xml.text/src/org/netbeans/modules/xml/text/completion/SyntaxQueryHelper.java
@@ -41,13 +41,13 @@ import org.w3c.dom.Node;
*/
final class SyntaxQueryHelper {
- public final static int COMPLETION_TYPE_UNKNOWN = 0;
- public final static int COMPLETION_TYPE_ATTRIBUTE = 1;
- public final static int COMPLETION_TYPE_VALUE = 2;
- public final static int COMPLETION_TYPE_ELEMENT = 3;
- public final static int COMPLETION_TYPE_ENTITY = 4;
- public final static int COMPLETION_TYPE_NOTATION = 5;
- public final static int COMPLETION_TYPE_DTD = 6;
+ public static final int COMPLETION_TYPE_UNKNOWN = 0;
+ public static final int COMPLETION_TYPE_ATTRIBUTE = 1;
+ public static final int COMPLETION_TYPE_VALUE = 2;
+ public static final int COMPLETION_TYPE_ELEMENT = 3;
+ public static final int COMPLETION_TYPE_ENTITY = 4;
+ public static final int COMPLETION_TYPE_NOTATION = 5;
+ public static final int COMPLETION_TYPE_DTD = 6;
private XMLSyntaxSupport support;
diff --git a/ide/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/lib/CharStream.java b/ide/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/lib/CharStream.java
index 03b461b..a0f7a06 100644
--- a/ide/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/lib/CharStream.java
+++ b/ide/xml.text/src/org/netbeans/modules/xml/text/syntax/javacc/lib/CharStream.java
@@ -40,45 +40,45 @@ public interface CharStream {
* of selecting the input is the responsibility of the class
* implementing this interface. Can throw any java.io.IOException.
*/
- abstract public char readChar() throws java.io.IOException;
+ public abstract char readChar() throws java.io.IOException;
/**
* Returns the column position of the character last read.
* @deprecated
* @see #getEndColumn
*/
- abstract public int getColumn();
+ public abstract int getColumn();
/**
* Returns the line number of the character last read.
* @deprecated
* @see #getEndLine
*/
- abstract public int getLine();
+ public abstract int getLine();
/**
* Returns the column number of the last character for current token (being
* matched after the last call to BeginTOken).
*/
- abstract public int getEndColumn();
+ public abstract int getEndColumn();
/**
* Returns the line number of the last character for current token (being
* matched after the last call to BeginTOken).
*/
- abstract public int getEndLine();
+ public abstract int getEndLine();
/**
* Returns the column number of the first character for current token (being
* matched after the last call to BeginTOken).
*/
- abstract public int getBeginColumn();
+ public abstract int getBeginColumn();
/**
* Returns the line number of the first character for current token (being
* matched after the last call to BeginTOken).
*/
- abstract public int getBeginLine();
+ public abstract int getBeginLine();
/**
* Backs up the input stream by amount steps. Lexer calls this method if it
@@ -86,14 +86,14 @@ public interface CharStream {
* (longer) token. So, they will be used again as the prefix of the next
* token and it is the implemetation's responsibility to do this right.
*/
- abstract public void backup(int amount);
+ public abstract void backup(int amount);
/**
* Returns the next character that marks the beginning of the next token.
* All characters must remain in the buffer between two successive calls
* to this method to implement backup correctly.
*/
- abstract public char BeginToken() throws java.io.IOException;
+ public abstract char BeginToken() throws java.io.IOException;
/**
* Returns a string made up of characters from the marked token beginning
@@ -101,7 +101,7 @@ public interface CharStream {
* anything that they want to. For example, for efficiency, one might decide
* to just return null, which is a valid implementation.
*/
- abstract public String GetImage();
+ public abstract String GetImage();
/**
* Returns an array of characters that make up the suffix of length 'len' for
@@ -114,7 +114,7 @@ public interface CharStream {
* return t.substring(t.length() - len, t.length()).toCharArray();
* }
*/
- abstract public char[] GetSuffix(int len);
+ public abstract char[] GetSuffix(int len);
/**
* The lexer calls this function to indicate that it is done with the stream
@@ -122,6 +122,6 @@ public interface CharStream {
* Again, the body of this function can be just empty and it will not
* affect the lexer's operation.
*/
- abstract public void Done();
+ public abstract void Done();
}
diff --git a/ide/xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/completion/CompletionJTest.java b/ide/xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/completion/CompletionJTest.java
index 66b4364..2e3ab07 100644
--- a/ide/xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/completion/CompletionJTest.java
+++ b/ide/xml.text/test/qa-functional/src/org/netbeans/modules/xml/text/completion/CompletionJTest.java
@@ -191,7 +191,7 @@ public class CompletionJTest extends JXTest {
* @param suf sufix
* @param index index of inserting item, -1 =>
*/
- final protected void insertTag(String pref, String suf, int index) {
+ protected final void insertTag(String pref, String suf, int index) {
insert(pref);
if (index < 0) {
showCompl(NO_WAIT);
diff --git a/ide/xml.tools/test/qa-functional/src/org/netbeans/modules/xml/tools/actions/AbstractCheckTest.java b/ide/xml.tools/test/qa-functional/src/org/netbeans/modules/xml/tools/actions/AbstractCheckTest.java
index 5c49acc..00c13d2 100644
--- a/ide/xml.tools/test/qa-functional/src/org/netbeans/modules/xml/tools/actions/AbstractCheckTest.java
+++ b/ide/xml.tools/test/qa-functional/src/org/netbeans/modules/xml/tools/actions/AbstractCheckTest.java
@@ -31,7 +31,7 @@ public abstract class AbstractCheckTest extends XTest {
}
/** Check all selected nodes. */
- abstract protected QaIOReporter performAction(Node[] nodes);
+ protected abstract QaIOReporter performAction(Node[] nodes);
// LIBS ////////////////////////////////////////////////////////////////////
diff --git a/ide/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/mime/validation/WSIAPValidator.java b/ide/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/mime/validation/WSIAPValidator.java
index 5d298fb..656d223 100644
--- a/ide/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/mime/validation/WSIAPValidator.java
+++ b/ide/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/model/extensions/mime/validation/WSIAPValidator.java
@@ -71,8 +71,8 @@ import org.openide.util.NbBundle;
public class WSIAPValidator implements MIMEContent.Visitor {
public static final String CONTENT_TYPE_TEXT_XML = "text/xml";
- public final static String NS_URI_SWA_REF = "http://ws-i.org/profiles/basic/1.1/xsd";
- public final static String SCHEMA_TYPE_SWA_REF = "swaRef";
+ public static final String NS_URI_SWA_REF = "http://ws-i.org/profiles/basic/1.1/xsd";
+ public static final String SCHEMA_TYPE_SWA_REF = "swaRef";
private final List<ResultItem> mResults;
private final MIMEComponentValidator mValidator;
diff --git a/ide/xml.xam/src/org/netbeans/modules/xml/xam/AbstractModelFactory.java b/ide/xml.xam/src/org/netbeans/modules/xml/xam/AbstractModelFactory.java
index 741a1bb..1580bd1 100644
--- a/ide/xml.xam/src/org/netbeans/modules/xml/xam/AbstractModelFactory.java
+++ b/ide/xml.xam/src/org/netbeans/modules/xml/xam/AbstractModelFactory.java
@@ -157,7 +157,7 @@ public abstract class AbstractModelFactory<M extends Model> {
}
}
- private synchronized static List<AbstractModel> getAllModels() {
+ private static synchronized List<AbstractModel> getAllModels() {
List<AbstractModel> models = new ArrayList<AbstractModel>();
List<WeakReference<AbstractModelFactory>> mfactories =
new ArrayList<WeakReference<AbstractModelFactory>>(factories);
diff --git a/ide/xml.xam/src/org/netbeans/modules/xml/xam/dom/AbstractDocumentComponent.java b/ide/xml.xam/src/org/netbeans/modules/xml/xam/dom/AbstractDocumentComponent.java
index 9528bb3..6348023 100644
--- a/ide/xml.xam/src/org/netbeans/modules/xml/xam/dom/AbstractDocumentComponent.java
+++ b/ide/xml.xam/src/org/netbeans/modules/xml/xam/dom/AbstractDocumentComponent.java
@@ -113,7 +113,7 @@ public abstract class AbstractDocumentComponent<C extends DocumentComponent<C>>
fireValueChanged();
}
- abstract protected Object getAttributeValueOf(Attribute attr, String stringValue);
+ protected abstract Object getAttributeValueOf(Attribute attr, String stringValue);
/**
* Returns string value of the attribute from different namespace
diff --git a/ide/xml.xam/src/org/netbeans/modules/xml/xam/spi/XsdBasedValidator.java b/ide/xml.xam/src/org/netbeans/modules/xml/xam/spi/XsdBasedValidator.java
index fb74d23..b49f815 100644
--- a/ide/xml.xam/src/org/netbeans/modules/xml/xam/spi/XsdBasedValidator.java
+++ b/ide/xml.xam/src/org/netbeans/modules/xml/xam/spi/XsdBasedValidator.java
@@ -70,7 +70,7 @@ public abstract class XsdBasedValidator implements Validator {
* @param model Get Schemas that the model has to be validated against.
* @return Compiled Schema object.
*/
- abstract protected Schema getSchema(Model model);
+ protected abstract Schema getSchema(Model model);
/**
* Entry point to validate a model.
diff --git a/ide/xml.xdm/src/org/netbeans/modules/xml/xdm/diff/XDMUtil.java b/ide/xml.xdm/src/org/netbeans/modules/xml/xdm/diff/XDMUtil.java
index 66e62b4..8206814 100644
--- a/ide/xml.xdm/src/org/netbeans/modules/xml/xdm/diff/XDMUtil.java
+++ b/ide/xml.xdm/src/org/netbeans/modules/xml/xdm/diff/XDMUtil.java
@@ -489,7 +489,7 @@ public class XDMUtil {
static org.netbeans.modules.xml.xdm.nodes.Document fDoc;
static org.netbeans.modules.xml.xdm.nodes.Document sDoc;
- public final static String NS_PREFIX = "xmlns";
- public final static String SCHEMA_LOCATION = "schemaLocation";
- public final static String XML_PROLOG = "<?xml version=\"1.0\"?>\n";
+ public static final String NS_PREFIX = "xmlns";
+ public static final String SCHEMA_LOCATION = "schemaLocation";
+ public static final String XML_PROLOG = "<?xml version=\"1.0\"?>\n";
}
diff --git a/ide/xml.xdm/src/org/netbeans/modules/xml/xdm/nodes/Convertors.java b/ide/xml.xdm/src/org/netbeans/modules/xml/xdm/nodes/Convertors.java
index 5cf4eb2..e376814 100644
--- a/ide/xml.xdm/src/org/netbeans/modules/xml/xdm/nodes/Convertors.java
+++ b/ide/xml.xdm/src/org/netbeans/modules/xml/xdm/nodes/Convertors.java
@@ -153,15 +153,15 @@ public final class Convertors {
static class EncodingUtil {
/** IANA to Java encoding mappings */
- protected final static Map<String, String> encodingIANA2JavaMap = new TreeMap<String, String>();
+ protected static final Map<String, String> encodingIANA2JavaMap = new TreeMap<String, String>();
/** */
- protected final static Map<String, String> encodingIANADescriptionMap = new TreeMap<String, String>();
+ protected static final Map<String, String> encodingIANADescriptionMap = new TreeMap<String, String>();
/** */
- protected final static Map<String, String> encodingIANAAliasesMap = new TreeMap<String, String>();
+ protected static final Map<String, String> encodingIANAAliasesMap = new TreeMap<String, String>();
- protected final static Map<String, String> encodingJava2IANAMap = new TreeMap<String, String>();
+ protected static final Map<String, String> encodingJava2IANAMap = new TreeMap<String, String>();
//
// Static initialization
diff --git a/ide/xml/src/org/netbeans/modules/xml/EntityDataObject.java b/ide/xml/src/org/netbeans/modules/xml/EntityDataObject.java
index 781e9de..ad5ab4d 100644
--- a/ide/xml/src/org/netbeans/modules/xml/EntityDataObject.java
+++ b/ide/xml/src/org/netbeans/modules/xml/EntityDataObject.java
@@ -64,7 +64,7 @@ public final class EntityDataObject extends MultiDataObject implements XMLDataOb
private transient Synchronizator synchronizator;
/** Cookie Manager */
- private transient final DataObjectCookieManager cookieManager;
+ private final transient DataObjectCookieManager cookieManager;
public EntityDataObject (final FileObject obj, final UniFileLoader loader) throws DataObjectExistsException {
diff --git a/ide/xml/src/org/netbeans/modules/xml/actions/CollectSystemAction.java b/ide/xml/src/org/netbeans/modules/xml/actions/CollectSystemAction.java
index 8fa8494..57866d2 100644
--- a/ide/xml/src/org/netbeans/modules/xml/actions/CollectSystemAction.java
+++ b/ide/xml/src/org/netbeans/modules/xml/actions/CollectSystemAction.java
@@ -60,7 +60,7 @@ public abstract class CollectSystemAction extends SystemAction implements Presen
return registeredAction;
}
- abstract protected void addRegisteredAction();
+ protected abstract void addRegisteredAction();
protected void addRegisteredAction(String folderPath) {
List<String> actionClassNames = new ArrayList<String>();
diff --git a/ide/xml/src/org/netbeans/modules/xml/cookies/CookieFactory.java b/ide/xml/src/org/netbeans/modules/xml/cookies/CookieFactory.java
index db9f65b..c397425 100644
--- a/ide/xml/src/org/netbeans/modules/xml/cookies/CookieFactory.java
+++ b/ide/xml/src/org/netbeans/modules/xml/cookies/CookieFactory.java
@@ -28,7 +28,7 @@ import org.openide.nodes.CookieSet;
public abstract class CookieFactory implements CookieSet.Factory {
/** */
- abstract protected Class[] supportedCookies ();
+ protected abstract Class[] supportedCookies ();
/**
*/
diff --git a/ide/xml/src/org/netbeans/modules/xml/wizard/impl/SchemaPanel.java b/ide/xml/src/org/netbeans/modules/xml/wizard/impl/SchemaPanel.java
index 5fa76e4..9db41ed 100644
--- a/ide/xml/src/org/netbeans/modules/xml/wizard/impl/SchemaPanel.java
+++ b/ide/xml/src/org/netbeans/modules/xml/wizard/impl/SchemaPanel.java
@@ -71,10 +71,10 @@ public class SchemaPanel extends AbstractPanel implements ActionListener, TableM
private TemplateWizard templateWizard;
private FileObject primarySchema=null;
private Vector rows;
- private final static int PRIMARY_COL = 0;
- private final static int SCHEMA_COL = 1;
- private final static int ROOT_COL = 2;
- private final static int PREFIX_COL = 3;
+ private static final int PRIMARY_COL = 0;
+ private static final int SCHEMA_COL = 1;
+ private static final int ROOT_COL = 2;
+ private static final int PREFIX_COL = 3;
private SchemaTableModel tableModel;
private SchemaImportGUI gui;
private static String startString;
diff --git a/ide/xsl/src/org/netbeans/modules/xsl/XSLDataObject.java b/ide/xsl/src/org/netbeans/modules/xsl/XSLDataObject.java
index 5184e46..8d7f275 100644
--- a/ide/xsl/src/org/netbeans/modules/xsl/XSLDataObject.java
+++ b/ide/xsl/src/org/netbeans/modules/xsl/XSLDataObject.java
@@ -61,7 +61,7 @@ public final class XSLDataObject extends MultiDataObject implements XMLDataObjec
public static final String MIME_TYPE = "application/xslt+xml"; // NOI18N
private static final String XSL_ICON_BASE =
"org/netbeans/modules/xsl/resources/xslObject"; // NOI18N
- private transient final DataObjectCookieManager cookieManager;
+ private final transient DataObjectCookieManager cookieManager;
private transient Synchronizator synchronizator;
public XSLDataObject(final FileObject obj, final UniFileLoader loader) throws DataObjectExistsException {
diff --git a/ide/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQuery.java b/ide/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQuery.java
index 7c40582..80ce7eb 100644
--- a/ide/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQuery.java
+++ b/ide/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQuery.java
@@ -103,11 +103,11 @@ public final class XSLGrammarQuery implements GrammarQuery{
private String lastDoctypePublic;
// we cannot parse SGML DTD for HTML, let emulate it by XHTML DTD
- private final static String XHTML_PUBLIC_ID =
+ private static final String XHTML_PUBLIC_ID =
System.getProperty("netbeans.xsl.html.public", "-//W3C//DTD XHTML 1.0 Transitional//EN"); // NOI18N
// we cannot parse SGML DTD for HTML, let emulate it by XHTML DTD
- private final static String XHTML_SYSTEM_ID =
+ private static final String XHTML_SYSTEM_ID =
System.getProperty("netbeans.xsl.html.system", "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"); // NOI18N
// namespace that this grammar supports
@@ -978,7 +978,7 @@ public final class XSLGrammarQuery implements GrammarQuery{
// Result classes ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- private static abstract class AbstractResultNode extends AbstractNode implements GrammarResult {
+ private abstract static class AbstractResultNode extends AbstractNode implements GrammarResult {
public Icon getIcon(int kind) {
return null;
diff --git a/ide/xsl/src/org/netbeans/modules/xsl/settings/TransformHistory.java b/ide/xsl/src/org/netbeans/modules/xsl/settings/TransformHistory.java
index 6315fa7..de50644 100644
--- a/ide/xsl/src/org/netbeans/modules/xsl/settings/TransformHistory.java
+++ b/ide/xsl/src/org/netbeans/modules/xsl/settings/TransformHistory.java
@@ -196,8 +196,8 @@ public final class TransformHistory implements Serializable {
/** Max length of history. */
public static final int MAX = 5;
- transient private List inputList;
- transient private Map inputOutputMap;
+ private transient List inputList;
+ private transient Map inputOutputMap;
/** Serializable mirror of inputList and inputOutputMap fields. */
private Object[] inputOutputArray;
---------------------------------------------------------------------
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
[netbeans] 15/17: Use the blessed modifier order in projects located in platform projects
Posted by mk...@apache.org.
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 255cfd2ec3e03276b8a6c25ee0c8e61620cc9b7f
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Fri Feb 18 11:12:44 2022 +0100
Use the blessed modifier order in projects located in platform projects
---
.../netbeans/modules/htmlui/FallbackViewer.java | 2 +-
.../src/org/netbeans/modules/htmlui/ATech.java | 2 +-
.../api/progress/ProgressHandleFactoryTest.java | 2 +-
.../progress/module/ProgressApiAccessor.java | 2 +-
.../src/org/netbeans/api/search/SearchHistory.java | 8 ++--
.../netbeans/modules/search/BasicSearchForm.java | 2 +-
.../org/netbeans/modules/search/ResultView.java | 2 +-
.../netbeans/modules/search/ResultViewPanel.java | 2 +-
.../modules/search/ui/FormLayoutHelper.java | 2 +-
.../netbeans/spi/search/SearchScopeDefinition.java | 4 +-
.../provider/DefaultSearchResultsDisplayer.java | 2 +-
.../spi/search/provider/SearchProvider.java | 2 +-
.../search/provider/SearchResultsDisplayer.java | 2 +-
.../netbeans/api/visual/action/WidgetAction.java | 4 +-
.../netbeans/api/visual/graph/GraphPinScene.java | 2 +-
.../org/netbeans/api/visual/graph/GraphScene.java | 2 +-
.../libsrc/org/netbeans/updater/UpdaterFrame.java | 10 ++---
.../services/OperationContainerImpl.java | 2 +-
.../autoupdate/services/OperationValidator.java | 16 ++++----
.../autoupdate/services/UpdateManagerImpl.java | 2 +-
.../modules/autoupdate/services/Utilities.java | 2 +-
.../updateprovider/AutoupdateCatalogParser.java | 2 +-
.../autoupdate/updateprovider/DummyModuleInfo.java | 2 +-
.../services/FeatureDependsOnFeatureTest.java | 2 +-
.../services/FeatureNotUpToDateTest.java | 2 +-
.../autoupdate/ui/LocalDownloadSupport.java | 2 +-
.../modules/autoupdate/ui/SettingsTab.java | 2 +-
.../netbeans/core/execution/ExecutionEngine.java | 2 +-
.../multitabs/impl/FolderNameTabDecorator.java | 2 +-
.../multitabs/impl/ProjectColorTabDecorator.java | 2 +-
.../org/netbeans/core/multiview/SplitLayerUI.java | 2 +-
.../org/netbeans/core/multiview/TabsComponent.java | 2 +-
.../core/spi/multiview/MultiViewFactory.java | 4 +-
.../core/network/proxy/NetworkProxySettings.java | 8 ++--
.../proxy/fallback/FallbackNetworkProxy.java | 22 +++++-----
.../network/proxy/gnome/GconfNetworkProxy.java | 44 ++++++++++----------
.../network/proxy/gnome/GnomeNetworkProxy.java | 2 +-
.../network/proxy/gnome/GsettingsNetworkProxy.java | 48 +++++++++++-----------
.../core/network/proxy/kde/KdeNetworkProxy.java | 44 ++++++++++----------
.../core/network/proxy/mac/MacNetworkProxy.java | 36 ++++++++--------
.../core/network/proxy/pac/datetime/DateRange.java | 2 +-
.../proxy/pac/datetime/PacUtilsDateTime.java | 4 +-
.../core/network/proxy/pac/datetime/TimeRange.java | 2 +-
.../network/proxy/windows/WindowsNetworkProxy.java | 14 +++----
.../core/network/utils/SimpleObjCache.java | 2 +-
.../proxy/pac/impl/PacHelperMethodsImplTest.java | 4 +-
.../core/startup/AutomaticDependencies.java | 2 +-
.../core/startup/layers/BinaryCacheManager.java | 2 +-
.../startup/layers/ParsingLayerCacheManager.java | 10 ++---
.../options/filetypes/IgnoredFilesPreferences.java | 2 +-
.../core/windows/ModeStructureSnapshot.java | 2 +-
.../netbeans/core/windows/PersistenceHandler.java | 2 +-
.../netbeans/core/windows/TopComponentTracker.java | 2 +-
.../core/windows/documentgroup/PleaseWait.java | 2 +-
.../netbeans/core/windows/model/SplitSubModel.java | 2 +-
.../core/windows/services/ActionPasteType.java | 8 ++--
.../core/windows/services/NbPresenter.java | 2 +-
.../windows/view/ModeStructureAccessorImpl.java | 2 +-
.../netbeans/core/windows/view/ui/MainWindow.java | 2 +-
.../org/netbeans/core/windows/view/ui/NbSheet.java | 4 +-
.../ui/popupswitcher/KeyboardPopupSwitcher.java | 4 +-
.../view/ui/StatusLineElementProviderTest.java | 6 +--
.../src/org/netbeans/modules/favorites/Tab.java | 10 ++---
.../org/netbeans/modules/htmlui/impl/ATech.java | 2 +-
.../modules/javahelp/BrowserDisplayer.java | 2 +-
.../org/netbeans/lib/uihandler/DecorableTest.java | 2 +-
.../masterfs/watcher/windows/WindowsNotifier.java | 2 +-
.../masterfs/filebasedfs/FileBasedFileSystem.java | 10 ++---
.../filebasedfs/children/ChildrenSupport.java | 2 +-
.../filebasedfs/fileobjects/BaseFileObj.java | 2 +-
.../masterfs/filebasedfs/naming/NamingFactory.java | 2 +-
.../filebasedfs/MIMESupportLoggingTest.java | 2 +-
.../filebasedfs/fileobjects/FolderObjTest.java | 4 +-
.../utils/FileChangedManagerDeadlockTest.java | 2 +-
.../netbeans/modules/netbinox/NetbinoxHooks.java | 2 +-
.../netbeans/modules/netbinox/HookRaceTest.java | 4 +-
.../src/org/netbeans/JarClassLoader.java | 2 +-
.../o.n.bootstrap/src/org/netbeans/ModuleData.java | 4 +-
.../src/org/netbeans/ModuleManager.java | 4 +-
.../src/org/netbeans/ProxyClassPackages.java | 6 +--
.../unit/src/org/netbeans/CLIHandlerGrepTest.java | 4 +-
.../org/netbeans/CLIHandlerReadingOfInputTest.java | 4 +-
.../org/netbeans/CLIHandlerServerWaitsTest.java | 4 +-
.../test/unit/src/org/netbeans/CLIHandlerTest.java | 4 +-
.../org/netbeans/beaninfo/editors/FontEditor.java | 4 +-
.../o.n.core/src/org/netbeans/core/ExitDialog.java | 2 +-
.../src/org/netbeans/core/ModuleActions.java | 6 +--
.../netbeans/core/projects/XMLSettingsTest.java | 2 +-
.../netbeans/core/HtmlBrowserComponentTest.java | 2 +-
.../netbeans/swing/laf/dark/DarkMetalTheme.java | 2 +-
.../src/org/netbeans/swing/etable/ETable.java | 12 +++---
.../src/org/netbeans/swing/outline/Outline.java | 2 +-
.../netbeans/swing/plaf/aqua/AquaSeparatorUI.java | 4 +-
.../org/netbeans/swing/plaf/gtk/GtkLFCustoms.java | 2 +-
.../beanstubs/org/openide/util/Utilities.java | 2 +-
.../plaf/NonStretchingViewTabLayoutModel.java | 4 +-
.../swing/tabcontrol/plaf/WinFlatUtils.java | 2 +-
.../openide.awt/src/org/openide/awt/Actions.java | 2 +-
.../src/org/openide/awt/HtmlBrowser.java | 4 +-
.../src/org/openide/awt/MouseUtils.java | 4 +-
.../src/org/openide/awt/QuickSearch.java | 2 +-
.../src/org/openide/awt/SplittedPanel.java | 22 +++++-----
.../src/org/openide/awt/ContextActionTest.java | 2 +-
.../src/org/openide/explorer/ExplorerPanel.java | 2 +-
.../src/org/openide/explorer/view/TTVTest.java | 2 +-
.../src/org/openide/WizardValidationException.java | 2 +-
.../openide/explorer/ExplorerActionsImpl.java | 2 +-
.../org/openide/explorer/propertysheet/PSheet.java | 4 +-
.../openide/explorer/propertysheet/PropUtils.java | 4 +-
.../explorer/propertysheet/PropertySheetView.java | 6 +--
.../src/org/openide/explorer/view/ChoiceView.java | 6 +--
.../openide/explorer/view/CustomPopupFactory.java | 2 +-
.../openide/explorer/view/DragDropUtilities.java | 2 +-
.../org/openide/explorer/view/DropGlassPane.java | 16 ++++----
.../src/org/openide/explorer/view/ListView.java | 10 ++---
.../src/org/openide/explorer/view/MenuView.java | 4 +-
.../src/org/openide/explorer/view/OutlineView.java | 4 +-
.../explorer/view/OutlineViewDropSupport.java | 6 +--
.../src/org/openide/explorer/view/TableSheet.java | 6 +--
.../src/org/openide/explorer/view/TableView.java | 4 +-
.../src/org/openide/explorer/view/TreeView.java | 12 +++---
.../openide/explorer/view/TreeViewDropSupport.java | 12 +++---
.../org/openide/explorer/view/ViewTooltips.java | 4 +-
.../explorer/propertysheet/ProxyNodeTest.java | 2 +-
.../explorer/view/TreeTableView126560Test.java | 2 +-
.../org/openide/explorer/view/TreeViewTest.java | 2 +-
.../openide/filesystems/FileFilterSupport.java | 2 +-
.../openide/filesystems/AbstractFileSystem.java | 4 +-
.../org/openide/filesystems/AbstractFolder.java | 2 +-
.../org/openide/filesystems/DefaultAttributes.java | 16 ++++----
.../src/org/openide/filesystems/ExternalUtil.java | 2 +-
.../src/org/openide/filesystems/FCLSupport.java | 8 ++--
.../src/org/openide/filesystems/FileObject.java | 10 ++---
.../src/org/openide/filesystems/FileSystem.java | 6 +--
.../src/org/openide/filesystems/Repository.java | 4 +-
.../src/org/openide/filesystems/XMLMapAttr.java | 6 +--
.../org/openide/filesystems/FileObjectTestHid.java | 10 ++---
.../src/org/openide/filesystems/TestUtilHid.java | 14 +++----
.../src/org/openide/windows/IOColorLines.java | 2 +-
.../src/org/openide/windows/IOColorPrint.java | 2 +-
.../src/org/openide/windows/IOColors.java | 4 +-
.../src/org/openide/windows/IOFolding.java | 2 +-
.../src/org/openide/windows/IOPosition.java | 2 +-
.../src/org/openide/windows/IOSelect.java | 2 +-
.../openide.io/src/org/openide/windows/IOTab.java | 8 ++--
.../src/org/openide/actions/NewTemplateAction.java | 2 +-
.../src/org/openide/awt/Toolbar.java | 2 +-
.../src/org/openide/loaders/DataFolder.java | 8 ++--
.../src/org/openide/loaders/DataLoaderPool.java | 4 +-
.../src/org/openide/loaders/DataNode.java | 2 +-
.../src/org/openide/loaders/DataObjectPool.java | 4 +-
.../org/openide/loaders/DataTransferSupport.java | 2 +-
.../src/org/openide/loaders/FileEntry.java | 4 +-
.../src/org/openide/loaders/FolderList.java | 14 +++----
.../org/openide/loaders/InstanceDataObject.java | 6 +--
.../src/org/openide/loaders/InstanceNode.java | 2 +-
.../src/org/openide/loaders/MultiDataObject.java | 2 +-
.../src/org/openide/text/DataEditorSupport.java | 8 ++--
.../openide/loaders/AskEditorQuestionsTest.java | 2 +-
.../unit/src/org/openide/loaders/TestUtilHid.java | 2 +-
.../org/openide/text/DataEditorReadOnlyTest.java | 2 +-
.../org/openide/text/DataEditorSupportTest.java | 2 +-
.../FileEncodingQueryDataEditorSupportTest.java | 2 +-
.../src/org/openide/modules/Dependency.java | 20 ++++-----
.../openide/nodes/NodesRegistrationSupport.java | 2 +-
.../src/org/openide/nodes/ChildFactory.java | 2 +-
.../src/org/openide/nodes/Children.java | 6 +--
.../src/org/openide/nodes/CookieSetLkp.java | 4 +-
.../openide.nodes/src/org/openide/nodes/Index.java | 2 +-
.../openide.nodes/src/org/openide/nodes/Node.java | 6 +--
.../src/org/openide/nodes/PropertySupport.java | 6 +--
.../openide.nodes/src/org/openide/nodes/Sheet.java | 2 +-
.../src/org/openide/util/actions/CookieAction.java | 2 +-
.../src/org/openide/text/Annotatable.java | 12 +++---
.../src/org/openide/text/Annotation.java | 10 ++---
.../openide/text/CloneableEditorInitializer.java | 2 +-
.../src/org/openide/text/DocumentLine.java | 2 +-
.../src/org/openide/text/IndentEngine.java | 4 +-
.../openide.text/src/org/openide/text/Line.java | 20 ++++-----
.../src/org/openide/text/PositionRef.java | 8 ++--
.../src/org/openide/text/QuietEditorPane.java | 6 +--
.../openide/text/AskEditorQuestionsTest.java | 2 +-
.../src/org/openide/text/Deadlock207571Test.java | 2 +-
.../org/openide/text/EditToBeUndoneRedoneTest.java | 2 +-
.../src/org/openide/text/LoadMultipleDocsTest.java | 2 +-
.../org/openide/text/WrapEditorComponentTest.java | 2 +-
.../src/org/openide/util/Lookup.java | 4 +-
.../org/openide/util/lookup/AbstractLookup.java | 4 +-
.../org/openide/util/lookup/InstanceContent.java | 4 +-
.../src/org/openide/util/lookup/ProxyLookup.java | 4 +-
.../lookup/AbstractLookupArrayStorageTest.java | 2 +-
.../src/org/openide/ServiceType.java | 4 +-
.../src/org/openide/util/HelpCtx.java | 2 +-
.../src/org/openide/util/ImageUtilities.java | 2 +-
.../src/org/openide/util/NetworkSettings.java | 2 +-
.../org/openide/util/actions/ActionInvoker.java | 2 +-
.../openide/util/actions/CallbackSystemAction.java | 2 +-
.../openide/util/datatransfer/ExTransferable.java | 6 +--
.../org/openide/util/UtilitiesTranslateTest.java | 4 +-
.../org/openide/util/actions/SystemActionTest.java | 2 +-
.../src/org/openide/util/CharSequences.java | 4 +-
.../src/org/openide/util/NbBundle.java | 2 +-
.../src/org/openide/util/NbCollections.java | 2 +-
.../src/org/openide/util/RequestProcessor.java | 6 +--
.../org/openide/util/io/NbMarshalledObject.java | 2 +-
.../unit/src/org/openide/util/WeakSetTest.java | 4 +-
.../org/openide/windows/CloneableTopComponent.java | 4 +-
.../src/org/openide/windows/ModeUtilities.java | 2 +-
.../openide/windows/TopComponentGetLookupTest.java | 2 +-
.../src/org/netbeans/modules/options/Utils.java | 2 +-
.../modules/options/keymap/KeymapModel.java | 2 +-
.../modules/sampler/SamplesOutputStream.java | 6 +--
.../org/netbeans/modules/sendopts/OptionImpl.java | 2 +-
.../org/netbeans/api/sendopts/StreamingTest.java | 4 +-
.../settings/examples/JavaCompilerSetting.java | 8 ++--
.../modules/settings/examples/ProxySettings.java | 4 +-
.../src/org/netbeans/modules/settings/Env.java | 12 +++---
.../org/netbeans/modules/settings/SaveSupport.java | 4 +-
.../modules/settings/ScheduledRequest.java | 4 +-
.../settings/convertors/ModuleInfoManager.java | 4 +-
.../settings/convertors/SerialDataConvertor.java | 2 +-
.../settings/convertors/SerialDataNode.java | 2 +-
.../convertors/XMLPropertiesConvertor.java | 6 +--
.../settings/convertors/XMLSettingsSupport.java | 6 +--
.../netbeans/spi/settings/ConvertorResolver.java | 2 +-
.../org/netbeans/spi/settings/DOMConvertor.java | 16 ++++----
.../modules/settings/convertors/FooSetting.java | 4 +-
.../netbeans/spi/settings/DOMConvertorTest.java | 6 +--
.../modules/quicksearch/CommandEvaluator.java | 2 +-
.../modules/quicksearch/SlowProviderTest.java | 4 +-
.../modules/templates/actions/TemplatesAction.java | 2 +-
.../modules/templates/ui/TemplatesPanel.java | 8 ++--
.../modules/templatesui/AbstractWizard.java | 2 +-
.../exceptions/ReporterResultTopComponent.java | 2 +-
.../org/netbeans/modules/uihandler/Installer.java | 6 +--
.../org/netbeans/modules/uihandler/UINodeTest.java | 2 +-
236 files changed, 581 insertions(+), 581 deletions(-)
diff --git a/platform/api.htmlui/src/org/netbeans/modules/htmlui/FallbackViewer.java b/platform/api.htmlui/src/org/netbeans/modules/htmlui/FallbackViewer.java
index 11fe0d6..7420c3a 100644
--- a/platform/api.htmlui/src/org/netbeans/modules/htmlui/FallbackViewer.java
+++ b/platform/api.htmlui/src/org/netbeans/modules/htmlui/FallbackViewer.java
@@ -92,7 +92,7 @@ final class FallbackViewer implements HTMLViewerSpi<FallbackViewer.UI, JButton>
EventQueue.invokeLater(r);
}
- final static class UI {
+ static final class UI {
final Context context;
UI(Context context) {
diff --git a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ATech.java b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ATech.java
index 958ac77..1adcf68 100644
--- a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ATech.java
+++ b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ATech.java
@@ -30,7 +30,7 @@ public interface ATech {
}
@ServiceProvider(service = Contexts.Provider.class)
- public final static class Register implements Contexts.Provider {
+ public static final class Register implements Contexts.Provider {
@Override
public void fillContext(Contexts.Builder bldr, Class<?> type) {
bldr.register(ATech.class, new First(), 30);
diff --git a/platform/api.progress.nb/test/unit/src/org/netbeans/api/progress/ProgressHandleFactoryTest.java b/platform/api.progress.nb/test/unit/src/org/netbeans/api/progress/ProgressHandleFactoryTest.java
index 7a22845..539b076 100644
--- a/platform/api.progress.nb/test/unit/src/org/netbeans/api/progress/ProgressHandleFactoryTest.java
+++ b/platform/api.progress.nb/test/unit/src/org/netbeans/api/progress/ProgressHandleFactoryTest.java
@@ -116,7 +116,7 @@ public class ProgressHandleFactoryTest extends NbTestCase {
synchronized void wakeup() {
notify();
}
- volatile public boolean blocking = false;
+ public volatile boolean blocking = false;
private int blockingTime;
}
diff --git a/platform/api.progress/src/org/netbeans/progress/module/ProgressApiAccessor.java b/platform/api.progress/src/org/netbeans/progress/module/ProgressApiAccessor.java
index 0490b37..94b195c 100644
--- a/platform/api.progress/src/org/netbeans/progress/module/ProgressApiAccessor.java
+++ b/platform/api.progress/src/org/netbeans/progress/module/ProgressApiAccessor.java
@@ -34,7 +34,7 @@ public abstract class ProgressApiAccessor {
INSTANCE = inst;
}
- public synchronized static ProgressApiAccessor getInstance() {
+ public static synchronized ProgressApiAccessor getInstance() {
if (INSTANCE == null) {
try {
Class.forName(ProgressHandle.class.getName(), true, ProgressApiAccessor.class.getClassLoader());
diff --git a/platform/api.search/src/org/netbeans/api/search/SearchHistory.java b/platform/api.search/src/org/netbeans/api/search/SearchHistory.java
index d929a34..d0ff1f0 100644
--- a/platform/api.search/src/org/netbeans/api/search/SearchHistory.java
+++ b/platform/api.search/src/org/netbeans/api/search/SearchHistory.java
@@ -72,14 +72,14 @@ public final class SearchHistory {
* @deprecated just changes in history
*/
@Deprecated
- public final static String LAST_SELECTED = "last-selected"; //NOI18N
+ public static final String LAST_SELECTED = "last-selected"; //NOI18N
/** Property name for adding pattern that was not in history
* Firing:
* oldValue - null
* newValue - added pattern
*/
- public final static String ADD_TO_HISTORY = "add-to-history"; //NOI18N
+ public static final String ADD_TO_HISTORY = "add-to-history"; //NOI18N
/** Property name for adding replace pattern that was not in history
* Firing:
@@ -87,7 +87,7 @@ public final class SearchHistory {
* newValue - added pattern
* @since 1.8
*/
- public final static String ADD_TO_REPLACE = "add-to-replace"; //NOI18N
+ public static final String ADD_TO_REPLACE = "add-to-replace"; //NOI18N
/** Preferences node for storing history info */
private static Preferences prefs;
@@ -103,7 +103,7 @@ public final class SearchHistory {
}
/** @return singleton instance of SearchHistory */
- public synchronized static SearchHistory getDefault(){
+ public static synchronized SearchHistory getDefault(){
if (INSTANCE == null) {
INSTANCE = new SearchHistory();
}
diff --git a/platform/api.search/src/org/netbeans/modules/search/BasicSearchForm.java b/platform/api.search/src/org/netbeans/modules/search/BasicSearchForm.java
index 6071120..035c9f5 100644
--- a/platform/api.search/src/org/netbeans/modules/search/BasicSearchForm.java
+++ b/platform/api.search/src/org/netbeans/modules/search/BasicSearchForm.java
@@ -1113,7 +1113,7 @@ final class BasicSearchForm extends JPanel implements ChangeListener,
}
}
- final static class MultiLineComboBoxEditor implements ComboBoxEditor {
+ static final class MultiLineComboBoxEditor implements ComboBoxEditor {
private final JTextArea area = new JTextArea();
diff --git a/platform/api.search/src/org/netbeans/modules/search/ResultView.java b/platform/api.search/src/org/netbeans/modules/search/ResultView.java
index 18225c9..e04c281 100644
--- a/platform/api.search/src/org/netbeans/modules/search/ResultView.java
+++ b/platform/api.search/src/org/netbeans/modules/search/ResultView.java
@@ -156,7 +156,7 @@ public final class ResultView extends TopComponent {
}
@Deprecated
- final public static class ResolvableHelper implements java.io.Serializable {
+ public static final class ResolvableHelper implements java.io.Serializable {
static final long serialVersionUID = 7398708142639457544L;
public Object readResolve() {
return null;
diff --git a/platform/api.search/src/org/netbeans/modules/search/ResultViewPanel.java b/platform/api.search/src/org/netbeans/modules/search/ResultViewPanel.java
index cb8293c..e311345 100644
--- a/platform/api.search/src/org/netbeans/modules/search/ResultViewPanel.java
+++ b/platform/api.search/src/org/netbeans/modules/search/ResultViewPanel.java
@@ -138,7 +138,7 @@ class ResultViewPanel extends JPanel implements Lookup.Provider {
resultViewCards.show(this, CARD_NAME_RESULTS);
}
- public synchronized final GraphicalSearchListener createListener() {
+ public final synchronized GraphicalSearchListener createListener() {
if (searchListener == null) {
searchListener = new GraphicalSearchListener(
searchComposition, this);
diff --git a/platform/api.search/src/org/netbeans/modules/search/ui/FormLayoutHelper.java b/platform/api.search/src/org/netbeans/modules/search/ui/FormLayoutHelper.java
index e866ee0..dad8b59 100644
--- a/platform/api.search/src/org/netbeans/modules/search/ui/FormLayoutHelper.java
+++ b/platform/api.search/src/org/netbeans/modules/search/ui/FormLayoutHelper.java
@@ -98,7 +98,7 @@ public class FormLayoutHelper {
GroupLayout.DEFAULT_SIZE, component);
}
- public static abstract class Column {
+ public abstract static class Column {
protected abstract void addComponent(
JComponent component, Group parallelColumnGroup);
diff --git a/platform/api.search/src/org/netbeans/spi/search/SearchScopeDefinition.java b/platform/api.search/src/org/netbeans/spi/search/SearchScopeDefinition.java
index 6a54f54..649b1ff 100644
--- a/platform/api.search/src/org/netbeans/spi/search/SearchScopeDefinition.java
+++ b/platform/api.search/src/org/netbeans/spi/search/SearchScopeDefinition.java
@@ -83,7 +83,7 @@ public abstract class SearchScopeDefinition {
* @param l listener to be registered
* @see #isApplicable
*/
- public synchronized final void addChangeListener(
+ public final synchronized void addChangeListener(
@NonNull ChangeListener l) {
if (!changeListeners.contains(l)) {
changeListeners.add(l);
@@ -99,7 +99,7 @@ public abstract class SearchScopeDefinition {
* @see #addChangeListener
* @see #isApplicable
*/
- public synchronized final void removeChangeListener(
+ public final synchronized void removeChangeListener(
@NonNull ChangeListener l) {
changeListeners.remove(l);
}
diff --git a/platform/api.search/src/org/netbeans/spi/search/provider/DefaultSearchResultsDisplayer.java b/platform/api.search/src/org/netbeans/spi/search/provider/DefaultSearchResultsDisplayer.java
index b993ec0..cf4346c 100644
--- a/platform/api.search/src/org/netbeans/spi/search/provider/DefaultSearchResultsDisplayer.java
+++ b/platform/api.search/src/org/netbeans/spi/search/provider/DefaultSearchResultsDisplayer.java
@@ -160,7 +160,7 @@ public final class DefaultSearchResultsDisplayer<U>
* Class definining which nodes should be selected when Previous or Next
* button is pressed and what action should be performed.
*/
- public static abstract class ResultNodeShiftSupport {
+ public abstract static class ResultNodeShiftSupport {
/**
* Method that checks whether a node should be selected when Next or
diff --git a/platform/api.search/src/org/netbeans/spi/search/provider/SearchProvider.java b/platform/api.search/src/org/netbeans/spi/search/provider/SearchProvider.java
index 4983c73..2774d0a 100644
--- a/platform/api.search/src/org/netbeans/spi/search/provider/SearchProvider.java
+++ b/platform/api.search/src/org/netbeans/spi/search/provider/SearchProvider.java
@@ -139,7 +139,7 @@ public abstract class SearchProvider {
* }}</pre>
* </div>
*/
- public static abstract class Presenter {
+ public abstract static class Presenter {
private SearchProvider searchProvider;
private boolean replacing;
diff --git a/platform/api.search/src/org/netbeans/spi/search/provider/SearchResultsDisplayer.java b/platform/api.search/src/org/netbeans/spi/search/provider/SearchResultsDisplayer.java
index 0ce126c3..e88b6df 100644
--- a/platform/api.search/src/org/netbeans/spi/search/provider/SearchResultsDisplayer.java
+++ b/platform/api.search/src/org/netbeans/spi/search/provider/SearchResultsDisplayer.java
@@ -85,7 +85,7 @@ public abstract class SearchResultsDisplayer<T> {
/**
* Helper class for transforming matching objects to nodes.
*/
- public static abstract class NodeDisplayer<T> {
+ public abstract static class NodeDisplayer<T> {
/** Constructor for subclasses. */
protected NodeDisplayer() {}
diff --git a/platform/api.visual/src/org/netbeans/api/visual/action/WidgetAction.java b/platform/api.visual/src/org/netbeans/api/visual/action/WidgetAction.java
index 0e52d80..f43c4c6 100644
--- a/platform/api.visual/src/org/netbeans/api/visual/action/WidgetAction.java
+++ b/platform/api.visual/src/org/netbeans/api/visual/action/WidgetAction.java
@@ -54,7 +54,7 @@ public interface WidgetAction {
/**
* Represents a state of event processing.
*/
- public static abstract class State {
+ public abstract static class State {
/**
* The state that means: The event is not processed by the action and has to be processed by other actions too.
@@ -468,7 +468,7 @@ public interface WidgetAction {
* An adapter of the widget action. All methods return locked or rejected event state based on a result of isLocked method.
* This is often used for long-term actions like MoveAction.
*/
- public static abstract class LockedAdapter implements WidgetAction {
+ public abstract static class LockedAdapter implements WidgetAction {
/**
* Called by event handlers to resolve whether they should return locked or rejected event state.
diff --git a/platform/api.visual/src/org/netbeans/api/visual/graph/GraphPinScene.java b/platform/api.visual/src/org/netbeans/api/visual/graph/GraphPinScene.java
index 6b5acea..4a19685 100644
--- a/platform/api.visual/src/org/netbeans/api/visual/graph/GraphPinScene.java
+++ b/platform/api.visual/src/org/netbeans/api/visual/graph/GraphPinScene.java
@@ -484,7 +484,7 @@ public abstract class GraphPinScene<N, E, P> extends ObjectScene {
/**
* This class is a particular GraphPinScene where nodes, edges and pins are represented with String class.
*/
- public static abstract class StringGraph extends GraphPinScene<String, String, String> {
+ public abstract static class StringGraph extends GraphPinScene<String, String, String> {
}
diff --git a/platform/api.visual/src/org/netbeans/api/visual/graph/GraphScene.java b/platform/api.visual/src/org/netbeans/api/visual/graph/GraphScene.java
index b4aae62..216c421 100644
--- a/platform/api.visual/src/org/netbeans/api/visual/graph/GraphScene.java
+++ b/platform/api.visual/src/org/netbeans/api/visual/graph/GraphScene.java
@@ -360,7 +360,7 @@ public abstract class GraphScene<N, E> extends ObjectScene {
/**
* This class is a particular GraphScene where nodes and edges are represented with String class.
*/
- public static abstract class StringGraph extends GraphScene<String, String> {
+ public abstract static class StringGraph extends GraphScene<String, String> {
}
diff --git a/platform/autoupdate.services/libsrc/org/netbeans/updater/UpdaterFrame.java b/platform/autoupdate.services/libsrc/org/netbeans/updater/UpdaterFrame.java
index e202a9b..791e69f 100644
--- a/platform/autoupdate.services/libsrc/org/netbeans/updater/UpdaterFrame.java
+++ b/platform/autoupdate.services/libsrc/org/netbeans/updater/UpdaterFrame.java
@@ -304,7 +304,7 @@ implements UpdatingContext {
return false;
}
- static private Color stringToColor( String key, Color defcolor ) {
+ private static Color stringToColor( String key, Color defcolor ) {
try {
String str = Localization.getBrandedString( key + "_R" ); // NOI18N
int re = Integer.parseInt( str );
@@ -321,7 +321,7 @@ implements UpdatingContext {
}
}
- static private Dimension stringToDimension (String key, Dimension defaultSize) {
+ private static Dimension stringToDimension (String key, Dimension defaultSize) {
try {
String str = Localization.getBrandedString( key + "_X" ); // NOI18N
int x = Integer.parseInt( str );
@@ -335,15 +335,15 @@ implements UpdatingContext {
}
}
- static private boolean addBorder() {
+ private static boolean addBorder() {
return "true".equals( Localization.getBrandedString( "UpdaterFrame.hasBorder" ) ); // NOI18N
}
- static private boolean isGradient () {
+ private static boolean isGradient () {
return "true".equals (Localization.getBrandedString ("UpdaterFrame.isGradient")); // NOI18N
}
- static private boolean isGradientVertical () {
+ private static boolean isGradientVertical () {
return "true".equals (Localization.getBrandedString ("UpdaterFrame.isGradientVertical")); // NOI18N
}
diff --git a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/OperationContainerImpl.java b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/OperationContainerImpl.java
index 44edef6..5ce364c 100644
--- a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/OperationContainerImpl.java
+++ b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/OperationContainerImpl.java
@@ -184,7 +184,7 @@ public final class OperationContainerImpl<Support> {
return Collections.unmodifiableList(operations);
}
- synchronized public List<OperationInfo<Support>> listAllWithPossibleEager () {
+ public synchronized List<OperationInfo<Support>> listAllWithPossibleEager () {
if (upToDate) {
return listAll();
}
diff --git a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/OperationValidator.java b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/OperationValidator.java
index a5ffd73..4908c41 100644
--- a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/OperationValidator.java
+++ b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/OperationValidator.java
@@ -36,14 +36,14 @@ import org.openide.modules.ModuleInfo;
* @author Radek Matous, Jiri Rechtacek
*/
abstract class OperationValidator {
- private final static OperationValidator FOR_INSTALL = new InstallValidator();
- private final static OperationValidator FOR_INTERNAL_UPDATE = new InternalUpdateValidator();
- private final static OperationValidator FOR_UNINSTALL = new UninstallValidator();
- private final static OperationValidator FOR_UPDATE = new UpdateValidator();
- private final static OperationValidator FOR_ENABLE = new EnableValidator();
- private final static OperationValidator FOR_DISABLE = new DisableValidator();
- private final static OperationValidator FOR_CUSTOM_INSTALL = new CustomInstallValidator();
- private final static OperationValidator FOR_CUSTOM_UNINSTALL = new CustomUninstallValidator();
+ private static final OperationValidator FOR_INSTALL = new InstallValidator();
+ private static final OperationValidator FOR_INTERNAL_UPDATE = new InternalUpdateValidator();
+ private static final OperationValidator FOR_UNINSTALL = new UninstallValidator();
+ private static final OperationValidator FOR_UPDATE = new UpdateValidator();
+ private static final OperationValidator FOR_ENABLE = new EnableValidator();
+ private static final OperationValidator FOR_DISABLE = new DisableValidator();
+ private static final OperationValidator FOR_CUSTOM_INSTALL = new CustomInstallValidator();
+ private static final OperationValidator FOR_CUSTOM_UNINSTALL = new CustomUninstallValidator();
private static final Logger LOGGER = Logger.getLogger (OperationValidator.class.getName ());
/** Creates a new instance of OperationValidator */
diff --git a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/UpdateManagerImpl.java b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/UpdateManagerImpl.java
index 4ae351f..0193a3b 100644
--- a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/UpdateManagerImpl.java
+++ b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/UpdateManagerImpl.java
@@ -317,7 +317,7 @@ public class UpdateManagerImpl extends Object {
return units.get(moduleCodeName);
}
- synchronized private void createMaps () {
+ private synchronized void createMaps () {
availableEagers = new HashSet<UpdateElement> (getUnits ().size ());
installedEagers = new HashSet<UpdateElement> (getUnits ().size ());
token2installedProviders = new HashMap<String, Collection<ModuleInfo>> (11);
diff --git a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/Utilities.java b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/Utilities.java
index aa64fb7..886aa30 100644
--- a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/Utilities.java
+++ b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/Utilities.java
@@ -380,7 +380,7 @@ public class Utilities {
}
}
- static private class KeyStoreProviderListener implements LookupListener {
+ private static class KeyStoreProviderListener implements LookupListener {
private KeyStoreProviderListener () {
}
diff --git a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/AutoupdateCatalogParser.java b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/AutoupdateCatalogParser.java
index a6d737f..40dfe39 100644
--- a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/AutoupdateCatalogParser.java
+++ b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/AutoupdateCatalogParser.java
@@ -157,7 +157,7 @@ public class AutoupdateCatalogParser extends DefaultHandler {
private static String XML_EXTENSION = ".xml"; // NOI18N
private static String GZIP_MIME_TYPE = "application/x-gzip"; // NOI18N
- public synchronized static Map<String, UpdateItem> getUpdateItems (URL url, AutoupdateCatalogProvider provider) throws IOException {
+ public static synchronized Map<String, UpdateItem> getUpdateItems (URL url, AutoupdateCatalogProvider provider) throws IOException {
Map<String, UpdateItem> items = new HashMap<String, UpdateItem> ();
URI base;
try {
diff --git a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/DummyModuleInfo.java b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/DummyModuleInfo.java
index 54580a3..d86ccc2 100644
--- a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/DummyModuleInfo.java
+++ b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/DummyModuleInfo.java
@@ -171,7 +171,7 @@ public final class DummyModuleInfo extends ModuleInfo {
return deps;
}
- private final static Set<Dependency> parseDeps(Attributes attr, String cnb) throws IllegalArgumentException {
+ private static final Set<Dependency> parseDeps(Attributes attr, String cnb) throws IllegalArgumentException {
Set<Dependency> s = new HashSet<Dependency> ();
s.addAll(Dependency.create(Dependency.TYPE_MODULE, attr.getValue("OpenIDE-Module-Module-Dependencies"))); // NOI18N
s.addAll(Dependency.create(Dependency.TYPE_PACKAGE, attr.getValue("OpenIDE-Module-Package-Dependencies"))); // NOI18N
diff --git a/platform/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/FeatureDependsOnFeatureTest.java b/platform/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/FeatureDependsOnFeatureTest.java
index a881731..7d452ea 100644
--- a/platform/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/FeatureDependsOnFeatureTest.java
+++ b/platform/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/FeatureDependsOnFeatureTest.java
@@ -183,7 +183,7 @@ public class FeatureDependsOnFeatureTest extends NbTestCase {
assertFalse(testDependsOnFeature + " has some available updates.", testDependsOnFeature.getAvailableUpdates().isEmpty());
}
- final static class HackedModuleInfo extends ModuleInfo {
+ static final class HackedModuleInfo extends ModuleInfo {
private ModuleInfo info;
private SpecificationVersion hackedVersion;
diff --git a/platform/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/FeatureNotUpToDateTest.java b/platform/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/FeatureNotUpToDateTest.java
index 1eae523..34ccfb7 100644
--- a/platform/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/FeatureNotUpToDateTest.java
+++ b/platform/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/FeatureNotUpToDateTest.java
@@ -159,7 +159,7 @@ public class FeatureNotUpToDateTest extends NbTestCase
assertFalse (feature + " has some available updates.", feature.getAvailableUpdates ().isEmpty ());
}
- final static class HackedModuleInfo extends ModuleInfo {
+ static final class HackedModuleInfo extends ModuleInfo {
private ModuleInfo info;
private SpecificationVersion hackedVersion;
diff --git a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/LocalDownloadSupport.java b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/LocalDownloadSupport.java
index 667c908..526d7f3 100644
--- a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/LocalDownloadSupport.java
+++ b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/LocalDownloadSupport.java
@@ -192,7 +192,7 @@ public class LocalDownloadSupport {
}
}
- synchronized private void initCodeName2Unit () {
+ private synchronized void initCodeName2Unit () {
assert nbm2unitCodeName == null : "Cannot initialize nbm2unit twice!";
nbm2unitCodeName = new HashMap<File, String> ();
codeName2unit = new HashMap<String, UpdateUnit> ();
diff --git a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/SettingsTab.java b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/SettingsTab.java
index 3507ae2..6d72231 100644
--- a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/SettingsTab.java
+++ b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/SettingsTab.java
@@ -420,7 +420,7 @@ private void bProxyActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:
private boolean sbEnabled;
private String detailsTitle;
- synchronized private void prepareContent() {
+ private synchronized void prepareContent() {
assert ! SwingUtilities.isEventDispatchThread() : "Invoke SettingsTab.prepareContent out of AWT only";
int rowIndex = table.getSelectedRow();
if (rowIndex != -1 && table.getRowCount() > 0 && getSettingsTableModel().getUpdateUnitProvider(rowIndex) != null) {
diff --git a/platform/core.execution/src/org/netbeans/core/execution/ExecutionEngine.java b/platform/core.execution/src/org/netbeans/core/execution/ExecutionEngine.java
index ce33ca9..268e939 100644
--- a/platform/core.execution/src/org/netbeans/core/execution/ExecutionEngine.java
+++ b/platform/core.execution/src/org/netbeans/core/execution/ExecutionEngine.java
@@ -70,7 +70,7 @@ public final class
private static final IOTable taskIOs = new IOTable(base, systemIO);
/* table of window:threadgrp */
- static private WindowTable wtable = new WindowTable();
+ private static WindowTable wtable = new WindowTable();
/** list of ExecutionListeners */
private HashSet<ExecutionListener> executionListeners = new HashSet<ExecutionListener>();
diff --git a/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/FolderNameTabDecorator.java b/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/FolderNameTabDecorator.java
index 3be9c24..c9fab2d 100644
--- a/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/FolderNameTabDecorator.java
+++ b/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/FolderNameTabDecorator.java
@@ -40,7 +40,7 @@ import org.openide.windows.TopComponent;
public class FolderNameTabDecorator extends TabDecorator {
private final SettingsImpl settings = new SettingsImpl();
- private final static String pathSeparator = System.getProperty( "file.separator", "/" ); //NOI18N
+ private static final String pathSeparator = System.getProperty( "file.separator", "/" ); //NOI18N
@Override
public String getText( TabData tab ) {
diff --git a/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/ProjectColorTabDecorator.java b/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/ProjectColorTabDecorator.java
index 1235779..41eeb4c 100644
--- a/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/ProjectColorTabDecorator.java
+++ b/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/ProjectColorTabDecorator.java
@@ -53,7 +53,7 @@ public class ProjectColorTabDecorator extends TabDecorator {
private static final Map<TabData, Color> tab2color = new WeakHashMap<>(10);
private static final List<Color> backGroundColors;
private static Color foregroundColor;
- private final static ChangeListener projectsListener = (ChangeEvent e) -> updateColorMapping();
+ private static final ChangeListener projectsListener = (ChangeEvent e) -> updateColorMapping();
static {
backGroundColors = new ArrayList<>( 10 );
diff --git a/platform/core.multiview/src/org/netbeans/core/multiview/SplitLayerUI.java b/platform/core.multiview/src/org/netbeans/core/multiview/SplitLayerUI.java
index 0c46806..dd99b55 100644
--- a/platform/core.multiview/src/org/netbeans/core/multiview/SplitLayerUI.java
+++ b/platform/core.multiview/src/org/netbeans/core/multiview/SplitLayerUI.java
@@ -53,7 +53,7 @@ class SplitLayerUI extends LayerUI<JPanel> {
private boolean isDragging = false;
private final AWTEventListener awtListener;
- private final static Color FILL_COLOR = new Color( 0, 0, 0, 128);
+ private static final Color FILL_COLOR = new Color( 0, 0, 0, 128);
public SplitLayerUI( final JComponent content ) {
this.content = content;
diff --git a/platform/core.multiview/src/org/netbeans/core/multiview/TabsComponent.java b/platform/core.multiview/src/org/netbeans/core/multiview/TabsComponent.java
index c227a12..d72fdb0 100644
--- a/platform/core.multiview/src/org/netbeans/core/multiview/TabsComponent.java
+++ b/platform/core.multiview/src/org/netbeans/core/multiview/TabsComponent.java
@@ -46,7 +46,7 @@ import org.openide.windows.TopComponent;
class TabsComponent extends JPanel {
private JComponent EMPTY;
- private final static String TOOLBAR_MARKER = "MultiViewPanel"; //NOI18N
+ private static final String TOOLBAR_MARKER = "MultiViewPanel"; //NOI18N
MultiViewModel model;
private MouseListener buttonMouseListener = null;
diff --git a/platform/core.multiview/src/org/netbeans/core/spi/multiview/MultiViewFactory.java b/platform/core.multiview/src/org/netbeans/core/spi/multiview/MultiViewFactory.java
index ef43d83..bcbb00e 100644
--- a/platform/core.multiview/src/org/netbeans/core/spi/multiview/MultiViewFactory.java
+++ b/platform/core.multiview/src/org/netbeans/core/spi/multiview/MultiViewFactory.java
@@ -55,12 +55,12 @@ public final class MultiViewFactory {
* A utility singleton instance of MultiViewElement that does nothing.
*/
- public final static MultiViewElement BLANK_ELEMENT = new Blank();
+ public static final MultiViewElement BLANK_ELEMENT = new Blank();
/**
* a utility noop action instance to be used when no special handling is
* required in createUnsafeCloseState() method.
*/
- public final static Action NOOP_CLOSE_ACTION = new NoopAction();
+ public static final Action NOOP_CLOSE_ACTION = new NoopAction();
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/NetworkProxySettings.java b/platform/core.network/src/org/netbeans/core/network/proxy/NetworkProxySettings.java
index 23722dd..420978f 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/NetworkProxySettings.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/NetworkProxySettings.java
@@ -37,10 +37,10 @@ public final class NetworkProxySettings {
MANUAL
}
- private final static Logger LOGGER = Logger.getLogger(NetworkProxySettings.class.getName());
- private final static String COLON = ":"; //NOI18N
- private final static String SLASH = "/"; //NOI18N
- private final static String EMPTY_STRING = ""; //NOI18N
+ private static final Logger LOGGER = Logger.getLogger(NetworkProxySettings.class.getName());
+ private static final String COLON = ":"; //NOI18N
+ private static final String SLASH = "/"; //NOI18N
+ private static final String EMPTY_STRING = ""; //NOI18N
private final boolean resolved;
private final ProxyMode proxyMode;
private final String httpProxyHost;
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/fallback/FallbackNetworkProxy.java b/platform/core.network/src/org/netbeans/core/network/proxy/fallback/FallbackNetworkProxy.java
index d08e881..feb4665 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/fallback/FallbackNetworkProxy.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/fallback/FallbackNetworkProxy.java
@@ -35,20 +35,20 @@ import org.openide.util.NbBundle;
*/
public class FallbackNetworkProxy implements NetworkProxyResolver {
- private final static Logger LOGGER = Logger.getLogger(FallbackNetworkProxy.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(FallbackNetworkProxy.class.getName());
- private final static String AT = "@"; //NOI18N
- private final static String COMMA = ","; //NOI18N
- private final static String SLASH = "/"; //NOI18N
- private final static String PROTOCOL_PREXIF_SEPARATOR = "://"; //NOI18N
- private final static String EMPTY_STRING = ""; //NOI18N
+ private static final String AT = "@"; //NOI18N
+ private static final String COMMA = ","; //NOI18N
+ private static final String SLASH = "/"; //NOI18N
+ private static final String PROTOCOL_PREXIF_SEPARATOR = "://"; //NOI18N
+ private static final String EMPTY_STRING = ""; //NOI18N
- private final static String HTTP_PROXY_SYS_PROPERTY = "http_proxy"; //NOI18N
- private final static String HTTPS_PROXY_SYS_PROPERTY = "https_proxy"; //NOI18N
- private final static String SOCKS_PROXY_SYS_PROPERTY = "socks_proxy"; //NOI18N
- private final static String NO_PROXY_SYS_PROPERTY = "no_proxy"; //NOI18N
+ private static final String HTTP_PROXY_SYS_PROPERTY = "http_proxy"; //NOI18N
+ private static final String HTTPS_PROXY_SYS_PROPERTY = "https_proxy"; //NOI18N
+ private static final String SOCKS_PROXY_SYS_PROPERTY = "socks_proxy"; //NOI18N
+ private static final String NO_PROXY_SYS_PROPERTY = "no_proxy"; //NOI18N
- private final static String DEFAULT_NO_PROXY_HOSTS = NbBundle.getMessage(FallbackNetworkProxy.class, "DefaulNoProxyHosts");
+ private static final String DEFAULT_NO_PROXY_HOSTS = NbBundle.getMessage(FallbackNetworkProxy.class, "DefaulNoProxyHosts");
@Override
public NetworkProxySettings getNetworkProxySettings() {
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GconfNetworkProxy.java b/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GconfNetworkProxy.java
index 724d635..22a4db1 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GconfNetworkProxy.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GconfNetworkProxy.java
@@ -33,30 +33,30 @@ import static org.netbeans.core.network.proxy.gnome.GnomeNetworkProxy.executeCom
*/
public class GconfNetworkProxy {
- private final static Logger LOGGER = Logger.getLogger(GconfNetworkProxy.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(GconfNetworkProxy.class.getName());
- private final static String EQUALS = "="; //NOI18N
- private final static String COLON = ","; //NOI18N
- private final static String SQ_BRACKET_LEFT = "["; //NOI18N
- private final static String SQ_BRACKET_RIGHT = "]"; //NOI18N
+ private static final String EQUALS = "="; //NOI18N
+ private static final String COLON = ","; //NOI18N
+ private static final String SQ_BRACKET_LEFT = "["; //NOI18N
+ private static final String SQ_BRACKET_RIGHT = "]"; //NOI18N
- protected final static String GCONF_PATH = "/usr/bin/gconftool-2"; //NOI18N
- private final static String GCONF_ARGUMENT_LIST_RECURSIVELY = " -R "; //NOI18N
- private final static String GCONF_NODE_PROXY = "/system/proxy"; //NOI18N
- private final static String GCONF_NODE_HTTP_PROXY = "/system/http_proxy"; //NOI18N
- private final static String GCONF_KEY_MODE = "mode"; //NOI18N
- private final static String GCONF_KEY_PAC_URL = "autoconfig_url"; //NOI18N
- private final static String GCONF_KEY_HTTP_ALL = "use_http_proxy"; //NOI18N
- private final static String GCONF_KEY_HTTP_HOST = "host"; //NOI18N
- private final static String GCONF_KEY_HTTP_PORT = "port"; //NOI18N
- private final static String GCONF_KEY_HTTPS_HOST = "secure_host"; //NOI18N
- private final static String GCONF_KEY_HTTPS_PORT = "secure_port"; //NOI18N
- private final static String GCONF_KEY_SOCKS_HOST = "socks_host"; //NOI18N
- private final static String GCONF_KEY_SOCKS_PORT = "socks_port"; //NOI18N
- private final static String GCONF_KEY_IGNORE_HOSTS = "ignore_hosts"; //NOI18N
- private final static String GCONF_VALUE_NONE = "none"; //NOI18N
- private final static String GCONF_VALUE_AUTO = "auto"; //NOI18N
- private final static String GCONF_VALUE_MANUAL = "manual"; //NOI18N
+ protected static final String GCONF_PATH = "/usr/bin/gconftool-2"; //NOI18N
+ private static final String GCONF_ARGUMENT_LIST_RECURSIVELY = " -R "; //NOI18N
+ private static final String GCONF_NODE_PROXY = "/system/proxy"; //NOI18N
+ private static final String GCONF_NODE_HTTP_PROXY = "/system/http_proxy"; //NOI18N
+ private static final String GCONF_KEY_MODE = "mode"; //NOI18N
+ private static final String GCONF_KEY_PAC_URL = "autoconfig_url"; //NOI18N
+ private static final String GCONF_KEY_HTTP_ALL = "use_http_proxy"; //NOI18N
+ private static final String GCONF_KEY_HTTP_HOST = "host"; //NOI18N
+ private static final String GCONF_KEY_HTTP_PORT = "port"; //NOI18N
+ private static final String GCONF_KEY_HTTPS_HOST = "secure_host"; //NOI18N
+ private static final String GCONF_KEY_HTTPS_PORT = "secure_port"; //NOI18N
+ private static final String GCONF_KEY_SOCKS_HOST = "socks_host"; //NOI18N
+ private static final String GCONF_KEY_SOCKS_PORT = "socks_port"; //NOI18N
+ private static final String GCONF_KEY_IGNORE_HOSTS = "ignore_hosts"; //NOI18N
+ private static final String GCONF_VALUE_NONE = "none"; //NOI18N
+ private static final String GCONF_VALUE_AUTO = "auto"; //NOI18N
+ private static final String GCONF_VALUE_MANUAL = "manual"; //NOI18N
/**
* Returns network proxy settings - retrieved via gconftool.
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GnomeNetworkProxy.java b/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GnomeNetworkProxy.java
index 3ffdb5d..44dfb6f 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GnomeNetworkProxy.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GnomeNetworkProxy.java
@@ -33,7 +33,7 @@ import org.netbeans.core.network.proxy.NetworkProxySettings;
*/
public class GnomeNetworkProxy implements NetworkProxyResolver{
- private final static Logger LOGGER = Logger.getLogger(GnomeNetworkProxy.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(GnomeNetworkProxy.class.getName());
@Override
public NetworkProxySettings getNetworkProxySettings() {
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GsettingsNetworkProxy.java b/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GsettingsNetworkProxy.java
index 125fe39..e358d6b 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GsettingsNetworkProxy.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GsettingsNetworkProxy.java
@@ -33,33 +33,33 @@ import static org.netbeans.core.network.proxy.gnome.GnomeNetworkProxy.executeCom
*/
public class GsettingsNetworkProxy {
- private final static Logger LOGGER = Logger.getLogger(GsettingsNetworkProxy.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(GsettingsNetworkProxy.class.getName());
- private final static String EMPTY_STRING = ""; //NOI18N
- private final static String SPACE = " "; //NOI18N
- private final static String DOT = "."; //NOI18N
- private final static String COLON = ","; //NOI18N
- private final static String SINGLE_QUOTE = "'"; //NOI18N
- private final static String SQ_BRACKET_LEFT = "["; //NOI18N
- private final static String SQ_BRACKET_RIGHT = "]"; //NOI18N
+ private static final String EMPTY_STRING = ""; //NOI18N
+ private static final String SPACE = " "; //NOI18N
+ private static final String DOT = "."; //NOI18N
+ private static final String COLON = ","; //NOI18N
+ private static final String SINGLE_QUOTE = "'"; //NOI18N
+ private static final String SQ_BRACKET_LEFT = "["; //NOI18N
+ private static final String SQ_BRACKET_RIGHT = "]"; //NOI18N
- protected final static String GSETTINGS_PATH = "/usr/bin/gsettings"; //NOI18N
- private final static String GSETTINGS_ARGUMENT_LIST_RECURSIVELY = " list-recursively "; //NOI18N
- private final static String GSETTINGS_PROXY_SCHEMA = "org.gnome.system.proxy"; //NOI18N
+ protected static final String GSETTINGS_PATH = "/usr/bin/gsettings"; //NOI18N
+ private static final String GSETTINGS_ARGUMENT_LIST_RECURSIVELY = " list-recursively "; //NOI18N
+ private static final String GSETTINGS_PROXY_SCHEMA = "org.gnome.system.proxy"; //NOI18N
- private final static String GSETTINGS_KEY_MODE = "org.gnome.system.proxy.mode"; //NOI18N
- private final static String GSETTINGS_KEY_PAC_URL = "org.gnome.system.proxy.autoconfig-url"; //NOI18N
- private final static String GSETTINGS_KEY_HTTP_ALL = "org.gnome.system.proxy.http.use-same-proxy"; //NOI18N
- private final static String GSETTINGS_KEY_HTTP_HOST = "org.gnome.system.proxy.http.host"; //NOI18N
- private final static String GSETTINGS_KEY_HTTP_PORT = "org.gnome.system.proxy.http.port"; //NOI18N
- private final static String GSETTINGS_KEY_HTTPS_HOST = "org.gnome.system.proxy.https.host"; //NOI18N
- private final static String GSETTINGS_KEY_HTTPS_PORT = "org.gnome.system.proxy.https.port"; //NOI18N
- private final static String GSETTINGS_KEY_SOCKS_HOST = "org.gnome.system.proxy.socks.host"; //NOI18N
- private final static String GSETTINGS_KEY_SOCKS_PORT = "org.gnome.system.proxy.socks.port"; //NOI18N
- private final static String GSETTINGS_KEY_IGNORE_HOSTS = "org.gnome.system.proxy.ignore-hosts"; //NOI18N
- private final static String GSETTINGS_VALUE_NONE = "none"; //NOI18N
- private final static String GSETTINGS_VALUE_AUTO = "auto"; //NOI18N
- private final static String GSETTINGS_VALUE_MANUAL = "manual"; //NOI18N
+ private static final String GSETTINGS_KEY_MODE = "org.gnome.system.proxy.mode"; //NOI18N
+ private static final String GSETTINGS_KEY_PAC_URL = "org.gnome.system.proxy.autoconfig-url"; //NOI18N
+ private static final String GSETTINGS_KEY_HTTP_ALL = "org.gnome.system.proxy.http.use-same-proxy"; //NOI18N
+ private static final String GSETTINGS_KEY_HTTP_HOST = "org.gnome.system.proxy.http.host"; //NOI18N
+ private static final String GSETTINGS_KEY_HTTP_PORT = "org.gnome.system.proxy.http.port"; //NOI18N
+ private static final String GSETTINGS_KEY_HTTPS_HOST = "org.gnome.system.proxy.https.host"; //NOI18N
+ private static final String GSETTINGS_KEY_HTTPS_PORT = "org.gnome.system.proxy.https.port"; //NOI18N
+ private static final String GSETTINGS_KEY_SOCKS_HOST = "org.gnome.system.proxy.socks.host"; //NOI18N
+ private static final String GSETTINGS_KEY_SOCKS_PORT = "org.gnome.system.proxy.socks.port"; //NOI18N
+ private static final String GSETTINGS_KEY_IGNORE_HOSTS = "org.gnome.system.proxy.ignore-hosts"; //NOI18N
+ private static final String GSETTINGS_VALUE_NONE = "none"; //NOI18N
+ private static final String GSETTINGS_VALUE_AUTO = "auto"; //NOI18N
+ private static final String GSETTINGS_VALUE_MANUAL = "manual"; //NOI18N
/**
* Returns network proxy settings - retrieved via GSettings (preferred).
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/kde/KdeNetworkProxy.java b/platform/core.network/src/org/netbeans/core/network/proxy/kde/KdeNetworkProxy.java
index dc165ac..bb8e8af 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/kde/KdeNetworkProxy.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/kde/KdeNetworkProxy.java
@@ -44,29 +44,29 @@ import org.netbeans.core.network.proxy.NetworkProxySettings;
*/
public class KdeNetworkProxy implements NetworkProxyResolver {
- private final static Logger LOGGER = Logger.getLogger(KdeNetworkProxy.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(KdeNetworkProxy.class.getName());
- private final static String EMPTY_STRING = ""; //NOI18N
- private final static String SPACE = " "; //NOI18N
- private final static String EQUALS = "="; //NOI18N
- private final static String COLON = ":"; //NOI18N
- private final static String COMMA = ","; //NOI18N
- private final static String SQ_BRACKET_LEFT = "["; //NOI18N
- private final static String HOME = "HOME"; //NOI18N
- private final static String KIOSLAVERC_PROXY_SETTINGS_GROUP = "[Proxy Settings]"; //NOI18N
- private final static String KIOSLAVERC_PROXY_TYPE = "ProxyType"; //NOI18N
- private final static String KIOSLAVERC_PROXY_CONFIG_SCRIPT = "Proxy Config Script"; //NOI18N
- private final static String KIOSLAVERC_HTTP_PROXY = "httpProxy"; //NOI18N
- private final static String KIOSLAVERC_HTTPS_PROXY = "httpsProxy"; //NOI18N
- private final static String KIOSLAVERC_SOCKS_PROXY = "socksProxy"; //NOI18N
- private final static String KIOSLAVERC_NO_PROXY_FOR = "NoProxyFor"; //NOI18N
- private final static String KIOSLAVERC_PROXY_TYPE_NONE = "0"; //NOI18N
- private final static String KIOSLAVERC_PROXY_TYPE_MANUAL = "1"; //NOI18N
- private final static String KIOSLAVERC_PROXY_TYPE_PAC = "2"; //NOI18N
- private final static String KIOSLAVERC_PROXY_TYPE_AUTO = "3"; //NOI18N
- private final static String KIOSLAVERC_PROXY_TYPE_SYSTEM = "4"; //NOI18N
- private final static String KIOSLAVERC_PATH_IN_HOME = ".config/kioslaverc"; //NOI18N
- private final static String KIOSLAVERC_PATH_IN_HOME_KDE4 = ".kde/share/config/kioslaverc"; //NOI18N
+ private static final String EMPTY_STRING = ""; //NOI18N
+ private static final String SPACE = " "; //NOI18N
+ private static final String EQUALS = "="; //NOI18N
+ private static final String COLON = ":"; //NOI18N
+ private static final String COMMA = ","; //NOI18N
+ private static final String SQ_BRACKET_LEFT = "["; //NOI18N
+ private static final String HOME = "HOME"; //NOI18N
+ private static final String KIOSLAVERC_PROXY_SETTINGS_GROUP = "[Proxy Settings]"; //NOI18N
+ private static final String KIOSLAVERC_PROXY_TYPE = "ProxyType"; //NOI18N
+ private static final String KIOSLAVERC_PROXY_CONFIG_SCRIPT = "Proxy Config Script"; //NOI18N
+ private static final String KIOSLAVERC_HTTP_PROXY = "httpProxy"; //NOI18N
+ private static final String KIOSLAVERC_HTTPS_PROXY = "httpsProxy"; //NOI18N
+ private static final String KIOSLAVERC_SOCKS_PROXY = "socksProxy"; //NOI18N
+ private static final String KIOSLAVERC_NO_PROXY_FOR = "NoProxyFor"; //NOI18N
+ private static final String KIOSLAVERC_PROXY_TYPE_NONE = "0"; //NOI18N
+ private static final String KIOSLAVERC_PROXY_TYPE_MANUAL = "1"; //NOI18N
+ private static final String KIOSLAVERC_PROXY_TYPE_PAC = "2"; //NOI18N
+ private static final String KIOSLAVERC_PROXY_TYPE_AUTO = "3"; //NOI18N
+ private static final String KIOSLAVERC_PROXY_TYPE_SYSTEM = "4"; //NOI18N
+ private static final String KIOSLAVERC_PATH_IN_HOME = ".config/kioslaverc"; //NOI18N
+ private static final String KIOSLAVERC_PATH_IN_HOME_KDE4 = ".kde/share/config/kioslaverc"; //NOI18N
private final List<Path> KIOSLAVERC_PATHS;
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/mac/MacNetworkProxy.java b/platform/core.network/src/org/netbeans/core/network/proxy/mac/MacNetworkProxy.java
index d3face2..bb0af2c 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/mac/MacNetworkProxy.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/mac/MacNetworkProxy.java
@@ -32,27 +32,27 @@ import org.netbeans.core.network.proxy.NetworkProxySettings;
*/
public class MacNetworkProxy implements NetworkProxyResolver {
- private final static Logger LOGGER = Logger.getLogger(MacNetworkProxy.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(MacNetworkProxy.class.getName());
- private final static MacNetworkProxyLibrary cfNetworkLibrary = MacNetworkProxyLibrary.LIBRARY;
- private final static MacCoreFoundationLibrary cfLibrary = MacCoreFoundationLibrary.LIBRARY;
+ private static final MacNetworkProxyLibrary cfNetworkLibrary = MacNetworkProxyLibrary.LIBRARY;
+ private static final MacCoreFoundationLibrary cfLibrary = MacCoreFoundationLibrary.LIBRARY;
- private final static String COMMA = ","; //NOI18N
+ private static final String COMMA = ","; //NOI18N
- private final static NativeLibrary NETWORK_LIBRARY = NativeLibrary.getInstance("CoreServices"); //NOI18N
- private final static String KEY_AUTO_DISCOVERY_ENABLE = "kCFNetworkProxiesProxyAutoDiscoveryEnable"; //NOI18N
- private final static String KEY_PAC_ENABLE = "kCFNetworkProxiesProxyAutoConfigEnable"; //NOI18N
- private final static String KEY_PAC_URL = "kCFNetworkProxiesProxyAutoConfigURLString"; //NOI18N
- private final static String KEY_HTTP_ENABLE = "kCFNetworkProxiesHTTPEnable"; //NOI18N
- private final static String KEY_HTTP_HOST = "kCFNetworkProxiesHTTPProxy"; //NOI18N
- private final static String KEY_HTTP_PORT = "kCFNetworkProxiesHTTPPort"; //NOI18N
- private final static String KEY_HTTPS_ENABLE = "kCFNetworkProxiesHTTPSEnable"; //NOI18N
- private final static String KEY_HTTPS_HOST = "kCFNetworkProxiesHTTPSProxy"; //NOI18N
- private final static String KEY_HTTPS_PORT = "kCFNetworkProxiesHTTPSPort"; //NOI18N
- private final static String KEY_SOCKS_ENABLE = "kCFNetworkProxiesSOCKSEnable"; //NOI18N
- private final static String KEY_SOCKS_HOST = "kCFNetworkProxiesSOCKSProxy"; //NOI18N
- private final static String KEY_SOCKS_PORT = "kCFNetworkProxiesSOCKSPort"; //NOI18N
- private final static String KEY_EXCEPTIONS_LIST = "kCFNetworkProxiesExceptionsList"; //NOI18N
+ private static final NativeLibrary NETWORK_LIBRARY = NativeLibrary.getInstance("CoreServices"); //NOI18N
+ private static final String KEY_AUTO_DISCOVERY_ENABLE = "kCFNetworkProxiesProxyAutoDiscoveryEnable"; //NOI18N
+ private static final String KEY_PAC_ENABLE = "kCFNetworkProxiesProxyAutoConfigEnable"; //NOI18N
+ private static final String KEY_PAC_URL = "kCFNetworkProxiesProxyAutoConfigURLString"; //NOI18N
+ private static final String KEY_HTTP_ENABLE = "kCFNetworkProxiesHTTPEnable"; //NOI18N
+ private static final String KEY_HTTP_HOST = "kCFNetworkProxiesHTTPProxy"; //NOI18N
+ private static final String KEY_HTTP_PORT = "kCFNetworkProxiesHTTPPort"; //NOI18N
+ private static final String KEY_HTTPS_ENABLE = "kCFNetworkProxiesHTTPSEnable"; //NOI18N
+ private static final String KEY_HTTPS_HOST = "kCFNetworkProxiesHTTPSProxy"; //NOI18N
+ private static final String KEY_HTTPS_PORT = "kCFNetworkProxiesHTTPSPort"; //NOI18N
+ private static final String KEY_SOCKS_ENABLE = "kCFNetworkProxiesSOCKSEnable"; //NOI18N
+ private static final String KEY_SOCKS_HOST = "kCFNetworkProxiesSOCKSProxy"; //NOI18N
+ private static final String KEY_SOCKS_PORT = "kCFNetworkProxiesSOCKSPort"; //NOI18N
+ private static final String KEY_EXCEPTIONS_LIST = "kCFNetworkProxiesExceptionsList"; //NOI18N
@Override
public NetworkProxySettings getNetworkProxySettings() {
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/DateRange.java b/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/DateRange.java
index 782e1aa..25b566a 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/DateRange.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/DateRange.java
@@ -36,7 +36,7 @@ import java.util.Calendar;
*/
class DateRange {
- private final static int UNDEFINED = -1;
+ private static final int UNDEFINED = -1;
private final int yearMin;
private final int yearMax;
private final int monthMin;
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/PacUtilsDateTime.java b/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/PacUtilsDateTime.java
index c527661..a51085e 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/PacUtilsDateTime.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/PacUtilsDateTime.java
@@ -35,7 +35,7 @@ public class PacUtilsDateTime {
* Content: {@code SUN MON TUE WED THU FRI SAT}
*
*/
- public final static List<String> WEEKDAY_NAMES = Collections.unmodifiableList(
+ public static final List<String> WEEKDAY_NAMES = Collections.unmodifiableList(
Arrays.asList("SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"));
/**
@@ -44,7 +44,7 @@ public class PacUtilsDateTime {
* Content: {@code JAN FEB MAR APR MAY JUN JUL AUG SEP OCT NOV DEC}
*
*/
- public final static List<String> MONTH_NAMES = Collections.unmodifiableList(
+ public static final List<String> MONTH_NAMES = Collections.unmodifiableList(
Arrays.asList("JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"));
private static final TimeZone UTC_TIME = TimeZone.getTimeZone("UTC");
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/TimeRange.java b/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/TimeRange.java
index c603ad0..7c39ddb 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/TimeRange.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/TimeRange.java
@@ -38,7 +38,7 @@ import java.util.Calendar;
*/
class TimeRange {
- private final static int UNDEFINED = -1;
+ private static final int UNDEFINED = -1;
private final int hourMin;
private final int hourMax;
private final int minuteMin;
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/windows/WindowsNetworkProxy.java b/platform/core.network/src/org/netbeans/core/network/proxy/windows/WindowsNetworkProxy.java
index c580e95..24eb437 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/windows/WindowsNetworkProxy.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/windows/WindowsNetworkProxy.java
@@ -30,15 +30,15 @@ import org.netbeans.core.network.proxy.NetworkProxySettings;
*/
public class WindowsNetworkProxy implements NetworkProxyResolver {
- private final static Logger LOGGER = Logger.getLogger(WindowsNetworkProxy.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(WindowsNetworkProxy.class.getName());
- private final static String HTTP_PROPERTY_NAME = "http="; //NOI18N
- private final static String HTTPS_PROPERTY_NAME = "https="; //NOI18N
- private final static String SOCKS_PROPERTY_NAME = "socks="; //NOI18N
+ private static final String HTTP_PROPERTY_NAME = "http="; //NOI18N
+ private static final String HTTPS_PROPERTY_NAME = "https="; //NOI18N
+ private static final String SOCKS_PROPERTY_NAME = "socks="; //NOI18N
- private final static String SPACE = " "; //NOI18N
- private final static String COLON = ":"; //NOI18N
- private final static String SEMI_COLON = ";"; //NOI18N
+ private static final String SPACE = " "; //NOI18N
+ private static final String COLON = ":"; //NOI18N
+ private static final String SEMI_COLON = ";"; //NOI18N
@Override
diff --git a/platform/core.network/src/org/netbeans/core/network/utils/SimpleObjCache.java b/platform/core.network/src/org/netbeans/core/network/utils/SimpleObjCache.java
index da037c0..cc4699b 100644
--- a/platform/core.network/src/org/netbeans/core/network/utils/SimpleObjCache.java
+++ b/platform/core.network/src/org/netbeans/core/network/utils/SimpleObjCache.java
@@ -118,7 +118,7 @@ public class SimpleObjCache<K,V> {
map.clear();
}
- synchronized private void evictIfFull() {
+ private synchronized void evictIfFull() {
if (map.size() >= maxSize) {
K toBeEvicted = findEvictionCandidate();
if (toBeEvicted != null) {
diff --git a/platform/core.network/test/unit/src/org/netbeans/core/network/proxy/pac/impl/PacHelperMethodsImplTest.java b/platform/core.network/test/unit/src/org/netbeans/core/network/proxy/pac/impl/PacHelperMethodsImplTest.java
index 6337ce4..5d7b6a1 100644
--- a/platform/core.network/test/unit/src/org/netbeans/core/network/proxy/pac/impl/PacHelperMethodsImplTest.java
+++ b/platform/core.network/test/unit/src/org/netbeans/core/network/proxy/pac/impl/PacHelperMethodsImplTest.java
@@ -46,10 +46,10 @@ public class PacHelperMethodsImplTest {
private InetAddress ipv4Addr;
private InetAddress ipv6Addr;
private final NbPacHelperMethods helpers = new NbPacHelperMethods();
- private final static List<String> WEEKDAY_NAMES = Collections.unmodifiableList(
+ private static final List<String> WEEKDAY_NAMES = Collections.unmodifiableList(
Arrays.asList("SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"));
- private final static List<String> MONTH_NAMES = Collections.unmodifiableList(
+ private static final List<String> MONTH_NAMES = Collections.unmodifiableList(
Arrays.asList("JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"));
public PacHelperMethodsImplTest() {
diff --git a/platform/core.startup/src/org/netbeans/core/startup/AutomaticDependencies.java b/platform/core.startup/src/org/netbeans/core/startup/AutomaticDependencies.java
index 66400b6..6038c03 100644
--- a/platform/core.startup/src/org/netbeans/core/startup/AutomaticDependencies.java
+++ b/platform/core.startup/src/org/netbeans/core/startup/AutomaticDependencies.java
@@ -415,7 +415,7 @@ public final class AutomaticDependencies {
}
- private static abstract class Dep {
+ private abstract static class Dep {
public Dep() {}
public final String toString() {
return manifestKey() + ": " + toManifestForm();
diff --git a/platform/core.startup/src/org/netbeans/core/startup/layers/BinaryCacheManager.java b/platform/core.startup/src/org/netbeans/core/startup/layers/BinaryCacheManager.java
index 07f87ca..5446229 100644
--- a/platform/core.startup/src/org/netbeans/core/startup/layers/BinaryCacheManager.java
+++ b/platform/core.startup/src/org/netbeans/core/startup/layers/BinaryCacheManager.java
@@ -187,7 +187,7 @@ final class BinaryCacheManager extends ParsingLayerCacheManager {
}
}
- private final static String[] ATTR_TYPES = {
+ private static final String[] ATTR_TYPES = {
"bytevalue", // NOI18N
"shortvalue", // NOI18N
"intvalue", // NOI18N
diff --git a/platform/core.startup/src/org/netbeans/core/startup/layers/ParsingLayerCacheManager.java b/platform/core.startup/src/org/netbeans/core/startup/layers/ParsingLayerCacheManager.java
index 7b41a7a..d7128eb 100644
--- a/platform/core.startup/src/org/netbeans/core/startup/layers/ParsingLayerCacheManager.java
+++ b/platform/core.startup/src/org/netbeans/core/startup/layers/ParsingLayerCacheManager.java
@@ -57,7 +57,7 @@ import org.xml.sax.XMLReader;
*/
abstract class ParsingLayerCacheManager extends LayerCacheManager implements ContentHandler, ErrorHandler, EntityResolver {
- private final static String[] ATTR_TYPES = {
+ private static final String[] ATTR_TYPES = {
"boolvalue",
"bundlevalue",
"bytevalue",
@@ -74,9 +74,9 @@ abstract class ParsingLayerCacheManager extends LayerCacheManager implements Con
"urlvalue",
};
- private final static String DTD_1_0 = "-//NetBeans//DTD Filesystem 1.0//EN";
- private final static String DTD_1_1 = "-//NetBeans//DTD Filesystem 1.1//EN";
- private final static String DTD_1_2 = "-//NetBeans//DTD Filesystem 1.2//EN";
+ private static final String DTD_1_0 = "-//NetBeans//DTD Filesystem 1.0//EN";
+ private static final String DTD_1_1 = "-//NetBeans//DTD Filesystem 1.1//EN";
+ private static final String DTD_1_2 = "-//NetBeans//DTD Filesystem 1.2//EN";
private Locator locator;
private MemFolder root;
@@ -427,7 +427,7 @@ abstract class ParsingLayerCacheManager extends LayerCacheManager implements Con
/** Struct for <file> or <folder>.
*/
- protected static abstract class MemFileOrFolder {
+ protected abstract static class MemFileOrFolder {
public String name;
public List<MemAttr> attrs = null; // {null | List<MemAttr>}
private Object base;
diff --git a/platform/core.ui/src/org/netbeans/core/ui/options/filetypes/IgnoredFilesPreferences.java b/platform/core.ui/src/org/netbeans/core/ui/options/filetypes/IgnoredFilesPreferences.java
index d04dec7..5c58c48 100644
--- a/platform/core.ui/src/org/netbeans/core/ui/options/filetypes/IgnoredFilesPreferences.java
+++ b/platform/core.ui/src/org/netbeans/core/ui/options/filetypes/IgnoredFilesPreferences.java
@@ -43,7 +43,7 @@ final class IgnoredFilesPreferences {
= "IgnoreHiddenFilesInUserHome"; // NOI18N
/** Default ignored files pattern. Pattern \.(cvsignore|svn|DS_Store) is covered by ^\..*$ **/
static final String DEFAULT_IGNORED_FILES = "^(CVS|SCCS|vssver.?\\.scc|#.*#|%.*%|_svn)$|~$|^\\.(git|hg|svn|cache|DS_Store)$|^Thumbs.db$"; //NOI18N
- static private String syntaxError;
+ private static String syntaxError;
private IgnoredFilesPreferences() {
}
diff --git a/platform/core.windows/src/org/netbeans/core/windows/ModeStructureSnapshot.java b/platform/core.windows/src/org/netbeans/core/windows/ModeStructureSnapshot.java
index d31cf36..9a3a962 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/ModeStructureSnapshot.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/ModeStructureSnapshot.java
@@ -115,7 +115,7 @@ public class ModeStructureSnapshot {
/** Superclass for snapshot of model element.
* There are three types, split, mode, and editor (represents editor area) type. */
- public static abstract class ElementSnapshot {
+ public abstract static class ElementSnapshot {
// PENDING revise
/** Corresponding object in model (SplitNode or ModeNode or ModeImpl for separate mode). */
private final ModelElement originator;
diff --git a/platform/core.windows/src/org/netbeans/core/windows/PersistenceHandler.java b/platform/core.windows/src/org/netbeans/core/windows/PersistenceHandler.java
index 4e5bd7d..cbce993 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/PersistenceHandler.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/PersistenceHandler.java
@@ -45,7 +45,7 @@ import org.openide.windows.*;
*
* @author Peter Zavadsky, Marek Slama
*/
-final public class PersistenceHandler implements PersistenceObserver {
+public final class PersistenceHandler implements PersistenceObserver {
// Persistence data
/** Maps mode config name to mode instance. */
diff --git a/platform/core.windows/src/org/netbeans/core/windows/TopComponentTracker.java b/platform/core.windows/src/org/netbeans/core/windows/TopComponentTracker.java
index 7097020..8f07395 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/TopComponentTracker.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/TopComponentTracker.java
@@ -50,7 +50,7 @@ public final class TopComponentTracker {
/**
* @return The one and only instance.
*/
- public synchronized static TopComponentTracker getDefault() {
+ public static synchronized TopComponentTracker getDefault() {
if( null == theInstance ) {
theInstance = new TopComponentTracker();
}
diff --git a/platform/core.windows/src/org/netbeans/core/windows/documentgroup/PleaseWait.java b/platform/core.windows/src/org/netbeans/core/windows/documentgroup/PleaseWait.java
index 72a9684..96ae4fa 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/documentgroup/PleaseWait.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/documentgroup/PleaseWait.java
@@ -33,7 +33,7 @@ import org.netbeans.core.windows.WindowManagerImpl;
*/
class PleaseWait extends JPanel {
- private final static Color FILL_COLOR = new Color(0,0,0,128);
+ private static final Color FILL_COLOR = new Color(0,0,0,128);
private Component oldGlass;
public PleaseWait() {
diff --git a/platform/core.windows/src/org/netbeans/core/windows/model/SplitSubModel.java b/platform/core.windows/src/org/netbeans/core/windows/model/SplitSubModel.java
index 63714f1..a87c356 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/model/SplitSubModel.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/model/SplitSubModel.java
@@ -786,7 +786,7 @@ class SplitSubModel {
/// Nodes of this tree model
////////////////////////////////////////
/** Class representing one node in SplitSubModel. */
- protected static abstract class Node implements ModelElement {
+ protected abstract static class Node implements ModelElement {
/** Reference to parent node. */
private SplitNode parent;
diff --git a/platform/core.windows/src/org/netbeans/core/windows/services/ActionPasteType.java b/platform/core.windows/src/org/netbeans/core/windows/services/ActionPasteType.java
index c9aabd3..ada1b97 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/services/ActionPasteType.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/services/ActionPasteType.java
@@ -109,10 +109,10 @@ final class ActionPasteType {
return retVal;
}
- private final static class PasteTypeImpl extends PasteType {
- final private DataFolder targetFolder;
- final private Collection<DataObject> sourceDataObjects;
- final private int pasteOperation;
+ private static final class PasteTypeImpl extends PasteType {
+ private final DataFolder targetFolder;
+ private final Collection<DataObject> sourceDataObjects;
+ private final int pasteOperation;
private PasteTypeImpl(final Collection<DataObject> sourceDataObjects, final DataFolder targetFolder, final int pasteOperation) {
diff --git a/platform/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java b/platform/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java
index 0e48820..1e1ea8a 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java
@@ -139,7 +139,7 @@ implements PropertyChangeListener, WindowListener, Mutex.Action<Void>, Comparato
/** Initilizes accessible contexts */
initAccessibility();
}
- private final static String ESCAPE_COMMAND = "Escape"; // NOI18N
+ private static final String ESCAPE_COMMAND = "Escape"; // NOI18N
private Component currentMessage;
private JScrollPane currentScrollPane;
diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/ModeStructureAccessorImpl.java b/platform/core.windows/src/org/netbeans/core/windows/view/ModeStructureAccessorImpl.java
index 3e5a74f..1fce58b 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/view/ModeStructureAccessorImpl.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/view/ModeStructureAccessorImpl.java
@@ -124,7 +124,7 @@ final class ModeStructureAccessorImpl implements ModeStructureAccessor {
/** Superclass for accessor of model element.
* There are three types, split, mode, and editor (represents editor area) type. */
- static abstract class ElementAccessorImpl implements ElementAccessor {
+ abstract static class ElementAccessorImpl implements ElementAccessor {
// PENDING revise
/** Corresponding object in model (SplitNode or ModeNode for separate mode). */
private final ModelElement originator;
diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/ui/MainWindow.java b/platform/core.windows/src/org/netbeans/core/windows/view/ui/MainWindow.java
index 40b42e2..32e877e 100755
--- a/platform/core.windows/src/org/netbeans/core/windows/view/ui/MainWindow.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/view/ui/MainWindow.java
@@ -476,7 +476,7 @@ public final class MainWindow {
}
}
- static private class StatusLineElementsListener implements LookupListener {
+ private static class StatusLineElementsListener implements LookupListener {
private JPanel decoratingPanel;
StatusLineElementsListener (JPanel decoratingPanel) {
this.decoratingPanel = decoratingPanel;
diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/ui/NbSheet.java b/platform/core.windows/src/org/netbeans/core/windows/view/ui/NbSheet.java
index 1c20a9c..b7b948b 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/view/ui/NbSheet.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/view/ui/NbSheet.java
@@ -75,9 +75,9 @@ public final class NbSheet extends TopComponent {
/** shared sheet */
private static NbSheet sharedSheet;
/** listener to the property changes */
- transient private final Listener listener;
+ private final transient Listener listener;
/** listener to the node changes, especially their destruction */
- transient private final SheetNodesListener snListener;
+ private final transient SheetNodesListener snListener;
/** Should property sheet listen to the global changes ? */
boolean global;
/** the property sheet that is used to display nodes */
diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/ui/popupswitcher/KeyboardPopupSwitcher.java b/platform/core.windows/src/org/netbeans/core/windows/view/ui/popupswitcher/KeyboardPopupSwitcher.java
index de4db23..2d78707 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/view/ui/popupswitcher/KeyboardPopupSwitcher.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/view/ui/popupswitcher/KeyboardPopupSwitcher.java
@@ -94,8 +94,8 @@ public final class KeyboardPopupSwitcher implements WindowFocusListener {
/** Indicates whether an item to be selected is previous or next one. */
private boolean fwd = true;
- private final static AWTKeyStroke CTRL_TAB = AWTKeyStroke.getAWTKeyStroke( KeyEvent.VK_TAB, KeyEvent.CTRL_DOWN_MASK );
- private final static AWTKeyStroke CTRL_SHIFT_TAB = AWTKeyStroke.getAWTKeyStroke( KeyEvent.VK_TAB, KeyEvent.CTRL_DOWN_MASK+KeyEvent.SHIFT_DOWN_MASK );
+ private static final AWTKeyStroke CTRL_TAB = AWTKeyStroke.getAWTKeyStroke( KeyEvent.VK_TAB, KeyEvent.CTRL_DOWN_MASK );
+ private static final AWTKeyStroke CTRL_SHIFT_TAB = AWTKeyStroke.getAWTKeyStroke( KeyEvent.VK_TAB, KeyEvent.CTRL_DOWN_MASK+KeyEvent.SHIFT_DOWN_MASK );
/**
* Tries to process given <code>KeyEvent</code> and returns true is event
diff --git a/platform/core.windows/test/unit/src/org/netbeans/core/windows/view/ui/StatusLineElementProviderTest.java b/platform/core.windows/test/unit/src/org/netbeans/core/windows/view/ui/StatusLineElementProviderTest.java
index cb20fe7..f529801 100644
--- a/platform/core.windows/test/unit/src/org/netbeans/core/windows/view/ui/StatusLineElementProviderTest.java
+++ b/platform/core.windows/test/unit/src/org/netbeans/core/windows/view/ui/StatusLineElementProviderTest.java
@@ -46,9 +46,9 @@ public class StatusLineElementProviderTest extends NbTestCase {
System.setProperty ("org.openide.util.Lookup", "org.netbeans.core.windows.view.ui.StatusLineElementProviderTest$Lkp");
}
- static private InstanceContent ic = null;
- static private Impl impl1, impl2;
- static private JPanel statusLine;
+ private static InstanceContent ic = null;
+ private static Impl impl1, impl2;
+ private static JPanel statusLine;
public StatusLineElementProviderTest(String name) {
super(name);
diff --git a/platform/favorites/src/org/netbeans/modules/favorites/Tab.java b/platform/favorites/src/org/netbeans/modules/favorites/Tab.java
index c69351a..0e5e9cc 100644
--- a/platform/favorites/src/org/netbeans/modules/favorites/Tab.java
+++ b/platform/favorites/src/org/netbeans/modules/favorites/Tab.java
@@ -82,14 +82,14 @@ implements Runnable, ExplorerManager.Provider {
/* private */ static transient Tab DEFAULT; // package-private for unit tests
/** composited view */
- transient protected TreeView view;
+ protected transient TreeView view;
/** listeners to the root context and IDE settings */
- transient private PropertyChangeListener weakRcL;
- transient private NodeListener weakNRcL;
+ private transient PropertyChangeListener weakRcL;
+ private transient NodeListener weakNRcL;
- transient private NodeListener rcListener;
+ private transient NodeListener rcListener;
/** validity flag */
- transient private boolean valid = true;
+ private transient boolean valid = true;
private ExplorerManager manager;
diff --git a/platform/htmlui/test/unit/src/org/netbeans/modules/htmlui/impl/ATech.java b/platform/htmlui/test/unit/src/org/netbeans/modules/htmlui/impl/ATech.java
index 58efe55..b1bf557 100644
--- a/platform/htmlui/test/unit/src/org/netbeans/modules/htmlui/impl/ATech.java
+++ b/platform/htmlui/test/unit/src/org/netbeans/modules/htmlui/impl/ATech.java
@@ -30,7 +30,7 @@ public interface ATech {
}
@ServiceProvider(service = Contexts.Provider.class)
- public final static class Register implements Contexts.Provider {
+ public static final class Register implements Contexts.Provider {
@Override
public void fillContext(Contexts.Builder bldr, Class<?> type) {
bldr.register(ATech.class, new First(), 30);
diff --git a/platform/javahelp/src/org/netbeans/modules/javahelp/BrowserDisplayer.java b/platform/javahelp/src/org/netbeans/modules/javahelp/BrowserDisplayer.java
index 1cbf000..4fe4afe 100644
--- a/platform/javahelp/src/org/netbeans/modules/javahelp/BrowserDisplayer.java
+++ b/platform/javahelp/src/org/netbeans/modules/javahelp/BrowserDisplayer.java
@@ -96,7 +96,7 @@ public class BrowserDisplayer extends JButton
private HTMLDocument doc;
private URL base;
- private final static Cursor handCursor =
+ private static final Cursor handCursor =
Cursor.getPredefinedCursor(Cursor.HAND_CURSOR);
private Cursor origCursor;
diff --git a/platform/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/DecorableTest.java b/platform/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/DecorableTest.java
index 2f57c59..636a883 100644
--- a/platform/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/DecorableTest.java
+++ b/platform/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/DecorableTest.java
@@ -246,7 +246,7 @@ public class DecorableTest extends TestCase {
return buffImage;
}
- static private ColorModel colorModel(int transparency) {
+ private static ColorModel colorModel(int transparency) {
ColorModel model;
try {
model = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment()
diff --git a/platform/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java b/platform/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java
index a0722b1..84f5c08 100644
--- a/platform/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java
+++ b/platform/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java
@@ -217,7 +217,7 @@ public final class WindowsNotifier extends Notifier<Void> {
}
- final static Kernel32 KERNEL32 = Native.load("kernel32", Kernel32.class, W32APIOptions.UNICODE_OPTIONS);
+ static final Kernel32 KERNEL32 = Native.load("kernel32", Kernel32.class, W32APIOptions.UNICODE_OPTIONS);
public WindowsNotifier() { // prepare port, start thread?
}
diff --git a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/FileBasedFileSystem.java b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/FileBasedFileSystem.java
index f81f819..18ba602 100644
--- a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/FileBasedFileSystem.java
+++ b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/FileBasedFileSystem.java
@@ -55,9 +55,9 @@ import org.openide.util.lookup.ServiceProvider;
public class FileBasedFileSystem extends FileSystem {
private static final Logger LOG = Logger.getLogger(FileBasedFileSystem.class.getName());
private static volatile FileBasedFileSystem INSTANCE;
- transient private RootObj<? extends FileObject> root;
- transient private final StatusImpl status = new StatusImpl();
- transient private static int modificationInProgress;
+ private transient RootObj<? extends FileObject> root;
+ private final transient StatusImpl status = new StatusImpl();
+ private static transient int modificationInProgress;
public FileBasedFileSystem() {
if (BaseUtilities.isWindows()) {
@@ -69,11 +69,11 @@ public class FileBasedFileSystem extends FileSystem {
}
}
- public synchronized static boolean isModificationInProgress() {
+ public static synchronized boolean isModificationInProgress() {
return modificationInProgress == 0 ? false : true;
}
- private synchronized static void setModificationInProgress(boolean started) {
+ private static synchronized void setModificationInProgress(boolean started) {
if (started) {
modificationInProgress++;
} else {
diff --git a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/children/ChildrenSupport.java b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/children/ChildrenSupport.java
index c804d51..546905c 100644
--- a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/children/ChildrenSupport.java
+++ b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/children/ChildrenSupport.java
@@ -391,7 +391,7 @@ public class ChildrenSupport {
return notExistingChildren != null ? notExistingChildren : Collections.<FileNaming>emptySet();
}
- protected synchronized final void copyTo(ChildrenSupport newCache, FileNaming name) {
+ protected final synchronized void copyTo(ChildrenSupport newCache, FileNaming name) {
assert newCache != this && newCache.existingChildren == null && newCache.notExistingChildren == null;
for (FileNaming fn : getExisting(false)) {
newCache.getChild(fn.getName(), name, true);
diff --git a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java
index 68c1671..616967f 100644
--- a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java
+++ b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java
@@ -858,7 +858,7 @@ public abstract class BaseFileObj extends FileObject {
return new ReplaceForSerialization(getFileName().getFile());
}
- abstract protected void setValid(boolean valid);
+ protected abstract void setValid(boolean valid);
abstract void refreshImpl(final boolean expected, boolean fire);
@Override
diff --git a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/naming/NamingFactory.java b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/naming/NamingFactory.java
index 749c2c0..ec73d81 100644
--- a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/naming/NamingFactory.java
+++ b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/naming/NamingFactory.java
@@ -387,7 +387,7 @@ public final class NamingFactory {
}
- synchronized static String dump(Integer id, File file) {
+ static synchronized String dump(Integer id, File file) {
StringBuilder sb = new StringBuilder();
final String hex = Integer.toHexString(id);
diff --git a/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/MIMESupportLoggingTest.java b/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/MIMESupportLoggingTest.java
index 837887d..0621f9e 100644
--- a/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/MIMESupportLoggingTest.java
+++ b/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/MIMESupportLoggingTest.java
@@ -158,7 +158,7 @@ public class MIMESupportLoggingTest extends NbTestCase {
}
- public final static File copyStringToFile (File f, String content) throws Exception {
+ public static final File copyStringToFile (File f, String content) throws Exception {
FileOutputStream os = new FileOutputStream(f);
InputStream is = new ByteArrayInputStream(content.getBytes("UTF-8"));
FileUtil.copy(is, os);
diff --git a/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FolderObjTest.java b/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FolderObjTest.java
index 29685e3..951f364 100644
--- a/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FolderObjTest.java
+++ b/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FolderObjTest.java
@@ -84,7 +84,7 @@ public class FolderObjTest extends NbTestCase {
Level.FINEST : Level.OFF;
}
- static abstract class IntrusiveLogHandler extends Handler {
+ abstract static class IntrusiveLogHandler extends Handler {
private String message;
IntrusiveLogHandler(final String message) {
this.message = message;
@@ -96,7 +96,7 @@ public class FolderObjTest extends NbTestCase {
}
}
- abstract protected void processLogRecord(final LogRecord record);
+ protected abstract void processLogRecord(final LogRecord record);
public void flush() {}
public void close() { flush(); }
}
diff --git a/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/utils/FileChangedManagerDeadlockTest.java b/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/utils/FileChangedManagerDeadlockTest.java
index 7492b2f..3a0dc67 100644
--- a/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/utils/FileChangedManagerDeadlockTest.java
+++ b/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/utils/FileChangedManagerDeadlockTest.java
@@ -74,7 +74,7 @@ public class FileChangedManagerDeadlockTest {
assertTrue("Priority IO should be finished", priorityIO.finished.get());
}
- private static abstract class IORunnable implements Runnable {
+ private abstract static class IORunnable implements Runnable {
protected Semaphore semaphore;
final AtomicBoolean finished = new AtomicBoolean(false);
diff --git a/platform/netbinox/src/org/netbeans/modules/netbinox/NetbinoxHooks.java b/platform/netbinox/src/org/netbeans/modules/netbinox/NetbinoxHooks.java
index 2953c0f..27b753c 100644
--- a/platform/netbinox/src/org/netbeans/modules/netbinox/NetbinoxHooks.java
+++ b/platform/netbinox/src/org/netbeans/modules/netbinox/NetbinoxHooks.java
@@ -278,7 +278,7 @@ BundleFileFactoryHook, FrameworkLog, FrameworkListener, AdaptorHook, LookupListe
archive = netigsoArchive;
}
- private synchronized static void initRegistry(HookRegistry hr, NetbinoxHooks hooks) {
+ private static synchronized void initRegistry(HookRegistry hr, NetbinoxHooks hooks) {
hookRegistry = hr;
hr.addClassLoadingHook(hooks);
hr.addBundleFileFactoryHook(hooks);
diff --git a/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/HookRaceTest.java b/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/HookRaceTest.java
index 620660e..dad69b5 100644
--- a/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/HookRaceTest.java
+++ b/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/HookRaceTest.java
@@ -88,9 +88,9 @@ public class HookRaceTest extends NbTestCase {
}
public static final class SlowH implements HookConfigurator {
- private final static Object LOCK = new Object();
+ private static final Object LOCK = new Object();
private static boolean proceed;
- volatile static int cnt;
+ static volatile int cnt;
@Override
public void addHooks(HookRegistry hr) {
diff --git a/platform/o.n.bootstrap/src/org/netbeans/JarClassLoader.java b/platform/o.n.bootstrap/src/org/netbeans/JarClassLoader.java
index 99ab774..33a1399 100644
--- a/platform/o.n.bootstrap/src/org/netbeans/JarClassLoader.java
+++ b/platform/o.n.bootstrap/src/org/netbeans/JarClassLoader.java
@@ -331,7 +331,7 @@ public class JarClassLoader extends ProxyClassLoader {
}
}
- static abstract class Source {
+ abstract static class Source {
private URL url;
private ProtectionDomain pd;
protected JarClassLoader jcl;
diff --git a/platform/o.n.bootstrap/src/org/netbeans/ModuleData.java b/platform/o.n.bootstrap/src/org/netbeans/ModuleData.java
index f6323b6..7da76fd 100644
--- a/platform/o.n.bootstrap/src/org/netbeans/ModuleData.java
+++ b/platform/o.n.bootstrap/src/org/netbeans/ModuleData.java
@@ -48,8 +48,8 @@ import org.openide.util.NbBundle;
* @author Jaroslav Tulach <jt...@netbeans.org>
*/
class ModuleData {
- private final static PackageExport[] ZERO_PACKAGE_ARRAY = new PackageExport[0];
- private final static String[] ZERO_STRING_ARRAY = new String[0];
+ private static final PackageExport[] ZERO_PACKAGE_ARRAY = new PackageExport[0];
+ private static final String[] ZERO_STRING_ARRAY = new String[0];
private final String codeName;
private final String codeNameBase;
diff --git a/platform/o.n.bootstrap/src/org/netbeans/ModuleManager.java b/platform/o.n.bootstrap/src/org/netbeans/ModuleManager.java
index f39b139..8e8836a 100644
--- a/platform/o.n.bootstrap/src/org/netbeans/ModuleManager.java
+++ b/platform/o.n.bootstrap/src/org/netbeans/ModuleManager.java
@@ -2460,7 +2460,7 @@ public final class ModuleManager extends Modules {
willEnable = null;
}
- synchronized final void registerEnable(Set<Module> modules, List<Module> l) {
+ final synchronized void registerEnable(Set<Module> modules, List<Module> l) {
toEnable = new HashSet<String>();
for (Module m : modules) {
toEnable.add(m.getCodeNameBase());
@@ -2473,7 +2473,7 @@ public final class ModuleManager extends Modules {
Stamps.getModulesJARs().scheduleSave(this, CACHE, false);
}
- synchronized final List<String> simulateEnable(Set<Module> modules) {
+ final synchronized List<String> simulateEnable(Set<Module> modules) {
if (
toEnable != null &&
modules.size() == toEnable.size() &&
diff --git a/platform/o.n.bootstrap/src/org/netbeans/ProxyClassPackages.java b/platform/o.n.bootstrap/src/org/netbeans/ProxyClassPackages.java
index c5b9f56..ffce7a4 100644
--- a/platform/o.n.bootstrap/src/org/netbeans/ProxyClassPackages.java
+++ b/platform/o.n.bootstrap/src/org/netbeans/ProxyClassPackages.java
@@ -39,7 +39,7 @@ final class ProxyClassPackages {
*/
private static final Map<String, Set<ProxyClassLoader>> packageCoverage = new HashMap<String, Set<ProxyClassLoader>>();
- synchronized static void addCoveredPackages(
+ static synchronized void addCoveredPackages(
ProxyClassLoader loader, Iterable<String> coveredPackages
) {
for (String pkg : coveredPackages) {
@@ -57,7 +57,7 @@ final class ProxyClassPackages {
}
}
- synchronized static void removeCoveredPakcages(
+ static synchronized void removeCoveredPakcages(
ProxyClassLoader loader
) {
for (Iterator<String> it = ProxyClassPackages.packageCoverage.keySet().iterator(); it.hasNext();) {
@@ -71,7 +71,7 @@ final class ProxyClassPackages {
}
}
- synchronized static Set<ProxyClassLoader> findCoveredPkg(String pkg) {
+ static synchronized Set<ProxyClassLoader> findCoveredPkg(String pkg) {
return packageCoverage.get(pkg);
}
diff --git a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerGrepTest.java b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerGrepTest.java
index 5cfe743..340ddd0 100644
--- a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerGrepTest.java
+++ b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerGrepTest.java
@@ -36,8 +36,8 @@ import org.openide.util.RequestProcessor;
*/
public class CLIHandlerGrepTest extends NbTestCase {
- final static ByteArrayInputStream nullInput = new ByteArrayInputStream(new byte[0]);
- final static ByteArrayOutputStream nullOutput = new ByteArrayOutputStream();
+ static final ByteArrayInputStream nullInput = new ByteArrayInputStream(new byte[0]);
+ static final ByteArrayOutputStream nullOutput = new ByteArrayOutputStream();
static Logger LOG;
diff --git a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerReadingOfInputTest.java b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerReadingOfInputTest.java
index 2822199..6eb533e 100644
--- a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerReadingOfInputTest.java
+++ b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerReadingOfInputTest.java
@@ -33,8 +33,8 @@ import static org.netbeans.CLIHandlerTest.*;
*/
public class CLIHandlerReadingOfInputTest extends NbTestCase {
- final static ByteArrayInputStream nullInput = new ByteArrayInputStream(new byte[0]);
- final static ByteArrayOutputStream nullOutput = new ByteArrayOutputStream();
+ static final ByteArrayInputStream nullInput = new ByteArrayInputStream(new byte[0]);
+ static final ByteArrayOutputStream nullOutput = new ByteArrayOutputStream();
private Logger LOG;
diff --git a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerServerWaitsTest.java b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerServerWaitsTest.java
index ad65a56..6ad3c21 100644
--- a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerServerWaitsTest.java
+++ b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerServerWaitsTest.java
@@ -34,8 +34,8 @@ import static org.netbeans.CLIHandlerTest.*;
@RandomlyFails
public class CLIHandlerServerWaitsTest extends NbTestCase {
- final static ByteArrayInputStream nullInput = new ByteArrayInputStream(new byte[0]);
- final static ByteArrayOutputStream nullOutput = new ByteArrayOutputStream();
+ static final ByteArrayInputStream nullInput = new ByteArrayInputStream(new byte[0]);
+ static final ByteArrayOutputStream nullOutput = new ByteArrayOutputStream();
private Logger LOG;
diff --git a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerTest.java b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerTest.java
index c81f6b5..91df241 100644
--- a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerTest.java
+++ b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerTest.java
@@ -37,8 +37,8 @@ import org.openide.util.RequestProcessor;
*/
public class CLIHandlerTest extends NbTestCase {
- final static ByteArrayInputStream nullInput = new ByteArrayInputStream(new byte[0]);
- final static ByteArrayOutputStream nullOutput = new ByteArrayOutputStream();
+ static final ByteArrayInputStream nullInput = new ByteArrayInputStream(new byte[0]);
+ static final ByteArrayOutputStream nullOutput = new ByteArrayOutputStream();
private Logger LOG;
diff --git a/platform/o.n.core/src/org/netbeans/beaninfo/editors/FontEditor.java b/platform/o.n.core/src/org/netbeans/beaninfo/editors/FontEditor.java
index d96ee3f..3e01fdc 100644
--- a/platform/o.n.core/src/org/netbeans/beaninfo/editors/FontEditor.java
+++ b/platform/o.n.core/src/org/netbeans/beaninfo/editors/FontEditor.java
@@ -190,8 +190,8 @@ public class FontEditor implements PropertyEditor, XMLPropertyEditor {
else return NbBundle.getMessage(FontEditor.class, "CTL_Plain");
}
- static private String[] fonts;
- static private String [] getFonts () {
+ private static String[] fonts;
+ private static String [] getFonts () {
if (fonts == null) {
try {
fonts = GraphicsEnvironment.getLocalGraphicsEnvironment ().getAvailableFontFamilyNames();
diff --git a/platform/o.n.core/src/org/netbeans/core/ExitDialog.java b/platform/o.n.core/src/org/netbeans/core/ExitDialog.java
index 63fd562..3c09c2f 100644
--- a/platform/o.n.core/src/org/netbeans/core/ExitDialog.java
+++ b/platform/o.n.core/src/org/netbeans/core/ExitDialog.java
@@ -53,7 +53,7 @@ import org.openide.util.NbBundle;
*/
public class ExitDialog extends JPanel implements java.awt.event.ActionListener {
- private final static boolean isAqua = "Aqua".equals(UIManager.getLookAndFeel().getID());
+ private static final boolean isAqua = "Aqua".equals(UIManager.getLookAndFeel().getID());
private static Object[] exitOptions;
diff --git a/platform/o.n.core/src/org/netbeans/core/ModuleActions.java b/platform/o.n.core/src/org/netbeans/core/ModuleActions.java
index 7c2a72e..9165e12 100644
--- a/platform/o.n.core/src/org/netbeans/core/ModuleActions.java
+++ b/platform/o.n.core/src/org/netbeans/core/ModuleActions.java
@@ -145,7 +145,7 @@ public class ModuleActions extends ActionManager
/** Adds new action to the list.
*/
- public synchronized static void add (ManifestSection.ActionSection a) {
+ public static synchronized void add (ManifestSection.ActionSection a) {
List<ManifestSection.ActionSection> list = map.get (module);
if (list == null) {
list = new ArrayList<ManifestSection.ActionSection> ();
@@ -160,7 +160,7 @@ public class ModuleActions extends ActionManager
/** Removes new action from the list.
*/
- public synchronized static void remove (ManifestSection.ActionSection a) {
+ public static synchronized void remove (ManifestSection.ActionSection a) {
List<ManifestSection.ActionSection> list = map.get (module);
if (list == null) {
return;
@@ -178,7 +178,7 @@ public class ModuleActions extends ActionManager
/** Creates the actions.
*/
- private synchronized static SystemAction[] createActions () {
+ private static synchronized SystemAction[] createActions () {
Iterator<List<ManifestSection.ActionSection>> it = map.values ().iterator ();
ArrayList<Object> arr = new ArrayList<Object> (map.size () * 5);
diff --git a/platform/o.n.core/test/perf/src/org/netbeans/core/projects/XMLSettingsTest.java b/platform/o.n.core/test/perf/src/org/netbeans/core/projects/XMLSettingsTest.java
index c721936..f1ec866 100644
--- a/platform/o.n.core/test/perf/src/org/netbeans/core/projects/XMLSettingsTest.java
+++ b/platform/o.n.core/test/perf/src/org/netbeans/core/projects/XMLSettingsTest.java
@@ -211,7 +211,7 @@ public class XMLSettingsTest extends Benchmark {
}
}
- public static abstract class SuperClazz implements Serializable {
+ public abstract static class SuperClazz implements Serializable {
public abstract int x();
}
public static final class Clazz extends SuperClazz {
diff --git a/platform/o.n.core/test/unit/src/org/netbeans/core/HtmlBrowserComponentTest.java b/platform/o.n.core/test/unit/src/org/netbeans/core/HtmlBrowserComponentTest.java
index 0856164..27e696e 100644
--- a/platform/o.n.core/test/unit/src/org/netbeans/core/HtmlBrowserComponentTest.java
+++ b/platform/o.n.core/test/unit/src/org/netbeans/core/HtmlBrowserComponentTest.java
@@ -87,7 +87,7 @@ public class HtmlBrowserComponentTest {
private static class TestBrowserImpl extends HtmlBrowser.Impl {
private final JComponent theComponent = new JPanel();
- private final static TestLookupContent lookupContent = new TestLookupContent();
+ private static final TestLookupContent lookupContent = new TestLookupContent();
private final Lookup lookup = Lookups.singleton( lookupContent );
@Override
diff --git a/platform/o.n.swing.laf.dark/src/org/netbeans/swing/laf/dark/DarkMetalTheme.java b/platform/o.n.swing.laf.dark/src/org/netbeans/swing/laf/dark/DarkMetalTheme.java
index fb0033b..820011d 100644
--- a/platform/o.n.swing.laf.dark/src/org/netbeans/swing/laf/dark/DarkMetalTheme.java
+++ b/platform/o.n.swing.laf.dark/src/org/netbeans/swing/laf/dark/DarkMetalTheme.java
@@ -242,5 +242,5 @@ public class DarkMetalTheme extends MetalTheme {
return DEFAULT_FONT;
}
- private final static FontUIResource DEFAULT_FONT = new FontUIResource("Dialog", Font.PLAIN, 11); //NOI18N
+ private static final FontUIResource DEFAULT_FONT = new FontUIResource("Dialog", Font.PLAIN, 11); //NOI18N
}
diff --git a/platform/o.n.swing.outline/src/org/netbeans/swing/etable/ETable.java b/platform/o.n.swing.outline/src/org/netbeans/swing/etable/ETable.java
index b10b7f8..cde1c6c 100644
--- a/platform/o.n.swing.outline/src/org/netbeans/swing/etable/ETable.java
+++ b/platform/o.n.swing.outline/src/org/netbeans/swing/etable/ETable.java
@@ -124,11 +124,11 @@ public class ETable extends JTable {
private static final String ACTION_FOCUS_NEXT = "focusNext"; //NOI18N
/** Possible value for editing property */
- private final static int FULLY_EDITABLE = 1;
+ private static final int FULLY_EDITABLE = 1;
/** Possible value for editing property */
- private final static int FULLY_NONEDITABLE = 2;
+ private static final int FULLY_NONEDITABLE = 2;
/** Possible value for editing property */
- private final static int DEFAULT = 3;
+ private static final int DEFAULT = 3;
/** Key for storing the currently searched column's index. */
private static final String SEARCH_COLUMN = "SearchColumn";
@@ -177,9 +177,9 @@ public class ETable extends JTable {
/** */
int SEARCH_FIELD_SPACE = 3;
/** */
- final private JTextField searchTextField = new SearchTextField();
+ private final JTextField searchTextField = new SearchTextField();
/** */
- final private int heightOfTextField = searchTextField.getPreferredSize().height;
+ private final int heightOfTextField = searchTextField.getPreferredSize().height;
/** */
private JPanel searchPanel = null;
@@ -2436,7 +2436,7 @@ public class ETable extends JTable {
/**
* Item to the collection when doing the sorting of table rows.
*/
- public final static class RowMapping {
+ public static final class RowMapping {
// index (of the row) in the TableModel
private final int originalIndex;
// table model of my table
diff --git a/platform/o.n.swing.outline/src/org/netbeans/swing/outline/Outline.java b/platform/o.n.swing.outline/src/org/netbeans/swing/outline/Outline.java
index 1fcc947..fd439cb 100644
--- a/platform/o.n.swing.outline/src/org/netbeans/swing/outline/Outline.java
+++ b/platform/o.n.swing.outline/src/org/netbeans/swing/outline/Outline.java
@@ -459,7 +459,7 @@ public class Outline extends ETable {
}
private transient Map<TreePath, RowMapping> tempSortMap = null;
- private transient final Object tempSortMapLock = new Object();
+ private final transient Object tempSortMapLock = new Object();
/**
* Sorts the rows of the tree table.
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/aqua/AquaSeparatorUI.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/aqua/AquaSeparatorUI.java
index 9ec2626..f0c5318 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/aqua/AquaSeparatorUI.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/aqua/AquaSeparatorUI.java
@@ -41,8 +41,8 @@ import javax.swing.plaf.SeparatorUI;
* @author Christopher Atlan
*/
public class AquaSeparatorUI extends SeparatorUI {
- private final static Color lineColorHorizontal = new Color(215, 215, 215);
- private final static Color lineColorVertical = new Color(128, 128, 128);
+ private static final Color lineColorHorizontal = new Color(215, 215, 215);
+ private static final Color lineColorVertical = new Color(128, 128, 128);
private static ComponentUI separatorui = new AquaSeparatorUI();
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkLFCustoms.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkLFCustoms.java
index d0d8d34..9fc66ae 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkLFCustoms.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkLFCustoms.java
@@ -220,7 +220,7 @@ public class GtkLFCustoms extends LFCustoms {
}
/** Temporary workaround for GTK L&F */
- private static abstract class GTKIcon implements Icon {
+ private abstract static class GTKIcon implements Icon {
private static final int SIZE = 11;
@Override
public int getIconWidth() {
diff --git a/platform/o.n.swing.tabcontrol/beanstubs/org/openide/util/Utilities.java b/platform/o.n.swing.tabcontrol/beanstubs/org/openide/util/Utilities.java
index 4edb13d..312cc10 100644
--- a/platform/o.n.swing.tabcontrol/beanstubs/org/openide/util/Utilities.java
+++ b/platform/o.n.swing.tabcontrol/beanstubs/org/openide/util/Utilities.java
@@ -176,7 +176,7 @@ public final class Utilities {
private static int operatingSystem = -1;
// only for UtilitiesTest purposes
- final static void resetOperatingSystem () {
+ static final void resetOperatingSystem () {
operatingSystem = -1;
}
diff --git a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/NonStretchingViewTabLayoutModel.java b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/NonStretchingViewTabLayoutModel.java
index fe23ed0..35f135d 100644
--- a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/NonStretchingViewTabLayoutModel.java
+++ b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/NonStretchingViewTabLayoutModel.java
@@ -39,9 +39,9 @@ final class NonStretchingViewTabLayoutModel implements TabLayoutModel {
private TabDisplayer tabDisplayer;
- private final static int PADDING_RIGHT = 5+15+15;
+ private static final int PADDING_RIGHT = 5+15+15;
- private final static int ICON_X_PAD = 4;
+ private static final int ICON_X_PAD = 4;
private Dimension padding = new Dimension( 5+5, 0 );
diff --git a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/WinFlatUtils.java b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/WinFlatUtils.java
index 4720341..47975b2 100644
--- a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/WinFlatUtils.java
+++ b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/WinFlatUtils.java
@@ -89,7 +89,7 @@ class WinFlatUtils {
* Corresponds to {@code org.netbeans.swing.laf.flatlaf.ui.FlatTabControlIcon}. Just delegate
* to the HiDPI-enabled Windows icons.
*/
- final static class FlatTabControlIcon {
+ static final class FlatTabControlIcon {
public static Icon get(int buttonId, int buttonState) {
return Windows8VectorTabControlIcon.get(buttonId, buttonState);
}
diff --git a/platform/openide.awt/src/org/openide/awt/Actions.java b/platform/openide.awt/src/org/openide/awt/Actions.java
index ea3cf13..18ba3d4 100644
--- a/platform/openide.awt/src/org/openide/awt/Actions.java
+++ b/platform/openide.awt/src/org/openide/awt/Actions.java
@@ -914,7 +914,7 @@ public class Actions {
* if such change occures, updateState method is called to
* reflect it.
*/
- private static abstract class Bridge extends Object implements PropertyChangeListener {
+ private abstract static class Bridge extends Object implements PropertyChangeListener {
/** component to work with */
protected JComponent comp;
diff --git a/platform/openide.awt/src/org/openide/awt/HtmlBrowser.java b/platform/openide.awt/src/org/openide/awt/HtmlBrowser.java
index d9c18db..6d88ea9 100644
--- a/platform/openide.awt/src/org/openide/awt/HtmlBrowser.java
+++ b/platform/openide.awt/src/org/openide/awt/HtmlBrowser.java
@@ -740,7 +740,7 @@ public class HtmlBrowser extends JPanel {
* This interface represents an implementation of html browser used in HtmlBrowser. Each BrowserImpl
* implementation corresponds with some BrowserFactory implementation.
*/
- public static abstract class Impl {
+ public abstract static class Impl {
/** generated Serialized Version UID */
static final long serialVersionUID = 2912844785502962114L;
@@ -919,7 +919,7 @@ public class HtmlBrowser extends JPanel {
* browsers, etc.
* @since 3.14
*/
- public static abstract class URLDisplayer {
+ public abstract static class URLDisplayer {
/** Subclass constructor. */
protected URLDisplayer() {
}
diff --git a/platform/openide.awt/src/org/openide/awt/MouseUtils.java b/platform/openide.awt/src/org/openide/awt/MouseUtils.java
index 0d61232..1e6fd92 100644
--- a/platform/openide.awt/src/org/openide/awt/MouseUtils.java
+++ b/platform/openide.awt/src/org/openide/awt/MouseUtils.java
@@ -132,7 +132,7 @@ public class MouseUtils extends Object {
* Please note that older implementation which used treshold is now
* deprecated, please use default constructor.
*/
- public static abstract class PopupMouseAdapter extends MouseAdapter {
+ public abstract static class PopupMouseAdapter extends MouseAdapter {
/** @deprecated Obsoleted as of 3.4, PopupMouseAdapter now uses isPopupTrigger properly.
Threshold does nothing, please use default constructor without treshold.
*/
@@ -175,6 +175,6 @@ public class MouseUtils extends Object {
* param evt The mouse release event - should be used to obtain the
* position of the popup menu
*/
- abstract protected void showPopup(MouseEvent evt);
+ protected abstract void showPopup(MouseEvent evt);
}
}
diff --git a/platform/openide.awt/src/org/openide/awt/QuickSearch.java b/platform/openide.awt/src/org/openide/awt/QuickSearch.java
index 49639bb..57edfc1 100644
--- a/platform/openide.awt/src/org/openide/awt/QuickSearch.java
+++ b/platform/openide.awt/src/org/openide/awt/QuickSearch.java
@@ -499,7 +499,7 @@ public class QuickSearch {
return str1.substring(0, i);
}
- private final static class AnimationTimer {
+ private static final class AnimationTimer {
private final JLabel jLabel;
private final Icon findIcon;
diff --git a/platform/openide.awt/src/org/openide/awt/SplittedPanel.java b/platform/openide.awt/src/org/openide/awt/SplittedPanel.java
index d99cf63..58608a32 100644
--- a/platform/openide.awt/src/org/openide/awt/SplittedPanel.java
+++ b/platform/openide.awt/src/org/openide/awt/SplittedPanel.java
@@ -84,13 +84,13 @@ public class SplittedPanel extends JComponent implements Accessible {
static final long serialVersionUID = 5058424218525927233L;
/** constant for no split - only the first (left/top) component will be shown */
- public final static int NONE = 0;
+ public static final int NONE = 0;
/** constant for vertical split */
- public final static int VERTICAL = 1;
+ public static final int VERTICAL = 1;
/** constant for horizontal split */
- public final static int HORIZONTAL = 2;
+ public static final int HORIZONTAL = 2;
/** constraints constant for adding a splitter */
public static final Object ADD_SPLITTER = new Integer(0);
@@ -131,7 +131,7 @@ public class SplittedPanel extends JComponent implements Accessible {
private static MessageFormat descriptionFormat = null;
/** The default split type */
- private final static int DEFAULT_SPLIT_TYPE = HORIZONTAL;
+ private static final int DEFAULT_SPLIT_TYPE = HORIZONTAL;
/** Save the last preferred setting (first or second). Double click reset the splitPosition to this value */
private int resetPosition = FIRST_PREFERRED;
@@ -179,29 +179,29 @@ public class SplittedPanel extends JComponent implements Accessible {
/** current keepFirstSame state */
private boolean keepFirstSame = false;
- transient private boolean splitIsChanging = false;
+ private transient boolean splitIsChanging = false;
private int dragPos = -1;
/** true if the panes were swapped, false otherwise */
private boolean panesSwapped = false;
/** popup menu for setting vertical/horizontal splitting */
- transient private JPopupMenu popupMenu;
+ private transient JPopupMenu popupMenu;
/** The popup menu item */
- transient private JRadioButtonMenuItem verticalCMI;
+ private transient JRadioButtonMenuItem verticalCMI;
/** The popup menu item */
- transient private JRadioButtonMenuItem horizontalCMI;
+ private transient JRadioButtonMenuItem horizontalCMI;
/** The popup menu item */
- transient private JMenuItem swapCMI;
+ private transient JMenuItem swapCMI;
/** The popup menu item */
- transient private JMenuItem splitterCMI;
+ private transient JMenuItem splitterCMI;
/** A Vector of SplitChangeListeners */
- transient private Vector<SplitChangeListener> listeners;
+ private transient Vector<SplitChangeListener> listeners;
/** Accessible context */
private AccessibleContext accessibleContext;
diff --git a/platform/openide.awt/test/unit/src/org/openide/awt/ContextActionTest.java b/platform/openide.awt/test/unit/src/org/openide/awt/ContextActionTest.java
index 96938bf..19aa466 100644
--- a/platform/openide.awt/test/unit/src/org/openide/awt/ContextActionTest.java
+++ b/platform/openide.awt/test/unit/src/org/openide/awt/ContextActionTest.java
@@ -755,7 +755,7 @@ implements Lookup.Provider, ContextActionEnabler<ContextActionTest.Openable> {
propertyChangeSupport.firePropertyChange(PROP_STATEVALUE, oldStateValue, stateValue);
}
- private transient final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
+ private final transient PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
public void addPropertyChangeListener(PropertyChangeListener listener) {
propertyChangeSupport.addPropertyChangeListener(listener);
diff --git a/platform/openide.compat/src/org/openide/explorer/ExplorerPanel.java b/platform/openide.compat/src/org/openide/explorer/ExplorerPanel.java
index 3140b23..f9353ce 100644
--- a/platform/openide.compat/src/org/openide/explorer/ExplorerPanel.java
+++ b/platform/openide.compat/src/org/openide/explorer/ExplorerPanel.java
@@ -78,7 +78,7 @@ public class ExplorerPanel extends TopComponent implements ExplorerManager.Provi
private ExplorerManager manager;
/** listens on the selected nodes in the ExporerManager */
- transient private final PropertyChangeListener managerListener = new PropL();
+ private final transient PropertyChangeListener managerListener = new PropL();
/** action handler for cut/copy/paste/delete for this panel */
private ExplorerActions actions;
diff --git a/platform/openide.compat/test/unit/src/org/openide/explorer/view/TTVTest.java b/platform/openide.compat/test/unit/src/org/openide/explorer/view/TTVTest.java
index 237a0d2..44a28c3 100644
--- a/platform/openide.compat/test/unit/src/org/openide/explorer/view/TTVTest.java
+++ b/platform/openide.compat/test/unit/src/org/openide/explorer/view/TTVTest.java
@@ -193,7 +193,7 @@ public class TTVTest extends NbTestCase {
/** Specialized property that will hold reference to any node method
* holdNode was called on.
*/
- private static abstract class NodeHolderProperty extends PropertySupport.ReadOnly<Object> {
+ private abstract static class NodeHolderProperty extends PropertySupport.ReadOnly<Object> {
private Node heldNode;
NodeHolderProperty (String propName, Class propClass, String name, String hint) {
diff --git a/platform/openide.dialogs/src/org/openide/WizardValidationException.java b/platform/openide.dialogs/src/org/openide/WizardValidationException.java
index c0386ce..88fb14c 100644
--- a/platform/openide.dialogs/src/org/openide/WizardValidationException.java
+++ b/platform/openide.dialogs/src/org/openide/WizardValidationException.java
@@ -28,7 +28,7 @@ import javax.swing.JComponent;
* @author Jiri Rechtacek
* @since 4.28
*/
-final public class WizardValidationException extends Exception {
+public final class WizardValidationException extends Exception {
private String localizedMessage;
private JComponent source;
diff --git a/platform/openide.explorer/src/org/netbeans/modules/openide/explorer/ExplorerActionsImpl.java b/platform/openide.explorer/src/org/netbeans/modules/openide/explorer/ExplorerActionsImpl.java
index e48821c..478230c 100644
--- a/platform/openide.explorer/src/org/netbeans/modules/openide/explorer/ExplorerActionsImpl.java
+++ b/platform/openide.explorer/src/org/netbeans/modules/openide/explorer/ExplorerActionsImpl.java
@@ -594,7 +594,7 @@ public final class ExplorerActionsImpl {
}
}
- private static abstract class BaseAction extends AbstractAction {
+ private abstract static class BaseAction extends AbstractAction {
private static final int NO_CHANGE = 0;
private static final int ENABLED = 1;
private static final int DISABLED = 2;
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/PSheet.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/PSheet.java
index a68face..7efa584 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/PSheet.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/PSheet.java
@@ -81,8 +81,8 @@ import org.netbeans.modules.openide.explorer.TabbedContainerBridge;
* @author Tim Boudreau
*/
class PSheet extends JPanel implements MouseListener {
- public final static int STATE_HAS_DESCRIPTION = 1;
- public final static int STATE_HAS_TABS = 2;
+ public static final int STATE_HAS_DESCRIPTION = 1;
+ public static final int STATE_HAS_TABS = 2;
private int addCount = 0;
private String description = ""; //NOI18N
private String title = ""; //NOI18N
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropUtils.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropUtils.java
index cdd3269..d3173ee 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropUtils.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropUtils.java
@@ -213,7 +213,7 @@ final class PropUtils {
//Comparators copied from original propertysheet implementation
/** Comparator which compares types */
- private final static Comparator<Node.Property> SORTER_TYPE = new Comparator<Node.Property>() {
+ private static final Comparator<Node.Property> SORTER_TYPE = new Comparator<Node.Property>() {
@Override
public int compare(Node.Property l, Node.Property r) {
@@ -241,7 +241,7 @@ final class PropUtils {
};
/** Comparator which compares PropertyDetils names */
- private final static Comparator<Node.Property> SORTER_NAME = new Comparator<Node.Property>() {
+ private static final Comparator<Node.Property> SORTER_NAME = new Comparator<Node.Property>() {
@Override
public int compare(Node.Property l, Node.Property r) {
String s1 = l.getDisplayName();
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropertySheetView.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropertySheetView.java
index 42a9ae2..57eb896 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropertySheetView.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropertySheetView.java
@@ -70,13 +70,13 @@ public class PropertySheetView extends PropertySheet {
static final long serialVersionUID = -7568245745904766160L;
/** helper flag for avoiding multiple initialization of the GUI */
- transient private boolean guiInitialized = false;
+ private transient boolean guiInitialized = false;
/** The Listener that tracks changes in explorerManager */
- transient private PropertyIL managerListener;
+ private transient PropertyIL managerListener;
/** manager to use */
- transient private ExplorerManager explorerManager;
+ private transient ExplorerManager explorerManager;
public PropertySheetView() {
setPreferredSize(new Dimension (200, 300));
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/ChoiceView.java b/platform/openide.explorer/src/org/openide/explorer/view/ChoiceView.java
index 99a37be..e7deac4 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/ChoiceView.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/ChoiceView.java
@@ -69,13 +69,13 @@ public class ChoiceView extends JComboBox implements Externalizable {
/** The local reference to the explorerManager. It is transient
* because it will be reset in initializeManager() after deserialization.*/
- transient private ExplorerManager manager;
+ private transient ExplorerManager manager;
/** Listens on ExplorerManager. */
- transient private PropertyIL iListener;
+ private transient PropertyIL iListener;
/** model to use */
- transient private NodeListModel model;
+ private transient NodeListModel model;
/** Value of property showExploredContext. */
private boolean showExploredContext = true;
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/CustomPopupFactory.java b/platform/openide.explorer/src/org/openide/explorer/view/CustomPopupFactory.java
index aa15e49..9daec24 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/CustomPopupFactory.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/CustomPopupFactory.java
@@ -75,7 +75,7 @@ class CustomPopupFactory extends PopupFactory {
}
}
- private static abstract class OurPopup extends Popup {
+ private abstract static class OurPopup extends Popup {
protected Component owner = null;
protected Component contents = null;
protected int x = -1;
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/DragDropUtilities.java b/platform/openide.explorer/src/org/openide/explorer/view/DragDropUtilities.java
index 38b173f..33e0001 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/DragDropUtilities.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/DragDropUtilities.java
@@ -147,7 +147,7 @@ final class DragDropUtilities extends Object {
/* Invokes the stored runnable if it is there and than set to null.
*/
- static private void invokePostDropRun() {
+ private static void invokePostDropRun() {
if (postDropRun != null) {
SwingUtilities.invokeLater(postDropRun);
postDropRun = null;
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/DropGlassPane.java b/platform/openide.explorer/src/org/openide/explorer/view/DropGlassPane.java
index 7f6d324..e41fb5d 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/DropGlassPane.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/DropGlassPane.java
@@ -44,13 +44,13 @@ import org.openide.util.Parameters;
*/
final class DropGlassPane extends JPanel {
private static HashMap<Integer, DropGlassPane> map = new HashMap<Integer, DropGlassPane>();
- final static private int MIN_X = 5;
- final static private int MIN_Y = 3;
- final static private int MIN_WIDTH = 10;
- final static private int MIN_HEIGTH = 3;
- transient static private Component oldPane;
- transient static private JComponent originalSource;
- transient static private boolean wasVisible;
+ private static final int MIN_X = 5;
+ private static final int MIN_Y = 3;
+ private static final int MIN_WIDTH = 10;
+ private static final int MIN_HEIGTH = 3;
+ private static transient Component oldPane;
+ private static transient JComponent originalSource;
+ private static transient boolean wasVisible;
Line2D line = null;
private DropGlassPane() {
@@ -60,7 +60,7 @@ final class DropGlassPane extends JPanel {
* calculate the new bounds in current pane's boundary.
* @param comp
* @return */
- synchronized static public DropGlassPane getDefault(JComponent comp) {
+ public static synchronized DropGlassPane getDefault(JComponent comp) {
Integer id = new Integer(System.identityHashCode(comp));
if ((map.get(id)) == null) {
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/ListView.java b/platform/openide.explorer/src/org/openide/explorer/view/ListView.java
index 5c1819d..7680720 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/ListView.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/ListView.java
@@ -121,10 +121,10 @@ public class ListView extends JScrollPane implements Externalizable {
private transient ExplorerManager manager;
/** The actual JList list */
- transient protected JList list;
+ protected transient JList list;
/** model to use */
- transient protected NodeListModel model;
+ protected transient NodeListModel model;
//
// listeners
@@ -175,8 +175,8 @@ public class ListView extends JScrollPane implements Externalizable {
transient ListViewDropSupport dropSupport;
// default DnD actions
- transient private int allowedDragActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
- transient private int allowedDropActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
+ private transient int allowedDragActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
+ private transient int allowedDropActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
/** True, if the selection listener is attached. */
transient boolean listenerActive;
@@ -815,7 +815,7 @@ public class ListView extends JScrollPane implements Externalizable {
}
};
- final private int heightOfTextField = searchTextField.getPreferredSize().height;
+ private final int heightOfTextField = searchTextField.getPreferredSize().height;
private int originalScrollMode;
private JPanel searchpanel = null;
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/MenuView.java b/platform/openide.explorer/src/org/openide/explorer/view/MenuView.java
index cfd9750..b9ba2af 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/MenuView.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/MenuView.java
@@ -107,7 +107,7 @@ public class MenuView extends JPanel {
};
/** The explorerManager that manages this view */
- transient private ExplorerManager explorerManager;
+ private transient ExplorerManager explorerManager;
/** button to open root view */
private JButton root;
@@ -116,7 +116,7 @@ public class MenuView extends JPanel {
private JButton current;
/** property change listener */
- transient private Listener listener;
+ private transient Listener listener;
/* This is the constructor implementation
* recommended by ExplorerView class that only calls the inherited
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/OutlineView.java b/platform/openide.explorer/src/org/openide/explorer/view/OutlineView.java
index eb71102..2ea9c14 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/OutlineView.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/OutlineView.java
@@ -184,8 +184,8 @@ public class OutlineView extends JScrollPane {
transient boolean dropTargetPopupAllowed = true;
// default DnD actions
- transient private int allowedDragActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
- transient private int allowedDropActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
+ private transient int allowedDragActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
+ private transient int allowedDropActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
/** Listener on keystroke to invoke default action */
private ActionListener defaultTreeActionListener;
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/OutlineViewDropSupport.java b/platform/openide.explorer/src/org/openide/explorer/view/OutlineViewDropSupport.java
index f35e129..0d0732d 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/OutlineViewDropSupport.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/OutlineViewDropSupport.java
@@ -51,8 +51,8 @@ import javax.swing.tree.TreePath;
* @author Dafe Simonek, Jiri Rechtacek, David Strupl
*/
final class OutlineViewDropSupport implements DropTargetListener, Runnable {
- final static protected int FUSSY_POINTING = 3;
- final static private int DELAY_TIME_FOR_EXPAND = 1000;
+ protected static final int FUSSY_POINTING = 3;
+ private static final int DELAY_TIME_FOR_EXPAND = 1000;
/** true if support is active, false otherwise */
boolean active = false;
@@ -270,7 +270,7 @@ final class OutlineViewDropSupport implements DropTargetListener, Runnable {
timer = new Timer(
DELAY_TIME_FOR_EXPAND,
new ActionListener() {
- final public void actionPerformed(ActionEvent e) {
+ public final void actionPerformed(ActionEvent e) {
if (LOGABLE) {
log("should expand " + path); // NOI18N
}
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/TableSheet.java b/platform/openide.explorer/src/org/openide/explorer/view/TableSheet.java
index 129db06..b25c38d 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/TableSheet.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/TableSheet.java
@@ -41,12 +41,12 @@ import org.openide.util.NbBundle;
*/
class TableSheet extends JScrollPane {
/** table */
- transient protected JTable table;
+ protected transient JTable table;
/** model */
- transient private NodeTableModel tableModel;
+ private transient NodeTableModel tableModel;
- transient private TableSheetCell tableCell;
+ private transient TableSheetCell tableCell;
/** Create table view with default table model.
*/
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/TableView.java b/platform/openide.explorer/src/org/openide/explorer/view/TableView.java
index 3e7f47e..d9c838b 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/TableView.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/TableView.java
@@ -88,8 +88,8 @@ public class TableView extends JScrollPane {
// transient private List storeSelectedPaths;
// default DnD actions
- transient private int allowedDragActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
- transient private int allowedDropActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
+ private transient int allowedDragActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
+ private transient int allowedDropActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
/** Creates a new instance of TableView */
public TableView() {
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/TreeView.java b/platform/openide.explorer/src/org/openide/explorer/view/TreeView.java
index 2901b1b..ce67bc2 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/TreeView.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/TreeView.java
@@ -139,7 +139,7 @@ public abstract class TreeView extends JScrollPane {
//
/** Main <code>JTree</code> component. */
- transient protected JTree tree;
+ protected transient JTree tree;
/** model */
transient NodeTreeModel treeModel;
@@ -181,21 +181,21 @@ public abstract class TreeView extends JScrollPane {
transient boolean dropTargetPopupAllowed = true;
// default DnD actions
- transient private int allowedDragActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
- transient private int allowedDropActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
+ private transient int allowedDragActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
+ private transient int allowedDropActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
/** Quick Search support */
- transient private QuickSearch qs;
+ private transient QuickSearch qs;
/** wait cursor is shown automatically during expanding */
- transient private boolean autoWaitCursor = true;
+ private transient boolean autoWaitCursor = true;
/** Holds VisualizerChildren for all visible nodes */
private final VisualizerHolder visHolder = new VisualizerHolder();
/** reference to the last visible search field */
private static Reference<TreeView> lastSearchField = new WeakReference<TreeView>(null);
- transient private boolean removedNodeWasSelected = false;
+ private transient boolean removedNodeWasSelected = false;
/** Constructor.
*/
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/TreeViewDropSupport.java b/platform/openide.explorer/src/org/openide/explorer/view/TreeViewDropSupport.java
index c442ddf..d4a0e30 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/TreeViewDropSupport.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/TreeViewDropSupport.java
@@ -53,11 +53,11 @@ import javax.swing.tree.TreePath;
* @author Dafe Simonek, Jiri Rechtacek
*/
final class TreeViewDropSupport implements DropTargetListener, Runnable {
- final static protected int FUSSY_POINTING = 3;
- final static private int DELAY_TIME_FOR_EXPAND = 1000;
- final static private int SHIFT_DOWN = -1;
- final static private int SHIFT_RIGHT = 10;
- final static private int SHIFT_LEFT = 15;
+ protected static final int FUSSY_POINTING = 3;
+ private static final int DELAY_TIME_FOR_EXPAND = 1000;
+ private static final int SHIFT_DOWN = -1;
+ private static final int SHIFT_RIGHT = 10;
+ private static final int SHIFT_LEFT = 15;
// Attributes
@@ -267,7 +267,7 @@ final class TreeViewDropSupport implements DropTargetListener, Runnable {
timer = new Timer(
DELAY_TIME_FOR_EXPAND,
new ActionListener() {
- final public void actionPerformed(ActionEvent e) {
+ public final void actionPerformed(ActionEvent e) {
view.expandNode(cn);
}
}
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/ViewTooltips.java b/platform/openide.explorer/src/org/openide/explorer/view/ViewTooltips.java
index b2beccf..1781bde 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/ViewTooltips.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/ViewTooltips.java
@@ -93,7 +93,7 @@ final class ViewTooltips extends MouseAdapter implements MouseMotionListener {
* for now) which should show helper tooltips. Should be called
* from the component's addNotify() method.
*/
- synchronized static void register (JComponent comp) {
+ static synchronized void register (JComponent comp) {
ViewTooltips vtt = (ViewTooltips) comp.getClientProperty(KEY);
assert vtt == null : "There already is " + vtt + " for " + comp;
comp.putClientProperty(KEY, vtt = new ViewTooltips());
@@ -105,7 +105,7 @@ final class ViewTooltips extends MouseAdapter implements MouseMotionListener {
* for now) which should show helper tooltips. Should be called
* from the component's removeNotify() method.
*/
- synchronized static void unregister (JComponent comp) {
+ static synchronized void unregister (JComponent comp) {
ViewTooltips inst = (ViewTooltips) comp.getClientProperty(KEY);
if (inst == null) {
return;
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/ProxyNodeTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/ProxyNodeTest.java
index aa2446f..c08eb52 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/ProxyNodeTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/ProxyNodeTest.java
@@ -240,7 +240,7 @@ public class ProxyNodeTest extends NbTestCase {
this.name = name;
propertyChangeSupport.firePropertyChange(PROP_NAME, oldName, name);
}
- private transient final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
+ private final transient PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
public void addPropertyChangeListener(PropertyChangeListener listener) {
propertyChangeSupport.addPropertyChangeListener(listener);
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/view/TreeTableView126560Test.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/view/TreeTableView126560Test.java
index 61aa3aa..0e68e39 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/view/TreeTableView126560Test.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/view/TreeTableView126560Test.java
@@ -97,7 +97,7 @@ public class TreeTableView126560Test extends NbTestCase {
class AwtBlock implements Runnable {
- synchronized public void run() {
+ public synchronized void run() {
notifyAll();
doWait();
}
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewTest.java
index 15f2e4e..6e1f9c0 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewTest.java
@@ -268,7 +268,7 @@ public final class TreeViewTest extends NbTestCase {
tree.collapseRow(4);
}
- final static class TreeChildren extends Children.Array {
+ static final class TreeChildren extends Children.Array {
private static final char[] letters
= new char[] {'A', 'B', 'C', 'D', 'E'};
diff --git a/platform/openide.filesystems.nb/src/org/netbeans/modules/openide/filesystems/FileFilterSupport.java b/platform/openide.filesystems.nb/src/org/netbeans/modules/openide/filesystems/FileFilterSupport.java
index bf498a6..48a407e 100644
--- a/platform/openide.filesystems.nb/src/org/netbeans/modules/openide/filesystems/FileFilterSupport.java
+++ b/platform/openide.filesystems.nb/src/org/netbeans/modules/openide/filesystems/FileFilterSupport.java
@@ -279,7 +279,7 @@ public final class FileFilterSupport {
/**
* Element of File Filter. One accepted extension or file name pattern.
*/
- private static abstract class FilterElement {
+ private abstract static class FilterElement {
public abstract String getName();
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/AbstractFileSystem.java b/platform/openide.filesystems/src/org/openide/filesystems/AbstractFileSystem.java
index b20f35b..91bacdf 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/AbstractFileSystem.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/AbstractFileSystem.java
@@ -98,7 +98,7 @@ public abstract class AbstractFileSystem extends FileSystem {
private static final long serialVersionUID = -3345098214331282438L;
/** cached last value of Enumeration which holds resource name (enumeration like StringTokenizer)*/
- static transient private PathElements lastEnum;
+ private static transient PathElements lastEnum;
/** root object for the filesystem */
private transient AbstractFileObject root;
@@ -208,7 +208,7 @@ public abstract class AbstractFileSystem extends FileSystem {
*
* @param ms number of milliseconds between two refreshes; if <code><= 0</code> then refreshing is disabled
*/
- protected synchronized final void setRefreshTime(int ms) {
+ protected final synchronized void setRefreshTime(int ms) {
if (refresher != null) {
refresher.stop();
}
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/AbstractFolder.java b/platform/openide.filesystems/src/org/openide/filesystems/AbstractFolder.java
index 2da49d0..34aa19e 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/AbstractFolder.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/AbstractFolder.java
@@ -953,7 +953,7 @@ abstract class AbstractFolder extends FileObject {
* @param lock the lock obtained by a call to {@link #lock}
* @exception IOException if the file could not be deleted
*/
- final public void delete(FileLock lock) throws IOException {
+ public final void delete(FileLock lock) throws IOException {
if (isFolder()) {
FileObject[] fos = this.getChildren();
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java b/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java
index 9a519c9..e75bc7d 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java
@@ -95,20 +95,20 @@ public class DefaultAttributes extends Object implements AbstractFileSystem.Attr
* @deprecated does not handle XML attributes
*/
@Deprecated
- public final static String ATTR_NAME = "filesystem"; // NOI18N
+ public static final String ATTR_NAME = "filesystem"; // NOI18N
/** Extension of special file in each folder where attributes are saved.
* @deprecated does not handle XML attributes
*/
@Deprecated
- public final static String ATTR_EXT = "attributes"; // NOI18N
+ public static final String ATTR_EXT = "attributes"; // NOI18N
/** Name with extension of special file in each folder where attributes are saved.
* @deprecated does not handle XML attributes
*/
@Deprecated
- public final static String ATTR_NAME_EXT = ATTR_NAME + '.' + ATTR_EXT;
- private final static String ATTR_NAME_EXT_XML = System.getProperty(
+ public static final String ATTR_NAME_EXT = ATTR_NAME + '.' + ATTR_EXT;
+ private static final String ATTR_NAME_EXT_XML = System.getProperty(
"org.openide.filesystems.DefaultAttributes.ATTR_NAME_EXT_XML", ".nbattrs"
); // NOI18N
@@ -119,7 +119,7 @@ public class DefaultAttributes extends Object implements AbstractFileSystem.Attr
* - org.openide.loaders.CompilerSupport
* - org.netbeans.core.ExJarFileSystem
*/
- private final static String READONLY_ATTRIBUTES = "readOnlyAttrs"; //NOI18N
+ private static final String READONLY_ATTRIBUTES = "readOnlyAttrs"; //NOI18N
// <?xml version="1.0"?>
// <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD DefaultAttributes 1.0//EN" "http://www.netbeans.org/dtds/attributes-1_0.dtd">
@@ -710,7 +710,7 @@ public class DefaultAttributes extends Object implements AbstractFileSystem.Attr
* @param pbStream is pushback input stream; tests 4 bytes and then returns them back
* @return true if the file has serialized form
*/
- static private final boolean isSerialized(PushbackInputStream pbStream)
+ private static final boolean isSerialized(PushbackInputStream pbStream)
throws IOException {
int[] serialPattern = { '\u00AC', '\u00ED', '\u0000', '\u0005' }; //NOI18N patern for serialized objects
byte[] checkedArray = new byte[serialPattern.length];
@@ -775,7 +775,7 @@ public class DefaultAttributes extends Object implements AbstractFileSystem.Attr
/** Table that hold mapping between files and attributes.
* Hold mapping of type (String, Map (String, Object))
*/
- final static class Table extends HashMap implements Externalizable {
+ static final class Table extends HashMap implements Externalizable {
static final long serialVersionUID = 2353458763249746934L;
/** name of folder we belong to */
@@ -1156,7 +1156,7 @@ public class DefaultAttributes extends Object implements AbstractFileSystem.Attr
* - protected void characters(char[] ch, int start, int length) throws SAXException {}
* - protected void internalStartElement(String elemName, HashMap mapMandatory,HashMap mapAllowed) throws SAXException {}
*/
- static abstract class ElementHandler {
+ abstract static class ElementHandler {
private static final String[] EMPTY = { };
private int mandatAttrCount;
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/ExternalUtil.java b/platform/openide.filesystems/src/org/openide/filesystems/ExternalUtil.java
index 3c139aa..fe9575a 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/ExternalUtil.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/ExternalUtil.java
@@ -68,7 +68,7 @@ final class ExternalUtil {
return orig;
}
- final static Logger LOG = Logger.getLogger("org.openide.filesystems"); // NOI18N
+ static final Logger LOG = Logger.getLogger("org.openide.filesystems"); // NOI18N
/** Logs a text.
*/
public static void log(String msg) {
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/FCLSupport.java b/platform/openide.filesystems/src/org/openide/filesystems/FCLSupport.java
index 8e759ae..99c4cbb 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/FCLSupport.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/FCLSupport.java
@@ -41,7 +41,7 @@ class FCLSupport {
/* Add new listener to this object.
* @param l the listener
*/
- synchronized final void addFileChangeListener(FileChangeListener fcl) {
+ final synchronized void addFileChangeListener(FileChangeListener fcl) {
if (listeners == null) {
listeners = new ListenerList<FileChangeListener>();
}
@@ -52,7 +52,7 @@ class FCLSupport {
/* Remove listener from this object.
* @param l the listener
*/
- synchronized final void removeFileChangeListener(FileChangeListener fcl) {
+ final synchronized void removeFileChangeListener(FileChangeListener fcl) {
if (listeners != null) {
listeners.remove(fcl);
}
@@ -89,14 +89,14 @@ class FCLSupport {
/** @return true if there is a listener
*/
- synchronized final boolean hasListeners() {
+ final synchronized boolean hasListeners() {
return listeners != null && listeners.hasListeners();
}
/**
* Wrapper for a file change event and a listener (or a list of listeners).
*/
- private static abstract class DispatchEventWrapper {
+ private abstract static class DispatchEventWrapper {
final FileEvent fe;
final Op operation;
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/FileObject.java b/platform/openide.filesystems/src/org/openide/filesystems/FileObject.java
index 16e5e0f..66bc740 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/FileObject.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/FileObject.java
@@ -444,7 +444,7 @@ public abstract class FileObject extends Object implements Serializable, Lookup.
* @param attrName name of the attribute
* @return appropriate (serializable) value or <CODE>null</CODE> if the attribute is unset (or could not be properly restored for some reason)
*/
- abstract public Object getAttribute(String attrName);
+ public abstract Object getAttribute(String attrName);
/** Set the file attribute with the specified name. The actual meaning of
* this method is implementation dependent. It is generally expected that
@@ -467,13 +467,13 @@ public abstract class FileObject extends Object implements Serializable, Lookup.
* @param value new value or <code>null</code> to clear the attribute. Must be serializable, although particular filesystems may or may not use serialization to store attribute values.
* @exception IOException if the attribute cannot be set. If serialization is used to store it, this may in fact be a subclass such as {@link java.io.NotSerializableException}.
*/
- abstract public void setAttribute(String attrName, Object value)
+ public abstract void setAttribute(String attrName, Object value)
throws IOException;
/** Get all file attribute names for this file.
* @return enumeration of keys (as strings)
*/
- abstract public Enumeration<String> getAttributes();
+ public abstract Enumeration<String> getAttributes();
/** Test whether this file has the specified extension.
* @param ext the extension the file should have
@@ -1368,8 +1368,8 @@ public abstract class FileObject extends Object implements Serializable, Lookup.
private static class ED extends FileSystem.EventDispatcher {
private FCLSupport.Op op;
private Enumeration<FileChangeListener> en;
- final private List<FileChangeListener> fsList;
- final private List<FileChangeListener> repList;
+ private final List<FileChangeListener> fsList;
+ private final List<FileChangeListener> repList;
private FileEvent fe;
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/FileSystem.java b/platform/openide.filesystems/src/org/openide/filesystems/FileSystem.java
index 22a37ee..5f76d83 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/FileSystem.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/FileSystem.java
@@ -134,7 +134,7 @@ public abstract class FileSystem implements Serializable {
/** Used for synchronization purpose*/
private static final Object internLock = new Object();
- private transient static ThreadLocal<EventControl> thrLocal = new ThreadLocal<EventControl>();
+ private static transient ThreadLocal<EventControl> thrLocal = new ThreadLocal<EventControl>();
/** Empty status */
private static final StatusDecorator STATUS_NONE = new StatusDecorator() {
@@ -152,7 +152,7 @@ public abstract class FileSystem implements Serializable {
* It can be invalid if there is another filesystem with the
* same name in the filesystem pool.
*/
- transient private boolean valid = false;
+ private transient boolean valid = false;
/** True if the filesystem is assigned to pool.
* Is modified from Repository methods.
@@ -765,7 +765,7 @@ public abstract class FileSystem implements Serializable {
/** Class used to notify events for the filesystem.
*/
- static abstract class EventDispatcher extends Object implements Runnable {
+ abstract static class EventDispatcher extends Object implements Runnable {
public final void run() {
dispatch(false, null);
}
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/Repository.java b/platform/openide.filesystems/src/org/openide/filesystems/Repository.java
index 86b6741..a6e4c97 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/Repository.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/Repository.java
@@ -108,7 +108,7 @@ public class Repository implements Serializable {
*
* @since 7.59
*/
- public static abstract class LayerProvider {
+ public abstract static class LayerProvider {
/** Allows providers to add their additions to the structure
* beneath {@link FileUtil#getConfigRoot()}. The method is
* supposed to collect all additional layers and {@link Collection#add(java.lang.Object) add}
@@ -1033,7 +1033,7 @@ public class Repository implements Serializable {
* <p/>
* @since 9.5
*/
- public static abstract class LocalProvider {
+ public abstract static class LocalProvider {
/**
* Returns the local repository instance. The method can return {@code null} to indicate
* the main Repository should be used. The method <b>must</b> return the very same instance
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java b/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java
index 42a50c0..f783026 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java
@@ -442,7 +442,7 @@ final class XMLMapAttr implements Map {
* attribute a returns it as Object. Each Attr contains pair key and value. Key is type. Value is real value (in textual form) of this type.
* Detailed describtion is in <A HREF="XMLMapAttr.html">XMLMapAttr<A>
*/
- final static class Attr extends java.lang.Object {
+ static final class Attr extends java.lang.Object {
// static final long serialVersionUID = -62733358015297232L;
private static final String[] ALLOWED_ATTR_KEYS = {
"bytevalue", "shortvalue", "intvalue", "longvalue", "floatvalue", "doublevalue", "boolvalue", "charvalue",
@@ -1060,7 +1060,7 @@ final class XMLMapAttr implements Map {
* Checks if key is valid
* @return Index to array of allowed keys or -1 which means error.
*/
- final static int isValid(String key) {
+ static final int isValid(String key) {
int index = -1;
int i;
String[] strArray = getAttrTypes();
@@ -1108,7 +1108,7 @@ final class XMLMapAttr implements Map {
static class ModifiedAttribute implements java.io.Serializable {
/** generated Serialized Version UID */
static final long serialVersionUID = 84214031923497718L;
- private final static String[] fragments = new String[] { "transient:" }; //NOI18N
+ private static final String[] fragments = new String[] { "transient:" }; //NOI18N
private int modifier = 0;
private Object origAttrValue = null;
diff --git a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/FileObjectTestHid.java b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/FileObjectTestHid.java
index 61ed1fa..a9a7598 100644
--- a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/FileObjectTestHid.java
+++ b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/FileObjectTestHid.java
@@ -37,12 +37,12 @@ import org.openide.util.Lookup.Result;
*/
public class FileObjectTestHid extends TestBaseHid {
- private final static String FOLDER_CHILD_NAME= "testFolder";
- private final static String FOLDER_CHILD= "/"+FOLDER_CHILD_NAME;
+ private static final String FOLDER_CHILD_NAME= "testFolder";
+ private static final String FOLDER_CHILD= "/"+FOLDER_CHILD_NAME;
- private final static String FILE_CHILD_NAME= "test";
- private final static String FILE_CHILD_EXT= "txt";
- private final static String FILE_CHILD= "/"+FILE_CHILD_NAME+"." +FILE_CHILD_EXT;
+ private static final String FILE_CHILD_NAME= "test";
+ private static final String FILE_CHILD_EXT= "txt";
+ private static final String FILE_CHILD= "/"+FILE_CHILD_NAME+"." +FILE_CHILD_EXT;
/**Should be deleted and testedFS renamed to fs*/
private FileSystem fs;
diff --git a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/TestUtilHid.java b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/TestUtilHid.java
index bc2e24a..6826daa 100644
--- a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/TestUtilHid.java
+++ b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/TestUtilHid.java
@@ -57,13 +57,13 @@ public class TestUtilHid {
}
/** @return URL to folder where should be placed tested data */
- public final static URL getResourceContext () {
+ public static final URL getResourceContext () {
//System.out.println("getResourceContext: " + FileSystemFactoryHid.class.getResource("../data"));
return FileSystemFactoryHid.class.getResource("../data/");
}
/** It may be helpful to delete resursively Files */
- public final static boolean deleteFolder (File file) throws IOException{
+ public static final boolean deleteFolder (File file) throws IOException{
boolean ret = file.delete();
if (ret) {
@@ -94,7 +94,7 @@ public class TestUtilHid {
* {@link #createLocalFileSystem(File,String[])}
* or use FileUtil.toFileObject with masterfs in CP
*/
- public final static FileSystem createLocalFileSystem(String testName, String[] resources) throws IOException {
+ public static final FileSystem createLocalFileSystem(String testName, String[] resources) throws IOException {
File mountPoint = locationOfLFSTempFolder(testName);
return createLocalFileSystem(mountPoint, resources);
@@ -131,7 +131,7 @@ public class TestUtilHid {
return mountPoint;
}
- public final static void destroyLocalFileSystem (String testName) throws IOException {
+ public static final void destroyLocalFileSystem (String testName) throws IOException {
File mountPoint = TestUtilHid.locationOfTempFolder("lfstest");
if (mountPoint.exists()) {
@@ -141,7 +141,7 @@ public class TestUtilHid {
}
- public final static void destroyXMLFileSystem(String testName) throws IOException {
+ public static final void destroyXMLFileSystem(String testName) throws IOException {
File tempFile = TestUtilHid.locationOfTempFolder("xfstest");
File xmlFile = new File (tempFile,"xfstest.xml");
if (xmlFile.exists())
@@ -149,7 +149,7 @@ public class TestUtilHid {
}
- public final static FileSystem createXMLFileSystem(String testName, String[] resources) throws IOException{
+ public static final FileSystem createXMLFileSystem(String testName, String[] resources) throws IOException{
File xmlFile = createXMLLayer(testName, resources);
XMLFileSystem xfs = new XMLFileSystem ();
@@ -160,7 +160,7 @@ public class TestUtilHid {
return xfs;
}
- public final static FileSystem createXMLFileSystem(String testName, Resource rootResource) throws IOException {
+ public static final FileSystem createXMLFileSystem(String testName, Resource rootResource) throws IOException {
File xmlFile = createXMLLayer(testName, rootResource);
XMLFileSystem xfs = new XMLFileSystem ();
diff --git a/platform/openide.io/src/org/openide/windows/IOColorLines.java b/platform/openide.io/src/org/openide/windows/IOColorLines.java
index e879a59..38adb73 100644
--- a/platform/openide.io/src/org/openide/windows/IOColorLines.java
+++ b/platform/openide.io/src/org/openide/windows/IOColorLines.java
@@ -102,5 +102,5 @@ public abstract class IOColorLines {
* or highlight the hyperlink.
* @param color a color for the line of text (null allowed). If null is passed default color (see {@link IOColors}) is used.
*/
- abstract protected void println(CharSequence text, OutputListener listener, boolean important, Color color) throws IOException;
+ protected abstract void println(CharSequence text, OutputListener listener, boolean important, Color color) throws IOException;
}
diff --git a/platform/openide.io/src/org/openide/windows/IOColorPrint.java b/platform/openide.io/src/org/openide/windows/IOColorPrint.java
index 73ecd8a..68cbce5 100644
--- a/platform/openide.io/src/org/openide/windows/IOColorPrint.java
+++ b/platform/openide.io/src/org/openide/windows/IOColorPrint.java
@@ -105,5 +105,5 @@ public abstract class IOColorPrint {
* or highlight the hyperlink.
* @param color a color for the text (null allowed). If null is passed default color (see {@link IOColors}) is used.
*/
- abstract protected void print(CharSequence text, OutputListener listener, boolean important, Color color) throws IOException;
+ protected abstract void print(CharSequence text, OutputListener listener, boolean important, Color color) throws IOException;
}
diff --git a/platform/openide.io/src/org/openide/windows/IOColors.java b/platform/openide.io/src/org/openide/windows/IOColors.java
index 8a4fb1d..cb4d5ea 100644
--- a/platform/openide.io/src/org/openide/windows/IOColors.java
+++ b/platform/openide.io/src/org/openide/windows/IOColors.java
@@ -124,12 +124,12 @@ public abstract class IOColors {
* @param type output type to get color for
* @return current color for specified output
*/
- abstract protected Color getColor(OutputType type);
+ protected abstract Color getColor(OutputType type);
/**
* Sets specified color for output
* @param type output type to set color for
* @param color new color for specified output type
*/
- abstract protected void setColor(OutputType type, Color color);
+ protected abstract void setColor(OutputType type, Color color);
}
diff --git a/platform/openide.io/src/org/openide/windows/IOFolding.java b/platform/openide.io/src/org/openide/windows/IOFolding.java
index 4404e70..4b872bd 100644
--- a/platform/openide.io/src/org/openide/windows/IOFolding.java
+++ b/platform/openide.io/src/org/openide/windows/IOFolding.java
@@ -127,7 +127,7 @@ public abstract class IOFolding {
/**
* An SPI for creating custom FoldHandle implementations.
*/
- protected static abstract class FoldHandleDefinition {
+ protected abstract static class FoldHandleDefinition {
/**
* Finish the fold at the current last line. Ensure that nested folds
diff --git a/platform/openide.io/src/org/openide/windows/IOPosition.java b/platform/openide.io/src/org/openide/windows/IOPosition.java
index ab8bc0b..99547dc 100644
--- a/platform/openide.io/src/org/openide/windows/IOPosition.java
+++ b/platform/openide.io/src/org/openide/windows/IOPosition.java
@@ -79,5 +79,5 @@ public abstract class IOPosition {
* Gets current position in IO
* @return current position
*/
- abstract protected Position currentPosition();
+ protected abstract Position currentPosition();
}
diff --git a/platform/openide.io/src/org/openide/windows/IOSelect.java b/platform/openide.io/src/org/openide/windows/IOSelect.java
index c9fc6c4..1f002e8 100644
--- a/platform/openide.io/src/org/openide/windows/IOSelect.java
+++ b/platform/openide.io/src/org/openide/windows/IOSelect.java
@@ -102,5 +102,5 @@ public abstract class IOSelect {
* @param extraOps Additional operations to apply to the containing
* TopComponent.
*/
- abstract protected void select(Set<AdditionalOperation> extraOps);
+ protected abstract void select(Set<AdditionalOperation> extraOps);
}
diff --git a/platform/openide.io/src/org/openide/windows/IOTab.java b/platform/openide.io/src/org/openide/windows/IOTab.java
index 139cdcf..f9bd6ae 100644
--- a/platform/openide.io/src/org/openide/windows/IOTab.java
+++ b/platform/openide.io/src/org/openide/windows/IOTab.java
@@ -108,24 +108,24 @@ public abstract class IOTab {
* Gets current tab icon
* @return current tab icon
*/
- abstract protected Icon getIcon();
+ protected abstract Icon getIcon();
/**
* Sets icon to tab
* @param icon tab icon
*/
- abstract protected void setIcon(Icon icon);
+ protected abstract void setIcon(Icon icon);
/**
* Gets current tool tip text
* @return current tool tip text
*/
- abstract protected String getToolTipText();
+ protected abstract String getToolTipText();
/**
* Sets tool tip text to tab
* @param text new tool tip text
*/
- abstract protected void setToolTipText(String text);
+ protected abstract void setToolTipText(String text);
}
diff --git a/platform/openide.loaders/src/org/openide/actions/NewTemplateAction.java b/platform/openide.loaders/src/org/openide/actions/NewTemplateAction.java
index 3ad371a..1db1b5c 100644
--- a/platform/openide.loaders/src/org/openide/actions/NewTemplateAction.java
+++ b/platform/openide.loaders/src/org/openide/actions/NewTemplateAction.java
@@ -877,7 +877,7 @@ public class NewTemplateAction extends NodeAction {
private void updateAction () {}
- static private final synchronized Node[] getNodesFromLookup (Lookup lookup) {
+ private static final synchronized Node[] getNodesFromLookup (Lookup lookup) {
if (lookup != null) {
return lookup.lookupAll(Node.class).toArray(EMPTY_NODE_ARRAY);
}
diff --git a/platform/openide.loaders/src/org/openide/awt/Toolbar.java b/platform/openide.loaders/src/org/openide/awt/Toolbar.java
index 9e68946..f19a5fd 100644
--- a/platform/openide.loaders/src/org/openide/awt/Toolbar.java
+++ b/platform/openide.loaders/src/org/openide/awt/Toolbar.java
@@ -253,7 +253,7 @@ public class Toolbar extends ToolbarWithOverflow /*implemented by patchsuperclas
* @deprecated Always returns 1
*/
@Deprecated
- static public int rowCount (int height) {
+ public static int rowCount (int height) {
return 1;
}
diff --git a/platform/openide.loaders/src/org/openide/loaders/DataFolder.java b/platform/openide.loaders/src/org/openide/loaders/DataFolder.java
index b06a224..af74f32 100644
--- a/platform/openide.loaders/src/org/openide/loaders/DataFolder.java
+++ b/platform/openide.loaders/src/org/openide/loaders/DataFolder.java
@@ -193,7 +193,7 @@ public class DataFolder extends MultiDataObject implements DataObject.Container
* @param mode an constant from {@link DataFolder.SortMode}
* @exception IOException if the mode cannot be set
*/
- public synchronized final void setSortMode (SortMode mode) throws IOException {
+ public final synchronized void setSortMode (SortMode mode) throws IOException {
SortMode old = getOrder ().getSortMode ();
getOrder ().setSortMode (mode);
firePropertyChange (PROP_SORT_MODE, old, getOrder ().getSortMode ());
@@ -220,7 +220,7 @@ public class DataFolder extends MultiDataObject implements DataObject.Container
* @exception IOException if the order cannot be set
*
*/
- public synchronized final void setOrder (DataObject[] arr) throws IOException {
+ public final synchronized void setOrder (DataObject[] arr) throws IOException {
getOrder ().setOrder (arr);
firePropertyChange (PROP_ORDER, null, null);
}
@@ -380,8 +380,8 @@ public class DataFolder extends MultiDataObject implements DataObject.Container
}
}
- private final static class ClonedFilterHandle implements Node.Handle {
- private final static long serialVersionUID = 24234097765186L;
+ private static final class ClonedFilterHandle implements Node.Handle {
+ private static final long serialVersionUID = 24234097765186L;
private DataObject folder;
private DataFilter filter;
public ClonedFilterHandle (DataFolder folder, DataFilter filter) {
diff --git a/platform/openide.loaders/src/org/openide/loaders/DataLoaderPool.java b/platform/openide.loaders/src/org/openide/loaders/DataLoaderPool.java
index b57c252..beade10 100644
--- a/platform/openide.loaders/src/org/openide/loaders/DataLoaderPool.java
+++ b/platform/openide.loaders/src/org/openide/loaders/DataLoaderPool.java
@@ -165,7 +165,7 @@ implements java.io.Serializable {
/** Add a listener for operations on data objects.
* @param l the listener
*/
- public synchronized final void addOperationListener (OperationListener l) {
+ public final synchronized void addOperationListener (OperationListener l) {
if (listeners == null) listeners = new EventListenerList();
listeners.add( OperationListener.class, l);
}
@@ -173,7 +173,7 @@ implements java.io.Serializable {
/** Remove a listener for operations on data objects.
* @param l the listener
*/
- public synchronized final void removeOperationListener (OperationListener l) {
+ public final synchronized void removeOperationListener (OperationListener l) {
if (listeners != null) {
listeners.remove( OperationListener.class, l);
}
diff --git a/platform/openide.loaders/src/org/openide/loaders/DataNode.java b/platform/openide.loaders/src/org/openide/loaders/DataNode.java
index 6401b45..174704e 100644
--- a/platform/openide.loaders/src/org/openide/loaders/DataNode.java
+++ b/platform/openide.loaders/src/org/openide/loaders/DataNode.java
@@ -1185,7 +1185,7 @@ public class DataNode extends AbstractNode {
private Set<FileObject> obj_files;
- synchronized private void lazyInitialization () {
+ private synchronized void lazyInitialization () {
obj_files = obj.files();
}
diff --git a/platform/openide.loaders/src/org/openide/loaders/DataObjectPool.java b/platform/openide.loaders/src/org/openide/loaders/DataObjectPool.java
index f094237..54cb159 100644
--- a/platform/openide.loaders/src/org/openide/loaders/DataObjectPool.java
+++ b/platform/openide.loaders/src/org/openide/loaders/DataObjectPool.java
@@ -117,7 +117,7 @@ implements ChangeListener {
/** Method to check whether the constructor is allowed.
*/
- final static boolean isConstructorAllowed() {
+ static final boolean isConstructorAllowed() {
return FIND.get() != null;
}
@@ -657,7 +657,7 @@ implements ChangeListener {
}
}
- static private Collection<Item> getTargets(FileEvent fe, boolean checkSiblings) {
+ private static Collection<Item> getTargets(FileEvent fe, boolean checkSiblings) {
FileObject fo = fe.getFile();
// The FileSystem notifying us about the changes should
// not hold any lock so we're safe here
diff --git a/platform/openide.loaders/src/org/openide/loaders/DataTransferSupport.java b/platform/openide.loaders/src/org/openide/loaders/DataTransferSupport.java
index ad1982b..903aff8 100644
--- a/platform/openide.loaders/src/org/openide/loaders/DataTransferSupport.java
+++ b/platform/openide.loaders/src/org/openide/loaders/DataTransferSupport.java
@@ -87,7 +87,7 @@ abstract class DataTransferSupport {
/** Supports paste of multiple DataObject at once.
*/
- static abstract class PasteTypeExt extends PasteType {
+ abstract static class PasteTypeExt extends PasteType {
private static final RequestProcessor RP = new RequestProcessor("Paste Support"); // NOI18N
/** All DataObjects being pasted. */
diff --git a/platform/openide.loaders/src/org/openide/loaders/FileEntry.java b/platform/openide.loaders/src/org/openide/loaders/FileEntry.java
index 65af66a..3ac38c6 100644
--- a/platform/openide.loaders/src/org/openide/loaders/FileEntry.java
+++ b/platform/openide.loaders/src/org/openide/loaders/FileEntry.java
@@ -199,7 +199,7 @@ public class FileEntry extends MultiDataObject.Entry {
* <P>
* Useful for representing useless files.
*/
- public final static class Numb extends MultiDataObject.Entry {
+ public static final class Numb extends MultiDataObject.Entry {
/** generated Serialized Version UID */
static final long serialVersionUID = -6572157492885890612L;
@@ -290,7 +290,7 @@ public class FileEntry extends MultiDataObject.Entry {
* using this entry.
* @since 1.13
*/
- public final static class Folder extends MultiDataObject.Entry {
+ public static final class Folder extends MultiDataObject.Entry {
/** Creates new FolderEntry */
public Folder (MultiDataObject obj, FileObject fo) {
diff --git a/platform/openide.loaders/src/org/openide/loaders/FolderList.java b/platform/openide.loaders/src/org/openide/loaders/FolderList.java
index 2b583de..0a2b814 100644
--- a/platform/openide.loaders/src/org/openide/loaders/FolderList.java
+++ b/platform/openide.loaders/src/org/openide/loaders/FolderList.java
@@ -86,31 +86,31 @@ implements FileChangeListener, DataObject.Container {
* Whenever a new change notification arrives (thru file listener)
* the previous task is canceled (if not running) and new is created.
*/
- transient private volatile RequestProcessor.Task refreshTask;
+ private transient volatile RequestProcessor.Task refreshTask;
/** task that is non-null if a setOrder has been called
*/
- transient private volatile ComparatorTask comparatorTask;
+ private transient volatile ComparatorTask comparatorTask;
/** Primary files in this folder. Maps (FileObject, Reference (DataObject))
*/
- transient private Map<FileObject, Reference<DataObject>> primaryFiles = null;
+ private transient Map<FileObject, Reference<DataObject>> primaryFiles = null;
/** order of primary files (FileObject) */
- transient private List<FileObject> order;
+ private transient List<FileObject> order;
private static final Logger err = Logger.getLogger("org.openide.loaders.FolderList"); // NOI18N
/** property change support */
- transient private PropertyChangeSupport pcs;
+ private transient PropertyChangeSupport pcs;
/**
* If true, this folder has been fully created (though it might
* still be refreshing etc.). Used to avoid e.g. MDO.PROP_FILES
* firing before the folder is ready.
*/
- transient private boolean folderCreated = false;
+ private transient boolean folderCreated = false;
- transient private FileChangeListener weakFCL = FileUtil.weakFileChangeListener(this, null);
+ private transient FileChangeListener weakFCL = FileUtil.weakFileChangeListener(this, null);
static {
// Ensure it is loaded so that WeakListenerImpl does not have to load it later:
diff --git a/platform/openide.loaders/src/org/openide/loaders/InstanceDataObject.java b/platform/openide.loaders/src/org/openide/loaders/InstanceDataObject.java
index 5ee036c..8115c50 100644
--- a/platform/openide.loaders/src/org/openide/loaders/InstanceDataObject.java
+++ b/platform/openide.loaders/src/org/openide/loaders/InstanceDataObject.java
@@ -945,7 +945,7 @@ public class InstanceDataObject extends MultiDataObject implements InstanceCooki
// XXX #27494 Please changes to this field apply also into
// core/naming/src/org/netbeans/core/naming/Utils class.
- private final static int MAX_FILENAME_LENGTH = 50;
+ private static final int MAX_FILENAME_LENGTH = 50;
// XXX #27494 Please changes to this method apply also into
// core/naming/src/org/netbeans/core/naming/Utils class.
@@ -1543,7 +1543,7 @@ public class InstanceDataObject extends MultiDataObject implements InstanceCooki
private InstanceDataObject result = null;
private boolean create;
- private final static Creator me = new Creator ();
+ private static final Creator me = new Creator ();
private Creator() {
@@ -1638,7 +1638,7 @@ public class InstanceDataObject extends MultiDataObject implements InstanceCooki
}
/** path where to find convertor/provider definition */
- private final static String EA_PROVIDER_PATH = "settings.providerPath"; // NOI18N
+ private static final String EA_PROVIDER_PATH = "settings.providerPath"; // NOI18N
private static final String EA_SUBCLASSES = "settings.subclasses"; // NOI18N
/** look up appropriate convertor according to obj */
diff --git a/platform/openide.loaders/src/org/openide/loaders/InstanceNode.java b/platform/openide.loaders/src/org/openide/loaders/InstanceNode.java
index def5137..6fae892 100644
--- a/platform/openide.loaders/src/org/openide/loaders/InstanceNode.java
+++ b/platform/openide.loaders/src/org/openide/loaders/InstanceNode.java
@@ -955,7 +955,7 @@ final class InstanceNode extends DataNode implements Runnable {
} // end of I
/** Derived from BeanChildren and allow replace beancontext. */
- private final static class InstanceChildren extends Children.Keys implements PropertyChangeListener {
+ private static final class InstanceChildren extends Children.Keys implements PropertyChangeListener {
java.lang.ref.WeakReference<PropertyChangeListener> dobjListener;
InstanceDataObject dobj;
Object bean;
diff --git a/platform/openide.loaders/src/org/openide/loaders/MultiDataObject.java b/platform/openide.loaders/src/org/openide/loaders/MultiDataObject.java
index 6059055..d499e39 100644
--- a/platform/openide.loaders/src/org/openide/loaders/MultiDataObject.java
+++ b/platform/openide.loaders/src/org/openide/loaders/MultiDataObject.java
@@ -1229,7 +1229,7 @@ public class MultiDataObject extends DataObject {
}
}
- final static class Pair {
+ static final class Pair {
MultiDataObject.Entry entry;
FileObject file;
diff --git a/platform/openide.loaders/src/org/openide/text/DataEditorSupport.java b/platform/openide.loaders/src/org/openide/text/DataEditorSupport.java
index 5631cce..adbd1b6 100644
--- a/platform/openide.loaders/src/org/openide/text/DataEditorSupport.java
+++ b/platform/openide.loaders/src/org/openide/text/DataEditorSupport.java
@@ -731,7 +731,7 @@ public class DataEditorSupport extends CloneableEditorSupport {
/** Environment that connects the data object and the CloneableEditorSupport.
*/
- public static abstract class Env extends OpenSupport.Env implements CloneableEditorSupport.Env {
+ public abstract static class Env extends OpenSupport.Env implements CloneableEditorSupport.Env {
/** generated Serialized Version UID */
private static final long serialVersionUID = -2945098431098324441L;
@@ -748,9 +748,9 @@ public class DataEditorSupport extends CloneableEditorSupport {
/** did we warned about the size of the file?
*/
- private transient static Set<FileObject> warnedFiles = new HashSet<FileObject>();
+ private static transient Set<FileObject> warnedFiles = new HashSet<FileObject>();
- private transient static boolean sentBigFileInfo;
+ private static transient boolean sentBigFileInfo;
/** Atomic action used to ignore fileChange event from FileObject.refresh */
private transient FileSystem.AtomicAction action = null;
@@ -839,7 +839,7 @@ public class DataEditorSupport extends CloneableEditorSupport {
/**
* default threshold for big file to warn user (default is 1MB)
*/
- private transient final long BIG_FILE_THRESHOLD_MB = Integer.getInteger("org.openide.text.big.file.size", 1) * 1024 * 1024;
+ private final transient long BIG_FILE_THRESHOLD_MB = Integer.getInteger("org.openide.text.big.file.size", 1) * 1024 * 1024;
/** Obtains the input stream.
* @exception IOException if an I/O error occurs
diff --git a/platform/openide.loaders/test/unit/src/org/netbeans/modules/openide/loaders/AskEditorQuestionsTest.java b/platform/openide.loaders/test/unit/src/org/netbeans/modules/openide/loaders/AskEditorQuestionsTest.java
index 9a87b51..30e664f 100644
--- a/platform/openide.loaders/test/unit/src/org/netbeans/modules/openide/loaders/AskEditorQuestionsTest.java
+++ b/platform/openide.loaders/test/unit/src/org/netbeans/modules/openide/loaders/AskEditorQuestionsTest.java
@@ -104,7 +104,7 @@ public class AskEditorQuestionsTest {
}
}
- public final static class MockDialogDisplayer extends DialogDisplayer {
+ public static final class MockDialogDisplayer extends DialogDisplayer {
public MockDialogDisplayer() {
}
diff --git a/platform/openide.loaders/test/unit/src/org/openide/loaders/TestUtilHid.java b/platform/openide.loaders/test/unit/src/org/openide/loaders/TestUtilHid.java
index aa28b29..27a01cd 100644
--- a/platform/openide.loaders/test/unit/src/org/openide/loaders/TestUtilHid.java
+++ b/platform/openide.loaders/test/unit/src/org/openide/loaders/TestUtilHid.java
@@ -57,7 +57,7 @@ public class TestUtilHid {
return lfs;
}
- public final static void destroyLocalFileSystem (String testName) throws IOException {
+ public static final void destroyLocalFileSystem (String testName) throws IOException {
}
static class StatusFileSystem extends LocalFileSystem {
diff --git a/platform/openide.loaders/test/unit/src/org/openide/text/DataEditorReadOnlyTest.java b/platform/openide.loaders/test/unit/src/org/openide/text/DataEditorReadOnlyTest.java
index 3384196..40a3420 100644
--- a/platform/openide.loaders/test/unit/src/org/openide/text/DataEditorReadOnlyTest.java
+++ b/platform/openide.loaders/test/unit/src/org/openide/text/DataEditorReadOnlyTest.java
@@ -216,7 +216,7 @@ public class DataEditorReadOnlyTest extends NbTestCase {
return this.file;
}
- public synchronized static FileEncodingQueryImpl getDefault () {
+ public static synchronized FileEncodingQueryImpl getDefault () {
if (instance == null) {
instance = new FileEncodingQueryImpl ();
}
diff --git a/platform/openide.loaders/test/unit/src/org/openide/text/DataEditorSupportTest.java b/platform/openide.loaders/test/unit/src/org/openide/text/DataEditorSupportTest.java
index 8445f07..1cdae57 100644
--- a/platform/openide.loaders/test/unit/src/org/openide/text/DataEditorSupportTest.java
+++ b/platform/openide.loaders/test/unit/src/org/openide/text/DataEditorSupportTest.java
@@ -664,7 +664,7 @@ public class DataEditorSupportTest extends NbTestCase {
return this.file;
}
- public synchronized static FileEncodingQueryImpl getDefault () {
+ public static synchronized FileEncodingQueryImpl getDefault () {
if (instance == null) {
instance = new FileEncodingQueryImpl ();
}
diff --git a/platform/openide.loaders/test/unit/src/org/openide/text/FileEncodingQueryDataEditorSupportTest.java b/platform/openide.loaders/test/unit/src/org/openide/text/FileEncodingQueryDataEditorSupportTest.java
index 4b0cf64..9122434 100644
--- a/platform/openide.loaders/test/unit/src/org/openide/text/FileEncodingQueryDataEditorSupportTest.java
+++ b/platform/openide.loaders/test/unit/src/org/openide/text/FileEncodingQueryDataEditorSupportTest.java
@@ -379,7 +379,7 @@ public class FileEncodingQueryDataEditorSupportTest extends NbTestCase {
return this.file;
}
- public synchronized static FileEncodingQueryImpl getDefault () {
+ public static synchronized FileEncodingQueryImpl getDefault () {
if (instance == null) {
instance = new FileEncodingQueryImpl ();
}
diff --git a/platform/openide.modules/src/org/openide/modules/Dependency.java b/platform/openide.modules/src/org/openide/modules/Dependency.java
index d10da62..f30b589 100644
--- a/platform/openide.modules/src/org/openide/modules/Dependency.java
+++ b/platform/openide.modules/src/org/openide/modules/Dependency.java
@@ -39,32 +39,32 @@ public final class Dependency implements Serializable {
static final long serialVersionUID = 9548259318L;
/** Dependency on another module. */
- public final static int TYPE_MODULE = 1;
+ public static final int TYPE_MODULE = 1;
/** Dependency on a package. */
- public final static int TYPE_PACKAGE = 2;
+ public static final int TYPE_PACKAGE = 2;
/** Dependency on Java. */
- public final static int TYPE_JAVA = 3;
+ public static final int TYPE_JAVA = 3;
/**
* Dependency on the IDE.
* @deprecated This type of dependency should no longer be used.
*/
@Deprecated
- public final static int TYPE_IDE = 4;
+ public static final int TYPE_IDE = 4;
/** Dependency on a token.
* @see ModuleInfo#getProvides
* @since 2.3
*/
- public final static int TYPE_REQUIRES = 5;
+ public static final int TYPE_REQUIRES = 5;
/** Dependency on a token, but without need to have token provider be initialised sooner.
* @see ModuleInfo#getProvides
* @since 7.1
*/
- public final static int TYPE_NEEDS = 6;
+ public static final int TYPE_NEEDS = 6;
/** An advisory dependency on a token. If at least one provider of such token is
* available, it is enabled. If there is no such provider, then nothing is done
@@ -73,16 +73,16 @@ public final class Dependency implements Serializable {
* @see ModuleInfo#getProvides
* @since 7.1
*/
- public final static int TYPE_RECOMMENDS = 7;
+ public static final int TYPE_RECOMMENDS = 7;
/** Comparison by specification version. */
- public final static int COMPARE_SPEC = 1;
+ public static final int COMPARE_SPEC = 1;
/** Comparison by implementation version. */
- public final static int COMPARE_IMPL = 2;
+ public static final int COMPARE_IMPL = 2;
/** No comparison, just require the dependency to be present. */
- public final static int COMPARE_ANY = 3;
+ public static final int COMPARE_ANY = 3;
/** @deprecated request dependencies on direct modules */
@Deprecated
diff --git a/platform/openide.nodes/src/org/netbeans/modules/openide/nodes/NodesRegistrationSupport.java b/platform/openide.nodes/src/org/netbeans/modules/openide/nodes/NodesRegistrationSupport.java
index a612197..4864d10 100644
--- a/platform/openide.nodes/src/org/netbeans/modules/openide/nodes/NodesRegistrationSupport.java
+++ b/platform/openide.nodes/src/org/netbeans/modules/openide/nodes/NodesRegistrationSupport.java
@@ -237,7 +237,7 @@ public final class NodesRegistrationSupport {
}
}
- private static abstract class AbstractRegistrator implements LookupListener {
+ private abstract static class AbstractRegistrator implements LookupListener {
Result lookupResult;
private final Class cls;
diff --git a/platform/openide.nodes/src/org/openide/nodes/ChildFactory.java b/platform/openide.nodes/src/org/openide/nodes/ChildFactory.java
index 360a3cd..6d81910 100644
--- a/platform/openide.nodes/src/org/openide/nodes/ChildFactory.java
+++ b/platform/openide.nodes/src/org/openide/nodes/ChildFactory.java
@@ -225,7 +225,7 @@ public abstract class ChildFactory <T> {
* @param <T> The key type for this child factory
* @since org.openide.nodes 7.7
*/
- public static abstract class Detachable<T> extends ChildFactory<T>{
+ public abstract static class Detachable<T> extends ChildFactory<T>{
/**
* Called immediately before the first call to createKeys(). Override
* to set up listening for changes, allocating expensive-to-create
diff --git a/platform/openide.nodes/src/org/openide/nodes/Children.java b/platform/openide.nodes/src/org/openide/nodes/Children.java
index 69de0fc..a59cbe7 100644
--- a/platform/openide.nodes/src/org/openide/nodes/Children.java
+++ b/platform/openide.nodes/src/org/openide/nodes/Children.java
@@ -1070,7 +1070,7 @@ public abstract class Children extends Object {
/** Entry mapping one key to the node.
*/
- final static class ME extends Object implements Entry {
+ static final class ME extends Object implements Entry {
/** key */
public Object key;
@@ -1312,7 +1312,7 @@ public abstract class Children extends Object {
*
* @param T the type of the key
*/
- public static abstract class Keys<T> extends Children.Array {
+ public abstract static class Keys<T> extends Children.Array {
/** the last runnable (created in method setKeys) for each children object.
*/
private static java.util.Map<Keys<?>,Runnable> lastRuns = new HashMap<Keys<?>,Runnable>(11);
@@ -1679,7 +1679,7 @@ public abstract class Children extends Object {
* added to the collection and if the same object is added
* more than once it is indexed by a number.
*/
- private static abstract class Dupl<T> implements Cloneable, Entry {
+ private abstract static class Dupl<T> implements Cloneable, Entry {
/** the key either real value or Dupl (Dupl (Dupl (... value ...)))*/
protected Object key;
diff --git a/platform/openide.nodes/src/org/openide/nodes/CookieSetLkp.java b/platform/openide.nodes/src/org/openide/nodes/CookieSetLkp.java
index c589b17..970ae18 100644
--- a/platform/openide.nodes/src/org/openide/nodes/CookieSetLkp.java
+++ b/platform/openide.nodes/src/org/openide/nodes/CookieSetLkp.java
@@ -124,7 +124,7 @@ final class CookieSetLkp extends AbstractLookup {
/** Instance of one item representing an object.
*/
- final static class SimpleItem<T> extends Pair<T> {
+ static final class SimpleItem<T> extends Pair<T> {
private T obj;
/** Create an item.
@@ -203,7 +203,7 @@ final class CookieSetLkp extends AbstractLookup {
/** Instance of one item registered in the map.
*/
- final static class ConvertingItem<T,R> extends Pair<R> {
+ static final class ConvertingItem<T,R> extends Pair<R> {
/** registered object */
private T obj;
diff --git a/platform/openide.nodes/src/org/openide/nodes/Index.java b/platform/openide.nodes/src/org/openide/nodes/Index.java
index 7a4757d..956949d 100644
--- a/platform/openide.nodes/src/org/openide/nodes/Index.java
+++ b/platform/openide.nodes/src/org/openide/nodes/Index.java
@@ -104,7 +104,7 @@ public interface Index extends Node.Cookie {
/** A support class implementing some methods of the <code>Index</code>
* cookie.
*/
- public static abstract class Support implements Index {
+ public abstract static class Support implements Index {
/** Registered listeners */
private HashSet<ChangeListener> listeners;
diff --git a/platform/openide.nodes/src/org/openide/nodes/Node.java b/platform/openide.nodes/src/org/openide/nodes/Node.java
index c78889e..0fbfd6e 100644
--- a/platform/openide.nodes/src/org/openide/nodes/Node.java
+++ b/platform/openide.nodes/src/org/openide/nodes/Node.java
@@ -1412,7 +1412,7 @@ public abstract class Node extends FeatureDescriptor implements Lookup.Provider,
* and value of type <code>String</code> giving a help ID.
* Normally this is unnecessary as help for the whole {@link Node} will be used by default.
*/
- public static abstract class PropertySet extends FeatureDescriptor {
+ public abstract static class PropertySet extends FeatureDescriptor {
/** Default constructor. */
public PropertySet() {
}
@@ -1491,7 +1491,7 @@ public abstract class Node extends FeatureDescriptor implements Lookup.Provider,
* {@link Node#firePropertyChange firing property changes}.
* @param T the type of bean
*/
- public static abstract class Property<T> extends FeatureDescriptor {
+ public abstract static class Property<T> extends FeatureDescriptor {
/**
* Contains classNames of incorrectly implemented properties which have
* been already logged by an ErrorManager.<br>
@@ -1690,7 +1690,7 @@ public abstract class Node extends FeatureDescriptor implements Lookup.Provider,
* @param T type of the whole property
* @param E type of one element
*/
- public static abstract class IndexedProperty<T,E> extends Node.Property<T> {
+ public abstract static class IndexedProperty<T,E> extends Node.Property<T> {
/** type of element that this property works with */
private Class<E> elementType;
diff --git a/platform/openide.nodes/src/org/openide/nodes/PropertySupport.java b/platform/openide.nodes/src/org/openide/nodes/PropertySupport.java
index 8890dad..3b5d42b 100644
--- a/platform/openide.nodes/src/org/openide/nodes/PropertySupport.java
+++ b/platform/openide.nodes/src/org/openide/nodes/PropertySupport.java
@@ -348,7 +348,7 @@ public abstract class PropertySupport<T> extends Node.Property<T> {
* Subclasses should implement
* {@link #getValue} and {@link #setValue}.
*/
- public static abstract class ReadWrite<T> extends PropertySupport<T> {
+ public abstract static class ReadWrite<T> extends PropertySupport<T> {
/** Construct a new support.
* @param name the name of the property
* @param type the class type of the property
@@ -363,7 +363,7 @@ public abstract class PropertySupport<T> extends Node.Property<T> {
/** A simple read-only property.
* Subclasses should implement {@link #getValue}.
*/
- public static abstract class ReadOnly<T> extends PropertySupport<T> {
+ public abstract static class ReadOnly<T> extends PropertySupport<T> {
/** Construct a new support.
* @param name the name of the property
* @param type the class type of the property
@@ -390,7 +390,7 @@ public abstract class PropertySupport<T> extends Node.Property<T> {
/** A simple write-only property.
* Subclasses should implement {@link #setValue}.
*/
- public static abstract class WriteOnly<T> extends PropertySupport<T> {
+ public abstract static class WriteOnly<T> extends PropertySupport<T> {
/** Construct a new support.
* @param name the name of the property
* @param type the class type of the property
diff --git a/platform/openide.nodes/src/org/openide/nodes/Sheet.java b/platform/openide.nodes/src/org/openide/nodes/Sheet.java
index 15a7635..730dd6f 100644
--- a/platform/openide.nodes/src/org/openide/nodes/Sheet.java
+++ b/platform/openide.nodes/src/org/openide/nodes/Sheet.java
@@ -278,7 +278,7 @@ public final class Sheet extends Object {
/** Get all properties in this set.
* @return the properties
*/
- synchronized public Node.Property<?>[] getProperties() {
+ public synchronized Node.Property<?>[] getProperties() {
if (array == null) {
array = new Node.Property<?>[props.size()];
props.toArray(array);
diff --git a/platform/openide.nodes/src/org/openide/util/actions/CookieAction.java b/platform/openide.nodes/src/org/openide/util/actions/CookieAction.java
index 45f81fd..d617745 100644
--- a/platform/openide.nodes/src/org/openide/util/actions/CookieAction.java
+++ b/platform/openide.nodes/src/org/openide/util/actions/CookieAction.java
@@ -302,7 +302,7 @@ public abstract class CookieAction extends NodeAction {
* extract the nodes it operates on from it. Otherwise it delegates to the
* regular NodeAction.
*/
- final static class CookieDelegateAction extends org.openide.util.actions.NodeAction.DelegateAction
+ static final class CookieDelegateAction extends org.openide.util.actions.NodeAction.DelegateAction
implements org.openide.nodes.NodeListener, Runnable {
/** our weak listener */
private org.openide.nodes.NodeListener listener;
diff --git a/platform/openide.text/src/org/openide/text/Annotatable.java b/platform/openide.text/src/org/openide/text/Annotatable.java
index 8541edb..78f2792 100644
--- a/platform/openide.text/src/org/openide/text/Annotatable.java
+++ b/platform/openide.text/src/org/openide/text/Annotatable.java
@@ -93,25 +93,25 @@ public abstract class Annotatable extends Object {
/** Add listeners on changes of annotatable properties
* @param l change listener*/
- final public void addPropertyChangeListener(java.beans.PropertyChangeListener l) {
+ public final void addPropertyChangeListener(java.beans.PropertyChangeListener l) {
propertyChangeSupport.addPropertyChangeListener(l);
}
/** Remove listeners on changes of annotatable properties
* @param l change listener*/
- final public void removePropertyChangeListener(java.beans.PropertyChangeListener l) {
+ public final void removePropertyChangeListener(java.beans.PropertyChangeListener l) {
propertyChangeSupport.removePropertyChangeListener(l);
}
/** Fire property change to registered listeners. */
- final protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
+ protected final void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
propertyChangeSupport.firePropertyChange(propertyName, oldValue, newValue);
}
/** Whether this Annotatable object was removed or not.
* @return whether the Annotatable object was removed or not
*/
- final public boolean isDeleted() {
+ public final boolean isDeleted() {
return deleted;
}
@@ -122,7 +122,7 @@ public abstract class Annotatable extends Object {
* what means that document is closed.
* @since 1.35
*/
- abstract public String getText();
+ public abstract String getText();
/** Setter for property deleted.
* @param deleted New value of property deleted.
@@ -139,7 +139,7 @@ public abstract class Annotatable extends Object {
* already attached some annotations or not.
* @return count of attached annotations
*/
- final public int getAnnotationCount() {
+ public final int getAnnotationCount() {
return attachedAnnotations.size();
}
}
diff --git a/platform/openide.text/src/org/openide/text/Annotation.java b/platform/openide.text/src/org/openide/text/Annotation.java
index 15496e5..58d91ce 100644
--- a/platform/openide.text/src/org/openide/text/Annotation.java
+++ b/platform/openide.text/src/org/openide/text/Annotation.java
@@ -128,24 +128,24 @@ public abstract class Annotation extends Object {
/** Gets annotatable object to which this annotation is attached.
* @return null if annotation is not attached or reference to annotatable object.
* @since 1.27 */
- final public Annotatable getAttachedAnnotatable() {
+ public final Annotatable getAttachedAnnotatable() {
return attached;
}
/** Add listeners on changes of annotation properties
* @param l change listener*/
- final public void addPropertyChangeListener(java.beans.PropertyChangeListener l) {
+ public final void addPropertyChangeListener(java.beans.PropertyChangeListener l) {
support.addPropertyChangeListener(l);
}
/** Remove listeners on changes of annotation properties
* @param l change listener*/
- final public void removePropertyChangeListener(java.beans.PropertyChangeListener l) {
+ public final void removePropertyChangeListener(java.beans.PropertyChangeListener l) {
support.removePropertyChangeListener(l);
}
/** Fire property change to registered listeners. */
- final protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
+ protected final void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
support.firePropertyChange(propertyName, oldValue, newValue);
}
@@ -154,7 +154,7 @@ public abstract class Annotation extends Object {
* property on which editors must listen and do the fronting of the annotation. Whether the annotation
* is visible in editor or not is not guaranteed by this method - use Line.show instead.
* @since 1.27 */
- final public void moveToFront() {
+ public final void moveToFront() {
support.firePropertyChange(PROP_MOVE_TO_FRONT, null, null);
}
diff --git a/platform/openide.text/src/org/openide/text/CloneableEditorInitializer.java b/platform/openide.text/src/org/openide/text/CloneableEditorInitializer.java
index 558ec36..df6c362 100644
--- a/platform/openide.text/src/org/openide/text/CloneableEditorInitializer.java
+++ b/platform/openide.text/src/org/openide/text/CloneableEditorInitializer.java
@@ -67,7 +67,7 @@ final class CloneableEditorInitializer implements Runnable {
private static final RequestProcessor RP = new RequestProcessor("org.openide.text Editor Initialization");
- final static Logger TIMER = Logger.getLogger("TIMER"); // NOI18N
+ static final Logger TIMER = Logger.getLogger("TIMER"); // NOI18N
/**
* Flag indicating if modal dialog for handling UQE is displayed. If it is
diff --git a/platform/openide.text/src/org/openide/text/DocumentLine.java b/platform/openide.text/src/org/openide/text/DocumentLine.java
index a85cf4a..3a083f1 100644
--- a/platform/openide.text/src/org/openide/text/DocumentLine.java
+++ b/platform/openide.text/src/org/openide/text/DocumentLine.java
@@ -918,7 +918,7 @@ public abstract class DocumentLine extends Line {
* ways to obtain a line set for documents following
* NetBeans conventions.
*/
- public static abstract class Set extends Line.Set {
+ public abstract static class Set extends Line.Set {
/** listener on document changes, accessed from LazyLines */
final LineListener listener;
diff --git a/platform/openide.text/src/org/openide/text/IndentEngine.java b/platform/openide.text/src/org/openide/text/IndentEngine.java
index 466d562..1e9a4bd 100644
--- a/platform/openide.text/src/org/openide/text/IndentEngine.java
+++ b/platform/openide.text/src/org/openide/text/IndentEngine.java
@@ -100,7 +100,7 @@ public abstract class IndentEngine extends org.openide.ServiceType {
* @deprecated IndentEngine now is a ServiceType
*/
@Deprecated
- public synchronized static void register(String mime, IndentEngine eng) {
+ public static synchronized void register(String mime, IndentEngine eng) {
map.put(mime, eng);
}
@@ -114,7 +114,7 @@ public abstract class IndentEngine extends org.openide.ServiceType {
/** Finds engine associated with given mime type.
* If no engine is associated returns default one.
*/
- public synchronized static IndentEngine find(String mime) {
+ public static synchronized IndentEngine find(String mime) {
Enumeration<? extends IndentEngine> en = indentEngines();
while (en.hasMoreElements()) {
diff --git a/platform/openide.text/src/org/openide/text/Line.java b/platform/openide.text/src/org/openide/text/Line.java
index 9810775..b2dba23 100644
--- a/platform/openide.text/src/org/openide/text/Line.java
+++ b/platform/openide.text/src/org/openide/text/Line.java
@@ -56,7 +56,7 @@ public abstract class Line extends Annotatable implements Serializable {
* and {@link ShowVisibilityType#NONE} instead.
*/
@Deprecated
- public final static int SHOW_TRY_SHOW = 0;
+ public static final int SHOW_TRY_SHOW = 0;
/** Opens the editor if necessary and shows the line.
* @see #show(int) <code>show</code>
@@ -64,7 +64,7 @@ public abstract class Line extends Annotatable implements Serializable {
* and {@link ShowVisibilityType#NONE} instead.
*/
@Deprecated
- public final static int SHOW_SHOW = 1;
+ public static final int SHOW_SHOW = 1;
/** Opens the editor if necessary, shows the line, and takes the focus.
* @see #show(int) <code>show</code>
@@ -72,7 +72,7 @@ public abstract class Line extends Annotatable implements Serializable {
* and {@link ShowVisibilityType#FOCUS} instead.
*/
@Deprecated
- public final static int SHOW_GOTO = 2;
+ public static final int SHOW_GOTO = 2;
/** Same as SHOW_GOTO except that the Window Manager attempts to front the
* editor window (i.e. make it the top most window).
@@ -83,7 +83,7 @@ public abstract class Line extends Annotatable implements Serializable {
* and {@link ShowVisibilityType#FRONT} instead.
*/
@Deprecated
- public final static int SHOW_TOFRONT = 3;
+ public static final int SHOW_TOFRONT = 3;
/** Takes the focus in case the editor is already opened and shows the line.
* Replaces (closes) the last editor opened using SHOW_REUSE in case
@@ -96,7 +96,7 @@ public abstract class Line extends Annotatable implements Serializable {
* and {@link ShowVisibilityType#FOCUS} instead.
*/
@Deprecated
- public final static int SHOW_REUSE = 4;
+ public static final int SHOW_REUSE = 4;
/** Focuses or opens given editor, marking it as reusable editor if it
* was not opened before. Similar to {@link #SHOW_REUSE} but ignores
@@ -107,7 +107,7 @@ public abstract class Line extends Annotatable implements Serializable {
* and {@link ShowVisibilityType#FOCUS} instead.
*/
@Deprecated
- public final static int SHOW_REUSE_NEW = 5;
+ public static final int SHOW_REUSE_NEW = 5;
/** ShowOpenType and ShowVisibilityType is replacement for constants SHOW_TRY_SHOW, SHOW_SHOW,
* SHOW_GOTO, SHOW_TOFRONT, SHOW_REUSE, SHOW_REUSE_NEW. It is to provide full control
@@ -155,7 +155,7 @@ public abstract class Line extends Annotatable implements Serializable {
};
/** Instance of null implementation of Line.Part */
- static final private Line.Part nullPart = new Line.NullPart();
+ private static final Line.Part nullPart = new Line.NullPart();
/** context of this line */
private org.openide.util.Lookup dataObject;
@@ -383,7 +383,7 @@ public abstract class Line extends Annotatable implements Serializable {
* part never cross the end of the line.
* @since 1.20
*/
- public static abstract class Part extends Annotatable {
+ public abstract static class Part extends Annotatable {
/** Property name for the line attribute */
public static final String PROP_LINE = "line"; // NOI18N
@@ -412,7 +412,7 @@ public abstract class Line extends Annotatable implements Serializable {
}
/** Implementation of Line.Part which is presenting empty part */
- static final private class NullPart extends Part {
+ private static final class NullPart extends Part {
NullPart() {
}
@@ -445,7 +445,7 @@ public abstract class Line extends Annotatable implements Serializable {
* and the compiler module asks for the 25th line (because the compiler reports an error at line 25 in the saved file) via the line set, the 26th line
* of the current document will be marked as being in error.
*/
- public static abstract class Set extends Object {
+ public abstract static class Set extends Object {
/** date when the object has been created */
private Date date;
diff --git a/platform/openide.text/src/org/openide/text/PositionRef.java b/platform/openide.text/src/org/openide/text/PositionRef.java
index e9e8afc..0208c65 100644
--- a/platform/openide.text/src/org/openide/text/PositionRef.java
+++ b/platform/openide.text/src/org/openide/text/PositionRef.java
@@ -50,7 +50,7 @@ public final class PositionRef extends Object implements Serializable, Position
private static final Logger LOG = Logger.getLogger(PositionRef.class.getName());
/** Which type of position is currently holded - int X Position */
- transient private Manager.Kind kind;
+ private transient Manager.Kind kind;
/** Manager for this position */
private Manager manager;
@@ -219,10 +219,10 @@ public final class PositionRef extends Object implements Serializable, Position
private static final RequestProcessor RP = new RequestProcessor(PositionRef.class);
/** support for the editor */
- transient private CloneableEditorSupport support;
+ private transient CloneableEditorSupport support;
/** the document for this manager or null if the manager is not in memory */
- transient private Reference<StyledDocument> doc;
+ private transient Reference<StyledDocument> doc;
/**
* Whether positions were turned into in-memory representation.
@@ -437,7 +437,7 @@ public final class PositionRef extends Object implements Serializable, Position
// End of class ChainItem.
/** Base kind with all methods */
- private static abstract class Kind extends Object {
+ private abstract static class Kind extends Object {
protected final PositionRef.Manager mgr;
Kind(PositionRef.Manager mgr) {
diff --git a/platform/openide.text/src/org/openide/text/QuietEditorPane.java b/platform/openide.text/src/org/openide/text/QuietEditorPane.java
index fc6ee08..103d2cb 100644
--- a/platform/openide.text/src/org/openide/text/QuietEditorPane.java
+++ b/platform/openide.text/src/org/openide/text/QuietEditorPane.java
@@ -80,9 +80,9 @@ final class QuietEditorPane extends JEditorPane {
}
}
- final static int FIRE = 0x1;
- final static int PAINT = 0x2;
- final static int ALL = FIRE | PAINT;
+ static final int FIRE = 0x1;
+ static final int PAINT = 0x2;
+ static final int ALL = FIRE | PAINT;
// #21120. Caret was null while serializing CloneableEditor.
diff --git a/platform/openide.text/test/unit/src/org/netbeans/modules/openide/text/AskEditorQuestionsTest.java b/platform/openide.text/test/unit/src/org/netbeans/modules/openide/text/AskEditorQuestionsTest.java
index bd6d72b..4bf2030 100644
--- a/platform/openide.text/test/unit/src/org/netbeans/modules/openide/text/AskEditorQuestionsTest.java
+++ b/platform/openide.text/test/unit/src/org/netbeans/modules/openide/text/AskEditorQuestionsTest.java
@@ -72,7 +72,7 @@ public class AskEditorQuestionsTest {
}
}
- public final static class MockDialogDisplayer extends DialogDisplayer {
+ public static final class MockDialogDisplayer extends DialogDisplayer {
public MockDialogDisplayer() {
}
diff --git a/platform/openide.text/test/unit/src/org/openide/text/Deadlock207571Test.java b/platform/openide.text/test/unit/src/org/openide/text/Deadlock207571Test.java
index a2197d4..112503c 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/Deadlock207571Test.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/Deadlock207571Test.java
@@ -69,7 +69,7 @@ implements CloneableEditorSupport.Env {
/** if not null contains message why this document cannot be modified */
private transient String cannotBeModified;
private transient Date date = new Date ();
- private transient final PropertyChangeSupport pcl;
+ private final transient PropertyChangeSupport pcl;
private transient VetoableChangeListener vetoL;
private transient volatile boolean inReloadBeforeSupportLock;
diff --git a/platform/openide.text/test/unit/src/org/openide/text/EditToBeUndoneRedoneTest.java b/platform/openide.text/test/unit/src/org/openide/text/EditToBeUndoneRedoneTest.java
index 3d263ac..507d0b3 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/EditToBeUndoneRedoneTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/EditToBeUndoneRedoneTest.java
@@ -72,7 +72,7 @@ implements CloneableEditorSupport.Env {
/** if not null contains message why this document cannot be modified */
private transient String cannotBeModified;
private transient Date date = new Date ();
- private transient final PropertyChangeSupport pcl;
+ private final transient PropertyChangeSupport pcl;
private transient VetoableChangeListener vetoL;
private transient volatile boolean inReloadBeforeSupportLock;
diff --git a/platform/openide.text/test/unit/src/org/openide/text/LoadMultipleDocsTest.java b/platform/openide.text/test/unit/src/org/openide/text/LoadMultipleDocsTest.java
index 39dd021..c6a6e59 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/LoadMultipleDocsTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/LoadMultipleDocsTest.java
@@ -193,7 +193,7 @@ public class LoadMultipleDocsTest extends NbTestCase {
}
/** Implementation of the CES */
- private final static class CES extends CloneableEditorSupport {
+ private static final class CES extends CloneableEditorSupport {
public CES (Env env, org.openide.util.Lookup l) {
super (env, l);
}
diff --git a/platform/openide.text/test/unit/src/org/openide/text/WrapEditorComponentTest.java b/platform/openide.text/test/unit/src/org/openide/text/WrapEditorComponentTest.java
index d867a01..c58efaf 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/WrapEditorComponentTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/WrapEditorComponentTest.java
@@ -231,7 +231,7 @@ implements CloneableEditorSupport.Env {
}
}
- private final static class NbLikeEditorKitWithCustomEditor extends NbLikeEditorKit {
+ private static final class NbLikeEditorKitWithCustomEditor extends NbLikeEditorKit {
public Document createDefaultDocument() {
return new CustomDoc();
diff --git a/platform/openide.util.lookup/src/org/openide/util/Lookup.java b/platform/openide.util.lookup/src/org/openide/util/Lookup.java
index 17be0d9..018bc84 100644
--- a/platform/openide.util.lookup/src/org/openide/util/Lookup.java
+++ b/platform/openide.util.lookup/src/org/openide/util/Lookup.java
@@ -444,7 +444,7 @@ public abstract class Lookup {
* Also permits listening to changes in the result.
* Result can contain duplicate items.
*/
- public static abstract class Result<T> extends Object {
+ public abstract static class Result<T> extends Object {
/** Registers a listener that is invoked when there is a possible
* change in this result.
* <p>
@@ -528,7 +528,7 @@ public abstract class Lookup {
*
* @since 1.25
*/
- public static abstract class Item<T> extends Object {
+ public abstract static class Item<T> extends Object {
/** Get the instance itself.
* @return the instance or null if the instance cannot be created
*/
diff --git a/platform/openide.util.lookup/src/org/openide/util/lookup/AbstractLookup.java b/platform/openide.util.lookup/src/org/openide/util/lookup/AbstractLookup.java
index 6ea8ead..10a7847 100644
--- a/platform/openide.util.lookup/src/org/openide/util/lookup/AbstractLookup.java
+++ b/platform/openide.util.lookup/src/org/openide/util/lookup/AbstractLookup.java
@@ -808,7 +808,7 @@ public class AbstractLookup extends Lookup implements Serializable {
/** Extension to the default lookup item that offers additional information
* for the data structures use in AbstractLookup
*/
- public static abstract class Pair<T> extends Lookup.Item<T> implements Serializable {
+ public abstract static class Pair<T> extends Lookup.Item<T> implements Serializable {
private static final long serialVersionUID = 1L;
/** possition of this item in the lookup, manipulated in addPair, removePair, setPairs methods */
@@ -1305,7 +1305,7 @@ public class AbstractLookup extends Lookup implements Serializable {
/** Just a holder for index & modified values.
*/
- final static class Info extends Object {
+ static final class Info extends Object {
public int index;
public Object transaction;
diff --git a/platform/openide.util.lookup/src/org/openide/util/lookup/InstanceContent.java b/platform/openide.util.lookup/src/org/openide/util/lookup/InstanceContent.java
index 638d481..28fbfd5 100644
--- a/platform/openide.util.lookup/src/org/openide/util/lookup/InstanceContent.java
+++ b/platform/openide.util.lookup/src/org/openide/util/lookup/InstanceContent.java
@@ -168,7 +168,7 @@ public final class InstanceContent extends AbstractLookup.Content {
/** Instance of one item representing an object.
*/
- final static class SimpleItem<T> extends Pair<T> {
+ static final class SimpleItem<T> extends Pair<T> {
private T obj;
/** Create an item.
@@ -249,7 +249,7 @@ public final class InstanceContent extends AbstractLookup.Content {
/** Instance of one item registered in the map.
*/
- final static class ConvertingItem<T,R> extends Pair<R> {
+ static final class ConvertingItem<T,R> extends Pair<R> {
/** registered object */
private T obj;
diff --git a/platform/openide.util.lookup/src/org/openide/util/lookup/ProxyLookup.java b/platform/openide.util.lookup/src/org/openide/util/lookup/ProxyLookup.java
index 3d1f394..2779fdb 100644
--- a/platform/openide.util.lookup/src/org/openide/util/lookup/ProxyLookup.java
+++ b/platform/openide.util.lookup/src/org/openide/util/lookup/ProxyLookup.java
@@ -907,7 +907,7 @@ public class ProxyLookup extends Lookup {
}
} // end of WeakResult
- static abstract class ImmutableInternalData extends Object {
+ abstract static class ImmutableInternalData extends Object {
static final ImmutableInternalData EMPTY = new EmptyInternalData();
static final Lookup[] EMPTY_ARR = new Lookup[0];
@@ -1371,7 +1371,7 @@ public class ProxyLookup extends Lookup {
}
} // end of LazyCollection
- private final static class LazyList extends LazyCollection implements List {
+ private static final class LazyList extends LazyCollection implements List {
public LazyList(R data, Object[] cc, int indexToCache, boolean callBeforeLookup, Lookup.Result[] arr) {
super(data, cc, indexToCache, callBeforeLookup, arr);
diff --git a/platform/openide.util.lookup/test/unit/src/org/openide/util/lookup/AbstractLookupArrayStorageTest.java b/platform/openide.util.lookup/test/unit/src/org/openide/util/lookup/AbstractLookupArrayStorageTest.java
index 124af3c..894b322 100644
--- a/platform/openide.util.lookup/test/unit/src/org/openide/util/lookup/AbstractLookupArrayStorageTest.java
+++ b/platform/openide.util.lookup/test/unit/src/org/openide/util/lookup/AbstractLookupArrayStorageTest.java
@@ -69,7 +69,7 @@ public class AbstractLookupArrayStorageTest extends AbstractLookupBaseHid {
}
- private static abstract class ArrayTestSuite extends NbTestSuite
+ private abstract static class ArrayTestSuite extends NbTestSuite
implements AbstractLookupBaseHid.Impl {
private int trash;
diff --git a/platform/openide.util.ui/src/org/openide/ServiceType.java b/platform/openide.util.ui/src/org/openide/ServiceType.java
index 7feb54d..4f9a430 100644
--- a/platform/openide.util.ui/src/org/openide/ServiceType.java
+++ b/platform/openide.util.ui/src/org/openide/ServiceType.java
@@ -206,9 +206,9 @@ public abstract class ServiceType extends Object implements Serializable, HelpCt
* @deprecated Use lookup instead.
*/
@Deprecated
- public static abstract class Registry implements Serializable {
+ public abstract static class Registry implements Serializable {
/** suid */
- final static long serialVersionUID = 8721000770371416481L;
+ static final long serialVersionUID = 8721000770371416481L;
/** Get all available services managed by the engine.
* @return an enumeration of {@link ServiceType}s
diff --git a/platform/openide.util.ui/src/org/openide/util/HelpCtx.java b/platform/openide.util.ui/src/org/openide/util/HelpCtx.java
index a325bfa..27e6347 100644
--- a/platform/openide.util.ui/src/org/openide/util/HelpCtx.java
+++ b/platform/openide.util.ui/src/org/openide/util/HelpCtx.java
@@ -41,7 +41,7 @@ public final class HelpCtx extends Object {
* This (hopefully) points to a note explaining to the user that no help is available.
* Precisely, the Help ID is set to <code>org.openide.util.HelpCtx.DEFAULT_HELP</code>.
*/
- public final static HelpCtx DEFAULT_HELP = new HelpCtx(HelpCtx.class.getName() + ".DEFAULT_HELP"); // NOI18N
+ public static final HelpCtx DEFAULT_HELP = new HelpCtx(HelpCtx.class.getName() + ".DEFAULT_HELP"); // NOI18N
/** URL of the help page */
private final URL helpCtx;
diff --git a/platform/openide.util.ui/src/org/openide/util/ImageUtilities.java b/platform/openide.util.ui/src/org/openide/util/ImageUtilities.java
index 083919e..121738b 100644
--- a/platform/openide.util.ui/src/org/openide/util/ImageUtilities.java
+++ b/platform/openide.util.ui/src/org/openide/util/ImageUtilities.java
@@ -931,7 +931,7 @@ public final class ImageUtilities {
return buffImage;
}
- static private ColorModel colorModel(int transparency) {
+ private static ColorModel colorModel(int transparency) {
ColorModel model;
try {
model = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment()
diff --git a/platform/openide.util.ui/src/org/openide/util/NetworkSettings.java b/platform/openide.util.ui/src/org/openide/util/NetworkSettings.java
index 6a7a076..c35f538 100644
--- a/platform/openide.util.ui/src/org/openide/util/NetworkSettings.java
+++ b/platform/openide.util.ui/src/org/openide/util/NetworkSettings.java
@@ -160,7 +160,7 @@ public final class NetworkSettings {
* @author Jiri Rechtacek, Ondrej Vrabec
* @since 8.17
*/
- public static abstract class ProxyCredentialsProvider {
+ public abstract static class ProxyCredentialsProvider {
/** Returns the <code>username</code> for Proxy Authentication.
* Returns <code>null</code> if no authentication required.
diff --git a/platform/openide.util.ui/src/org/openide/util/actions/ActionInvoker.java b/platform/openide.util.ui/src/org/openide/util/actions/ActionInvoker.java
index 6dcfb38..e7fbdb8 100644
--- a/platform/openide.util.ui/src/org/openide/util/actions/ActionInvoker.java
+++ b/platform/openide.util.ui/src/org/openide/util/actions/ActionInvoker.java
@@ -95,7 +95,7 @@ public abstract class ActionInvoker extends Object {
/** Special class that can be passed to invokeAction and delegates
* to correct values
*/
- private static abstract class ActionRunnable implements Action {
+ private abstract static class ActionRunnable implements Action {
final ActionEvent ev;
final Action action;
final boolean async;
diff --git a/platform/openide.util.ui/src/org/openide/util/actions/CallbackSystemAction.java b/platform/openide.util.ui/src/org/openide/util/actions/CallbackSystemAction.java
index b9a9147..a798f87 100644
--- a/platform/openide.util.ui/src/org/openide/util/actions/CallbackSystemAction.java
+++ b/platform/openide.util.ui/src/org/openide/util/actions/CallbackSystemAction.java
@@ -337,7 +337,7 @@ public abstract class CallbackSystemAction extends CallableSystemAction implemen
resultChanged(null);
}
- public synchronized static GlobalManager getDefault() {
+ public static synchronized GlobalManager getDefault() {
if (instance != null) {
return instance;
}
diff --git a/platform/openide.util.ui/src/org/openide/util/datatransfer/ExTransferable.java b/platform/openide.util.ui/src/org/openide/util/datatransfer/ExTransferable.java
index c25733d..4851941 100644
--- a/platform/openide.util.ui/src/org/openide/util/datatransfer/ExTransferable.java
+++ b/platform/openide.util.ui/src/org/openide/util/datatransfer/ExTransferable.java
@@ -152,7 +152,7 @@ public class ExTransferable extends Object implements Transferable {
*
* @param l the listener
*/
- public synchronized final void addTransferListener(TransferListener l) {
+ public final synchronized void addTransferListener(TransferListener l) {
if (listeners == null) {
listeners = new EventListenerList();
}
@@ -162,7 +162,7 @@ public class ExTransferable extends Object implements Transferable {
/** Removes a listener.
*/
- public synchronized final void removeTransferListener(TransferListener l) {
+ public final synchronized void removeTransferListener(TransferListener l) {
if (listeners != null) {
listeners.remove(TransferListener.class, l);
}
@@ -217,7 +217,7 @@ public class ExTransferable extends Object implements Transferable {
/** Support for transferable owner with only one data flavor.
* Subclasses need only implement {@link #getData}.
*/
- public static abstract class Single extends Object implements Transferable {
+ public abstract static class Single extends Object implements Transferable {
/** the supported data flavor */
private DataFlavor flavor;
diff --git a/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateTest.java b/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateTest.java
index 9f42262..a0628bb 100644
--- a/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateTest.java
+++ b/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateTest.java
@@ -223,12 +223,12 @@ public class UtilitiesTranslateTest extends NbTestCase {
/** A test to serialize and deserialize different class with same fields.
*/
private static final class A implements Serializable {
- final static long serialVersionUID = 1;
+ static final long serialVersionUID = 1;
public String value;
}
private static final class Ahoj implements Serializable {
- final static long serialVersionUID = 1;
+ static final long serialVersionUID = 1;
public String value;
}
diff --git a/platform/openide.util.ui/test/unit/src/org/openide/util/actions/SystemActionTest.java b/platform/openide.util.ui/test/unit/src/org/openide/util/actions/SystemActionTest.java
index a4edfb8..9902d93 100644
--- a/platform/openide.util.ui/test/unit/src/org/openide/util/actions/SystemActionTest.java
+++ b/platform/openide.util.ui/test/unit/src/org/openide/util/actions/SystemActionTest.java
@@ -67,7 +67,7 @@ public class SystemActionTest extends NbTestCase {
assertTrue(log.toString(), log.toString().contains("No such icon"));
}
- private static abstract class TestSystemAction extends SystemAction {
+ private abstract static class TestSystemAction extends SystemAction {
public void actionPerformed(ActionEvent e) {}
public HelpCtx getHelpCtx() {
return HelpCtx.DEFAULT_HELP;
diff --git a/platform/openide.util/src/org/openide/util/CharSequences.java b/platform/openide.util/src/org/openide/util/CharSequences.java
index b9fa71c..94e2bdb 100644
--- a/platform/openide.util/src/org/openide/util/CharSequences.java
+++ b/platform/openide.util/src/org/openide/util/CharSequences.java
@@ -1388,7 +1388,7 @@ public final class CharSequences {
* it is still more efficient than String, because string stores length in field
* and it costs 20 bytes aligned into 24
*/
- private final static class CharBasedSequence implements CompactCharSequence, Comparable<CharSequence> {
+ private static final class CharBasedSequence implements CompactCharSequence, Comparable<CharSequence> {
private final char[] value;
private int hash;
@@ -1457,7 +1457,7 @@ public final class CharSequences {
* compact char sequence implementation based on byte[]
* size: 8 + 4 + 4 (= 16 bytes) + sizeof ('value')
*/
- private final static class ByteBasedSequence implements CompactCharSequence, Comparable<CharSequence> {
+ private static final class ByteBasedSequence implements CompactCharSequence, Comparable<CharSequence> {
private final byte[] value;
private int hash;
diff --git a/platform/openide.util/src/org/openide/util/NbBundle.java b/platform/openide.util/src/org/openide/util/NbBundle.java
index e072141..982c4fe 100644
--- a/platform/openide.util/src/org/openide/util/NbBundle.java
+++ b/platform/openide.util/src/org/openide/util/NbBundle.java
@@ -1484,7 +1484,7 @@ public class NbBundle extends Object {
* Local charset to decode using UTF-8 by default, but automatically switching to ISO-8859-1 if UTF-8 decoding fails.
*
*/
- static private class UtfThenIsoCharset extends Charset {
+ private static class UtfThenIsoCharset extends Charset {
private final boolean onlyUTF8;
diff --git a/platform/openide.util/src/org/openide/util/NbCollections.java b/platform/openide.util/src/org/openide/util/NbCollections.java
index 4fa385a..35ad347 100644
--- a/platform/openide.util/src/org/openide/util/NbCollections.java
+++ b/platform/openide.util/src/org/openide/util/NbCollections.java
@@ -138,7 +138,7 @@ public class NbCollections {
return m2;
}
- private static abstract class CheckedIterator<E> implements Iterator<E> {
+ private abstract static class CheckedIterator<E> implements Iterator<E> {
private static final Object WAITING = new Object();
diff --git a/platform/openide.util/src/org/openide/util/RequestProcessor.java b/platform/openide.util/src/org/openide/util/RequestProcessor.java
index 8de90c6..7e79619 100644
--- a/platform/openide.util/src/org/openide/util/RequestProcessor.java
+++ b/platform/openide.util/src/org/openide/util/RequestProcessor.java
@@ -1083,7 +1083,7 @@ outer: do {
}
}
- private static abstract class TaskFutureWrapper implements ScheduledFuture<Void>, Runnable, RunnableWrapper {
+ private abstract static class TaskFutureWrapper implements ScheduledFuture<Void>, Runnable, RunnableWrapper {
volatile Task t;
protected final Runnable toRun;
protected final long initialDelay;
@@ -2196,7 +2196,7 @@ outer: do {
return 0;
}
- synchronized static final void schedule(Item localItem, long delay) {
+ static final synchronized void schedule(Item localItem, long delay) {
if (TICK == null) {
TICK = new TickTac();
TICK.scheduleImpl(localItem, delay);
@@ -2214,7 +2214,7 @@ outer: do {
queue.add(localItem);
}
- synchronized static final void cancel(Item localItem) {
+ static final synchronized void cancel(Item localItem) {
if (TICK != null) {
TICK.cancelImpl(localItem);
TickTac.class.notifyAll();
diff --git a/platform/openide.util/src/org/openide/util/io/NbMarshalledObject.java b/platform/openide.util/src/org/openide/util/io/NbMarshalledObject.java
index 4395d5d..758afea 100644
--- a/platform/openide.util/src/org/openide/util/io/NbMarshalledObject.java
+++ b/platform/openide.util/src/org/openide/util/io/NbMarshalledObject.java
@@ -38,7 +38,7 @@ import java.util.Arrays;
public final class NbMarshalledObject implements Serializable {
/** serial version UID */
private static final long serialVersionUID = 7842398740921434354L;
- private final static char[] HEX = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; // NOI18N
+ private static final char[] HEX = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; // NOI18N
/**
* @serial Bytes of serialized representation. If <code>objBytes</code> is
diff --git a/platform/openide.util/test/unit/src/org/openide/util/WeakSetTest.java b/platform/openide.util/test/unit/src/org/openide/util/WeakSetTest.java
index 0699ff8..55f6b80 100644
--- a/platform/openide.util/test/unit/src/org/openide/util/WeakSetTest.java
+++ b/platform/openide.util/test/unit/src/org/openide/util/WeakSetTest.java
@@ -145,7 +145,7 @@ public class WeakSetTest extends NbTestCase {
}
}
- private final static class TestObj {
+ private static final class TestObj {
static final Set<TestObj> testObjs = new WeakSet<TestObj>();
private final String name;
TestObj(String name) {
@@ -162,7 +162,7 @@ public class WeakSetTest extends NbTestCase {
}
- private final static class GC implements Runnable {
+ private static final class GC implements Runnable {
public void run() {
try {
diff --git a/platform/openide.windows/src/org/openide/windows/CloneableTopComponent.java b/platform/openide.windows/src/org/openide/windows/CloneableTopComponent.java
index c3b7dfe..999190b 100644
--- a/platform/openide.windows/src/org/openide/windows/CloneableTopComponent.java
+++ b/platform/openide.windows/src/org/openide/windows/CloneableTopComponent.java
@@ -132,7 +132,7 @@ public abstract class CloneableTopComponent extends TopComponent implements Exte
*
* @return the clone registry for this component's group
*/
- public synchronized final Ref getReference() {
+ public final synchronized Ref getReference() {
if (ref == null) {
ref = new Ref(this);
}
@@ -143,7 +143,7 @@ public abstract class CloneableTopComponent extends TopComponent implements Exte
/** Changes the reference to which this components belongs.
* @param another the new reference this component should belong
*/
- public synchronized final void setReference(Ref another) {
+ public final synchronized void setReference(Ref another) {
if (another == EMPTY) {
throw new IllegalArgumentException(
NbBundle.getBundle(CloneableTopComponent.class).getString("EXC_CannotAssign")
diff --git a/platform/openide.windows/src/org/openide/windows/ModeUtilities.java b/platform/openide.windows/src/org/openide/windows/ModeUtilities.java
index 796e5fc..2de0b7b 100644
--- a/platform/openide.windows/src/org/openide/windows/ModeUtilities.java
+++ b/platform/openide.windows/src/org/openide/windows/ModeUtilities.java
@@ -55,7 +55,7 @@ public final class ModeUtilities {
* @param mode the {@link Mode} whose XML configuration is required.
* @return the XML of the Mode's configuration or {@code null} if not supported.
*/
- public final static String toXml(Mode mode) {
+ public static final String toXml(Mode mode) {
return mode instanceof Mode.Xml
? ((Mode.Xml) mode).toXml()
: null;
diff --git a/platform/openide.windows/test/unit/src/org/openide/windows/TopComponentGetLookupTest.java b/platform/openide.windows/test/unit/src/org/openide/windows/TopComponentGetLookupTest.java
index 8383852..bb4911e 100644
--- a/platform/openide.windows/test/unit/src/org/openide/windows/TopComponentGetLookupTest.java
+++ b/platform/openide.windows/test/unit/src/org/openide/windows/TopComponentGetLookupTest.java
@@ -877,7 +877,7 @@ public class TopComponentGetLookupTest extends NbTestCase {
}
}
- private final static Def defaultFocusManager = new Def();
+ private static final Def defaultFocusManager = new Def();
static {
try {
Utilities.actionsGlobalContext();
diff --git a/platform/options.api/src/org/netbeans/modules/options/Utils.java b/platform/options.api/src/org/netbeans/modules/options/Utils.java
index 85c4979..c23c0e5 100644
--- a/platform/options.api/src/org/netbeans/modules/options/Utils.java
+++ b/platform/options.api/src/org/netbeans/modules/options/Utils.java
@@ -31,7 +31,7 @@ public class Utils {
private static Map<String, FileObject> filesCache = new HashMap<String, FileObject> ();
- public final static int ScrollBarUnitIncrement = 16;
+ public static final int ScrollBarUnitIncrement = 16;
public static FileObject getFileObject (String name, String ext, boolean create)
throws IOException {
diff --git a/platform/options.keymap/src/org/netbeans/modules/options/keymap/KeymapModel.java b/platform/options.keymap/src/org/netbeans/modules/options/keymap/KeymapModel.java
index e9d3a17..cdd408f 100644
--- a/platform/options.keymap/src/org/netbeans/modules/options/keymap/KeymapModel.java
+++ b/platform/options.keymap/src/org/netbeans/modules/options/keymap/KeymapModel.java
@@ -76,7 +76,7 @@ public class KeymapModel {
private static volatile List<KeymapManager> managers = null;
- private volatile static KeymapModel INSTANCE;
+ private static volatile KeymapModel INSTANCE;
static KeymapModel create() {
if (INSTANCE != null) {
diff --git a/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java b/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java
index 7f2063b..8776946 100644
--- a/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java
+++ b/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java
@@ -220,9 +220,9 @@ class SamplesOutputStream {
private static class Sample {
- final private long time;
- final private List<Long> sameThread;
- final private List<ThreadInfo> newThreads;
+ private final long time;
+ private final List<Long> sameThread;
+ private final List<ThreadInfo> newThreads;
Sample(long t, List<Long> sameT, List<ThreadInfo> newT) {
time = t;
diff --git a/platform/sendopts/src/org/netbeans/modules/sendopts/OptionImpl.java b/platform/sendopts/src/org/netbeans/modules/sendopts/OptionImpl.java
index 8f42a16..e6a5579 100644
--- a/platform/sendopts/src/org/netbeans/modules/sendopts/OptionImpl.java
+++ b/platform/sendopts/src/org/netbeans/modules/sendopts/OptionImpl.java
@@ -580,7 +580,7 @@ public abstract class OptionImpl implements Cloneable {
return new AlternativeOptionsImpl(option, null, list);
}
- public static abstract class Trampoline {
+ public abstract static class Trampoline {
public static Trampoline DEFAULT;
static {
try {
diff --git a/platform/sendopts/test/unit/src/org/netbeans/api/sendopts/StreamingTest.java b/platform/sendopts/test/unit/src/org/netbeans/api/sendopts/StreamingTest.java
index e8d9fbd..2f9affa 100644
--- a/platform/sendopts/test/unit/src/org/netbeans/api/sendopts/StreamingTest.java
+++ b/platform/sendopts/test/unit/src/org/netbeans/api/sendopts/StreamingTest.java
@@ -109,7 +109,7 @@ public class StreamingTest extends NbTestCase {
}
- public static abstract class SinkProvider {
+ public abstract static class SinkProvider {
/** associated option */
final Option option;
@@ -136,7 +136,7 @@ public class StreamingTest extends NbTestCase {
throws CommandException;
}
- public static abstract class Sink {
+ public abstract static class Sink {
public static Sink create(String n, WritableByteChannel b, boolean x) {
return null;
}
diff --git a/platform/settings/examples/src/org/netbeans/modules/settings/examples/JavaCompilerSetting.java b/platform/settings/examples/src/org/netbeans/modules/settings/examples/JavaCompilerSetting.java
index e01c5bb..340975a 100644
--- a/platform/settings/examples/src/org/netbeans/modules/settings/examples/JavaCompilerSetting.java
+++ b/platform/settings/examples/src/org/netbeans/modules/settings/examples/JavaCompilerSetting.java
@@ -26,10 +26,10 @@ import java.util.Properties;
* @author Jan Pokorsky
*/
public final class JavaCompilerSetting {
- private final static String PROP_DEBUG = "debug"; //NOI18N
- private final static String PROP_DEPRECATION = "deprecation"; //NOI18N
- private final static String PROP_CLASS_PATH = "classPath"; //NOI18N
- private final static String PROP_EXEC_PATH = "path"; //NOI18N
+ private static final String PROP_DEBUG = "debug"; //NOI18N
+ private static final String PROP_DEPRECATION = "deprecation"; //NOI18N
+ private static final String PROP_CLASS_PATH = "classPath"; //NOI18N
+ private static final String PROP_EXEC_PATH = "path"; //NOI18N
private java.beans.PropertyChangeSupport propertyChangeSupport = new java.beans.PropertyChangeSupport(this);
diff --git a/platform/settings/examples/src/org/netbeans/modules/settings/examples/ProxySettings.java b/platform/settings/examples/src/org/netbeans/modules/settings/examples/ProxySettings.java
index c7c5809..a479a75 100644
--- a/platform/settings/examples/src/org/netbeans/modules/settings/examples/ProxySettings.java
+++ b/platform/settings/examples/src/org/netbeans/modules/settings/examples/ProxySettings.java
@@ -26,8 +26,8 @@ import java.util.Properties;
* @author Jan Pokorsky
*/
public final class ProxySettings {
- private final static String PROP_PROXYHOST = "proxyHost"; //NOI18N
- private final static String PROP_PROXYPORT = "proxyPort"; //NOI18N
+ private static final String PROP_PROXYHOST = "proxyHost"; //NOI18N
+ private static final String PROP_PROXYPORT = "proxyPort"; //NOI18N
/** Holds value of property proxyHost. */
private String proxyHost;
diff --git a/platform/settings/src/org/netbeans/modules/settings/Env.java b/platform/settings/src/org/netbeans/modules/settings/Env.java
index c4481e2..bc2a478 100644
--- a/platform/settings/src/org/netbeans/modules/settings/Env.java
+++ b/platform/settings/src/org/netbeans/modules/settings/Env.java
@@ -39,36 +39,36 @@ public final class Env implements Environment.Provider {
* <code><attr name="settings.convertor" methodvalue="org.netbeans.modules.settings.XMLPropertiesConvertor.create"/>
* </code>
*/
- public final static String EA_CONVERTOR = "settings.convertor"; //NOI18N
+ public static final String EA_CONVERTOR = "settings.convertor"; //NOI18N
/** file attribute containing path to the provider. Used by
* InstanceDataObject.create or upgrade algorithm. Usage
* <code><attr name="settings.providerPath" stringvalue="xml/lookups/NetBeans/DTD_XML_Properties_1_0.instance"/>
* </code>
*/
- public final static String EA_PROVIDER_PATH = "settings.providerPath"; // NOI18N
+ public static final String EA_PROVIDER_PATH = "settings.providerPath"; // NOI18N
/** file attribute containing PUBLIC attribute of xml header. Usage
* <code><attr name="hint.originalPublicID" stringvalue="-//NetBeans//DTD XML Properties 1.0//EN"/>
* </code>
*/
- public final static String EA_PUBLICID = "hint.originalPublicID"; // NOI18N
+ public static final String EA_PUBLICID = "hint.originalPublicID"; // NOI18N
/** file attribute containnig class name of the setting object. Usage
* <code><attr name="settings.instanceClass" stringvalue="org.netbeans.modules.foo.Foo"/>
* </code>
*/
- public final static String EA_INSTANCE_CLASS_NAME = "settings.instanceClass"; //NOI18N
+ public static final String EA_INSTANCE_CLASS_NAME = "settings.instanceClass"; //NOI18N
/** file attribute containnig class name and subclass names of the setting object. Use the
* attribute for performance reasons. Usage
* <code><attr name="settings.instanceOf" stringvalue="org.netbeans.modules.foo.Foo[, ...]"/>
* </code>
*/
- public final static String EA_INSTANCE_OF = "settings.instanceOf"; //NOI18N
+ public static final String EA_INSTANCE_OF = "settings.instanceOf"; //NOI18N
/** file attribute containnig the setting object. Usage
* <code><attr name="settings.instanceCreate" newvalue="org.netbeans.modules.foo.Foo"/>
* </code> or
* <code><attr name="settings.instanceCreate" methodvalue="org.netbeans.modules.foo.Foo.create"/>
* </code>
*/
- public final static String EA_INSTANCE_CREATE = "settings.instanceCreate"; //NOI18N
+ public static final String EA_INSTANCE_CREATE = "settings.instanceCreate"; //NOI18N
/** file attribute determining whether the registration works also for subclasses of the registering
* class. Use of this attribute is optional. The default is false, the value must be boolean, example:
* <code><attr name="settings.subclasses" boolvalue="true"/></code>
diff --git a/platform/settings/src/org/netbeans/modules/settings/SaveSupport.java b/platform/settings/src/org/netbeans/modules/settings/SaveSupport.java
index 2a66281..a877325 100644
--- a/platform/settings/src/org/netbeans/modules/settings/SaveSupport.java
+++ b/platform/settings/src/org/netbeans/modules/settings/SaveSupport.java
@@ -38,9 +38,9 @@ import org.openide.util.Exceptions;
*/
final class SaveSupport {
/** property means setting is changed and should be changed */
- public final static String PROP_SAVE = "savecookie"; //NOI18N
+ public static final String PROP_SAVE = "savecookie"; //NOI18N
/** property means setting file content is changed */
- public final static String PROP_FILE_CHANGED = "fileChanged"; //NOI18N
+ public static final String PROP_FILE_CHANGED = "fileChanged"; //NOI18N
/** data object name cached in the attribute to prevent instance creation when
* its node is displayed.
* @see org.openide.loaders.InstanceDataObject#EA_NAME
diff --git a/platform/settings/src/org/netbeans/modules/settings/ScheduledRequest.java b/platform/settings/src/org/netbeans/modules/settings/ScheduledRequest.java
index cf2b1c4..200a84a 100644
--- a/platform/settings/src/org/netbeans/modules/settings/ScheduledRequest.java
+++ b/platform/settings/src/org/netbeans/modules/settings/ScheduledRequest.java
@@ -33,9 +33,9 @@ import org.openide.util.RequestProcessor.*;
* @author Jan Pokorsky
*/
public final class ScheduledRequest implements Runnable {
- private final static RequestProcessor PROCESSOR =
+ private static final RequestProcessor PROCESSOR =
new RequestProcessor("Settings Processor"); //NOI18N
- private final static int DELAY = 2000;
+ private static final int DELAY = 2000;
private Object inst;
private Task task;
diff --git a/platform/settings/src/org/netbeans/modules/settings/convertors/ModuleInfoManager.java b/platform/settings/src/org/netbeans/modules/settings/convertors/ModuleInfoManager.java
index e979366..e8d557e 100644
--- a/platform/settings/src/org/netbeans/modules/settings/convertors/ModuleInfoManager.java
+++ b/platform/settings/src/org/netbeans/modules/settings/convertors/ModuleInfoManager.java
@@ -32,7 +32,7 @@ import org.openide.util.LookupEvent;
* @author Jan Pokorsky
*/
final class ModuleInfoManager {
- private final static ModuleInfoManager mim = new ModuleInfoManager();;
+ private static final ModuleInfoManager mim = new ModuleInfoManager();;
/** all modules <code bas name, ModuleInfo> */
private HashMap<String, ModuleInfo> modules = null;
@@ -44,7 +44,7 @@ final class ModuleInfoManager {
private ModuleInfoManager() {
}
- public final static ModuleInfoManager getDefault() {
+ public static final ModuleInfoManager getDefault() {
return mim;
}
diff --git a/platform/settings/src/org/netbeans/modules/settings/convertors/SerialDataConvertor.java b/platform/settings/src/org/netbeans/modules/settings/convertors/SerialDataConvertor.java
index 9652bce..07cbec9 100644
--- a/platform/settings/src/org/netbeans/modules/settings/convertors/SerialDataConvertor.java
+++ b/platform/settings/src/org/netbeans/modules/settings/convertors/SerialDataConvertor.java
@@ -836,7 +836,7 @@ implements PropertyChangeListener, FileSystem.AtomicAction {
/** A provider for .settings files containing serial data format
* (hexa stream)
*/
- public final static class Provider implements Environment.Provider {
+ public static final class Provider implements Environment.Provider {
private final FileObject providerFO;
public static Environment.Provider create(FileObject fo) {
diff --git a/platform/settings/src/org/netbeans/modules/settings/convertors/SerialDataNode.java b/platform/settings/src/org/netbeans/modules/settings/convertors/SerialDataNode.java
index 71d2570..b62481d 100644
--- a/platform/settings/src/org/netbeans/modules/settings/convertors/SerialDataNode.java
+++ b/platform/settings/src/org/netbeans/modules/settings/convertors/SerialDataNode.java
@@ -845,7 +845,7 @@ public final class SerialDataNode extends DataNode {
} // end of I
/** Derived from BeanChildren and allow replace beancontext. */
- private final static class InstanceChildren extends Children.Keys {
+ private static final class InstanceChildren extends Children.Keys {
SerialDataNode task;
DataObject dobj;
Object bean;
diff --git a/platform/settings/src/org/netbeans/modules/settings/convertors/XMLPropertiesConvertor.java b/platform/settings/src/org/netbeans/modules/settings/convertors/XMLPropertiesConvertor.java
index bac0f1d..2351453 100644
--- a/platform/settings/src/org/netbeans/modules/settings/convertors/XMLPropertiesConvertor.java
+++ b/platform/settings/src/org/netbeans/modules/settings/convertors/XMLPropertiesConvertor.java
@@ -49,12 +49,12 @@ public final class XMLPropertiesConvertor extends Convertor implements PropertyC
* <code><attr name="xmlproperties.preventStoring" boolvalue="[true|false]"/>
* </code>
*/
- public final static String EA_PREVENT_STORING = "xmlproperties.preventStoring"; //NOI18N
+ public static final String EA_PREVENT_STORING = "xmlproperties.preventStoring"; //NOI18N
/** file attribute containnig list of property names their changes will be ignored. Usage
* <code><attr name="xmlproperties.ignoreChanges" stringvalue="name[, ...]"/>
* </code>
*/
- public final static String EA_IGNORE_CHANGES = "xmlproperties.ignoreChanges"; //NOI18N
+ public static final String EA_IGNORE_CHANGES = "xmlproperties.ignoreChanges"; //NOI18N
private FileObject providerFO;
/** cached property names to be filtered */
private java.util.Set ignoreProperites;
@@ -190,7 +190,7 @@ public final class XMLPropertiesConvertor extends Convertor implements PropertyC
return true;
}
- private final static String INDENT = " "; // NOI18N
+ private static final String INDENT = " "; // NOI18N
private String instanceClass = null;
diff --git a/platform/settings/src/org/netbeans/modules/settings/convertors/XMLSettingsSupport.java b/platform/settings/src/org/netbeans/modules/settings/convertors/XMLSettingsSupport.java
index f632309..3d218e0 100644
--- a/platform/settings/src/org/netbeans/modules/settings/convertors/XMLSettingsSupport.java
+++ b/platform/settings/src/org/netbeans/modules/settings/convertors/XMLSettingsSupport.java
@@ -256,7 +256,7 @@ final class XMLSettingsSupport {
// enlarged to not need do the test for negative byte values
- private final static char[] HEXDIGITS = {'0', '1', '2', '3', '4', '5', '6', '7',
+ private static final char[] HEXDIGITS = {'0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
'0', '1', '2', '3', '4', '5', '6', '7'};
@@ -333,7 +333,7 @@ final class XMLSettingsSupport {
}
/** Settings parser. */
- final static class SettingsRecognizer extends org.xml.sax.helpers.DefaultHandler {
+ static final class SettingsRecognizer extends org.xml.sax.helpers.DefaultHandler {
private static final String ELM_SETTING = "settings"; // NOI18N
private static final String ATR_SETTING_VERSION = "version"; // NOI18N
@@ -1143,7 +1143,7 @@ final class XMLSettingsSupport {
}
- final static class StopSAXException extends SAXException {
+ static final class StopSAXException extends SAXException {
public StopSAXException() {
super("Parser stopped"); // NOI18N
}
diff --git a/platform/settings/src/org/netbeans/spi/settings/ConvertorResolver.java b/platform/settings/src/org/netbeans/spi/settings/ConvertorResolver.java
index 5780182..d526afb 100644
--- a/platform/settings/src/org/netbeans/spi/settings/ConvertorResolver.java
+++ b/platform/settings/src/org/netbeans/spi/settings/ConvertorResolver.java
@@ -31,7 +31,7 @@ import org.openide.filesystems.FileUtil;
*/
final class ConvertorResolver {
private static final String LOOKUP_PREFIX = "/xml/lookups"; // NOI18N
- private final static ConvertorResolver DEFAULT = new ConvertorResolver();
+ private static final ConvertorResolver DEFAULT = new ConvertorResolver();
/** Creates a new instance of ConvertorResolver */
private ConvertorResolver() {
diff --git a/platform/settings/src/org/netbeans/spi/settings/DOMConvertor.java b/platform/settings/src/org/netbeans/spi/settings/DOMConvertor.java
index 1b21179..3d91a23 100644
--- a/platform/settings/src/org/netbeans/spi/settings/DOMConvertor.java
+++ b/platform/settings/src/org/netbeans/spi/settings/DOMConvertor.java
@@ -37,10 +37,10 @@ import org.xml.sax.SAXException;
*/
public abstract class DOMConvertor extends Convertor {
/** an attribute containing public ID of DTD describing nested elements */
- private final static String ATTR_PUBLIC_ID = "dtd_public_id"; // NOI18N
+ private static final String ATTR_PUBLIC_ID = "dtd_public_id"; // NOI18N
- private final static String ATTR_ID = "id"; // NOI18N
- private final static String ATTR_IDREF = "idref"; // NOI18N
+ private static final String ATTR_ID = "id"; // NOI18N
+ private static final String ATTR_IDREF = "idref"; // NOI18N
/** element used to wrap output from non-DOMConvertor or to reference
* already written object.
* @see #ATTR_ID
@@ -54,12 +54,12 @@ public abstract class DOMConvertor extends Convertor {
// ...
// <domconvertor idref='1'/>
- private final static String ELM_DELEGATE = "domconvertor"; // NOI18N
+ private static final String ELM_DELEGATE = "domconvertor"; // NOI18N
- private final static java.util.Map<Document, Map<Object,CacheRec>> refsCache =
+ private static final java.util.Map<Document, Map<Object,CacheRec>> refsCache =
new java.util.HashMap<Document, Map<Object,CacheRec>>();
/** cache of contexts <Document, Lookup>*/
- private final static java.util.Map<Document, Lookup> ctxCache = new java.util.HashMap<Document, Lookup>();
+ private static final java.util.Map<Document, Lookup> ctxCache = new java.util.HashMap<Document, Lookup>();
private String publicID;
private String systemID;
@@ -161,7 +161,7 @@ public abstract class DOMConvertor extends Convertor {
* @see #readElement
* @since 1.1
*/
- protected final static Object delegateRead(org.w3c.dom.Element element) throws java.io.IOException, ClassNotFoundException {
+ protected static final Object delegateRead(org.w3c.dom.Element element) throws java.io.IOException, ClassNotFoundException {
Object obj;
// in case of a reference a cache of already read objects should
@@ -232,7 +232,7 @@ public abstract class DOMConvertor extends Convertor {
* @see #writeElement
* @since 1.1
*/
- protected final static org.w3c.dom.Element delegateWrite(org.w3c.dom.Document doc, Object obj) throws java.io.IOException, org.w3c.dom.DOMException {
+ protected static final org.w3c.dom.Element delegateWrite(org.w3c.dom.Document doc, Object obj) throws java.io.IOException, org.w3c.dom.DOMException {
// first lookup a cache of already written objects to prevent
// storing of the same instance multiple times.
CacheRec cache = setCache(doc, obj);
diff --git a/platform/settings/test/unit/src/org/netbeans/modules/settings/convertors/FooSetting.java b/platform/settings/test/unit/src/org/netbeans/modules/settings/convertors/FooSetting.java
index 680a491..4da3173 100644
--- a/platform/settings/test/unit/src/org/netbeans/modules/settings/convertors/FooSetting.java
+++ b/platform/settings/test/unit/src/org/netbeans/modules/settings/convertors/FooSetting.java
@@ -26,8 +26,8 @@ import java.util.Properties;
* @author Jan Pokorsky
*/
public class FooSetting {
- private final static String PROP_PROPERTY1 = "property1";
- private final static String PROP_NAME = "name";
+ private static final String PROP_PROPERTY1 = "property1";
+ private static final String PROP_NAME = "name";
/** Holds value of property property1. */
private String property1;
diff --git a/platform/settings/test/unit/src/org/netbeans/spi/settings/DOMConvertorTest.java b/platform/settings/test/unit/src/org/netbeans/spi/settings/DOMConvertorTest.java
index 35d6800..4fa4ba6 100644
--- a/platform/settings/test/unit/src/org/netbeans/spi/settings/DOMConvertorTest.java
+++ b/platform/settings/test/unit/src/org/netbeans/spi/settings/DOMConvertorTest.java
@@ -135,9 +135,9 @@ public class DOMConvertorTest extends NbTestCase {
}
public static class ComposedSettingConvertor extends DOMConvertor {
- private final static String PUBLIC_ID = "-//NetBeans org.netbeans.modules.settings.xtest//DTD ComposedSetting 1.0//EN"; // NOI18N
- private final static String SYSTEM_ID = "nbres:/org/netbeans/modules/settings/convertors/data/composedsetting-1_0.dtd"; // NOI18N
- private final static String ELM_COMPOSED_SETTING = "composedsetting"; // NOI18N
+ private static final String PUBLIC_ID = "-//NetBeans org.netbeans.modules.settings.xtest//DTD ComposedSetting 1.0//EN"; // NOI18N
+ private static final String SYSTEM_ID = "nbres:/org/netbeans/modules/settings/convertors/data/composedsetting-1_0.dtd"; // NOI18N
+ private static final String ELM_COMPOSED_SETTING = "composedsetting"; // NOI18N
public ComposedSettingConvertor() {
super(PUBLIC_ID, SYSTEM_ID, ELM_COMPOSED_SETTING);
diff --git a/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/CommandEvaluator.java b/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/CommandEvaluator.java
index e642f3c..f47c44b 100644
--- a/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/CommandEvaluator.java
+++ b/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/CommandEvaluator.java
@@ -42,7 +42,7 @@ import org.openide.util.RequestProcessor.Task;
*/
public class CommandEvaluator {
- final static String RECENT = "Recent"; //NOI18N
+ static final String RECENT = "Recent"; //NOI18N
private static final String PROP_ENABLED_CATEGORIES
= "enabledCategories"; //NOI18N
diff --git a/platform/spi.quicksearch/test/unit/src/org/netbeans/modules/quicksearch/SlowProviderTest.java b/platform/spi.quicksearch/test/unit/src/org/netbeans/modules/quicksearch/SlowProviderTest.java
index c80dfe7..94cbdda 100644
--- a/platform/spi.quicksearch/test/unit/src/org/netbeans/modules/quicksearch/SlowProviderTest.java
+++ b/platform/spi.quicksearch/test/unit/src/org/netbeans/modules/quicksearch/SlowProviderTest.java
@@ -104,8 +104,8 @@ public class SlowProviderTest extends NbTestCase {
}
private static final Semaphore sync = new Semaphore(0);
- private volatile static boolean obsoleteAtStart;
- private volatile static boolean obsoleteAtEnd;
+ private static volatile boolean obsoleteAtStart;
+ private static volatile boolean obsoleteAtEnd;
public static class SlowProvider implements SearchProvider {
diff --git a/platform/templates/src/org/netbeans/modules/templates/actions/TemplatesAction.java b/platform/templates/src/org/netbeans/modules/templates/actions/TemplatesAction.java
index b9a8fc0..41ec62a 100644
--- a/platform/templates/src/org/netbeans/modules/templates/actions/TemplatesAction.java
+++ b/platform/templates/src/org/netbeans/modules/templates/actions/TemplatesAction.java
@@ -172,7 +172,7 @@ public class TemplatesAction extends AbstractAction { // XXX could be ActionList
}
}
- static private Set<Node> getNodes2Open (Node [] nodes) {
+ private static Set<Node> getNodes2Open (Node [] nodes) {
Set<Node> nodes2open = new HashSet<> (nodes.length);
for (int i = 0; i < nodes.length; i++) {
if (nodes [i].isLeaf ()) {
diff --git a/platform/templates/src/org/netbeans/modules/templates/ui/TemplatesPanel.java b/platform/templates/src/org/netbeans/modules/templates/ui/TemplatesPanel.java
index c3a3f33..8e5ebf8 100644
--- a/platform/templates/src/org/netbeans/modules/templates/ui/TemplatesPanel.java
+++ b/platform/templates/src/org/netbeans/modules/templates/ui/TemplatesPanel.java
@@ -109,7 +109,7 @@ public class TemplatesPanel extends TopComponent implements ExplorerManager.Prov
private static TemplateTreeView view;
private static final RequestProcessor rp = new RequestProcessor("Templates", 1);
- static private FileObject templatesRoot;
+ private static FileObject templatesRoot;
private static Node templatesRootNode = null;
private static final String TEMPLATE_DISPLAY_NAME_ATTRIBUTE = "displayName"; // NOI18N
@@ -1168,7 +1168,7 @@ public class TemplatesPanel extends TopComponent implements ExplorerManager.Prov
}
}
- static private DataObject getDOFromNode (Node n) {
+ private static DataObject getDOFromNode (Node n) {
DataObject dobj = n.getLookup ().lookup (DataObject.class);
if (dobj == null) {
throw new NullPointerException("DataObject can not be found for node " + n);
@@ -1176,7 +1176,7 @@ public class TemplatesPanel extends TopComponent implements ExplorerManager.Prov
return dobj;
}
- static private DataFolder getTargetFolder (Node [] nodes) {
+ private static DataFolder getTargetFolder (Node [] nodes) {
DataFolder folder;
if (nodes == null || nodes.length == 0) {
folder = DataFolder.findFolder (getTemplatesRoot ());
@@ -1648,7 +1648,7 @@ public class TemplatesPanel extends TopComponent implements ExplorerManager.Prov
}
/** Copy from AbstractLookup.SimpleItem */
- private final static class SimpleItem<T> extends Pair<T> {
+ private static final class SimpleItem<T> extends Pair<T> {
private T obj;
/** Create an item.
diff --git a/platform/templatesui/src/org/netbeans/modules/templatesui/AbstractWizard.java b/platform/templatesui/src/org/netbeans/modules/templatesui/AbstractWizard.java
index 886652b..0753a1d 100644
--- a/platform/templatesui/src/org/netbeans/modules/templatesui/AbstractWizard.java
+++ b/platform/templatesui/src/org/netbeans/modules/templatesui/AbstractWizard.java
@@ -476,7 +476,7 @@ implements WizardDescriptor.InstantiatingIterator<WizardDescriptor> {
}
@JavaScriptBody(args = "code", body = "return 0 || eval(code);")
- native static Object eval(String code);
+ static native Object eval(String code);
@JavaScriptBody(args = { "arr" }, body =
"for (var i = 0; i < arr.length; i++) {\n" +
diff --git a/platform/uihandler/src/org/netbeans/modules/exceptions/ReporterResultTopComponent.java b/platform/uihandler/src/org/netbeans/modules/exceptions/ReporterResultTopComponent.java
index dbb8eff..f8d928d 100644
--- a/platform/uihandler/src/org/netbeans/modules/exceptions/ReporterResultTopComponent.java
+++ b/platform/uihandler/src/org/netbeans/modules/exceptions/ReporterResultTopComponent.java
@@ -383,7 +383,7 @@ public final class ReporterResultTopComponent extends TopComponent implements Hy
});
}
- final static class ResolvableHelper implements Serializable {
+ static final class ResolvableHelper implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/platform/uihandler/src/org/netbeans/modules/uihandler/Installer.java b/platform/uihandler/src/org/netbeans/modules/uihandler/Installer.java
index 8070e29..ead1fbd 100644
--- a/platform/uihandler/src/org/netbeans/modules/uihandler/Installer.java
+++ b/platform/uihandler/src/org/netbeans/modules/uihandler/Installer.java
@@ -1661,7 +1661,7 @@ public class Installer extends ModuleInstall implements Runnable {
return enc;
}
- private static abstract class Submit implements ActionListener, Runnable {
+ private abstract static class Submit implements ActionListener, Runnable {
private enum DialogState {
@@ -1682,7 +1682,7 @@ public class Installer extends ModuleInstall implements Runnable {
protected String errorURL = null;
protected String errorMessage = null;
protected DataType dataType = DataType.DATA_UIGESTURE;
- final protected List<LogRecord> recs;
+ protected final List<LogRecord> recs;
protected boolean isOOM = false;
protected boolean isAfterRestart = false;
protected ExceptionsSettings settings;
@@ -1899,7 +1899,7 @@ public class Installer extends ModuleInstall implements Runnable {
LOG.log(Level.FINE, "doShow, dialogCreated, exiting");
}
- protected synchronized final void doCloseDialog() {
+ protected final synchronized void doCloseDialog() {
dialogState = DialogState.NON_CREATED;
closeDialog();
notifyAll();
diff --git a/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/UINodeTest.java b/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/UINodeTest.java
index af9d6ac..1ddf69c 100644
--- a/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/UINodeTest.java
+++ b/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/UINodeTest.java
@@ -201,7 +201,7 @@ public class UINodeTest extends TestCase {
return buffImage;
}
- static private ColorModel colorModel(int transparency) {
+ private static ColorModel colorModel(int transparency) {
ColorModel model;
try {
model = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment()
---------------------------------------------------------------------
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
[netbeans] 05/17: Use the blessed modifier order in projects located in php projects
Posted by mk...@apache.org.
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 a5373c006c562cce7a7c5913a2e71788af35c20d
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Fri Feb 18 11:08:59 2022 +0100
Use the blessed modifier order in projects located in php projects
---
.../org/netbeans/modules/php/dbgp/SessionProgress.java | 2 +-
.../modules/php/dbgp/breakpoints/LineBreakpoint.java | 6 +++---
.../src/org/netbeans/modules/php/dbgp/URIMapperTest.java | 2 +-
.../modules/php/editor/parser/ASTPHP5Parser.java | 16 ++++++++--------
.../php/editor/parser/astnodes/FieldsDeclaration.java | 2 +-
.../modules/php/editor/parser/astnodes/PHPDocTag.java | 4 ++--
.../php/editor/parser/astnodes/SimpleASTNode.java | 8 ++++----
.../editor/parser/astnodes/SingleFieldDeclaration.java | 2 +-
.../qa-functional/src/org/netbeans/test/php/Commit.java | 10 +++++-----
.../src/org/netbeans/test/php/GeneralPHP.java | 2 +-
.../netbeans/modules/php/editor/csl/TestUtilities.java | 8 ++++----
.../modules/php/editor/parser/PrintASTVisitor.java | 4 ++--
.../smarty/editor/actions/ToggleBlockCommentAction.java | 4 ++--
.../smarty/editor/completion/TplCompletionProvider.java | 2 +-
.../completion/entries/SmartyCodeCompletionOffer.java | 6 +++---
15 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/php/php.dbgp/src/org/netbeans/modules/php/dbgp/SessionProgress.java b/php/php.dbgp/src/org/netbeans/modules/php/dbgp/SessionProgress.java
index e20f6ea..5759059 100644
--- a/php/php.dbgp/src/org/netbeans/modules/php/dbgp/SessionProgress.java
+++ b/php/php.dbgp/src/org/netbeans/modules/php/dbgp/SessionProgress.java
@@ -31,7 +31,7 @@ import org.openide.util.NbBundle;
* @author Radek Matous
*/
public final class SessionProgress implements Cancellable {
- private final static ConcurrentMap<Session, SessionProgress> INSTANCE = new ConcurrentHashMap<>();
+ private static final ConcurrentMap<Session, SessionProgress> INSTANCE = new ConcurrentHashMap<>();
private final ProgressHandle h;
private volatile Session session;
private volatile boolean isFinished;
diff --git a/php/php.dbgp/src/org/netbeans/modules/php/dbgp/breakpoints/LineBreakpoint.java b/php/php.dbgp/src/org/netbeans/modules/php/dbgp/breakpoints/LineBreakpoint.java
index 288586e..5021118 100644
--- a/php/php.dbgp/src/org/netbeans/modules/php/dbgp/breakpoints/LineBreakpoint.java
+++ b/php/php.dbgp/src/org/netbeans/modules/php/dbgp/breakpoints/LineBreakpoint.java
@@ -174,11 +174,11 @@ public class LineBreakpoint extends AbstractBreakpoint {
return myFileUrl;
}
- public synchronized final String getCondition() {
+ public final synchronized String getCondition() {
return condition;
}
- public synchronized final void setCondition(String condition) {
+ public final synchronized void setCondition(String condition) {
String oldCondition = this.condition;
if ((condition != null && condition.equals(oldCondition))
|| (condition == null && oldCondition == null)) {
@@ -188,7 +188,7 @@ public class LineBreakpoint extends AbstractBreakpoint {
firePropertyChange(PROP_CONDITION, oldCondition, condition);
}
- public synchronized final boolean isConditional() {
+ public final synchronized boolean isConditional() {
return condition != null && !condition.isEmpty();
}
diff --git a/php/php.dbgp/test/unit/src/org/netbeans/modules/php/dbgp/URIMapperTest.java b/php/php.dbgp/test/unit/src/org/netbeans/modules/php/dbgp/URIMapperTest.java
index 2436b29..9d74e4c 100644
--- a/php/php.dbgp/test/unit/src/org/netbeans/modules/php/dbgp/URIMapperTest.java
+++ b/php/php.dbgp/test/unit/src/org/netbeans/modules/php/dbgp/URIMapperTest.java
@@ -34,7 +34,7 @@ import org.openide.util.Pair;
*/
public class URIMapperTest extends NbTestCase {
- final private URIMapper oneToOneMapper = URIMapper.createOneToOne();
+ private final URIMapper oneToOneMapper = URIMapper.createOneToOne();
private URIMapper basesMapper;
private URIMapper[] allMappers;
private URI webServerURIBase;
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java
index 3cd1832..07c0a43 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java
@@ -2294,14 +2294,14 @@ new EncodedActionTable17().getTableData()
enum Access {
NON_STATIC, STATIC, NULLSAFE
}
- protected final static Integer IMPLICIT_PUBLIC = Integer.valueOf(BodyDeclaration.Modifier.IMPLICIT_PUBLIC);
- protected final static Integer PUBLIC = Integer.valueOf(BodyDeclaration.Modifier.PUBLIC);
- protected final static Integer PRIVATE = Integer.valueOf(BodyDeclaration.Modifier.PRIVATE);
- protected final static Integer PROTECTED = Integer.valueOf(BodyDeclaration.Modifier.PROTECTED);
- protected final static Integer ABSTRACT = Integer.valueOf(BodyDeclaration.Modifier.ABSTRACT);
- protected final static Integer FINAL = Integer.valueOf(BodyDeclaration.Modifier.FINAL);
- protected final static Integer STATIC = Integer.valueOf(BodyDeclaration.Modifier.STATIC);
- protected final static Integer READONLY = Integer.valueOf(BodyDeclaration.Modifier.READONLY);
+ protected static final Integer IMPLICIT_PUBLIC = Integer.valueOf(BodyDeclaration.Modifier.IMPLICIT_PUBLIC);
+ protected static final Integer PUBLIC = Integer.valueOf(BodyDeclaration.Modifier.PUBLIC);
+ protected static final Integer PRIVATE = Integer.valueOf(BodyDeclaration.Modifier.PRIVATE);
+ protected static final Integer PROTECTED = Integer.valueOf(BodyDeclaration.Modifier.PROTECTED);
+ protected static final Integer ABSTRACT = Integer.valueOf(BodyDeclaration.Modifier.ABSTRACT);
+ protected static final Integer FINAL = Integer.valueOf(BodyDeclaration.Modifier.FINAL);
+ protected static final Integer STATIC = Integer.valueOf(BodyDeclaration.Modifier.STATIC);
+ protected static final Integer READONLY = Integer.valueOf(BodyDeclaration.Modifier.READONLY);
private ErrorStrategy defaultStrategy = new DefaultErrorStrategy();;
private ErrorStrategy errorStrategy = defaultStrategy;
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/FieldsDeclaration.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/FieldsDeclaration.java
index 0498d27..7550cdd 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/FieldsDeclaration.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/FieldsDeclaration.java
@@ -30,7 +30,7 @@ import org.netbeans.api.annotations.common.CheckForNull;
* e.g.
* var $a, $b;
* public $a = 3;
- * final private static $var;
+ * private static final $var;
* protected ?int $int = 0; // PHP 7.4
* </pre>
*/
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/PHPDocTag.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/PHPDocTag.java
index 5fa7a73..880f34c 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/PHPDocTag.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/PHPDocTag.java
@@ -70,8 +70,8 @@ public class PHPDocTag extends ASTNode {
}
- final private AnnotationParsedLine type;
- final private String value;
+ private final AnnotationParsedLine type;
+ private final String value;
public PHPDocTag(int start, int end, AnnotationParsedLine kind, String value) {
super(start, end);
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/SimpleASTNode.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/SimpleASTNode.java
index 91afb8b..5f25e95 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/SimpleASTNode.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/SimpleASTNode.java
@@ -27,10 +27,10 @@ import java.util.List;
* @author petr
*/
public class SimpleASTNode {
- final private int startOffset;
- final private int endOffset;
- final private String kind;
- final private ArrayList<SimpleASTNode> children;
+ private final int startOffset;
+ private final int endOffset;
+ private final String kind;
+ private final ArrayList<SimpleASTNode> children;
public SimpleASTNode (int start, int end, String kind){
this.startOffset = start;
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/SingleFieldDeclaration.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/SingleFieldDeclaration.java
index dcf685e..870b075 100644
--- a/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/SingleFieldDeclaration.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/parser/astnodes/SingleFieldDeclaration.java
@@ -24,7 +24,7 @@ package org.netbeans.modules.php.editor.parser.astnodes;
* e.g.
* var $a, $b;
* public $a = 3;
- * final private static $var;
+ * private static final $var;
* private int $int = 20; // PHP 7.4
* </pre>
*/
diff --git a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/Commit.java b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/Commit.java
index 6153b7d..e941ef5 100644
--- a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/Commit.java
+++ b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/Commit.java
@@ -47,14 +47,14 @@ import org.openide.util.NbBundle;
public class Commit extends GeneralPHP {
static final String PROJECT_NAME = "LoginSample";
- static private final String TEST_PHP_NAME_1 = "PhpProject_commit_0001";
- static private final String INDEX_PHP_INITIAL_CONTENT
+ private static final String TEST_PHP_NAME_1 = "PhpProject_commit_0001";
+ private static final String INDEX_PHP_INITIAL_CONTENT
= "<!DOCTYPEhtml><!--Tochangethislicenseheader,chooseLicenseHeadersinProjectProperties.Tochangethistemplatefile,chooseTools|Templatesandopenthetemplateintheeditor.--><html><head><metacharset=\"UTF-8\"><title></title></head><body><?php//putyourcodehere?></body></html>";
- static private final String EMPTY_PHP_INITIAL_CONTENT
+ private static final String EMPTY_PHP_INITIAL_CONTENT
= "<?php/**Tochangethislicenseheader,chooseLicenseHeadersinProjectProperties.*Tochangethistemplatefile,chooseTools|Templates*andopenthetemplateintheeditor.*/?>";
- static private final String CLASS_PHP_INITIAL_CONTENT
+ private static final String CLASS_PHP_INITIAL_CONTENT
= "<?php/**Tochangethislicenseheader,chooseLicenseHeadersinProjectProperties.*Tochangethistemplatefile,chooseTools|Templates*andopenthetemplateintheeditor.*//***DescriptionofnewPHPClass**@author" + System.getProperty("user.name") + "*/classnewPHPClass{//putyourcodehere}";
- static private final int COMPLETION_LIST_INCLASS = 22;
+ private static final int COMPLETION_LIST_INCLASS = 22;
private static boolean bUnzipped = false;
public Commit(String arg0) {
diff --git a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/GeneralPHP.java b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/GeneralPHP.java
index 8e5b00b..16d2b48 100644
--- a/php/php.editor/test/qa-functional/src/org/netbeans/test/php/GeneralPHP.java
+++ b/php/php.editor/test/qa-functional/src/org/netbeans/test/php/GeneralPHP.java
@@ -57,7 +57,7 @@ public class GeneralPHP extends JellyTestCase {
static final String PROJECT_RentSymfony = "Rent a Flat - Symfony Framework Sample Application";
static final String PROJECT_RentZend = "Rent a Flat - Zend Framework Sample Application";
static final String PROJECT_TodoList = "TodoList - PHP Sample Application";
- static protected final int COMPLETION_LIST_THRESHOLD = 5000;
+ protected static final int COMPLETION_LIST_THRESHOLD = 5000;
protected static final String PHP_EXTENSION = ".php";
public class CFulltextStringComparator implements Operator.StringComparator {
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/TestUtilities.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/TestUtilities.java
index 5719345..5512aa4 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/TestUtilities.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/csl/TestUtilities.java
@@ -49,7 +49,7 @@ public final class TestUtilities {
* @param f the file to be read
* @return the contents of the file(s).
*/
- public final static String copyFileToString (java.io.File f) throws java.io.IOException {
+ public static final String copyFileToString (java.io.File f) throws java.io.IOException {
int s = (int)f.length ();
byte[] data = new byte[s];
int len = new FileInputStream (f).read (data);
@@ -64,7 +64,7 @@ public final class TestUtilities {
* @param f the file to be read
* @return the contents of the file(s).
*/
- public final static String copyGZipFileToString (java.io.File f) throws java.io.IOException {
+ public static final String copyGZipFileToString (java.io.File f) throws java.io.IOException {
GZIPInputStream is = new GZIPInputStream(new FileInputStream(f));
byte[] arr = new byte[256 * 256];
int first = 0;
@@ -83,7 +83,7 @@ public final class TestUtilities {
* @param content the contents of the returned file.
* @return the created file
*/
- public final static File copyStringToFile (File f, String content) throws Exception {
+ public static final File copyStringToFile (File f, String content) throws Exception {
FileOutputStream os = new FileOutputStream(f);
InputStream is = new ByteArrayInputStream(content.getBytes("UTF-8"));
FileUtil.copy(is, os);
@@ -100,7 +100,7 @@ public final class TestUtilities {
* @param content the contents of the returned file.
* @return the created file
*/
- public final static FileObject copyStringToFile (FileObject f, String content) throws Exception {
+ public static final FileObject copyStringToFile (FileObject f, String content) throws Exception {
OutputStream os = f.getOutputStream();
InputStream is = new ByteArrayInputStream(content.getBytes("UTF-8"));
FileUtil.copy(is, os);
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/PrintASTVisitor.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/PrintASTVisitor.java
index 61cbaea..7cf0d19 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/PrintASTVisitor.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/parser/PrintASTVisitor.java
@@ -30,8 +30,8 @@ import org.netbeans.modules.php.editor.parser.astnodes.*;
public class PrintASTVisitor implements Visitor {
private StringBuffer buffer;
- private final static String NEW_LINE = "\n";
- private final static String TAB = " ";
+ private static final String NEW_LINE = "\n";
+ private static final String TAB = " ";
private int indent;
private class XMLPrintNode {
diff --git a/php/php.smarty/src/org/netbeans/modules/php/smarty/editor/actions/ToggleBlockCommentAction.java b/php/php.smarty/src/org/netbeans/modules/php/smarty/editor/actions/ToggleBlockCommentAction.java
index 9204a70..c5c1f4e 100644
--- a/php/php.smarty/src/org/netbeans/modules/php/smarty/editor/actions/ToggleBlockCommentAction.java
+++ b/php/php.smarty/src/org/netbeans/modules/php/smarty/editor/actions/ToggleBlockCommentAction.java
@@ -44,8 +44,8 @@ import org.openide.util.Exceptions;
public class ToggleBlockCommentAction extends BaseAction {
static final long serialVersionUID = -1L;
- static final private String FORCE_COMMENT = "force-comment"; //NOI18N
- static final private String FORCE_UNCOMMENT = "force-uncomment"; //NOI18N
+ private static final String FORCE_COMMENT = "force-comment"; //NOI18N
+ private static final String FORCE_UNCOMMENT = "force-uncomment"; //NOI18N
public ToggleBlockCommentAction() {
super(ExtKit.toggleCommentAction);
diff --git a/php/php.smarty/src/org/netbeans/modules/php/smarty/editor/completion/TplCompletionProvider.java b/php/php.smarty/src/org/netbeans/modules/php/smarty/editor/completion/TplCompletionProvider.java
index 5372e8e..9d435af 100644
--- a/php/php.smarty/src/org/netbeans/modules/php/smarty/editor/completion/TplCompletionProvider.java
+++ b/php/php.smarty/src/org/netbeans/modules/php/smarty/editor/completion/TplCompletionProvider.java
@@ -188,7 +188,7 @@ public class TplCompletionProvider implements CompletionProvider {
}
}
}
- private static abstract class AbstractQuery extends AsyncCompletionQuery {
+ private abstract static class AbstractQuery extends AsyncCompletionQuery {
@Override
protected void preQueryUpdate(JTextComponent component) {
diff --git a/php/php.smarty/src/org/netbeans/modules/php/smarty/editor/completion/entries/SmartyCodeCompletionOffer.java b/php/php.smarty/src/org/netbeans/modules/php/smarty/editor/completion/entries/SmartyCodeCompletionOffer.java
index c681376..909ea0c 100644
--- a/php/php.smarty/src/org/netbeans/modules/php/smarty/editor/completion/entries/SmartyCodeCompletionOffer.java
+++ b/php/php.smarty/src/org/netbeans/modules/php/smarty/editor/completion/entries/SmartyCodeCompletionOffer.java
@@ -34,9 +34,9 @@ import org.openide.util.Exceptions;
*/
public class SmartyCodeCompletionOffer {
- private final static ArrayList<TplCompletionItem> completionItemsFunctions = new ArrayList<TplCompletionItem>();
- private final static ArrayList<TplCompletionItem> completionItemsModifiers = new ArrayList<TplCompletionItem>();
- private final static HashMap<String, ArrayList<TplCompletionItem>> completionItemsFunctionParams = new HashMap<String, ArrayList<TplCompletionItem>>();
+ private static final ArrayList<TplCompletionItem> completionItemsFunctions = new ArrayList<TplCompletionItem>();
+ private static final ArrayList<TplCompletionItem> completionItemsModifiers = new ArrayList<TplCompletionItem>();
+ private static final HashMap<String, ArrayList<TplCompletionItem>> completionItemsFunctionParams = new HashMap<String, ArrayList<TplCompletionItem>>();
static {
//loadFunctions(new String[]{"built-in-functions", "custom-functions"});
---------------------------------------------------------------------
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
[netbeans] 07/17: Use the blessed modifier order in projects located in nb projects
Posted by mk...@apache.org.
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 68e45d30505e205ee05683caa37e89e8fbb6cd2b
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Fri Feb 18 11:09:21 2022 +0100
Use the blessed modifier order in projects located in nb projects
---
.../src/org/netbeans/upgrade/systemoptions/PropertiesStorage.java | 2 +-
.../org/netbeans/upgrade/systemoptions/SettingsRecognizer.java | 2 +-
.../src/org/netbeans/modules/welcome/content/LinkButton.java | 4 ++--
.../src/org/netbeans/modules/welcome/ui/StartPageContent.java | 8 ++++----
nb/welcome/src/org/netbeans/modules/welcome/ui/TabbedPane.java | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/PropertiesStorage.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/PropertiesStorage.java
index c02bdf8..5c8a3ed 100644
--- a/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/PropertiesStorage.java
+++ b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/PropertiesStorage.java
@@ -34,7 +34,7 @@ import org.openide.filesystems.FileUtil;
*/
class PropertiesStorage {
private static final String USERROOT_PREFIX = "/Preferences";//NOI18N
- private final static FileObject SFS_ROOT = FileUtil.getConfigRoot();
+ private static final FileObject SFS_ROOT = FileUtil.getConfigRoot();
private final String folderPath;
private String filePath;
diff --git a/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SettingsRecognizer.java b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SettingsRecognizer.java
index b89705b..4040ebd 100644
--- a/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SettingsRecognizer.java
+++ b/nb/o.n.upgrader/src/org/netbeans/upgrade/systemoptions/SettingsRecognizer.java
@@ -847,7 +847,7 @@ public class SettingsRecognizer extends org.xml.sax.helpers.DefaultHandler {
}
}
- final static class StopSAXException extends SAXException {
+ static final class StopSAXException extends SAXException {
public StopSAXException() {
super("Parser stopped"); // NOI18N
}
diff --git a/nb/welcome/src/org/netbeans/modules/welcome/content/LinkButton.java b/nb/welcome/src/org/netbeans/modules/welcome/content/LinkButton.java
index df9e461..56a7ea8 100644
--- a/nb/welcome/src/org/netbeans/modules/welcome/content/LinkButton.java
+++ b/nb/welcome/src/org/netbeans/modules/welcome/content/LinkButton.java
@@ -57,8 +57,8 @@ public abstract class LinkButton extends JButton
private final Color defaultForeground;
- private final static Border regularBorder = ButtonBorder.createRegular();
- private final static Border mouseoverBorder = ButtonBorder.createMouseOver();
+ private static final Border regularBorder = ButtonBorder.createRegular();
+ private static final Border mouseoverBorder = ButtonBorder.createMouseOver();
private String usageTrackingId;
diff --git a/nb/welcome/src/org/netbeans/modules/welcome/ui/StartPageContent.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/StartPageContent.java
index b553528..c3c8d31 100644
--- a/nb/welcome/src/org/netbeans/modules/welcome/ui/StartPageContent.java
+++ b/nb/welcome/src/org/netbeans/modules/welcome/ui/StartPageContent.java
@@ -39,10 +39,10 @@ import org.netbeans.modules.welcome.content.Constants;
*/
public class StartPageContent extends JPanel implements Constants {
- private final static Color COLOR_TOP_START = new Color(46, 110, 172);
- private final static Color COLOR_TOP_END = new Color(255, 255, 255);
- private final static Color COLOR_BOTTOM_START = new Color(255, 255, 255);
- private final static Color COLOR_BOTTOM_END = new Color(241, 246, 252);
+ private static final Color COLOR_TOP_START = new Color(46, 110, 172);
+ private static final Color COLOR_TOP_END = new Color(255, 255, 255);
+ private static final Color COLOR_BOTTOM_START = new Color(255, 255, 255);
+ private static final Color COLOR_BOTTOM_END = new Color(241, 246, 252);
public StartPageContent() {
super( new GridBagLayout() );
diff --git a/nb/welcome/src/org/netbeans/modules/welcome/ui/TabbedPane.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/TabbedPane.java
index f1aab46..cf47ee1 100644
--- a/nb/welcome/src/org/netbeans/modules/welcome/ui/TabbedPane.java
+++ b/nb/welcome/src/org/netbeans/modules/welcome/ui/TabbedPane.java
@@ -153,7 +153,7 @@ class TabbedPane extends JPanel implements Constants {// , Scrollable {
return d;
}
- private final static Color colBackground = Utils.getTopBarColor();
+ private static final Color colBackground = Utils.getTopBarColor();
private static final Image imgSelected;
private static final Image imgRollover;
---------------------------------------------------------------------
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
[netbeans] 11/17: Use the blessed modifier order in projects located in contrib projects
Posted by mk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mklaehn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit bb307804df485caa7517bc7b0d1eb853afa243bb
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Fri Feb 18 11:10:27 2022 +0100
Use the blessed modifier order in projects located in contrib projects
---
.../modules/cordova/platforms/ios/IOSPlatform.java | 2 +-
.../grailsproject/SourceCategoriesGrails11.java | 4 ++--
.../grailsproject/SourceCategoriesGrails301.java | 4 ++--
.../commands/GrailsCommandChooser.java | 4 ++--
.../ui/wizards/impl/GrailsTargetChooserPanel.java | 2 +-
.../framework/HibernateWebModuleExtender.java | 2 +-
.../modules/j2ee/jboss4/ide/JBOutputSupport.java | 2 +-
.../modules/j2ee/jboss4/ide/JBStartRunnable.java | 22 +++++++++++-----------
.../j2ee/weblogic9/WLConnectionSupport.java | 4 ++--
.../websvc/metro/model/MetroConfigLoader.java | 4 ++--
.../wsitconf/api/DesignerListenerProvider.java | 2 +-
.../websvc/wsitconf/api/DevDefaultsProvider.java | 2 +-
.../refactoring/WSITRefactoringPlugin.java | 2 +-
.../wsitconf/wsdlmodelext/RMDeliveryAssurance.java | 4 ++--
.../wsitconf/wsdlmodelext/RMSequenceBinding.java | 4 ++--
.../wsitconf/wsdlmodelext/WSITModelSupport.java | 2 +-
.../wsitmodelext/versioning/ConfigVersion.java | 2 +-
17 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/contrib/cordova.platforms.ios/src/org/netbeans/modules/cordova/platforms/ios/IOSPlatform.java b/contrib/cordova.platforms.ios/src/org/netbeans/modules/cordova/platforms/ios/IOSPlatform.java
index 1aa99a7..21c3201 100644
--- a/contrib/cordova.platforms.ios/src/org/netbeans/modules/cordova/platforms/ios/IOSPlatform.java
+++ b/contrib/cordova.platforms.ios/src/org/netbeans/modules/cordova/platforms/ios/IOSPlatform.java
@@ -54,7 +54,7 @@ public class IOSPlatform implements MobilePlatform {
private boolean isReady = false;
- private transient final java.beans.PropertyChangeSupport propertyChangeSupport = new java.beans.PropertyChangeSupport(this);
+ private final transient java.beans.PropertyChangeSupport propertyChangeSupport = new java.beans.PropertyChangeSupport(this);
private String sdkLocation;
private SDK DEFAULT = new IOSSDK("Simulator - iOS 6.0", "iphonesimulator6.0"); // NOI18N
diff --git a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails11.java b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails11.java
index 603f8bd..f3254f0 100644
--- a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails11.java
+++ b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails11.java
@@ -29,8 +29,8 @@ import org.netbeans.modules.groovy.grails.api.GrailsPlatform;
*/
public class SourceCategoriesGrails11 implements SourceCategoriesInterface {
- static public final GrailsPlatform.Version MIN_VERSION = GrailsPlatform.Version.VERSION_DEFAULT;
- static private final Map<SourceCategoryType, SourceCategory> SOURCE_CATEGORIES
+ public static final GrailsPlatform.Version MIN_VERSION = GrailsPlatform.Version.VERSION_DEFAULT;
+ private static final Map<SourceCategoryType, SourceCategory> SOURCE_CATEGORIES
= new HashMap<>();
static {
diff --git a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails301.java b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails301.java
index 5625a41..88b8228 100644
--- a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails301.java
+++ b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/SourceCategoriesGrails301.java
@@ -29,9 +29,9 @@ import org.netbeans.modules.groovy.grails.api.GrailsPlatform;
*/
public class SourceCategoriesGrails301 implements SourceCategoriesInterface {
- static public final GrailsPlatform.Version MIN_VERSION = GrailsPlatform.Version.valueOf("3.0.1");
+ public static final GrailsPlatform.Version MIN_VERSION = GrailsPlatform.Version.valueOf("3.0.1");
- static private final Map<SourceCategoryType, SourceCategory> SOURCE_CATEGORIES
+ private static final Map<SourceCategoryType, SourceCategory> SOURCE_CATEGORIES
= new HashMap<>();
static {
diff --git a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.java b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.java
index ba588d9..7339c86 100644
--- a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.java
+++ b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/commands/GrailsCommandChooser.java
@@ -60,7 +60,7 @@ import org.openide.util.NbBundle;
public final class GrailsCommandChooser extends JPanel {
- private final static Object NO_TASK_ITEM = getMessage("GrailsCommandChooser.no.matching.task");
+ private static final Object NO_TASK_ITEM = getMessage("GrailsCommandChooser.no.matching.task");
/** Remember checkbox state per IDE sessions. */
private static boolean debug;
@@ -577,7 +577,7 @@ public final class GrailsCommandChooser extends JPanel {
private javax.swing.JComboBox taskParametersComboBox;
// End of variables declaration//GEN-END:variables
- final static class Filter {
+ static final class Filter {
private final String filter;
private final List<GrailsCommand> tasks;
diff --git a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanel.java b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanel.java
index b027528..ad7238b 100644
--- a/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanel.java
+++ b/contrib/groovy.grailsproject/src/org/netbeans/modules/groovy/grailsproject/ui/wizards/impl/GrailsTargetChooserPanel.java
@@ -325,7 +325,7 @@ public final class GrailsTargetChooserPanel implements WizardDescriptor.Panel<Wi
* @param extension extension of created file
* @return localized error message or null if all right
*/
- final public static String canUseFileName(FileObject targetFolder, String folderName, String newObjectName, String extension) {
+ public static final String canUseFileName(FileObject targetFolder, String folderName, String newObjectName, String extension) {
String newObjectNameToDisplay = newObjectName;
if (newObjectName != null) {
newObjectName = newObjectName.replace('.', '/'); // NOI18N
diff --git a/contrib/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateWebModuleExtender.java b/contrib/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateWebModuleExtender.java
index 6741511..80ef6b9 100644
--- a/contrib/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateWebModuleExtender.java
+++ b/contrib/hibernateweb/src/org/netbeans/modules/hibernateweb/framework/HibernateWebModuleExtender.java
@@ -57,7 +57,7 @@ import org.openide.util.HelpCtx;
public class HibernateWebModuleExtender extends WebModuleExtender {
private HibernateConfigurationPanel configPanel = null;
- private final static String DEFAULT_CONFIG_FILENAME = "hibernate.cfg";
+ private static final String DEFAULT_CONFIG_FILENAME = "hibernate.cfg";
private final String dialect = "hibernate.dialect";
private final String driver = "hibernate.connection.driver_class";
private final String url = "hibernate.connection.url";
diff --git a/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JBOutputSupport.java b/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JBOutputSupport.java
index ee713fd..f5244fa 100644
--- a/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JBOutputSupport.java
+++ b/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JBOutputSupport.java
@@ -86,7 +86,7 @@ public final class JBOutputSupport {
this.props = props;
}
- public synchronized static JBOutputSupport getInstance(InstanceProperties props, boolean create) {
+ public static synchronized JBOutputSupport getInstance(InstanceProperties props, boolean create) {
JBOutputSupport instance = INSTANCE_CACHE.get(props);
if (instance == null && create) {
instance = new JBOutputSupport(props);
diff --git a/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JBStartRunnable.java b/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JBStartRunnable.java
index 5832cd6..a65dd2a 100644
--- a/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JBStartRunnable.java
+++ b/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/ide/JBStartRunnable.java
@@ -64,35 +64,35 @@ class JBStartRunnable implements Runnable {
private static final int START_TIMEOUT = 300000;
- private final static String CONF_FILE_NAME =
+ private static final String CONF_FILE_NAME =
"run.conf.bat"; // NOI18N
- private final static String RUN_FILE_NAME =
+ private static final String RUN_FILE_NAME =
"run.bat"; // NOI18N
- private final static String JBOSS_HOME
+ private static final String JBOSS_HOME
= "JBOSS_HOME"; // NOI18N
- private final static String STARTUP_SH = File.separator +
+ private static final String STARTUP_SH = File.separator +
"bin" + File.separator + "run.sh"; // NOI18N
- private final static String STANDALONE_SH = File.separator +
+ private static final String STANDALONE_SH = File.separator +
"bin" + File.separator + "standalone.sh"; // NOI18N
- private final static String STARTUP_BAT = File.separator +
+ private static final String STARTUP_BAT = File.separator +
"bin" + File.separator + RUN_FILE_NAME; // NOI18N
- private final static String STANDALONE_BAT = File.separator +
+ private static final String STANDALONE_BAT = File.separator +
"bin" + File.separator + "standalone.bat"; // NOI18N
- private final static String CONF_BAT = File.separator +
+ private static final String CONF_BAT = File.separator +
"bin" + File.separator + CONF_FILE_NAME; // NOI18N
- private final static String JAVA_OPTS = "JAVA_OPTS";// NOI18N
+ private static final String JAVA_OPTS = "JAVA_OPTS";// NOI18N
- private final static Pattern IF_JAVA_OPTS_PATTERN =
+ private static final Pattern IF_JAVA_OPTS_PATTERN =
Pattern.compile(".*if(\\s+not)?\\s+(\"x%"+JAVA_OPTS+
"%\"\\s+==\\s+\"x\")\\s+.*", // NOI18N
Pattern.DOTALL);
- private final static String NEW_IF_CONDITION_STRING =
+ private static final String NEW_IF_CONDITION_STRING =
"\"xx\" == \"x\""; // NOI18N
private static final SpecificationVersion
diff --git a/contrib/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/WLConnectionSupport.java b/contrib/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/WLConnectionSupport.java
index d58d3cd..a02fc74 100644
--- a/contrib/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/WLConnectionSupport.java
+++ b/contrib/j2ee.weblogic9/src/org/netbeans/modules/j2ee/weblogic9/WLConnectionSupport.java
@@ -175,7 +175,7 @@ public final class WLConnectionSupport {
}
- public static abstract class JMXRuntimeAction<T> implements JMXAction<T> {
+ public abstract static class JMXRuntimeAction<T> implements JMXAction<T> {
public abstract T call(MBeanServerConnection connection, ObjectName service) throws Exception;
@@ -192,7 +192,7 @@ public final class WLConnectionSupport {
}
}
- public static abstract class JMXEditAction<T> implements JMXAction<T> {
+ public abstract static class JMXEditAction<T> implements JMXAction<T> {
public abstract T call(MBeanServerConnection connection, ObjectName service) throws Exception;
diff --git a/contrib/websvc.metro.model/src/org/netbeans/modules/websvc/metro/model/MetroConfigLoader.java b/contrib/websvc.metro.model/src/org/netbeans/modules/websvc/metro/model/MetroConfigLoader.java
index fd848a8..dbccb1e 100644
--- a/contrib/websvc.metro.model/src/org/netbeans/modules/websvc/metro/model/MetroConfigLoader.java
+++ b/contrib/websvc.metro.model/src/org/netbeans/modules/websvc/metro/model/MetroConfigLoader.java
@@ -56,8 +56,8 @@ import org.openide.util.Exceptions;
*/
public class MetroConfigLoader {
- public final static String CFG_FILE_NAME="metro.xml";
- public final static String DEFAULT_TUBELINE_NAME="default";
+ public static final String CFG_FILE_NAME="metro.xml";
+ public static final String DEFAULT_TUBELINE_NAME="default";
private JAXBContext jaxbContext = null;
private ObjectFactory objFactory = null;
diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/api/DesignerListenerProvider.java b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/api/DesignerListenerProvider.java
index f1e4c09..27237b5 100644
--- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/api/DesignerListenerProvider.java
+++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/api/DesignerListenerProvider.java
@@ -34,7 +34,7 @@ public final class DesignerListenerProvider {
private static List<WeakReference<PropertyChangeListener>> listeners = new ArrayList<WeakReference<PropertyChangeListener>>();
- public static synchronized final void registerListener(PropertyChangeListener pcl) {
+ public static final synchronized void registerListener(PropertyChangeListener pcl) {
if (pcl == null) throw new IllegalArgumentException("Cannot pass nulls here!");
listeners.add(new WeakReference(pcl));
}
diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/api/DevDefaultsProvider.java b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/api/DevDefaultsProvider.java
index 1cd2e25..7b3940b 100644
--- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/api/DevDefaultsProvider.java
+++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/api/DevDefaultsProvider.java
@@ -44,7 +44,7 @@ public final class DevDefaultsProvider extends Object {
* Sets up the server environment by creating proper keystores if required, and
* filling proper keys into them
*/
- public synchronized final void fillDefaultsToServer(String serverID) {
+ public final synchronized void fillDefaultsToServer(String serverID) {
DefaultSettings.fillDefaultsToServer(serverID);
}
diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/refactoring/WSITRefactoringPlugin.java b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/refactoring/WSITRefactoringPlugin.java
index 602a87f..6a8ff19 100644
--- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/refactoring/WSITRefactoringPlugin.java
+++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/refactoring/WSITRefactoringPlugin.java
@@ -228,7 +228,7 @@ abstract class WSITRefactoringPlugin<T extends AbstractRefactoring> extends Java
}
}
- protected static abstract class AbstractRefactoringElement extends SimpleRefactoringElementImplementation {
+ protected abstract static class AbstractRefactoringElement extends SimpleRefactoringElementImplementation {
protected final WSDLModel model;
protected final FileObject file;
diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/RMDeliveryAssurance.java b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/RMDeliveryAssurance.java
index cb28341..70ad1f9 100644
--- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/RMDeliveryAssurance.java
+++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/RMDeliveryAssurance.java
@@ -66,11 +66,11 @@ public enum RMDeliveryAssurance {
},
/*AT_MOST_ONCE*/;
- public final static RMDeliveryAssurance getDefault() {
+ public static final RMDeliveryAssurance getDefault() {
return EXACTLY_ONCE;
}
- public final static RMDeliveryAssurance getValue(ConfigVersion cfgVersion, Binding b) {
+ public static final RMDeliveryAssurance getValue(ConfigVersion cfgVersion, Binding b) {
if (ConfigVersion.CONFIG_1_0.equals(cfgVersion)) {
if (RMModelHelper.isAllowDuplicates(b)) {
return AT_LEAST_ONCE;
diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/RMSequenceBinding.java b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/RMSequenceBinding.java
index 3d51ffa..6e43f64 100644
--- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/RMSequenceBinding.java
+++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/RMSequenceBinding.java
@@ -45,11 +45,11 @@ public enum RMSequenceBinding {
}
};
- public final static RMSequenceBinding getDefault() {
+ public static final RMSequenceBinding getDefault() {
return SECURED_TOKEN;
}
- public final static RMSequenceBinding getValue(ConfigVersion cfgVersion, Binding b) {
+ public static final RMSequenceBinding getValue(ConfigVersion cfgVersion, Binding b) {
if (!ConfigVersion.CONFIG_1_0.equals(cfgVersion)) {
if (RMModelHelper.getInstance(cfgVersion).isSequenceBinding(b, SECURED_TRANSPORT)) {
return SECURED_TRANSPORT;
diff --git a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/WSITModelSupport.java b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/WSITModelSupport.java
index 56db2b5..f8fa6cd 100644
--- a/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/WSITModelSupport.java
+++ b/contrib/websvc.wsitconf/src/org/netbeans/modules/websvc/wsitconf/wsdlmodelext/WSITModelSupport.java
@@ -676,7 +676,7 @@ public class WSITModelSupport {
save(model);
}
- public synchronized static void save(WSDLModel model) {
+ public static synchronized void save(WSDLModel model) {
Set<FileObject> traversedModels = new HashSet();
save(model, traversedModels);
}
diff --git a/contrib/websvc.wsitmodelext/src/org/netbeans/modules/websvc/wsitmodelext/versioning/ConfigVersion.java b/contrib/websvc.wsitmodelext/src/org/netbeans/modules/websvc/wsitmodelext/versioning/ConfigVersion.java
index 0b5ce03..b2f2a3b 100644
--- a/contrib/websvc.wsitmodelext/src/org/netbeans/modules/websvc/wsitmodelext/versioning/ConfigVersion.java
+++ b/contrib/websvc.wsitmodelext/src/org/netbeans/modules/websvc/wsitmodelext/versioning/ConfigVersion.java
@@ -54,7 +54,7 @@ public enum ConfigVersion {
return NbBundle.getMessage(ConfigVersion.class, this.name());
}
- public final static ConfigVersion getDefault() {
+ public static final ConfigVersion getDefault() {
return CONFIG_2_0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: 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
[netbeans] 01/17: Use the blessed modifier order in projects located in cpplite projects
Posted by mk...@apache.org.
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 a6bb989e647ea819ef6741c7a3e0edabce59793c
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Thu Feb 17 22:23:09 2022 +0100
Use the blessed modifier order in projects located in cpplite projects
---
.../cpplite/debugger/debuggingview/DebuggingActionsProvider.java | 2 +-
.../org/netbeans/modules/cpplite/debugger/AbstractDebugTest.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/debuggingview/DebuggingActionsProvider.java b/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/debuggingview/DebuggingActionsProvider.java
index 0585757..a5411fb 100644
--- a/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/debuggingview/DebuggingActionsProvider.java
+++ b/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/debuggingview/DebuggingActionsProvider.java
@@ -123,7 +123,7 @@ public class DebuggingActionsProvider implements NodeActionsProvider {
);
}
- private static abstract class LazyActionPerformer implements Models.ActionPerformer {
+ private abstract static class LazyActionPerformer implements Models.ActionPerformer {
private RequestProcessor rp;
diff --git a/cpplite/cpplite.debugger/test/unit/src/org/netbeans/modules/cpplite/debugger/AbstractDebugTest.java b/cpplite/cpplite.debugger/test/unit/src/org/netbeans/modules/cpplite/debugger/AbstractDebugTest.java
index 5e2e811..c4b3077 100644
--- a/cpplite/cpplite.debugger/test/unit/src/org/netbeans/modules/cpplite/debugger/AbstractDebugTest.java
+++ b/cpplite/cpplite.debugger/test/unit/src/org/netbeans/modules/cpplite/debugger/AbstractDebugTest.java
@@ -54,7 +54,7 @@ public abstract class AbstractDebugTest extends NbTestCase {
super(s);
}
- protected final static void createSourceFile(String fileName, File wd, String content) throws IOException {
+ protected static final void createSourceFile(String fileName, File wd, String content) throws IOException {
FileObject source = FileUtil.createData(FileUtil.toFileObject(wd), "main.cpp");
try (OutputStream os = source.getOutputStream();
Writer w = new OutputStreamWriter(os)) {
@@ -62,12 +62,12 @@ public abstract class AbstractDebugTest extends NbTestCase {
}
}
- protected final static void compileC(String name, File wd) throws IOException, InterruptedException {
+ protected static final void compileC(String name, File wd) throws IOException, InterruptedException {
Process compile = new ProcessBuilder("gcc", "-o", name, "-g", name + ".c").directory(wd).start();
assertEquals(0, compile.waitFor());
}
- protected final static void compileCPP(String name, File wd) throws IOException, InterruptedException {
+ protected static final void compileCPP(String name, File wd) throws IOException, InterruptedException {
Process compile = new ProcessBuilder("g++", "-o", name, "-g", name + ".cpp").directory(wd).start();
assertEquals(0, compile.waitFor());
}
---------------------------------------------------------------------
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
[netbeans] 09/17: Use the blessed modifier order in projects located in harness projects
Posted by mk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mklaehn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit ed4851dd9ef436e9dc23aa30b6452a841d10de97
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Fri Feb 18 11:10:00 2022 +0100
Use the blessed modifier order in projects located in harness projects
---
.../modules/apisupport/jnlplauncher/Main.java | 4 ++--
.../nbjunit/src/org/netbeans/junit/NbTestCase.java | 24 +++++++++++-----------
.../src/org/netbeans/junit/NbTestDecorator.java | 20 +++++++++---------
.../org/netbeans/junit/ParametricTestSuite.java | 2 +-
.../src/org/netbeans/junit/MockServicesTest.java | 2 +-
.../src/org/netbeans/insane/impl/RootTest.java | 2 +-
6 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/harness/apisupport.harness/jnlp-src/org/netbeans/modules/apisupport/jnlplauncher/Main.java b/harness/apisupport.harness/jnlp-src/org/netbeans/modules/apisupport/jnlplauncher/Main.java
index 33f5b2d..187dbcd 100644
--- a/harness/apisupport.harness/jnlp-src/org/netbeans/modules/apisupport/jnlplauncher/Main.java
+++ b/harness/apisupport.harness/jnlp-src/org/netbeans/modules/apisupport/jnlplauncher/Main.java
@@ -42,7 +42,7 @@ public class Main extends Object {
/** Fixes value of netbeans.user property.
*/
- final static void fixNetBeansUser() {
+ static final void fixNetBeansUser() {
String userDir = System.getProperty("netbeans.user"); // NOI18N
if (userDir == null) {
userDir = System.getProperty("jnlp.netbeans.user"); // NOI18N
@@ -68,7 +68,7 @@ public class Main extends Object {
* permissions. The jars besides the one containing this class
* don't have to be signed with this.
*/
- final static void fixPolicy() {
+ static final void fixPolicy() {
if (Boolean.getBoolean("netbeans.jnlp.fixPolicy")) { // NOI18N
// Grant all the code all persmission
Policy.setPolicy(new RuntimePolicy());
diff --git a/harness/nbjunit/src/org/netbeans/junit/NbTestCase.java b/harness/nbjunit/src/org/netbeans/junit/NbTestCase.java
index 56738d1..12e7b39 100644
--- a/harness/nbjunit/src/org/netbeans/junit/NbTestCase.java
+++ b/harness/nbjunit/src/org/netbeans/junit/NbTestCase.java
@@ -631,7 +631,7 @@ public abstract class NbTestCase extends TestCase implements NbTest {
* @param externalDiff instance of class implementing the {@link org.netbeans.junit.diff.Diff} interface, it has to be
* already initialized, when passed in this assertFile function.
*/
- static public void assertFile(String message, String test, String pass, String diff, Diff externalDiff) {
+ public static void assertFile(String message, String test, String pass, String diff, Diff externalDiff) {
Diff diffImpl = null == externalDiff ? Manager.getSystemDiff() : externalDiff;
File diffFile = getDiffName(pass, null == diff ? null : new File(diff));
@@ -666,7 +666,7 @@ public abstract class NbTestCase extends TestCase implements NbTest {
* @param externalDiff instance of class implementing the {@link org.netbeans.junit.diff.Diff} interface, it has to be
* already initialized, when passed in this assertFile function.
*/
- static public void assertFile(String test, String pass, String diff, Diff externalDiff) {
+ public static void assertFile(String test, String pass, String diff, Diff externalDiff) {
assertFile(null, test, pass, diff, externalDiff);
}
/**
@@ -681,7 +681,7 @@ public abstract class NbTestCase extends TestCase implements NbTest {
* directory. Constructed file name consists from the name of pass file (without extension and path) appended
* by the '.diff'.
*/
- static public void assertFile(String message, String test, String pass, String diff) {
+ public static void assertFile(String message, String test, String pass, String diff) {
assertFile(message, test, pass, diff, null);
}
/**
@@ -695,7 +695,7 @@ public abstract class NbTestCase extends TestCase implements NbTest {
* directory. Constructed file name consists from the name of pass file (without extension and path) appended
* by the '.diff'.
*/
- static public void assertFile(String test, String pass, String diff) {
+ public static void assertFile(String test, String pass, String diff) {
assertFile(null, test, pass, diff, null);
}
/**
@@ -704,7 +704,7 @@ public abstract class NbTestCase extends TestCase implements NbTest {
* @param pass second file to be compared, it should be so called 'golden' file, which defines the
* correct content for the test-generated file.
*/
- static public void assertFile(String test, String pass) {
+ public static void assertFile(String test, String pass) {
assertFile(null, test, pass, null, null);
}
@@ -724,7 +724,7 @@ public abstract class NbTestCase extends TestCase implements NbTest {
* @param externalDiff instance of class implementing the {@link org.netbeans.junit.diff.Diff} interface, it has to be
* already initialized, when passed in this assertFile function.
*/
- static public void assertFile(String message, File test, File pass, File diff, Diff externalDiff) {
+ public static void assertFile(String message, File test, File pass, File diff, Diff externalDiff) {
Diff diffImpl = null == externalDiff ? Manager.getSystemDiff() : externalDiff;
File diffFile = getDiffName(pass.getAbsolutePath(), diff);
@@ -759,7 +759,7 @@ public abstract class NbTestCase extends TestCase implements NbTest {
* @param externalDiff instance of class implementing the {@link org.netbeans.junit.diff.Diff} interface, it has to be
* already initialized, when passed in this assertFile function.
*/
- static public void assertFile(File test, File pass, File diff, Diff externalDiff) {
+ public static void assertFile(File test, File pass, File diff, Diff externalDiff) {
assertFile("Difference between " + test + " and " + pass, test, pass, diff, externalDiff);
}
/**
@@ -774,7 +774,7 @@ public abstract class NbTestCase extends TestCase implements NbTest {
* directory. Constructed file name consists from the name of pass file (without extension and path) appended
* by the '.diff'.
*/
- static public void assertFile(String message, File test, File pass, File diff) {
+ public static void assertFile(String message, File test, File pass, File diff) {
assertFile(message, test, pass, diff, null);
}
/**
@@ -788,7 +788,7 @@ public abstract class NbTestCase extends TestCase implements NbTest {
* directory. Constructed file name consists from the name of pass file (without extension and path) appended
* by the '.diff'.
*/
- static public void assertFile(File test, File pass, File diff) {
+ public static void assertFile(File test, File pass, File diff) {
assertFile("Difference between " + test + " and " + pass, test, pass, diff, null);
}
/**
@@ -797,13 +797,13 @@ public abstract class NbTestCase extends TestCase implements NbTest {
* @param pass second file to be compared, it should be so called 'golden' file, which defines the
* correct content for the test-generated file.
*/
- static public void assertFile(File test, File pass) {
+ public static void assertFile(File test, File pass) {
assertFile("Difference between " + test + " and " + pass, test, pass, null, null);
}
/**
*/
- static private File getDiffName(String pass, File diff) {
+ private static File getDiffName(String pass, File diff) {
if (null == diff) {
return null;
}
@@ -1314,7 +1314,7 @@ public abstract class NbTestCase extends TestCase implements NbTest {
}
// radix for new nbfsurl
- private final static int radix = 16;
+ private static final int radix = 16;
// new nbfsurl decoder - assumes the external form
// begins with nbfs://
private static String convertNewNBFSURL(URL url) {
diff --git a/harness/nbjunit/src/org/netbeans/junit/NbTestDecorator.java b/harness/nbjunit/src/org/netbeans/junit/NbTestDecorator.java
index 9163e27..e1b0904 100644
--- a/harness/nbjunit/src/org/netbeans/junit/NbTestDecorator.java
+++ b/harness/nbjunit/src/org/netbeans/junit/NbTestDecorator.java
@@ -93,64 +93,64 @@ public class NbTestDecorator extends TestDecorator implements NbTest {
/** for description, see this method in NbTestCase class
*/
- static public void assertFile(String message, String test, String pass, String diff, Diff externalDiff) {
+ public static void assertFile(String message, String test, String pass, String diff, Diff externalDiff) {
NbTestCase.assertFile(message,test,pass,diff,externalDiff);
}
/** for description, see this method in NbTestCase class
*/
- static public void assertFile(String test, String pass, String diff, Diff externalDiff) {
+ public static void assertFile(String test, String pass, String diff, Diff externalDiff) {
NbTestCase.assertFile(test, pass, diff, externalDiff);
}
/** for description, see this method in NbTestCase class
*/
- static public void assertFile(String message, String test, String pass, String diff) {
+ public static void assertFile(String message, String test, String pass, String diff) {
NbTestCase.assertFile(message, test, pass, diff);
}
/** for description, see this method in NbTestCase class
*/
- static public void assertFile(String test, String pass, String diff) {
+ public static void assertFile(String test, String pass, String diff) {
NbTestCase.assertFile(test, pass, diff);
}
/** for description, see this method in NbTestCase class
*/
- static public void assertFile(String test, String pass) {
+ public static void assertFile(String test, String pass) {
NbTestCase.assertFile(test, pass);
}
/** for description, see this method in NbTestCase class
*/
- static public void assertFile(String message, File test, File pass, File diff, Diff externalDiff) {
+ public static void assertFile(String message, File test, File pass, File diff, Diff externalDiff) {
NbTestCase.assertFile(message,test,pass,diff,externalDiff);
}
/** for description, see this method in NbTestCase class
*/
- static public void assertFile(File test, File pass, File diff, Diff externalDiff) {
+ public static void assertFile(File test, File pass, File diff, Diff externalDiff) {
NbTestCase.assertFile(test, pass, diff, externalDiff);
}
/** for description, see this method in NbTestCase class
*/
- static public void assertFile(String message, File test, File pass, File diff) {
+ public static void assertFile(String message, File test, File pass, File diff) {
NbTestCase.assertFile(message, test, pass, diff);
}
/** for description, see this method in NbTestCase class
*/
- static public void assertFile(File test, File pass, File diff) {
+ public static void assertFile(File test, File pass, File diff) {
NbTestCase.assertFile(test,pass,diff);
}
/** for description, see this method in NbTestCase class
*/
- static public void assertFile(File test, File pass) {
+ public static void assertFile(File test, File pass) {
NbTestCase.assertFile(test, pass);
}
diff --git a/harness/nbjunit/src/org/netbeans/junit/ParametricTestSuite.java b/harness/nbjunit/src/org/netbeans/junit/ParametricTestSuite.java
index 684add2..3520862 100644
--- a/harness/nbjunit/src/org/netbeans/junit/ParametricTestSuite.java
+++ b/harness/nbjunit/src/org/netbeans/junit/ParametricTestSuite.java
@@ -54,7 +54,7 @@ public abstract class ParametricTestSuite extends MultiTestSuite{
* Factory method returns a new instance of a testcases.
* Overrides the basic method so that it's needless any more.
*/
- final protected MultiTestCase nextTestCase(){
+ protected final MultiTestCase nextTestCase(){
return null;
}
diff --git a/harness/nbjunit/test/unit/src/org/netbeans/junit/MockServicesTest.java b/harness/nbjunit/test/unit/src/org/netbeans/junit/MockServicesTest.java
index ed28262..08b71ef 100644
--- a/harness/nbjunit/test/unit/src/org/netbeans/junit/MockServicesTest.java
+++ b/harness/nbjunit/test/unit/src/org/netbeans/junit/MockServicesTest.java
@@ -168,7 +168,7 @@ public abstract class MockServicesTest extends TestCase {
}
}
- public static abstract class MockChoice6 implements Choice {}
+ public abstract static class MockChoice6 implements Choice {}
/**
* Check that service registrations are available from all threads,
diff --git a/harness/o.n.insane/test/unit/src/org/netbeans/insane/impl/RootTest.java b/harness/o.n.insane/test/unit/src/org/netbeans/insane/impl/RootTest.java
index b306e9f..325f978 100644
--- a/harness/o.n.insane/test/unit/src/org/netbeans/insane/impl/RootTest.java
+++ b/harness/o.n.insane/test/unit/src/org/netbeans/insane/impl/RootTest.java
@@ -50,7 +50,7 @@ public class RootTest {
public static class ObjectWithField {
- public final static String FIELD = "field";
+ public static final String FIELD = "field";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: 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
[netbeans] 02/17: Use the blessed modifier order in projects located in websvccommon projects
Posted by mk...@apache.org.
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 b6daca96683129c4cc7daceda3523bb87253a677
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Fri Feb 18 11:08:05 2022 +0100
Use the blessed modifier order in projects located in websvccommon projects
---
.../src/org/netbeans/modules/websvc/saas/model/SaasServicesModel.java | 2 +-
.../modules/websvc/saas/spi/websvcmgr/WsdlServiceProxyDescriptor.java | 2 +-
.../netbeans/modules/websvc/saas/codegen/SaasClientCodeGenerator.java | 4 ++--
.../src/org/netbeans/modules/websvc/saas/codegen/util/Inflector.java | 2 +-
.../src/org/netbeans/modules/websvc/saas/ui/nodes/SaasMethodNode.java | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasServicesModel.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasServicesModel.java
index 62be31d..6eaccce 100644
--- a/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasServicesModel.java
+++ b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/model/SaasServicesModel.java
@@ -58,7 +58,7 @@ public class SaasServicesModel {
}
private static SaasServicesModel instance;
- public synchronized static SaasServicesModel getInstance() {
+ public static synchronized SaasServicesModel getInstance() {
if (instance == null) {
instance = new SaasServicesModel();
}
diff --git a/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlServiceProxyDescriptor.java b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlServiceProxyDescriptor.java
index 76a8e59..1ef4486 100644
--- a/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlServiceProxyDescriptor.java
+++ b/websvccommon/websvc.saas.api/src/org/netbeans/modules/websvc/saas/spi/websvcmgr/WsdlServiceProxyDescriptor.java
@@ -57,7 +57,7 @@ public class WsdlServiceProxyDescriptor {
private int wsType;
private String wsdl;
private String xmlDescriptor;
- transient private WSService model;
+ private transient WSService model;
private List<JarEntry> jars;
private Map<String, Object> consumerData;
diff --git a/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/SaasClientCodeGenerator.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/SaasClientCodeGenerator.java
index 8e38229..9c99e0a 100644
--- a/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/SaasClientCodeGenerator.java
+++ b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/SaasClientCodeGenerator.java
@@ -57,7 +57,7 @@ import org.openide.util.Exceptions;
*
* @author nam
*/
-abstract public class SaasClientCodeGenerator implements SaasClientCodeGenerationProvider {
+public abstract class SaasClientCodeGenerator implements SaasClientCodeGenerationProvider {
public static final String REST_CONNECTION = "RestConnection"; //NOI18N
public static final String REST_RESPONSE = "RestResponse"; //NOI18N
@@ -238,7 +238,7 @@ abstract public class SaasClientCodeGenerator implements SaasClientCodeGeneratio
}
}
- abstract protected String getCustomMethodBody() throws IOException;
+ protected abstract String getCustomMethodBody() throws IOException;
public SaasBean getBean() {
return bean;
diff --git a/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/Inflector.java b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/Inflector.java
index 029f452..981ee8d 100644
--- a/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/Inflector.java
+++ b/websvccommon/websvc.saas.codegen/src/org/netbeans/modules/websvc/saas/codegen/util/Inflector.java
@@ -134,7 +134,7 @@ public class Inflector {
* <p>The singleton instance returned by the default <code>getInstance()</code>
* method.</p>
*/
- private transient static Inflector instance = null;
+ private static transient Inflector instance = null;
/**
diff --git a/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasMethodNode.java b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasMethodNode.java
index 6e388bd..0a7321c 100644
--- a/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasMethodNode.java
+++ b/websvccommon/websvc.saas.ui/src/org/netbeans/modules/websvc/saas/ui/nodes/SaasMethodNode.java
@@ -52,7 +52,7 @@ public class SaasMethodNode extends AbstractNode {
return method.getDocumentation();
}
- static private final Image ICON = ImageUtilities.loadImage("org/netbeans/modules/websvc/saas/ui/resources/method.png"); // NOI18N
+ private static final Image ICON = ImageUtilities.loadImage("org/netbeans/modules/websvc/saas/ui/resources/method.png"); // NOI18N
@Override
public Image getIcon(int type){
---------------------------------------------------------------------
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
[netbeans] 10/17: Use the blessed modifier order in projects located in groovy projects
Posted by mk...@apache.org.
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 6c1dddc3a2304cf45cb7a16ff88426c9909b1c12
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Fri Feb 18 11:10:10 2022 +0100
Use the blessed modifier order in projects located in groovy projects
---
.../qa-functional/src/org/netbeans/test/groovy/GeneralGroovy.java | 2 +-
.../org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanel.java | 2 +-
.../actions/singlefilerun/SingleGroovySourceRunActionProvider.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/groovy/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/GeneralGroovy.java b/groovy/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/GeneralGroovy.java
index 85322b9..137a850 100644
--- a/groovy/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/GeneralGroovy.java
+++ b/groovy/groovy.editor/test/qa-functional/src/org/netbeans/test/groovy/GeneralGroovy.java
@@ -45,7 +45,7 @@ public class GeneralGroovy extends JellyTestCase {
static final String JAVA_CATEGORY_NAME = "Java";
static final String GROOVY_CATEGORY_NAME = "Groovy";
static final String JAVA_PROJECT_NAME = "Java Application";
- static protected final int COMPLETION_LIST_THRESHOLD = 5000;
+ protected static final int COMPLETION_LIST_THRESHOLD = 5000;
protected static final String GROOVY_EXTENSION = ".groovy";
protected static final String SAMPLES = "Samples";
protected static final String SAMPLES_CATEGORY = "Groovy";
diff --git a/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanel.java b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanel.java
index 919210c..2694e2c 100644
--- a/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanel.java
+++ b/groovy/groovy.refactoring/src/org/netbeans/modules/groovy/refactoring/ui/WhereUsedPanel.java
@@ -284,7 +284,7 @@ public class WhereUsedPanel extends JPanel implements CustomRefactoringPanel {
}
}
- static abstract class WhereUsedInnerPanel extends JPanel {
+ abstract static class WhereUsedInnerPanel extends JPanel {
abstract boolean isSearchInComments();
abstract void initialize(RefactoringElement element);
}
diff --git a/groovy/groovy.support/src/org/netbeans/modules/groovy/support/actions/singlefilerun/SingleGroovySourceRunActionProvider.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/actions/singlefilerun/SingleGroovySourceRunActionProvider.java
index 25fad3b..bed0556 100644
--- a/groovy/groovy.support/src/org/netbeans/modules/groovy/support/actions/singlefilerun/SingleGroovySourceRunActionProvider.java
+++ b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/actions/singlefilerun/SingleGroovySourceRunActionProvider.java
@@ -97,7 +97,7 @@ public class SingleGroovySourceRunActionProvider implements ActionProvider {
return isSingleSourceFile(getGroovyFile(context));
}
- static private boolean isSingleSourceFile(FileObject fileObject) {
+ private static boolean isSingleSourceFile(FileObject fileObject) {
if (fileObject == null) {
return false;
}
@@ -105,7 +105,7 @@ public class SingleGroovySourceRunActionProvider implements ActionProvider {
return p == null;
}
- static private FileObject getGroovyFile(Lookup lookup) {
+ private static FileObject getGroovyFile(Lookup lookup) {
for (DataObject dObj : lookup.lookupAll(DataObject.class)) {
FileObject fObj = dObj.getPrimaryFile();
if (GROOVY_EXTENSION.equals(fObj.getExt().toLowerCase())) {
---------------------------------------------------------------------
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
[netbeans] 12/17: Use the blessed modifier order in projects located in ergonomics projects
Posted by mk...@apache.org.
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 a3af8600163c2827cd6d90bdfecad590cb7704a6
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Fri Feb 18 11:10:44 2022 +0100
Use the blessed modifier order in projects located in ergonomics projects
---
.../org/netbeans/modules/ide/ergonomics/fod/FeatureProjectFactory.java | 2 +-
.../src/org/netbeans/modules/ide/ergonomics/fod/FoDLayersProvider.java | 2 +-
.../unit/src/org/netbeans/modules/ide/ergonomics/CommonServersBase.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureProjectFactory.java b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureProjectFactory.java
index cb6017d..807b32a 100644
--- a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureProjectFactory.java
+++ b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FeatureProjectFactory.java
@@ -93,7 +93,7 @@ implements ProjectFactory, PropertyChangeListener, Runnable {
);
}
- final static class Data {
+ static final class Data {
private final boolean deepCheck;
private final FileObject dir;
private Map<String,String> data;
diff --git a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FoDLayersProvider.java b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FoDLayersProvider.java
index b13bbca..77fac58 100755
--- a/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FoDLayersProvider.java
+++ b/ergonomics/ide.ergonomics/src/org/netbeans/modules/ide/ergonomics/fod/FoDLayersProvider.java
@@ -43,7 +43,7 @@ import org.openide.util.lookup.ServiceProviders;
})
public final class FoDLayersProvider extends Repository.LayerProvider
implements LookupListener, Runnable {
- final static Logger LOG = Logger.getLogger (FoDLayersProvider.class.getPackage().getName());
+ static final Logger LOG = Logger.getLogger (FoDLayersProvider.class.getPackage().getName());
private RequestProcessor.Task refresh = FeatureManager.getInstance().create(this, true);
private Lookup.Result<ProjectFactory> factories;
private Lookup.Result<?> ants;
diff --git a/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/CommonServersBase.java b/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/CommonServersBase.java
index 5f78e4a..ff6ba89 100644
--- a/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/CommonServersBase.java
+++ b/ergonomics/ide.ergonomics/test/unit/src/org/netbeans/modules/ide/ergonomics/CommonServersBase.java
@@ -91,7 +91,7 @@ public abstract class CommonServersBase extends NbTestCase {
}
}
- private final static Comparator<ServerWizardProvider> comparator = new Comparator<ServerWizardProvider>() {
+ private static final Comparator<ServerWizardProvider> comparator = new Comparator<ServerWizardProvider>() {
@Override
public int compare(ServerWizardProvider arg0, ServerWizardProvider arg1) {
return arg0.getDisplayName().compareTo(arg1.getDisplayName());
---------------------------------------------------------------------
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
[netbeans] 04/17: Use the blessed modifier order in projects located in profiler projects
Posted by mk...@apache.org.
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 584017552e832252429f570419f7e8f286e2cc3a
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Fri Feb 18 11:08:43 2022 +0100
Use the blessed modifier order in projects located in profiler projects
---
.../netbeans/lib/profiler/charts/ChartItem.java | 2 +-
.../netbeans/lib/profiler/charts/ItemsModel.java | 2 +-
.../lib/profiler/charts/PaintersModel.java | 2 +-
.../lib/profiler/charts/axis/AxisMark.java | 2 +-
.../profiler/charts/axis/AxisMarksComputer.java | 4 ++--
.../lib/profiler/charts/axis/AxisMarksPainter.java | 2 +-
.../lib/profiler/charts/xy/XYItemPainter.java | 2 +-
.../profiler/ui/LiveResultsWindowContributor.java | 2 +-
.../org/netbeans/lib/profiler/ui/SwingWorker.java | 10 ++++----
.../lib/profiler/ui/components/CloseButton.java | 2 +-
.../lib/profiler/ui/components/LazyComboBox.java | 2 +-
.../profiler/ui/components/ProfilerToolbar.java | 2 +-
.../ui/cpu/statistics/StatisticalModule.java | 8 +++----
.../netbeans/lib/profiler/ui/results/DataView.java | 2 +-
.../lib/profiler/ui/swing/ExportUtils.java | 10 ++++----
.../lib/profiler/ui/swing/FilterUtils.java | 2 +-
.../lib/profiler/ui/swing/ProfilerPopup.java | 2 +-
.../lib/profiler/ui/swing/ProfilerTreeTable.java | 2 +-
.../profiler/ui/swing/ProfilerTreeTableModel.java | 2 +-
.../lib/profiler/ui/swing/SearchUtils.java | 2 +-
.../netbeans/lib/profiler/ui/SwingWorkerTest.java | 4 ++--
.../org/netbeans/lib/profiler/ProfilerClient.java | 2 +-
.../netbeans/lib/profiler/classfile/ClassPath.java | 2 +-
.../lib/profiler/heap/AbstractLongMap.java | 2 +-
.../netbeans/lib/profiler/heap/HprofGCRoots.java | 4 ++--
.../org/netbeans/lib/profiler/heap/Progress.java | 4 ++--
.../profiler/results/RuntimeCCTNodeProcessor.java | 18 +++++++-------
.../profiler/results/cpu/CPUCallGraphBuilder.java | 4 ++--
.../lib/profiler/results/cpu/InstrTimingData.java | 2 +-
.../lib/profiler/results/cpu/MethodInfoMapper.java | 2 +-
.../results/cpu/StackTraceSnapshotBuilder.java | 4 ++--
.../lib/profiler/results/cpu/ThreadInfo.java | 2 +-
.../results/cpu/marking/MarkingEngine.java | 2 +-
.../profiler/results/jdbc/JdbcGraphBuilder.java | 2 +-
.../profiler/results/locks/LockGraphBuilder.java | 2 +-
.../lib/profiler/results/locks/MonitorInfo.java | 2 +-
.../lib/profiler/results/memory/HeapHistogram.java | 2 +-
.../profiler/results/memory/JMethodIdTable.java | 18 +++++++-------
.../lib/profiler/server/ProfilerRuntime.java | 2 +-
.../lib/profiler/server/ProfilerServer.java | 2 +-
.../MavenProjectProfilingSupportProvider.java | 4 ++--
.../modules/maven/profiler/RunCheckerImpl.java | 2 +-
.../modules/profiler/api/EditorSupport.java | 2 +-
.../netbeans/modules/profiler/api/GoToSource.java | 2 +-
.../modules/profiler/api/ProfilerProject.java | 6 ++---
.../modules/profiler/api/ProfilerSource.java | 8 +++----
.../profiler/api/java/ExternalPackages.java | 2 +-
.../profiler/api/java/JavaProfilerSource.java | 4 ++--
.../profiler/api/java/ProfilerTypeUtils.java | 2 +-
.../modules/profiler/api/java/SourceClassInfo.java | 28 +++++++++++-----------
.../profiler/api/java/SourceMethodInfo.java | 14 +++++------
.../profiler/api/java/SourcePackageInfo.java | 6 ++---
.../modules/profiler/spi/IconsProvider.java | 2 +-
.../profiler/spi/ProfilerStorageProvider.java | 2 +-
.../modules/profiler/spi/SessionListener.java | 2 +-
.../spi/java/AbstractJavaProfilerSource.java | 2 +-
.../spi/java/ProfilerTypeUtilsProvider.java | 6 ++---
.../attach/providers/RemotePackExporter.java | 2 +-
.../attach/spi/AbstractRemotePackExporter.java | 10 ++++----
.../attach/steps/BasicAttachStepsProvider.java | 6 ++---
.../profiler/heapwalk/HeapFragmentWalker.java | 2 +-
.../profiler/heapwalk/HeapWalkerManager.java | 4 ++--
.../modules/profiler/heapwalk/OQLController.java | 4 ++--
.../modules/profiler/heapwalk/OQLSupport.java | 4 ++--
.../profiler/heapwalk/OverviewController.java | 12 +++++-----
.../heapwalk/details/api/ExportAction.java | 2 +-
.../heapwalk/details/jdk/ui/BorderBuilders.java | 2 +-
.../heapwalk/details/jdk/ui/ButtonBuilders.java | 2 +-
.../heapwalk/details/jdk/ui/ComponentBuilders.java | 4 ++--
.../details/jdk/ui/TextComponentBuilders.java | 2 +-
.../profiler/heapwalk/details/jdk/ui/Utils.java | 4 ++--
.../details/netbeans/PlatformDetailsProvider.java | 24 +++++++++----------
.../heapwalk/details/spi/DetailsProvider.java | 4 ++--
.../profiler/heapwalk/oql/ui/OQLEditor.java | 16 ++++++-------
.../j2se/J2SEProjectProfilingSupportProvider.java | 2 +-
.../nbimpl/actions/FileSensitivePerformer.java | 2 +-
.../profiler/nbimpl/actions/ProfilerLauncher.java | 20 ++++++++--------
.../nbimpl/actions/ProjectSensitivePerformer.java | 4 ++--
.../profiler/nbimpl/javac/ScanSensitiveTask.java | 4 ++--
.../nbimpl/project/AntProjectSupportProvider.java | 2 +-
.../JavaProjectProfilingSupportProvider.java | 4 ++--
.../profiler/nbimpl/project/ProjectUtilities.java | 4 ++--
.../providers/BaseProfilerTypeUtilsImpl.java | 10 ++++----
.../nbimpl/providers/GoToJavaSourceProvider.java | 4 ++--
.../oql/language/ClassnameCompletionItem.java | 16 ++++++-------
.../oql/language/FunctionCompletionItem.java | 10 ++++----
.../oql/language/KeywordCompletionItem.java | 10 ++++----
.../oql/language/OQLCompletionProvider.java | 6 ++---
.../modules/profiler/oql/language/OQLLexer.java | 6 ++---
.../modules/profiler/oql/language/OQLTokenId.java | 2 +-
.../oql/language/PackageCompletionItem.java | 8 +++----
.../profiler/oql/language/ui/OQLEditor.java | 6 ++---
.../modules/profiler/oql/engine/api/OQLEngine.java | 10 ++++----
.../profiler/oql/engine/api/OQLException.java | 2 +-
.../profiler/oql/engine/api/ReferenceChain.java | 2 +-
.../oql/engine/api/impl/OQLEngineImpl.java | 4 ++--
.../profiler/oql/engine/api/impl/Snapshot.java | 2 +-
.../profiler/oql/engine/api/impl/TreeIterator.java | 6 ++---
.../oql/repository/api/OQLQueryCategory.java | 2 +-
.../oql/repository/api/OQLQueryDefinition.java | 2 +-
.../oql/repository/api/OQLQueryRepository.java | 10 ++++----
.../modules/profiler/oql/spi/OQLEditorImpl.java | 8 +++----
.../profiler/ppoints/ProfilingPointWizard.java | 2 +-
.../profiler/ppoints/ProfilingPointsManager.java | 2 +-
.../ppoints/ui/InsertProfilingPointMenuAction.java | 2 +-
.../profiler/ppoints/ui/ProjectSelector.java | 2 +-
.../ppoints/ui/ToggleProfilingPointAction.java | 2 +-
.../modules/profiler/snaptracer/TracerPackage.java | 4 ++--
.../modules/profiler/snaptracer/TracerProbe.java | 4 ++--
.../snaptracer/impl/IdeSnapshotAction.java | 2 +-
.../snaptracer/impl/export/DataExport.java | 2 +-
.../snaptracer/impl/timeline/ChartPanel.java | 2 +-
.../modules/profiler/utilities/Delegate.java | 4 ++--
.../modules/profiler/NetBeansProfiler.java | 4 ++--
.../netbeans/modules/profiler/ResultsManager.java | 4 ++--
.../modules/profiler/SaveSnapshotAction.java | 2 +-
.../modules/profiler/actions/AttachAction.java | 4 ++--
.../actions/GetCmdLineArgumentsAction.java | 2 +-
.../modules/profiler/actions/HeapDumpAction.java | 4 ++--
.../profiler/actions/InternalStatsAction.java | 2 +-
.../profiler/actions/ResetResultsAction.java | 4 ++--
.../modules/profiler/actions/RunGCAction.java | 4 ++--
.../modules/profiler/actions/StopAction.java | 6 ++---
.../profiler/actions/TakeSnapshotAction.java | 2 +-
.../profiler/actions/TakeThreadDumpAction.java | 2 +-
.../modules/profiler/v2/ProfilerFeature.java | 10 ++++----
.../modules/profiler/v2/ProfilerFeatures.java | 2 +-
.../modules/profiler/v2/ProfilerPlugin.java | 2 +-
.../modules/profiler/v2/ProfilerSession.java | 6 ++---
.../modules/profiler/v2/ProfilerSessions.java | 2 +-
.../profiler/v2/features/MethodsFeatureModes.java | 16 ++++++-------
.../profiler/v2/features/ObjectsFeatureModes.java | 12 +++++-----
.../profiler/v2/features/SQLFeatureModes.java | 6 ++---
.../profiler/v2/impl/ClassMethodSelector.java | 12 +++++-----
.../profiler/v2/impl/SnapshotsWindowUI.java | 2 +-
135 files changed, 325 insertions(+), 325 deletions(-)
diff --git a/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartItem.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartItem.java
index 309d6e4..5cc9e2d 100644
--- a/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartItem.java
+++ b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ChartItem.java
@@ -33,7 +33,7 @@ public interface ChartItem {
public void removeItemListener(ChartItemListener listener);
- public static abstract class Abstract implements ChartItem {
+ public abstract static class Abstract implements ChartItem {
private List<ChartItemListener> listeners;
diff --git a/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemsModel.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemsModel.java
index 91c0727..b8fd946 100644
--- a/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemsModel.java
+++ b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/ItemsModel.java
@@ -37,7 +37,7 @@ public interface ItemsModel {
public void removeItemsListener(ItemsListener listener);
- public static abstract class Abstract implements ItemsModel {
+ public abstract static class Abstract implements ItemsModel {
private List<ItemsListener> listeners;
diff --git a/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/PaintersModel.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/PaintersModel.java
index b8df837..9f0b20a 100644
--- a/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/PaintersModel.java
+++ b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/PaintersModel.java
@@ -37,7 +37,7 @@ public interface PaintersModel {
public void removePaintersListener(PaintersListener listener);
- public static abstract class Abstract implements PaintersModel {
+ public abstract static class Abstract implements PaintersModel {
private List<PaintersListener> listeners;
diff --git a/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMark.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMark.java
index e705473..7c510e9 100644
--- a/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMark.java
+++ b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMark.java
@@ -28,7 +28,7 @@ public interface AxisMark {
public int getPosition();
- public static abstract class Abstract implements AxisMark {
+ public abstract static class Abstract implements AxisMark {
private final int position;
diff --git a/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMarksComputer.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMarksComputer.java
index bc40446..fcf8e1c 100644
--- a/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMarksComputer.java
+++ b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMarksComputer.java
@@ -41,7 +41,7 @@ public interface AxisMarksComputer {
public Iterator<AxisMark> marksIterator(int start, int end);
- public static abstract class Abstract implements AxisMarksComputer {
+ public abstract static class Abstract implements AxisMarksComputer {
protected final ChartContext context;
@@ -75,7 +75,7 @@ public interface AxisMarksComputer {
}
- public static abstract class AbstractIterator implements Iterator<AxisMark> {
+ public abstract static class AbstractIterator implements Iterator<AxisMark> {
public void remove() {
throw new UnsupportedOperationException(
"AxisMarksComputer does not support remove()"); // NOI18N
diff --git a/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMarksPainter.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMarksPainter.java
index 198c938..d06e7e4 100644
--- a/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMarksPainter.java
+++ b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/axis/AxisMarksPainter.java
@@ -32,7 +32,7 @@ public interface AxisMarksPainter {
public Component getPainter(AxisMark mark);
- public static abstract class Abstract extends JLabel implements AxisMarksPainter {
+ public abstract static class Abstract extends JLabel implements AxisMarksPainter {
public Abstract() { setBorder(BorderFactory.createEmptyBorder(2, 4, 2, 4)); }
diff --git a/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemPainter.java b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemPainter.java
index ba0444f..887a23c 100644
--- a/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemPainter.java
+++ b/profiler/lib.profiler.charts/src/org/netbeans/lib/profiler/charts/xy/XYItemPainter.java
@@ -39,7 +39,7 @@ public interface XYItemPainter extends ItemPainter {
public double getItemValueScale(XYItem item, ChartContext context);
- public static abstract class Abstract implements XYItemPainter {
+ public abstract static class Abstract implements XYItemPainter {
public double getItemView(double dataY, XYItem item, ChartContext context) {
return context.getViewY(dataY);
diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/LiveResultsWindowContributor.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/LiveResultsWindowContributor.java
index ae34681..79366b2 100644
--- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/LiveResultsWindowContributor.java
+++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/LiveResultsWindowContributor.java
@@ -29,7 +29,7 @@ import org.openide.util.Lookup;
*/
public interface LiveResultsWindowContributor {
- public static abstract class Adapter implements LiveResultsWindowContributor {
+ public abstract static class Adapter implements LiveResultsWindowContributor {
@Override
public void addToCpuResults(LiveFlatProfilePanel cpuPanel, ProfilerToolbar toolbar, ProfilerClient client, Lookup.Provider project) {
diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/SwingWorker.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/SwingWorker.java
index 9272d6f..8f19252 100644
--- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/SwingWorker.java
+++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/SwingWorker.java
@@ -43,9 +43,9 @@ public abstract class SwingWorker {
private final Object warmupLock = new Object();
private boolean useEQ;
- final private Semaphore throughputSemaphore;
- final private AtomicBoolean cancelFlag = new AtomicBoolean(false);
- final private AtomicBoolean primed= new AtomicBoolean(true);
+ private final Semaphore throughputSemaphore;
+ private final AtomicBoolean cancelFlag = new AtomicBoolean(false);
+ private final AtomicBoolean primed= new AtomicBoolean(true);
//@GuardedBy warmupLock
private boolean workerRunning;
@@ -171,7 +171,7 @@ public abstract class SwingWorker {
*
* @since 1.18
*/
- final public void cancel() {
+ public final void cancel() {
if (cancelFlag.compareAndSet(false, true)) {
cancelled();
if (throughputSemaphore != null) {
@@ -186,7 +186,7 @@ public abstract class SwingWorker {
*
* @since 1.18
*/
- final protected boolean isCancelled() {
+ protected final boolean isCancelled() {
return cancelFlag.get();
}
diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CloseButton.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CloseButton.java
index 01633d4..ce02535 100644
--- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CloseButton.java
+++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/CloseButton.java
@@ -36,7 +36,7 @@ public class CloseButton {
protected CloseButton() {}
- public static abstract class Provider {
+ public abstract static class Provider {
public abstract JButton create(Runnable onClose);
diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/LazyComboBox.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/LazyComboBox.java
index 9bbcaf5..96a314a 100644
--- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/LazyComboBox.java
+++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/LazyComboBox.java
@@ -110,7 +110,7 @@ public class LazyComboBox<E> extends JComboBox<E> {
protected int getPreferredWidth() { return -1; }
- public static abstract class Populator<E> {
+ public abstract static class Populator<E> {
protected abstract E initial();
diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ProfilerToolbar.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ProfilerToolbar.java
index 3d81de9..f5e400d 100644
--- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ProfilerToolbar.java
+++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/components/ProfilerToolbar.java
@@ -80,7 +80,7 @@ public abstract class ProfilerToolbar {
protected ProfilerToolbar() {}
- public static abstract class Provider {
+ public abstract static class Provider {
public abstract ProfilerToolbar create(boolean showSeparator);
diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/statistics/StatisticalModule.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/statistics/StatisticalModule.java
index 06a68d6..3a8c5a4 100644
--- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/statistics/StatisticalModule.java
+++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/cpu/statistics/StatisticalModule.java
@@ -36,7 +36,7 @@ public abstract class StatisticalModule extends JPanel {
//~ Methods ------------------------------------------------------------------------------------------------------------------
- final public void setSelectedMethodId(int methodId) {
+ public final void setSelectedMethodId(int methodId) {
int oldId = this.mId;
this.mId = methodId;
if (oldId != this.mId) {
@@ -44,11 +44,11 @@ public abstract class StatisticalModule extends JPanel {
}
}
- final protected int getSelectedMethodId() {
+ protected final int getSelectedMethodId() {
return mId;
}
- final public void setSelectedMark(Mark mark) {
+ public final void setSelectedMark(Mark mark) {
Mark oldMark = this.mark;
this.mark = mark;
@@ -57,7 +57,7 @@ public abstract class StatisticalModule extends JPanel {
}
}
- final protected Mark getSelectedMark() {
+ protected final Mark getSelectedMark() {
return this.mark;
}
diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/DataView.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/DataView.java
index 5a393db..19f646e 100644
--- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/DataView.java
+++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/results/DataView.java
@@ -285,7 +285,7 @@ public abstract class DataView extends JPanel {
}
- public static abstract class PopupCustomizer {
+ public abstract static class PopupCustomizer {
public abstract JMenuItem[] getMenuItems(JComponent invoker, DataView source, Object value, ClientUtils.SourceCodeSelection userValue);
diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ExportUtils.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ExportUtils.java
index d066308..4dfe664 100644
--- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ExportUtils.java
+++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ExportUtils.java
@@ -109,7 +109,7 @@ public final class ExportUtils {
public static final FormatFilter PNG_FILTER = new FormatFilter(PNG_FILE, "png"); // NOI18N
- public static abstract class Exportable {
+ public abstract static class Exportable {
public abstract String getName();
@@ -119,7 +119,7 @@ public final class ExportUtils {
}
- public static abstract class ExportProvider {
+ public abstract static class ExportProvider {
public abstract FormatFilter getFormatFilter();
@@ -127,7 +127,7 @@ public final class ExportUtils {
}
- public static abstract class BaseExportProvider extends ExportProvider {
+ public abstract static class BaseExportProvider extends ExportProvider {
private final FormatFilter formatFilter;
@@ -138,7 +138,7 @@ public final class ExportUtils {
}
- public static abstract class ProfilerTableExportProvider extends BaseExportProvider {
+ public abstract static class ProfilerTableExportProvider extends BaseExportProvider {
private final ProfilerTable table;
@@ -153,7 +153,7 @@ public final class ExportUtils {
}
- public static abstract class AbstractNPSExportProvider extends BaseExportProvider {
+ public abstract static class AbstractNPSExportProvider extends BaseExportProvider {
private final File sourceFile;
diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/FilterUtils.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/FilterUtils.java
index c7bab41..8836646 100644
--- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/FilterUtils.java
+++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/FilterUtils.java
@@ -382,7 +382,7 @@ public final class FilterUtils {
else button.setEnabled(!currentFilter.equals(activeFilter));
}
- private static abstract class Filter extends RowFilter {
+ private abstract static class Filter extends RowFilter {
public boolean equals(Object o) {
return o instanceof Filter;
diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerPopup.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerPopup.java
index 4630a34..e162ce9 100644
--- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerPopup.java
+++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerPopup.java
@@ -237,7 +237,7 @@ public final class ProfilerPopup {
}
- public static abstract class Listener {
+ public abstract static class Listener {
protected void popupShown() {}
diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTable.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTable.java
index 1e61b79..25c3fcf 100644
--- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTable.java
+++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTable.java
@@ -425,7 +425,7 @@ public class ProfilerTreeTable extends ProfilerTable {
// tree.updateUI();
// }
- public static abstract class NodeExpansionEvaluator {
+ public abstract static class NodeExpansionEvaluator {
public abstract Boolean hasBeenExpanded(TreePath path);
diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTableModel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTableModel.java
index 50cbf01..ed8dbba 100644
--- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTableModel.java
+++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTableModel.java
@@ -48,7 +48,7 @@ public interface ProfilerTreeTableModel {
public void removeListener(Listener listener);
- public static abstract class Abstract implements ProfilerTreeTableModel {
+ public abstract static class Abstract implements ProfilerTreeTableModel {
private TreeNode root;
diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/SearchUtils.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/SearchUtils.java
index 6ac107c..94df58c 100644
--- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/SearchUtils.java
+++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/SearchUtils.java
@@ -429,7 +429,7 @@ public final class SearchUtils {
private SearchUtils() {}
- public static abstract class TreeHelper {
+ public abstract static class TreeHelper {
public static final int NODE_SEARCH_DOWN = 10; // Node to be searched, search its children
public static final int NODE_SEARCH_NEXT = 11; // Node to be searched, do not search its children
diff --git a/profiler/lib.profiler.ui/test/unit/src/org/netbeans/lib/profiler/ui/SwingWorkerTest.java b/profiler/lib.profiler.ui/test/unit/src/org/netbeans/lib/profiler/ui/SwingWorkerTest.java
index 9fd835b..a1d951f 100644
--- a/profiler/lib.profiler.ui/test/unit/src/org/netbeans/lib/profiler/ui/SwingWorkerTest.java
+++ b/profiler/lib.profiler.ui/test/unit/src/org/netbeans/lib/profiler/ui/SwingWorkerTest.java
@@ -210,9 +210,9 @@ public class SwingWorkerTest {
}
public class SwingWorkerImpl extends SwingWorker {
- final private Runnable task, onDone, onCancel, waiting;
+ private final Runnable task, onDone, onCancel, waiting;
- final private int warmup;
+ private final int warmup;
public SwingWorkerImpl(int warmup, boolean forceEQ, Semaphore throughputSemaphore, Runnable task, Runnable onDone, Runnable onCancel, Runnable waiting) {
super(forceEQ, throughputSemaphore);
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/ProfilerClient.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/ProfilerClient.java
index 4d31ac8..16f2e9f 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/ProfilerClient.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/ProfilerClient.java
@@ -362,7 +362,7 @@ public class ProfilerClient implements CommonConstants {
private MemoryCCTProvider memCctProvider;
private JdbcCCTProvider jdbcCctProvider;
private final Object execInSeparateThreadLock = new Object();
- final private Object forceObtainedResultsDumpLock = new Object(); // To make dump processing and other commands mutually
+ private final Object forceObtainedResultsDumpLock = new Object(); // To make dump processing and other commands mutually
// exclusive
/*instrMethodGroupFromRootComplete, */
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassPath.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassPath.java
index a6c542d..25c169e 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassPath.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/classfile/ClassPath.java
@@ -44,7 +44,7 @@ public class ClassPath {
protected int hits; // This is done to avoid indexing of the JAR files too early and all at once
protected int threshHits; // This is done to avoid indexing of the JAR files too early and all at once
- final protected Random r = new Random(System.currentTimeMillis());
+ protected final Random r = new Random(System.currentTimeMillis());
//~ Methods --------------------------------------------------------------------------------------------------------------
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/AbstractLongMap.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/AbstractLongMap.java
index ca3022c..280a28f 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/AbstractLongMap.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/AbstractLongMap.java
@@ -234,7 +234,7 @@ abstract class AbstractLongMap {
byte[] buf;
boolean bufferModified;
long offset;
- final static int BUFFER_SIZE = 128;
+ static final int BUFFER_SIZE = 128;
//~ Constructors ---------------------------------------------------------------------------------------------------------
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofGCRoots.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofGCRoots.java
index 320b0a3..56fe459 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofGCRoots.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/HprofGCRoots.java
@@ -36,9 +36,9 @@ class HprofGCRoots {
final HprofHeap heap;
private Map<Integer, ThreadObjectHprofGCRoot> threadObjGC;
- final private Object lastThreadObjGCLock = new Object();
+ private final Object lastThreadObjGCLock = new Object();
private Map<Long,GCRoot> gcRoots;
- final private Object gcRootLock = new Object();
+ private final Object gcRootLock = new Object();
private List gcRootsList;
HprofGCRoots(HprofHeap h) {
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/Progress.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/Progress.java
index e787da1..9284c3e 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/Progress.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/heap/Progress.java
@@ -33,7 +33,7 @@ enum Progress {
}
private static List<Listener> listeners = Collections.emptyList();
- synchronized static void register(Listener onChange) {
+ static synchronized void register(Listener onChange) {
if (listeners.isEmpty()) {
listeners = Collections.singletonList(onChange);
} else {
@@ -43,7 +43,7 @@ enum Progress {
}
}
- private synchronized static void notifyUpdates(Handle h, Type type) {
+ private static synchronized void notifyUpdates(Handle h, Type type) {
for (Listener onChange : listeners) {
switch (type) {
case STARTED: onChange.started(h); break;
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/RuntimeCCTNodeProcessor.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/RuntimeCCTNodeProcessor.java
index c8ebdf4..8552b39 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/RuntimeCCTNodeProcessor.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/RuntimeCCTNodeProcessor.java
@@ -33,8 +33,8 @@ import org.netbeans.lib.profiler.results.cpu.cct.nodes.ThreadCPUCCTNode;
*
* @author Jaroslav Bachorik
*/
-final public class RuntimeCCTNodeProcessor {
- final private static Logger LOGGER = Logger.getLogger(RuntimeCCTNodeProcessor.class.getName());
+public final class RuntimeCCTNodeProcessor {
+ private static final Logger LOGGER = Logger.getLogger(RuntimeCCTNodeProcessor.class.getName());
/**
* A processor plugin definition. <br/>
@@ -66,9 +66,9 @@ final public class RuntimeCCTNodeProcessor {
* Provides default empty implementations and implements simple dispatching
* mechanism for typed <b>onNode</b> calls.
*/
- public static abstract class PluginAdapter implements Plugin {
+ public abstract static class PluginAdapter implements Plugin {
@Override
- final public void onBackout(RuntimeCCTNode node) {
+ public final void onBackout(RuntimeCCTNode node) {
if (node instanceof MethodCPUCCTNode) {
onBackout((MethodCPUCCTNode)node);
} else if (node instanceof MarkedCPUCCTNode) {
@@ -85,7 +85,7 @@ final public class RuntimeCCTNodeProcessor {
}
@Override
- final public void onNode(RuntimeCCTNode node) {
+ public final void onNode(RuntimeCCTNode node) {
if (node instanceof MethodCPUCCTNode) {
onNode((MethodCPUCCTNode)node);
} else if (node instanceof MarkedCPUCCTNode) {
@@ -150,9 +150,9 @@ final public class RuntimeCCTNodeProcessor {
protected void onBackout(ServletRequestCPUCCTNode node) {}
}
- private static abstract class Item<T extends RuntimeCCTNode> {
- final protected T instance;
- final protected Plugin[] plugins;
+ private abstract static class Item<T extends RuntimeCCTNode> {
+ protected final T instance;
+ protected final Plugin[] plugins;
public Item(T instance, Plugin ... plugins) {
this.instance = instance;
@@ -163,7 +163,7 @@ final public class RuntimeCCTNodeProcessor {
}
private static class SimpleItem extends Item<RuntimeCCTNode> {
- final private Deque<Item<RuntimeCCTNode>> stack;
+ private final Deque<Item<RuntimeCCTNode>> stack;
public SimpleItem(Deque<Item<RuntimeCCTNode>> stack, RuntimeCCTNode instance, Plugin ... plugins) {
super(instance, plugins);
this.stack = stack;
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCallGraphBuilder.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCallGraphBuilder.java
index be91f2d..9363ebc 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCallGraphBuilder.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/CPUCallGraphBuilder.java
@@ -101,7 +101,7 @@ public class CPUCallGraphBuilder extends BaseCallGraphBuilder implements CPUProf
private MethodInfoMapper methodInfoMapper = MethodInfoMapper.DEFAULT;
private TimingAdjusterOld timingAdjuster = TimingAdjusterOld.getDefault();
- final private ThreadInfos threadInfos = new ThreadInfos();
+ private final ThreadInfos threadInfos = new ThreadInfos();
//~ Methods ------------------------------------------------------------------------------------------------------------------
@@ -901,7 +901,7 @@ public class CPUCallGraphBuilder extends BaseCallGraphBuilder implements CPUProf
instrFilter = profilerClient.getSettings().getInstrumentationFilter();
setMethodInfoMapper(new MethodInfoMapper() {
- final private String INVALID_MID=ResourceBundle.getBundle("org.netbeans.lib.profiler.results.cpu.Bundle").getString("MSG_INVALID_METHODID"); // NOI18N
+ private final String INVALID_MID=ResourceBundle.getBundle("org.netbeans.lib.profiler.results.cpu.Bundle").getString("MSG_INVALID_METHODID"); // NOI18N
@Override
public String getInstrMethodClass(int methodId) {
String[] cNames = profilerClient.getStatus().getInstrMethodClasses();
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/InstrTimingData.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/InstrTimingData.java
index 3dfc7f3..c960014 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/InstrTimingData.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/InstrTimingData.java
@@ -30,7 +30,7 @@ import java.util.logging.Logger;
* @author Misha Dmitriev
*/
public class InstrTimingData implements Cloneable {
- final public static InstrTimingData DEFAULT = new InstrTimingData();
+ public static final InstrTimingData DEFAULT = new InstrTimingData();
// Of these variables, the xxx0 ones are used when either only absolute or only thread CPU timer is used.
// xxx0 and xxx1 together are used only when both timers are used.
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/MethodInfoMapper.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/MethodInfoMapper.java
index ca01230..5d6c315 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/MethodInfoMapper.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/MethodInfoMapper.java
@@ -21,7 +21,7 @@ package org.netbeans.lib.profiler.results.cpu;
import java.util.logging.Logger;
public abstract class MethodInfoMapper {
- final static protected Logger LOGGER = Logger.getLogger(MethodInfoMapper.class.getName());
+ protected static final Logger LOGGER = Logger.getLogger(MethodInfoMapper.class.getName());
public static final MethodInfoMapper DEFAULT = new MethodInfoMapper() {
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilder.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilder.java
index ac085cb..0f1d3e0 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilder.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/StackTraceSnapshotBuilder.java
@@ -290,7 +290,7 @@ public class StackTraceSnapshotBuilder {
status = null;
}
- final public void setIgnoredThreads(Set<String> ignoredThreadNames) {
+ public final void setIgnoredThreads(Set<String> ignoredThreadNames) {
synchronized (lock) {
this.ignoredThreadNames.clear();
this.ignoredThreadNames.addAll(ignoredThreadNames);
@@ -314,7 +314,7 @@ public class StackTraceSnapshotBuilder {
}
}
- final public void addStacktrace(java.lang.management.ThreadInfo[] threads, long dumpTimeStamp) throws IllegalStateException {
+ public final void addStacktrace(java.lang.management.ThreadInfo[] threads, long dumpTimeStamp) throws IllegalStateException {
long timediff = processDumpTimeStamp(dumpTimeStamp);
if (timediff < 0) return;
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/ThreadInfo.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/ThreadInfo.java
index ea9f749..ff816fb 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/ThreadInfo.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/ThreadInfo.java
@@ -33,7 +33,7 @@ public class ThreadInfo {
// we will have to compensate for the processing time
//~ Instance fields ------------------------------------------------------------------------------------------------------
- final private Object stackLock = new Object();
+ private final Object stackLock = new Object();
public TimedCPUCCTNode[] stack;
// Simulated stack for this thread - stack starting at root method
// (or a pseudo node if multiple root methods are called within the thread)
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkingEngine.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkingEngine.java
index aab23a0..405d6cd 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkingEngine.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/cpu/marking/MarkingEngine.java
@@ -58,7 +58,7 @@ public class MarkingEngine {
private final Object markGuard = new Object();
- final private MarkMapper mapper;
+ private final MarkMapper mapper;
// @GuardedBy markGuard
private MarkMapping[] marks;
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcGraphBuilder.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcGraphBuilder.java
index e9232f2..0cc6404 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcGraphBuilder.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/jdbc/JdbcGraphBuilder.java
@@ -71,7 +71,7 @@ public class JdbcGraphBuilder extends BaseCallGraphBuilder implements CPUProfili
private Map<ThreadInfo, Integer> currentSqlLevel;
private int lastSelectId;
private RuntimeMemoryCCTNode[] stacksForSelects; // [1- maxSelectId] selectId -> root of its allocation traces tree
- final private ThreadInfos threadInfos = new ThreadInfos();
+ private final ThreadInfos threadInfos = new ThreadInfos();
private final SQLParser sqlParser = new SQLParser();
private TextFilter filter;
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockGraphBuilder.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockGraphBuilder.java
index cede5c4..7abe5f6 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockGraphBuilder.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/LockGraphBuilder.java
@@ -38,7 +38,7 @@ import org.netbeans.lib.profiler.results.memory.MemoryProfilingResultsListener;
public class LockGraphBuilder extends BaseCallGraphBuilder implements LockProfilingResultListener, LockCCTProvider {
static final Logger LOG = Logger.getLogger(LockGraphBuilder.class.getName());
- final private ThreadInfos threadInfos = new ThreadInfos();
+ private final ThreadInfos threadInfos = new ThreadInfos();
private Map<Integer, MonitorInfo> monitorInfos = new HashMap();
private final TransactionalSupport transaction = new TransactionalSupport();
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/MonitorInfo.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/MonitorInfo.java
index 1741c26..ab55f69 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/MonitorInfo.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/locks/MonitorInfo.java
@@ -30,7 +30,7 @@ import org.netbeans.lib.profiler.utils.StringUtils;
*/
class MonitorInfo {
- final private int monitorId;
+ private final int monitorId;
private String className;
private Map<ThreadInfo, OpenThread> openThreads;
private Map<ThreadInfo, ThreadDetail> waitThreads;
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/HeapHistogram.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/HeapHistogram.java
index ded6195..b257c8d 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/HeapHistogram.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/HeapHistogram.java
@@ -45,7 +45,7 @@ public abstract class HeapHistogram {
public abstract long getTotalPermGenHeapBytes();
- public static abstract class ClassInfo {
+ public abstract static class ClassInfo {
public abstract String getName();
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/JMethodIdTable.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/JMethodIdTable.java
index 39d0e28..10e72e4 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/JMethodIdTable.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/results/memory/JMethodIdTable.java
@@ -91,7 +91,7 @@ public class JMethodIdTable {
//~ Methods ------------------------------------------------------------------------------------------------------------------
- synchronized public static JMethodIdTable getDefault() {
+ public static synchronized JMethodIdTable getDefault() {
if (defaultTable == null) {
defaultTable = new JMethodIdTable();
}
@@ -99,11 +99,11 @@ public class JMethodIdTable {
return defaultTable;
}
- synchronized public static void reset() {
+ public static synchronized void reset() {
defaultTable = null;
}
- synchronized public String debug() {
+ public synchronized String debug() {
if (entries == null) {
return "Entries = null, size = " + size + ", nElements = " + nElements + ", threshold = " // NOI18N
+ threshold + ", incompleteEntries = " + incompleteEntries; // NOI18N
@@ -113,7 +113,7 @@ public class JMethodIdTable {
}
}
- synchronized public void readFromStream(DataInputStream in) throws IOException {
+ public synchronized void readFromStream(DataInputStream in) throws IOException {
size = in.readInt();
nElements = in.readInt();
threshold = in.readInt();
@@ -137,7 +137,7 @@ public class JMethodIdTable {
}
}
- synchronized public void writeToStream(DataOutputStream out) throws IOException {
+ public synchronized void writeToStream(DataOutputStream out) throws IOException {
out.writeInt(size);
out.writeInt(nElements);
out.writeInt(threshold);
@@ -164,7 +164,7 @@ public class JMethodIdTable {
}
}
- synchronized public JMethodIdTableEntry getEntry(int methodId) {
+ public synchronized JMethodIdTableEntry getEntry(int methodId) {
int pos = hash(methodId) % size;
while ((entries[pos] != null) && (entries[pos].methodId != methodId)) {
@@ -174,7 +174,7 @@ public class JMethodIdTable {
return entries[pos];
}
- synchronized public void getNamesForMethodIds(ProfilerClient profilerClient)
+ public synchronized void getNamesForMethodIds(ProfilerClient profilerClient)
throws ClientUtils.TargetAppOrVMTerminated {
if (staticTable) {
throw new IllegalStateException("Attempt to update snapshot JMethodIdTable"); // NOI18N
@@ -212,7 +212,7 @@ public class JMethodIdTable {
completeEntry(methodId, className, methodName, methodSig, isNative);
}
- synchronized public void checkMethodId(int methodId) {
+ public synchronized void checkMethodId(int methodId) {
int pos = hash(methodId) % size;
while (entries[pos] != null) {
@@ -235,7 +235,7 @@ public class JMethodIdTable {
}
}
- synchronized private void completeEntry(int methodId, String className, String methodName, String methodSig, boolean isNative) {
+ private synchronized void completeEntry(int methodId, String className, String methodName, String methodSig, boolean isNative) {
int pos = hash(methodId) % size;
while (entries[pos].methodId != methodId) {
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntime.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntime.java
index 690319e..37fbddc 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntime.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerRuntime.java
@@ -62,7 +62,7 @@ public class ProfilerRuntime implements CommonConstants {
protected static int globalEvBufPosThreshold;
protected static volatile boolean sendingBuffer;
private static boolean printEvents; // For debugging
- private volatile static Set knownMonitors;
+ private static volatile Set knownMonitors;
//~ Methods ------------------------------------------------------------------------------------------------------------------
diff --git a/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerServer.java b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerServer.java
index e79be1f..f266ccd 100644
--- a/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerServer.java
+++ b/profiler/lib.profiler/src/org/netbeans/lib/profiler/server/ProfilerServer.java
@@ -390,7 +390,7 @@ public class ProfilerServer extends Thread implements CommonConstants {
private WireIO wireIO;
private boolean dynamic;
private int agentId = -1;
- final private Random r = new Random(System.currentTimeMillis()) ;
+ private final Random r = new Random(System.currentTimeMillis()) ;
//---------------------------------------------------------------------------------------
// Communication management
diff --git a/profiler/maven.profiler/src/org/netbeans/modules/maven/profiler/MavenProjectProfilingSupportProvider.java b/profiler/maven.profiler/src/org/netbeans/modules/maven/profiler/MavenProjectProfilingSupportProvider.java
index 3edee6b..e5f96a1 100644
--- a/profiler/maven.profiler/src/org/netbeans/modules/maven/profiler/MavenProjectProfilingSupportProvider.java
+++ b/profiler/maven.profiler/src/org/netbeans/modules/maven/profiler/MavenProjectProfilingSupportProvider.java
@@ -37,14 +37,14 @@ import org.openide.filesystems.FileObject;
projectType="org-netbeans-modules-maven") // NOI18N
public class MavenProjectProfilingSupportProvider extends JavaProjectProfilingSupportProvider {
- final private Set<String> supportedJ2eePTypes = new HashSet<String>() {
+ private final Set<String> supportedJ2eePTypes = new HashSet<String>() {
{
add(NbMavenProject.TYPE_WAR);
add(NbMavenProject.TYPE_EJB);
}
};
- final private Set<String> supportedPTypes = new HashSet<String>() {
+ private final Set<String> supportedPTypes = new HashSet<String>() {
{
add(NbMavenProject.TYPE_JAR);
addAll(supportedJ2eePTypes);
diff --git a/profiler/maven.profiler/src/org/netbeans/modules/maven/profiler/RunCheckerImpl.java b/profiler/maven.profiler/src/org/netbeans/modules/maven/profiler/RunCheckerImpl.java
index 19dee4f..b463de9 100644
--- a/profiler/maven.profiler/src/org/netbeans/modules/maven/profiler/RunCheckerImpl.java
+++ b/profiler/maven.profiler/src/org/netbeans/modules/maven/profiler/RunCheckerImpl.java
@@ -55,7 +55,7 @@ public class RunCheckerImpl implements LateBoundPrerequisitesChecker {
// private static final String PROFILER_JDKHOME_OPT = "${profiler.jdkhome.opt}"; // NOI18N
@ProjectServiceProvider(service=ProfilerLauncher.LauncherFactory.class, projectType="org-netbeans-modules-maven")
- final public static class MavenLauncherFactory implements ProfilerLauncher.LauncherFactory {
+ public static final class MavenLauncherFactory implements ProfilerLauncher.LauncherFactory {
@Override
public Launcher createLauncher(final Session session) {
return new Launcher() {
diff --git a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/EditorSupport.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/EditorSupport.java
index 2018513..670e83b 100644
--- a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/EditorSupport.java
+++ b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/EditorSupport.java
@@ -30,7 +30,7 @@ import org.openide.util.Lookup;
* @author Jiri Sedlacek
* @author Jaroslav Bachorik
*/
-final public class EditorSupport {
+public final class EditorSupport {
private static EditorSupportProvider getSupport() {
EditorSupportProvider support = Lookup.getDefault().lookup(EditorSupportProvider.class);
diff --git a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/GoToSource.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/GoToSource.java
index 2ce835f..cd3b979 100644
--- a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/GoToSource.java
+++ b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/GoToSource.java
@@ -34,7 +34,7 @@ import org.openide.util.RequestProcessor;
* @author Jaroslav Bachorik
* @author Tomas Hurka
*/
-final public class GoToSource {
+public final class GoToSource {
private static final RequestProcessor srcOpenerRP = new RequestProcessor("Profiler Source Opener"); // NOI18N
diff --git a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerProject.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerProject.java
index 04b647e..e1cd1f8 100644
--- a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerProject.java
+++ b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerProject.java
@@ -29,8 +29,8 @@ import org.openide.util.lookup.ProxyLookup;
*
* @author Jaroslav Bachorik
*/
-abstract public class ProfilerProject implements Lookup.Provider {
- final private Object lkpLock = new Object();
+public abstract class ProfilerProject implements Lookup.Provider {
+ private final Object lkpLock = new Object();
// @GuardedBy lkpLock
private Lookup lkp;
private Lookup.Provider provider;
@@ -49,5 +49,5 @@ abstract public class ProfilerProject implements Lookup.Provider {
}
}
- abstract protected Lookup additionalLookup();
+ protected abstract Lookup additionalLookup();
}
diff --git a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerSource.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerSource.java
index c212841..89fc5dc 100644
--- a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerSource.java
+++ b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/ProfilerSource.java
@@ -27,7 +27,7 @@ import org.openide.util.Lookup;
* A simple {@linkplain Lookup.Provider} derived from the appropriate {@linkplain MimeLookup} registrations.
* @author Jaroslav Bachorik
*/
-abstract public class ProfilerSource implements Lookup.Provider {
+public abstract class ProfilerSource implements Lookup.Provider {
private FileObject file;
protected ProfilerSource(FileObject file) {
@@ -38,12 +38,12 @@ abstract public class ProfilerSource implements Lookup.Provider {
* The wrapped file
* @return Returns the {@linkplain FileObject|} representing a particular {@linkplain ProfilerSource}
*/
- final public FileObject getFile() {
+ public final FileObject getFile() {
return file;
}
@Override
- final public Lookup getLookup() {
+ public final Lookup getLookup() {
return MimeLookup.getLookup(file.getMIMEType());
}
@@ -51,5 +51,5 @@ abstract public class ProfilerSource implements Lookup.Provider {
* Indicates whether a source can be run by the IDE or not
* @return Returns <b>TRUE</b> if the source can be run by the IDE (eg. main class, test etc.), <b>FALSE</b> otherwise
*/
- abstract public boolean isRunnable();
+ public abstract boolean isRunnable();
}
diff --git a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/ExternalPackages.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/ExternalPackages.java
index ece4400..3af9786 100644
--- a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/ExternalPackages.java
+++ b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/ExternalPackages.java
@@ -30,7 +30,7 @@ import org.openide.filesystems.FileUtil;
*
* @author Jaroslv Bachorik
*/
-final public class ExternalPackages {
+public final class ExternalPackages {
private static final Comparator<FileObject> pathComparator = new Comparator<FileObject>() {
@Override
public int compare(FileObject o1, FileObject o2) {
diff --git a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/JavaProfilerSource.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/JavaProfilerSource.java
index 213035a..45f1409 100644
--- a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/JavaProfilerSource.java
+++ b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/JavaProfilerSource.java
@@ -30,8 +30,8 @@ import org.openide.util.Lookup;
*
* @author Jaroslav Bachorik
*/
-final public class JavaProfilerSource extends ProfilerSource {
- final private AbstractJavaProfilerSource impl;
+public final class JavaProfilerSource extends ProfilerSource {
+ private final AbstractJavaProfilerSource impl;
/**
* Factory method for obtaining a {@linkplain JavaProfilerSource} from a file or NULL
diff --git a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/ProfilerTypeUtils.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/ProfilerTypeUtils.java
index 59cd2ad..d252410 100644
--- a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/ProfilerTypeUtils.java
+++ b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/ProfilerTypeUtils.java
@@ -29,7 +29,7 @@ import org.openide.util.Lookup;
*
* @author Jaroslav Bachorik
*/
-final public class ProfilerTypeUtils {
+public final class ProfilerTypeUtils {
private static ProfilerTypeUtilsProvider getProvider(Lookup.Provider project) {
return project != null ? project.getLookup().lookup(ProfilerTypeUtilsProvider.class) : Lookup.getDefault().lookup(ProfilerTypeUtilsProvider.class);
}
diff --git a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/SourceClassInfo.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/SourceClassInfo.java
index aadff87..a9bf8df 100644
--- a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/SourceClassInfo.java
+++ b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/SourceClassInfo.java
@@ -30,15 +30,15 @@ import org.openide.filesystems.FileObject;
*
* @author Jaroslav Bachorik
*/
-abstract public class SourceClassInfo {
- final public static Comparator<SourceClassInfo> COMPARATOR = new Comparator<SourceClassInfo>() {
+public abstract class SourceClassInfo {
+ public static final Comparator<SourceClassInfo> COMPARATOR = new Comparator<SourceClassInfo>() {
@Override
public int compare(SourceClassInfo o1, SourceClassInfo o2) {
return o1.getVMName().compareTo(o2.getVMName());
}
};
- final private static Pattern anonymousInnerClassPattern = Pattern.compile(".*?\\$[0-9]*$");
+ private static final Pattern anonymousInnerClassPattern = Pattern.compile(".*?\\$[0-9]*$");
private String simpleName, qualName, vmName;
@@ -74,7 +74,7 @@ abstract public class SourceClassInfo {
*
* @return Returns the class simple name (the last part of the FQN)
*/
- final public String getSimpleName() {
+ public final String getSimpleName() {
return simpleName;
}
@@ -82,7 +82,7 @@ abstract public class SourceClassInfo {
*
* @return Returns the class FQN
*/
- final public String getQualifiedName() {
+ public final String getQualifiedName() {
return qualName;
}
@@ -90,7 +90,7 @@ abstract public class SourceClassInfo {
*
* @return Returns the VM internal class name
*/
- final public String getVMName() {
+ public final String getVMName() {
return vmName;
}
@@ -102,15 +102,15 @@ abstract public class SourceClassInfo {
return isAnonymous(qualName);
}
- abstract public FileObject getFile();
- abstract public Set<SourceMethodInfo> getMethods(boolean all);
- abstract public Set<SourceClassInfo> getSubclasses();
- abstract public Set<SourceClassInfo> getInnerClases();
- abstract public Set<SourceMethodInfo> getConstructors();
- abstract public SourceClassInfo getSuperType();
- abstract public Set<SourceClassInfo> getInterfaces();
+ public abstract FileObject getFile();
+ public abstract Set<SourceMethodInfo> getMethods(boolean all);
+ public abstract Set<SourceClassInfo> getSubclasses();
+ public abstract Set<SourceClassInfo> getInnerClases();
+ public abstract Set<SourceMethodInfo> getConstructors();
+ public abstract SourceClassInfo getSuperType();
+ public abstract Set<SourceClassInfo> getInterfaces();
- final protected boolean isAnonymous(String className) {
+ protected final boolean isAnonymous(String className) {
return anonymousInnerClassPattern.matcher(className).matches();
}
}
diff --git a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/SourceMethodInfo.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/SourceMethodInfo.java
index ea26851..a785f57 100644
--- a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/SourceMethodInfo.java
+++ b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/SourceMethodInfo.java
@@ -30,7 +30,7 @@ import java.lang.reflect.Modifier;
public class SourceMethodInfo {
private String className, name, signature, vmName;
private boolean execFlag;
- final private int modifiers;
+ private final int modifiers;
public SourceMethodInfo(String className, String name, String signature, String vmName, boolean execFlag, int modifiers) {
this.className = className;
@@ -75,7 +75,7 @@ public class SourceMethodInfo {
*
* @return Returns the containing class FQN
*/
- final public String getClassName() {
+ public final String getClassName() {
return className;
}
@@ -83,7 +83,7 @@ public class SourceMethodInfo {
*
* @return Returns the method name
*/
- final public String getName() {
+ public final String getName() {
return name;
}
@@ -91,7 +91,7 @@ public class SourceMethodInfo {
*
* @return Returns the method signature
*/
- final public String getSignature() {
+ public final String getSignature() {
return signature;
}
@@ -99,7 +99,7 @@ public class SourceMethodInfo {
*
* @return Returns the VM internal method name
*/
- final public String getVMName() {
+ public final String getVMName() {
return vmName;
}
@@ -107,7 +107,7 @@ public class SourceMethodInfo {
*
* @return Returns TRUE if the method is executable (eg. main(String[]) or JSP main method)
*/
- final public boolean isExecutable() {
+ public final boolean isExecutable() {
return execFlag;
}
@@ -115,7 +115,7 @@ public class SourceMethodInfo {
*
* @return Returns method's modifiers in the {@linkplain Modifier} format
*/
- final public int getModifiers() {
+ public final int getModifiers() {
return modifiers;
}
diff --git a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/SourcePackageInfo.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/SourcePackageInfo.java
index db12e11..0ecdc38 100644
--- a/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/SourcePackageInfo.java
+++ b/profiler/profiler.api/src/org/netbeans/modules/profiler/api/java/SourcePackageInfo.java
@@ -24,7 +24,7 @@ import java.util.Collection;
* A java package wrapper
* @author Jaroslav Bachorik
*/
-abstract public class SourcePackageInfo {
+public abstract class SourcePackageInfo {
public static enum Scope {
SOURCE, DEPENDENCIES
}
@@ -51,6 +51,6 @@ abstract public class SourcePackageInfo {
return scope;
}
- abstract public Collection<SourcePackageInfo> getSubpackages();
- abstract public Collection<SourceClassInfo> getClasses();
+ public abstract Collection<SourcePackageInfo> getSubpackages();
+ public abstract Collection<SourceClassInfo> getClasses();
}
diff --git a/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/IconsProvider.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/IconsProvider.java
index f4ead218..8f2b575 100644
--- a/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/IconsProvider.java
+++ b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/IconsProvider.java
@@ -49,7 +49,7 @@ public abstract class IconsProvider {
/**
* Basic implementation of a simple IconsProvider supporting statically defined and dynamically generated images.
*/
- public static abstract class Basic extends IconsProvider {
+ public abstract static class Basic extends IconsProvider {
private Map<String, String> images;
diff --git a/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/ProfilerStorageProvider.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/ProfilerStorageProvider.java
index a96adb6..b3a7957 100644
--- a/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/ProfilerStorageProvider.java
+++ b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/ProfilerStorageProvider.java
@@ -103,7 +103,7 @@ public abstract class ProfilerStorageProvider {
// --- Base implementation -------------------------------------------------
- public static abstract class Abstract extends ProfilerStorageProvider {
+ public abstract static class Abstract extends ProfilerStorageProvider {
protected String EXT = "xml"; // NOI18N
diff --git a/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/SessionListener.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/SessionListener.java
index 73c6c45..f359a93 100644
--- a/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/SessionListener.java
+++ b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/SessionListener.java
@@ -30,7 +30,7 @@ public interface SessionListener {
/**
* Default No-op implementation of {@linkplain SessionListener}
*/
- public static abstract class Adapter implements SessionListener {
+ public abstract static class Adapter implements SessionListener {
@Override
public void onShutdown() {
diff --git a/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/java/AbstractJavaProfilerSource.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/java/AbstractJavaProfilerSource.java
index d0ee76b..97cdaf1 100644
--- a/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/java/AbstractJavaProfilerSource.java
+++ b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/java/AbstractJavaProfilerSource.java
@@ -29,7 +29,7 @@ import org.openide.filesystems.FileObject;
* @author Jaroslav Bachorik
*/
public interface AbstractJavaProfilerSource {
- final public static AbstractJavaProfilerSource NULL = new AbstractJavaProfilerSource() {
+ public static final AbstractJavaProfilerSource NULL = new AbstractJavaProfilerSource() {
@Override
public boolean isTest(FileObject fo) {
diff --git a/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/java/ProfilerTypeUtilsProvider.java b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/java/ProfilerTypeUtilsProvider.java
index 7fb7a26..fa486a4 100644
--- a/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/java/ProfilerTypeUtilsProvider.java
+++ b/profiler/profiler.api/src/org/netbeans/modules/profiler/spi/java/ProfilerTypeUtilsProvider.java
@@ -34,12 +34,12 @@ public abstract class ProfilerTypeUtilsProvider {
* @param className A fully qualified class name
* @return Returns a resolved class or NULL
*/
- abstract public SourceClassInfo resolveClass(String className);
+ public abstract SourceClassInfo resolveClass(String className);
/**
* @return Returns a list of all main classes present in the project
*/
- abstract public Collection<SourceClassInfo> getMainClasses();
+ public abstract Collection<SourceClassInfo> getMainClasses();
/**
*
@@ -47,7 +47,7 @@ public abstract class ProfilerTypeUtilsProvider {
* @param scope A {@linkplain SourcePackageInfo.Scope} - SOURCE or DEPENDENCIES
* @return Returns a list of project's packages
*/
- abstract public Collection<SourcePackageInfo> getPackages(boolean subprojects, SourcePackageInfo.Scope scope);
+ public abstract Collection<SourcePackageInfo> getPackages(boolean subprojects, SourcePackageInfo.Scope scope);
/**
* Case insensitive regexp class search
diff --git a/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/providers/RemotePackExporter.java b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/providers/RemotePackExporter.java
index 528cfeb..0a1778b 100644
--- a/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/providers/RemotePackExporter.java
+++ b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/providers/RemotePackExporter.java
@@ -31,7 +31,7 @@ import org.openide.util.NbBundle;
@NbBundle.Messages({
"RemotePackExporter_GeneratingRemotePack=Generating Remote Pack to {0}" // NOI18N
})
-final public class RemotePackExporter {
+public final class RemotePackExporter {
private static final class Singleton {
diff --git a/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/spi/AbstractRemotePackExporter.java b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/spi/AbstractRemotePackExporter.java
index 0366e44..026502c 100644
--- a/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/spi/AbstractRemotePackExporter.java
+++ b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/spi/AbstractRemotePackExporter.java
@@ -28,7 +28,7 @@ import org.netbeans.modules.profiler.attach.providers.TargetPlatformEnum;
*
* @author Jaroslav Bachorik
*/
-abstract public class AbstractRemotePackExporter {
+public abstract class AbstractRemotePackExporter {
private static final Map<String, String> scriptMapper = new HashMap<String, String>() {
{
put(IntegrationUtils.PLATFORM_LINUX_AMD64_OS, "linuxamd64"); //NOI18N
@@ -56,14 +56,14 @@ abstract public class AbstractRemotePackExporter {
}
};
- final protected String getPlatformShort(String hostOS) {
+ protected final String getPlatformShort(String hostOS) {
return scriptMapper.get(hostOS);
}
- final protected String getJVMShort(String jvm) {
+ protected final String getJVMShort(String jvm) {
return jdkMapper.get(jvm);
}
- abstract public String export(String exportPath, String hostOS, String jvm) throws IOException;
- abstract public String getRemotePackPath(String exportPath, String hostOS);
+ public abstract String export(String exportPath, String hostOS, String jvm) throws IOException;
+ public abstract String getRemotePackPath(String exportPath, String hostOS);
}
diff --git a/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/steps/BasicAttachStepsProvider.java b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/steps/BasicAttachStepsProvider.java
index 6370753..0136c95 100644
--- a/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/steps/BasicAttachStepsProvider.java
+++ b/profiler/profiler.attach/src/org/netbeans/modules/profiler/attach/steps/BasicAttachStepsProvider.java
@@ -89,15 +89,15 @@ public class BasicAttachStepsProvider extends AttachStepsProvider {
private final Set<ChangeListener> listeners = new HashSet<>();
- public synchronized final void addChangeListener(ChangeListener listener) {
+ public final synchronized void addChangeListener(ChangeListener listener) {
listeners.add(listener);
}
- public synchronized final void removeChangeListener(ChangeListener listener) {
+ public final synchronized void removeChangeListener(ChangeListener listener) {
listeners.remove(listener);
}
- protected synchronized final void fireChange(ChangeEvent e) {
+ protected final synchronized void fireChange(ChangeEvent e) {
if (e == null) e = new ChangeEvent(this);
for (ChangeListener listener : listeners) listener.stateChanged(e);
}
diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapFragmentWalker.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapFragmentWalker.java
index 5b6d6ca..1328237 100644
--- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapFragmentWalker.java
+++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapFragmentWalker.java
@@ -125,7 +125,7 @@ public class HeapFragmentWalker {
}
}
- public synchronized final int getRetainedSizesStatus() {
+ public final synchronized int getRetainedSizesStatus() {
return retainedSizesStatus;
}
diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapWalkerManager.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapWalkerManager.java
index f38e052..9aa6392 100644
--- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapWalkerManager.java
+++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/HeapWalkerManager.java
@@ -56,7 +56,7 @@ public class HeapWalkerManager {
private Set dumpsBeingDeleted = new HashSet();
private List<HeapWalker> heapWalkers = new ArrayList();
- final private RequestProcessor heapwalkerRp = new RequestProcessor(HeapWalkerManager.class);
+ private final RequestProcessor heapwalkerRp = new RequestProcessor(HeapWalkerManager.class);
//~ Constructors -------------------------------------------------------------------------------------------------------------
@@ -66,7 +66,7 @@ public class HeapWalkerManager {
//~ Methods ------------------------------------------------------------------------------------------------------------------
private static class Singleton {
- final private static HeapWalkerManager INSTANCE = new HeapWalkerManager();
+ private static final HeapWalkerManager INSTANCE = new HeapWalkerManager();
}
public static HeapWalkerManager getDefault() {
diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLController.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLController.java
index 6ea630e..e0882a1 100644
--- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLController.java
+++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLController.java
@@ -63,9 +63,9 @@ public class OQLController extends AbstractTopLevelController
private QueryController queryController;
private SavedController savedController;
- final private ExecutorService progressUpdater = Executors.newSingleThreadExecutor();
+ private final ExecutorService progressUpdater = Executors.newSingleThreadExecutor();
- final private AtomicBoolean analysisRunning = new AtomicBoolean(false);
+ private final AtomicBoolean analysisRunning = new AtomicBoolean(false);
private OQLEngine engine = null;
diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLSupport.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLSupport.java
index 85606e9..9a76977 100644
--- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLSupport.java
+++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OQLSupport.java
@@ -166,7 +166,7 @@ public final class OQLSupport {
}
- public static abstract class OQLNode<T extends Object> extends DefaultMutableTreeNode {
+ public abstract static class OQLNode<T extends Object> extends DefaultMutableTreeNode {
public OQLNode(T userObject) { super(userObject); }
@@ -186,7 +186,7 @@ public final class OQLSupport {
}
- private static abstract class SpecialNode extends OQLNode<Object> {
+ private abstract static class SpecialNode extends OQLNode<Object> {
public SpecialNode() { super(null); }
diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OverviewController.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OverviewController.java
index 2ead56c..9e34bbb 100644
--- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OverviewController.java
+++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/OverviewController.java
@@ -643,12 +643,12 @@ public class OverviewController extends AbstractController {
* in the hotspot implementation. Its value is set according to
* the JVM TI specification GetThreadState function.
*/
- private final static int JVMTI_THREAD_STATE_ALIVE = 0x0001;
- private final static int JVMTI_THREAD_STATE_TERMINATED = 0x0002;
- private final static int JVMTI_THREAD_STATE_RUNNABLE = 0x0004;
- private final static int JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER = 0x0400;
- private final static int JVMTI_THREAD_STATE_WAITING_INDEFINITELY = 0x0010;
- private final static int JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT = 0x0020;
+ private static final int JVMTI_THREAD_STATE_ALIVE = 0x0001;
+ private static final int JVMTI_THREAD_STATE_TERMINATED = 0x0002;
+ private static final int JVMTI_THREAD_STATE_RUNNABLE = 0x0004;
+ private static final int JVMTI_THREAD_STATE_BLOCKED_ON_MONITOR_ENTER = 0x0400;
+ private static final int JVMTI_THREAD_STATE_WAITING_INDEFINITELY = 0x0010;
+ private static final int JVMTI_THREAD_STATE_WAITING_WITH_TIMEOUT = 0x0020;
public void showNextSegment() {
HeapWalkerManager.getDefault().openHeapWalker(
diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/api/ExportAction.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/api/ExportAction.java
index 3b6fc12..0a8cd2d 100644
--- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/api/ExportAction.java
+++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/api/ExportAction.java
@@ -249,7 +249,7 @@ public final class ExportAction extends AbstractAction {
if (!checkFileExists(file)) return; // user doesn't want to overwrite existing file or it can't be overwritten
new NBSwingWorker(true) {
- final private ProgressHandle ph = ProgressHandle.createHandle(Bundle.ExportAction_ExportingViewMsg());
+ private final ProgressHandle ph = ProgressHandle.createHandle(Bundle.ExportAction_ExportingViewMsg());
@Override
protected void doInBackground() {
ph.setInitialDelay(500);
diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/BorderBuilders.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/BorderBuilders.java
index 70f799f..985ab68 100644
--- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/BorderBuilders.java
+++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/BorderBuilders.java
@@ -71,7 +71,7 @@ final class BorderBuilders {
return null;
}
- static abstract class BorderBuilder extends InstanceBuilder<Border> {
+ abstract static class BorderBuilder extends InstanceBuilder<Border> {
private final boolean isUIResource;
BorderBuilder(Instance instance, Heap heap) {
super(instance, heap);
diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ButtonBuilders.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ButtonBuilders.java
index bcd3cef..f4984f7 100644
--- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ButtonBuilders.java
+++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ButtonBuilders.java
@@ -106,7 +106,7 @@ final class ButtonBuilders {
}
- private static abstract class AbstractButtonBuilder<T extends AbstractButton> extends JComponentBuilder<T> {
+ private abstract static class AbstractButtonBuilder<T extends AbstractButton> extends JComponentBuilder<T> {
private final DefaultButtonModelBuilder model;
private final String text;
diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ComponentBuilders.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ComponentBuilders.java
index ea7d501..102e33f 100644
--- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ComponentBuilders.java
+++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/ComponentBuilders.java
@@ -129,8 +129,8 @@ final class ComponentBuilders {
static class ComponentBuilder<T extends Component> extends InstanceBuilder<T> {
- private final static int MAX_WIDTH = 10000;
- private final static int MAX_HEIGHT = 10000;
+ private static final int MAX_WIDTH = 10000;
+ private static final int MAX_HEIGHT = 10000;
protected final String className;
diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/TextComponentBuilders.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/TextComponentBuilders.java
index 191d18b..fb68fb3 100644
--- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/TextComponentBuilders.java
+++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/TextComponentBuilders.java
@@ -98,7 +98,7 @@ final class TextComponentBuilders {
}
- private static abstract class JTextComponentBuilder<T extends JTextComponent> extends JComponentBuilder<T> {
+ private abstract static class JTextComponentBuilder<T extends JTextComponent> extends JComponentBuilder<T> {
private final DocumentTextBuilder model;
private final boolean isEditable;
diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/Utils.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/Utils.java
index 2497593..245e6a0 100644
--- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/Utils.java
+++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/jdk/ui/Utils.java
@@ -184,7 +184,7 @@ final class Utils {
}
- static abstract class InstanceBuilder<T> {
+ abstract static class InstanceBuilder<T> {
InstanceBuilder(Instance instance, Heap heap) {}
@@ -200,7 +200,7 @@ final class Utils {
}
- static abstract class View<T extends InstanceBuilder> extends DetailsProvider.View implements Scrollable {
+ abstract static class View<T extends InstanceBuilder> extends DetailsProvider.View implements Scrollable {
private static final int DASH_SIZE = 20;
diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/PlatformDetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/PlatformDetailsProvider.java
index 6625295..4f0eba3 100644
--- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/PlatformDetailsProvider.java
+++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/netbeans/PlatformDetailsProvider.java
@@ -1303,7 +1303,7 @@ public class PlatformDetailsProvider extends DetailsProvider.Basic {
* it is still more effective than String, because string stores length in field
* and it costs 20 bytes aligned into 24
*/
- private final static class CharBasedSequence implements CompactCharSequence, Comparable<CharSequence> {
+ private static final class CharBasedSequence implements CompactCharSequence, Comparable<CharSequence> {
private final char[] value;
private int hash;
@@ -1372,7 +1372,7 @@ public class PlatformDetailsProvider extends DetailsProvider.Basic {
* compact char sequence implementation based on byte[]
* size: 8 + 4 + 4 (= 16 bytes) + sizeof ('value')
*/
- private final static class ByteBasedSequence implements CompactCharSequence, Comparable<CharSequence> {
+ private static final class ByteBasedSequence implements CompactCharSequence, Comparable<CharSequence> {
private final byte[] value;
private int hash;
@@ -1597,16 +1597,16 @@ public class PlatformDetailsProvider extends DetailsProvider.Basic {
private static class DependencyResolver {
- private final static int TYPE_MODULE = 1;
- private final static int TYPE_PACKAGE = 2;
- private final static int TYPE_JAVA = 3;
- private final static int TYPE_IDE = 4;
- private final static int TYPE_REQUIRES = 5;
- private final static int TYPE_NEEDS = 6;
- private final static int TYPE_RECOMMENDS = 7;
- private final static int COMPARE_SPEC = 1;
- private final static int COMPARE_IMPL = 2;
- private final static int COMPARE_ANY = 3;
+ private static final int TYPE_MODULE = 1;
+ private static final int TYPE_PACKAGE = 2;
+ private static final int TYPE_JAVA = 3;
+ private static final int TYPE_IDE = 4;
+ private static final int TYPE_REQUIRES = 5;
+ private static final int TYPE_NEEDS = 6;
+ private static final int TYPE_RECOMMENDS = 7;
+ private static final int COMPARE_SPEC = 1;
+ private static final int COMPARE_IMPL = 2;
+ private static final int COMPARE_ANY = 3;
static String toString(String name, String version, int type, int comparison) {
StringBuilder buf = new StringBuilder(100);
diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/spi/DetailsProvider.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/spi/DetailsProvider.java
index 4b153da..3a2c9e0 100644
--- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/spi/DetailsProvider.java
+++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/details/spi/DetailsProvider.java
@@ -55,7 +55,7 @@ public abstract class DetailsProvider {
}
- public static abstract class Basic extends DetailsProvider {
+ public abstract static class Basic extends DetailsProvider {
private final String[] supportedClasses;
@@ -76,7 +76,7 @@ public abstract class DetailsProvider {
}
- public static abstract class View extends JPanel {
+ public abstract static class View extends JPanel {
private RequestProcessor.Task workerTask;
private Instance instance;
diff --git a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/oql/ui/OQLEditor.java b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/oql/ui/OQLEditor.java
index b6bcf1c..373da54 100644
--- a/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/oql/ui/OQLEditor.java
+++ b/profiler/profiler.heapwalker/src/org/netbeans/modules/profiler/heapwalk/oql/ui/OQLEditor.java
@@ -50,18 +50,18 @@ import org.openide.util.Lookup;
*/
public class OQLEditor extends JPanel {
- final public static String VALIDITY_PROPERTY = OQLEditorImpl.VALIDITY_PROPERTY;
- volatile private boolean lexervalid = false;
- volatile private boolean parserValid = false;
- volatile private boolean oldValidity = false;
+ public static final String VALIDITY_PROPERTY = OQLEditorImpl.VALIDITY_PROPERTY;
+ private volatile boolean lexervalid = false;
+ private volatile boolean parserValid = false;
+ private volatile boolean oldValidity = false;
private JEditorPane queryEditor = null;
- final private OQLEngine engine;
+ private final OQLEngine engine;
- final private Color disabledBgColor = UIUtils.isGTKLookAndFeel() ?
+ private final Color disabledBgColor = UIUtils.isGTKLookAndFeel() ?
UIManager.getLookAndFeelDefaults().getColor("desktop") : // NOI18N
UIManager.getColor("TextField.disabledBackground"); // NOI18N
- final private transient Caret nullCaret = new NoCaret();
+ private final transient Caret nullCaret = new NoCaret();
private Color lastBgColor = null;
private Caret lastCaret = null;
@@ -165,7 +165,7 @@ public class OQLEditor extends JPanel {
getEditor().requestFocus();
}
- final private void validateScript() {
+ private final void validateScript() {
if (lexervalid || !parserValid) {
// only parse the query if there are no errors from lexer
try {
diff --git a/profiler/profiler.j2se/src/org/netbeans/modules/profiler/j2se/J2SEProjectProfilingSupportProvider.java b/profiler/profiler.j2se/src/org/netbeans/modules/profiler/j2se/J2SEProjectProfilingSupportProvider.java
index f82a4a1..155cb2d 100644
--- a/profiler/profiler.j2se/src/org/netbeans/modules/profiler/j2se/J2SEProjectProfilingSupportProvider.java
+++ b/profiler/profiler.j2se/src/org/netbeans/modules/profiler/j2se/J2SEProjectProfilingSupportProvider.java
@@ -50,7 +50,7 @@ import org.openide.modules.InstalledFileLocator;
@ProjectType(id="org-netbeans-modules-java-j2semodule",position=550)
}) // NOI18N
public class J2SEProjectProfilingSupportProvider extends JavaProjectProfilingSupportProvider {
- final private static Logger LOG = Logger.getLogger(J2SEProjectProfilingSupportProvider.class.getName());
+ private static final Logger LOG = Logger.getLogger(J2SEProjectProfilingSupportProvider.class.getName());
private static class MyPropertyProvider implements PropertyProvider {
//~ Instance fields ------------------------------------------------------------------------------------------------------
diff --git a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/FileSensitivePerformer.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/FileSensitivePerformer.java
index c8b5be9..48cb53a 100644
--- a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/FileSensitivePerformer.java
+++ b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/FileSensitivePerformer.java
@@ -39,7 +39,7 @@ import org.openide.util.lookup.Lookups;
*/
public class FileSensitivePerformer implements FileActionPerformer {
- final private String command;
+ private final String command;
public FileSensitivePerformer(String command) {
this.command = command;
diff --git a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfilerLauncher.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfilerLauncher.java
index fe4ebb7..2efce78 100644
--- a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfilerLauncher.java
+++ b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProfilerLauncher.java
@@ -65,11 +65,11 @@ import org.openide.util.lookup.ServiceProvider;
"ProfilerLauncher_noFeature=<html><b>No profiling feature selected.</b><br><br>Please select at least one profiling feature for the session.</html>"
})
public class ProfilerLauncher {
- final private static Logger LOG = Logger.getLogger(ProfilerLauncher.class.getName());
+ private static final Logger LOG = Logger.getLogger(ProfilerLauncher.class.getName());
- final private static String AGENT_ARGS = "agent.jvmargs"; // NOI18N
- final private static String LINUX_THREAD_TIMER_KEY = "-XX:+UseLinuxPosixThreadCPUClocks"; // NOI18N
- final private static String ARGS_PREFIX = "profiler.netbeansBindings.jvmarg"; // NOI18N
+ private static final String AGENT_ARGS = "agent.jvmargs"; // NOI18N
+ private static final String LINUX_THREAD_TIMER_KEY = "-XX:+UseLinuxPosixThreadCPUClocks"; // NOI18N
+ private static final String ARGS_PREFIX = "profiler.netbeansBindings.jvmarg"; // NOI18N
public static final class Command {
private final String command;
@@ -84,7 +84,7 @@ public class ProfilerLauncher {
}
}
- final private static class ProfilerSessionImpl extends ProfilerSession {
+ private static final class ProfilerSessionImpl extends ProfilerSession {
ProfilerSessionImpl(Lookup _context) {
super(NetBeansProfiler.getDefaultNB(), _context);
@@ -201,7 +201,7 @@ public class ProfilerLauncher {
}
- final public static class Session {
+ public static final class Session {
private SessionSettings ss;
private ProfilingSettings ps;
private Map<String, String> props;
@@ -211,7 +211,7 @@ public class ProfilerLauncher {
private JavaPlatform platform;
private String command;
private Lookup context;
- final private Map<String, Object> customProps = new HashMap<String, Object>();
+ private final Map<String, Object> customProps = new HashMap<String, Object>();
private boolean configured = false;
private boolean rerun;
@@ -382,8 +382,8 @@ public class ProfilerLauncher {
@ProjectType(id="org-netbeans-modules-autoproject"),
@ProjectType(id="org-netbeans-modules-java-j2semodule")
})
- final public static class AntLauncherFactory implements LauncherFactory {
- final private Project prj;
+ public static final class AntLauncherFactory implements LauncherFactory {
+ private final Project prj;
public AntLauncherFactory(Project prj) {
this.prj = prj;
}
@@ -399,7 +399,7 @@ public class ProfilerLauncher {
}
}
- final private static class AntLauncher implements Launcher {
+ private static final class AntLauncher implements Launcher {
private ActionProvider ap;
private String command;
private Lookup context;
diff --git a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProjectSensitivePerformer.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProjectSensitivePerformer.java
index 9b0aeb1..7463719 100644
--- a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProjectSensitivePerformer.java
+++ b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/actions/ProjectSensitivePerformer.java
@@ -35,8 +35,8 @@ import org.openide.util.lookup.ProxyLookup;
*/
public class ProjectSensitivePerformer implements ProjectActionPerformer {
- final private String command;
- final private boolean attach;
+ private final String command;
+ private final boolean attach;
public static ProjectSensitivePerformer profileProject(String command) {
return new ProjectSensitivePerformer(command, false);
diff --git a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ScanSensitiveTask.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ScanSensitiveTask.java
index 01dedd4..4a677f6 100644
--- a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ScanSensitiveTask.java
+++ b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/javac/ScanSensitiveTask.java
@@ -27,7 +27,7 @@ import org.netbeans.api.java.source.Task;
*
* @author Jaroslav Bachorik <ja...@oracle.com>
*/
-abstract public class ScanSensitiveTask<P> implements Task<P> {
+public abstract class ScanSensitiveTask<P> implements Task<P> {
private boolean uptodate;
/**
@@ -58,7 +58,7 @@ abstract public class ScanSensitiveTask<P> implements Task<P> {
* Indicates the requirements regarding the up-to-dateness of the accessed data
* @return <b>TRUE</b> if the task needs up-to-date data (eg. needs to wait for the scanning to finish); <b>FALSE</b> otherwise
*/
- final public boolean requiresUpToDate() {
+ public final boolean requiresUpToDate() {
return this.uptodate;
}
}
diff --git a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/AntProjectSupportProvider.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/AntProjectSupportProvider.java
index 2cab553..cf41eea 100644
--- a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/AntProjectSupportProvider.java
+++ b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/AntProjectSupportProvider.java
@@ -72,7 +72,7 @@ public abstract class AntProjectSupportProvider {
}
- public static abstract class Abstract extends AntProjectSupportProvider {
+ public abstract static class Abstract extends AntProjectSupportProvider {
private final Project project;
diff --git a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/JavaProjectProfilingSupportProvider.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/JavaProjectProfilingSupportProvider.java
index 0fb580a..9fa62eb 100644
--- a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/JavaProjectProfilingSupportProvider.java
+++ b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/JavaProjectProfilingSupportProvider.java
@@ -89,7 +89,7 @@ public abstract class JavaProjectProfilingSupportProvider extends ProjectProfili
"IncorrectJavaSpecVersionDialogCaption=Warning",
"IncorrectJavaSpecVersionDialogMsg=The specification version of project Java Platform is greater than specification version of the\nplatform that will be used for profiling. You may experience problems unless you set the compiler\nparameter to generate bytecode compatible with the platform that will be used.\n\nDo you want to continue with the current settings?"
})
- synchronized public JavaPlatform getProjectJavaPlatform() {
+ public synchronized JavaPlatform getProjectJavaPlatform() {
JavaPlatform projectJavaPlatform = resolveProjectJavaPlatform();
if (projectJavaPlatform != null && !MiscUtils.isSupportedJVM(projectJavaPlatform.getSystemProperties())) {
@@ -148,7 +148,7 @@ public abstract class JavaProjectProfilingSupportProvider extends ProjectProfili
// return platform;
}
- abstract protected JavaPlatform resolveProjectJavaPlatform();
+ protected abstract JavaPlatform resolveProjectJavaPlatform();
protected final JavaPlatform getPlatformByName(String platformName) {
if (platformName == null || platformName.equals("default_platform")) { // NOI18N
diff --git a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/ProjectUtilities.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/ProjectUtilities.java
index 0b331f9..b058993 100644
--- a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/ProjectUtilities.java
+++ b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/project/ProjectUtilities.java
@@ -99,7 +99,7 @@ public final class ProjectUtilities {
"org-netbeans-modules-j2ee-earproject",
"org-netbeans-modules-j2ee-ejbjarproject",
"org-netbeans-modules-web-project"})
- final public static class IntegrationUpdater extends ProjectOpenedHook {
+ public static final class IntegrationUpdater extends ProjectOpenedHook {
private Project prj;
public IntegrationUpdater(Project prj) {
@@ -202,7 +202,7 @@ public final class ProjectUtilities {
return buildDir;
}
- final private static Pattern PROFILER_INIT = Pattern.compile("<\\s*target\\s+.*?name\\s*=\\s*\"profile-init\"", Pattern.DOTALL | Pattern.MULTILINE);
+ private static final Pattern PROFILER_INIT = Pattern.compile("<\\s*target\\s+.*?name\\s*=\\s*\"profile-init\"", Pattern.DOTALL | Pattern.MULTILINE);
public static boolean isProfilerIntegrated(Project project) {
String buildXml = ProjectUtilities.getProjectBuildScript(project, "nbproject/build-impl.xml"); // NOI18N
Matcher m = PROFILER_INIT.matcher(buildXml);
diff --git a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/BaseProfilerTypeUtilsImpl.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/BaseProfilerTypeUtilsImpl.java
index 63181d6..272381d 100644
--- a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/BaseProfilerTypeUtilsImpl.java
+++ b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/BaseProfilerTypeUtilsImpl.java
@@ -40,10 +40,10 @@ import org.netbeans.modules.profiler.spi.java.ProfilerTypeUtilsProvider;
*
* @author Jaroslav Bachorik
*/
-abstract public class BaseProfilerTypeUtilsImpl extends ProfilerTypeUtilsProvider {
+public abstract class BaseProfilerTypeUtilsImpl extends ProfilerTypeUtilsProvider {
private static final Logger LOG = Logger.getLogger(BaseProfilerTypeUtilsImpl.class.getName());
@Override
- final public Collection<SourcePackageInfo> getPackages(boolean subprojects, final Scope scope) {
+ public final Collection<SourcePackageInfo> getPackages(boolean subprojects, final Scope scope) {
final Collection<SourcePackageInfo> pkgs = new ArrayList<SourcePackageInfo>();
final ClasspathInfo cpInfo = getClasspathInfo(subprojects, scope == SourcePackageInfo.Scope.SOURCE, scope == SourcePackageInfo.Scope.DEPENDENCIES);
@@ -65,7 +65,7 @@ abstract public class BaseProfilerTypeUtilsImpl extends ProfilerTypeUtilsProvide
}
@Override
- final public SourceClassInfo resolveClass(final String className) {
+ public final SourceClassInfo resolveClass(final String className) {
final ClasspathInfo cpInfo = getClasspathInfo();
if (cpInfo != null) {
ElementHandle<TypeElement> eh = ElementUtilitiesEx.resolveClassByName(className, cpInfo, false);
@@ -92,8 +92,8 @@ abstract public class BaseProfilerTypeUtilsImpl extends ProfilerTypeUtilsProvide
return clzs;
}
- abstract protected ClasspathInfo getClasspathInfo();
- abstract protected ClasspathInfo getClasspathInfo(boolean subprojects, boolean source, boolean deps);
+ protected abstract ClasspathInfo getClasspathInfo();
+ protected abstract ClasspathInfo getClasspathInfo(boolean subprojects, boolean source, boolean deps);
private Set<ClassIndex.SearchScope> toSearchScope(Set<Scope> scope) {
Set<ClassIndex.SearchScope> sScope = EnumSet.noneOf(ClassIndex.SearchScope.class);
diff --git a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/GoToJavaSourceProvider.java b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/GoToJavaSourceProvider.java
index 89d9261..e45b494 100644
--- a/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/GoToJavaSourceProvider.java
+++ b/profiler/profiler.nbimpl/src/org/netbeans/modules/profiler/nbimpl/providers/GoToJavaSourceProvider.java
@@ -67,8 +67,8 @@ public final class GoToJavaSourceProvider extends GoToSourceProvider {
private String methodName;
private String signature;
private int line;
- final private AtomicBoolean cancelled;
- final private AtomicBoolean result = new AtomicBoolean(true);
+ private final AtomicBoolean cancelled;
+ private final AtomicBoolean result = new AtomicBoolean(true);
public GotoSourceRunnable(Lookup.Provider project, String className, String methodName, String signature, int line, AtomicBoolean cancelled) {
this.project = project;
diff --git a/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/ClassnameCompletionItem.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/ClassnameCompletionItem.java
index 4b0e391..e236f98 100644
--- a/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/ClassnameCompletionItem.java
+++ b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/ClassnameCompletionItem.java
@@ -36,14 +36,14 @@ import org.netbeans.spi.editor.completion.support.CompletionUtilities;
* @author Jaroslav Bachorik
*/
public class ClassnameCompletionItem implements CompletionItem {
- final private String text;
- final private String sortPrefix;
- final private int caret;
- final private int correction;
- final private String pkgName;
- final private String typeName;
-
- final private static Color fieldColor = Color.decode("0xa38000");
+ private final String text;
+ private final String sortPrefix;
+ private final int caret;
+ private final int correction;
+ private final String pkgName;
+ private final String typeName;
+
+ private static final Color fieldColor = Color.decode("0xa38000");
public ClassnameCompletionItem(String sortPrefix, String text, int caretOffset) {
this(sortPrefix, text, caretOffset, 0);
diff --git a/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/FunctionCompletionItem.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/FunctionCompletionItem.java
index 67d138e..a32c3bd 100644
--- a/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/FunctionCompletionItem.java
+++ b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/FunctionCompletionItem.java
@@ -36,12 +36,12 @@ import org.netbeans.spi.editor.completion.support.CompletionUtilities;
* @author Jaroslav Bachorik
*/
public class FunctionCompletionItem implements CompletionItem {
- final private String text;
- final private String sortPrefix;
- final private int correction;
- final private int carretOffset;
+ private final String text;
+ private final String sortPrefix;
+ private final int correction;
+ private final int carretOffset;
- final private static Color fieldColor = Color.BLACK;
+ private static final Color fieldColor = Color.BLACK;
public FunctionCompletionItem(String sortPrefix, String text, int carretOffset) {
this(sortPrefix, text, carretOffset, 0);
diff --git a/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/KeywordCompletionItem.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/KeywordCompletionItem.java
index d7ac88b..da97983 100644
--- a/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/KeywordCompletionItem.java
+++ b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/KeywordCompletionItem.java
@@ -36,12 +36,12 @@ import org.netbeans.spi.editor.completion.support.CompletionUtilities;
* @author Jaroslav Bachorik
*/
public class KeywordCompletionItem implements CompletionItem {
- final private String text;
- final private String sortPrefix;
- final private int caret;
- final private int correction;
+ private final String text;
+ private final String sortPrefix;
+ private final int caret;
+ private final int correction;
- final private static Color fieldColor = Color.decode("0x0000B2");
+ private static final Color fieldColor = Color.decode("0x0000B2");
public KeywordCompletionItem(String sortPrefix, String text, int caretOffset) {
this(sortPrefix, text, caretOffset, 0);
diff --git a/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLCompletionProvider.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLCompletionProvider.java
index 3c1edfd..b87c47a 100644
--- a/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLCompletionProvider.java
+++ b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLCompletionProvider.java
@@ -41,9 +41,9 @@ import org.netbeans.spi.editor.completion.support.AsyncCompletionTask;
* @author Jaroslav Bachorik
*/
public class OQLCompletionProvider implements CompletionProvider {
- final private Set<String> keywords = new HashSet<String>();
- final private Set<String> functions = new HashSet<String>();
- final private Set<String> heapMethods = new HashSet<String>();
+ private final Set<String> keywords = new HashSet<String>();
+ private final Set<String> functions = new HashSet<String>();
+ private final Set<String> heapMethods = new HashSet<String>();
public OQLCompletionProvider() {
keywords.add("select"); // NOI18N
diff --git a/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLLexer.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLLexer.java
index b41ce61..bdfcf0e 100644
--- a/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLLexer.java
+++ b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLLexer.java
@@ -59,8 +59,8 @@ class OQLLexer implements Lexer<OQLTokenId> {
private TokenFactory<OQLTokenId>
tokenFactory;
private State state = State.INIT;
- final private Pattern classPattern = Pattern.compile("(\\[*)[a-z]+(?:[a-z 0-9]*)(?:[\\. \\$][a-z 0-9]+)*(\\[\\])*", Pattern.CASE_INSENSITIVE); // NOI18N
- final private Pattern classIdPattern = Pattern.compile("(0X)?([0-9 a-f A-F]+)");
+ private final Pattern classPattern = Pattern.compile("(\\[*)[a-z]+(?:[a-z 0-9]*)(?:[\\. \\$][a-z 0-9]+)*(\\[\\])*", Pattern.CASE_INSENSITIVE); // NOI18N
+ private final Pattern classIdPattern = Pattern.compile("(0X)?([0-9 a-f A-F]+)");
OQLLexer (LexerRestartInfo<OQLTokenId> info) {
@@ -371,7 +371,7 @@ class OQLLexer implements Lexer<OQLTokenId> {
}
}
- final private static boolean isEmpty(String string) {
+ private static final boolean isEmpty(String string) {
return string == null || string.length() == 0;
}
diff --git a/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLTokenId.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLTokenId.java
index 2a7886e..a7d1d65 100644
--- a/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLTokenId.java
+++ b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/OQLTokenId.java
@@ -42,7 +42,7 @@ public enum OQLTokenId implements TokenId {
CLAZZ_E("clazz-typo"),
ERROR("error");
- final private String primaryCategory;
+ private final String primaryCategory;
OQLTokenId(String primaryCategory) {
this.primaryCategory = primaryCategory;
diff --git a/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/PackageCompletionItem.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/PackageCompletionItem.java
index 7bac2bc..a4a3281 100644
--- a/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/PackageCompletionItem.java
+++ b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/PackageCompletionItem.java
@@ -36,11 +36,11 @@ import org.netbeans.spi.editor.completion.support.CompletionUtilities;
* @author Jaroslav Bachorik
*/
public class PackageCompletionItem implements CompletionItem {
- final private String text;
- final private int caret;
- final private int correction;
+ private final String text;
+ private final int caret;
+ private final int correction;
- final private static Color fieldColor = Color.GRAY;
+ private static final Color fieldColor = Color.GRAY;
public PackageCompletionItem(String text, int caretOffset) {
this(text, caretOffset, 0);
diff --git a/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/ui/OQLEditor.java b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/ui/OQLEditor.java
index e7f2a10..b0bbd3f 100644
--- a/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/ui/OQLEditor.java
+++ b/profiler/profiler.oql.language/src/org/netbeans/modules/profiler/oql/language/ui/OQLEditor.java
@@ -37,9 +37,9 @@ import org.openide.util.lookup.ServiceProvider;
*/
@ServiceProvider(service=OQLEditorImpl.class)
public class OQLEditor extends OQLEditorImpl{
- final static private class TokenChangeListener implements TokenHierarchyListener {
+ private static final class TokenChangeListener implements TokenHierarchyListener {
volatile boolean validFlag;
- final private Document document;
+ private final Document document;
public TokenChangeListener(Document document) {
this.document = document;
}
@@ -71,7 +71,7 @@ public class OQLEditor extends OQLEditorImpl{
return editorPane;
}
- synchronized public JEditorPane getEditorPane() {
+ public synchronized JEditorPane getEditorPane() {
return createEditor();
}
}
diff --git a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/OQLEngine.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/OQLEngine.java
index 0e65f49..b80caf4 100644
--- a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/OQLEngine.java
+++ b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/OQLEngine.java
@@ -29,17 +29,17 @@ import org.netbeans.modules.profiler.oql.engine.api.impl.Snapshot;
*
* @author J. Bachorik
*/
-final public class OQLEngine {
- final private static Logger LOGGER = Logger.getLogger(OQLEngine.class.getName());
- final private OQLEngineImpl delegate;
- final private Heap heap;
+public final class OQLEngine {
+ private static final Logger LOGGER = Logger.getLogger(OQLEngine.class.getName());
+ private final OQLEngineImpl delegate;
+ private final Heap heap;
/**
* This represents a parsed OQL query
*
* @author A. Sundararajan
*/
- public static abstract class OQLQuery {
+ public abstract static class OQLQuery {
}
diff --git a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/OQLException.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/OQLException.java
index fcbbe96..0f30e61 100644
--- a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/OQLException.java
+++ b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/OQLException.java
@@ -23,7 +23,7 @@ package org.netbeans.modules.profiler.oql.engine.api;
* OQLException is thrown if OQL execution results in error
*
*/
-final public class OQLException extends Exception {
+public final class OQLException extends Exception {
public OQLException(String msg) {
super(msg);
}
diff --git a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/ReferenceChain.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/ReferenceChain.java
index f56f086..690912c 100644
--- a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/ReferenceChain.java
+++ b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/ReferenceChain.java
@@ -28,7 +28,7 @@ import org.netbeans.lib.profiler.heap.JavaClass;
*
* @author Bill Foote
*/
-final public class ReferenceChain {
+public final class ReferenceChain {
private WeakReference<Object> obj; // Object referred to
ReferenceChain next; // Next in chain
private Heap heap;
diff --git a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/OQLEngineImpl.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/OQLEngineImpl.java
index 1c0ccf5..6f53f05 100644
--- a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/OQLEngineImpl.java
+++ b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/OQLEngineImpl.java
@@ -45,7 +45,7 @@ import org.openide.util.NbBundle;
* @author J. Bachorik
*/
public class OQLEngineImpl {
- final private static Logger LOGGER = Logger.getLogger(OQLEngineImpl.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(OQLEngineImpl.class.getName());
private static boolean oqlSupported;
@@ -376,7 +376,7 @@ public class OQLEngineImpl {
return null;
}
- final private AtomicBoolean cancelled = new AtomicBoolean(false);
+ private final AtomicBoolean cancelled = new AtomicBoolean(false);
private void init(Snapshot snapshot) throws RuntimeException {
this.snapshot = snapshot;
try {
diff --git a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Snapshot.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Snapshot.java
index e812eef..0c3dcb8 100644
--- a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Snapshot.java
+++ b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Snapshot.java
@@ -51,7 +51,7 @@ public class Snapshot {
private JavaClass weakReferenceClass;
private int referentFieldIndex;
private ReachableExcludes reachableExcludes;
- final private OQLEngine engine;
+ private final OQLEngine engine;
public Snapshot(Heap heap, OQLEngine engine) {
this.delegate = heap;
diff --git a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/TreeIterator.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/TreeIterator.java
index 2eab206..68cb687 100644
--- a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/TreeIterator.java
+++ b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/TreeIterator.java
@@ -29,7 +29,7 @@ import java.util.Stack;
* Provides an iterator over instances of <I> using instances of <T> for traversal
* @author Jaroslav Bachorik
*/
-abstract public class TreeIterator<I, T> implements Iterator<I> {
+public abstract class TreeIterator<I, T> implements Iterator<I> {
private Stack<T> toInspect = new Stack<T>();
private Set<T> inspected = new HashSet<T>();
@@ -61,8 +61,8 @@ abstract public class TreeIterator<I, T> implements Iterator<I> {
throw new UnsupportedOperationException("Not supported yet."); // NOI18N
}
- abstract protected Iterator<I> getSameLevelIterator(T popped);
- abstract protected Iterator<T> getTraversingIterator(T popped);
+ protected abstract Iterator<I> getSameLevelIterator(T popped);
+ protected abstract Iterator<T> getTraversingIterator(T popped);
private void setupIterator() {
while (!toInspect.isEmpty() && (inspecting == null || !inspecting.hasNext())) {
diff --git a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryCategory.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryCategory.java
index 3dda6c9..530247a 100644
--- a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryCategory.java
+++ b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryCategory.java
@@ -28,7 +28,7 @@ import org.netbeans.api.annotations.common.NonNull;
* to obtain this class instances.
* @author Jaroslav Bachorik
*/
-final public class OQLQueryCategory {
+public final class OQLQueryCategory {
private final String id;
private final String name;
private final String description;
diff --git a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryDefinition.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryDefinition.java
index 2a626bc..6cf79eb 100644
--- a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryDefinition.java
+++ b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryDefinition.java
@@ -25,7 +25,7 @@ import org.netbeans.api.annotations.common.NonNull;
* Value object for OQL query definition<br/>
* @author Jaroslav Bachorik
*/
-final public class OQLQueryDefinition {
+public final class OQLQueryDefinition {
private final String name;
private final String description;
private final String content;
diff --git a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryRepository.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryRepository.java
index 68a4d70..9fc3d3a 100644
--- a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryRepository.java
+++ b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/repository/api/OQLQueryRepository.java
@@ -36,13 +36,13 @@ import org.openide.filesystems.FileUtil;
* @author Jaroslav Bachorik
* @version 0.1
*/
-final public class OQLQueryRepository {
- final private static class Singleton {
- final private static OQLQueryRepository INSTANCE = new OQLQueryRepository();
+public final class OQLQueryRepository {
+ private static final class Singleton {
+ private static final OQLQueryRepository INSTANCE = new OQLQueryRepository();
}
- final private static String MATCH_ALL = ".*"; // NOI18N
- final private static Logger LOGGER = Logger.getLogger(OQLQueryRepository.class.getName());
+ private static final String MATCH_ALL = ".*"; // NOI18N
+ private static final Logger LOGGER = Logger.getLogger(OQLQueryRepository.class.getName());
private OQLQueryRepository() {}
diff --git a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/spi/OQLEditorImpl.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/spi/OQLEditorImpl.java
index 5dc92d5..af15800 100644
--- a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/spi/OQLEditorImpl.java
+++ b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/spi/OQLEditorImpl.java
@@ -27,17 +27,17 @@ import org.netbeans.modules.profiler.oql.engine.api.OQLEngine;
*
* @author Jaroslav Bachorik
*/
-abstract public class OQLEditorImpl {
- public final static String VALIDITY_PROPERTY = "document#valid";
+public abstract class OQLEditorImpl {
+ public static final String VALIDITY_PROPERTY = "document#valid";
public static interface ValidationCallback {
void callback(boolean lexingResult);
}
- final static protected ValidationCallback getValidationCallback(Document document) {
+ protected static final ValidationCallback getValidationCallback(Document document) {
return (ValidationCallback)document.getProperty(ValidationCallback.class);
}
- final static protected OQLEngine getEngine(Document document) {
+ protected static final OQLEngine getEngine(Document document) {
return (OQLEngine)document.getProperty(OQLEngine.class);
}
diff --git a/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointWizard.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointWizard.java
index 63ed10d..dc81769 100644
--- a/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointWizard.java
+++ b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointWizard.java
@@ -339,7 +339,7 @@ public class ProfilingPointWizard implements WizardDescriptor.Iterator {
//~ Methods ------------------------------------------------------------------------------------------------------------------
private static class Singleton {
- final private static ProfilingPointWizard INSTANCE = new ProfilingPointWizard();
+ private static final ProfilingPointWizard INSTANCE = new ProfilingPointWizard();
}
public static ProfilingPointWizard getDefault() {
diff --git a/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointsManager.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointsManager.java
index a946f8c..3f6b053 100644
--- a/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointsManager.java
+++ b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ProfilingPointsManager.java
@@ -317,7 +317,7 @@ public final class ProfilingPointsManager extends ProfilingPointsProcessor
private boolean ignoreStoreProfilingPoints = false;
private boolean processesProfilingPoints;
- final private Object pointsLock = new Object();
+ private final Object pointsLock = new Object();
// @GuardedBy pointsLock
private RuntimeProfilingPoint[] points = null;
diff --git a/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/InsertProfilingPointMenuAction.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/InsertProfilingPointMenuAction.java
index 5a75fdf..70a8b80 100644
--- a/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/InsertProfilingPointMenuAction.java
+++ b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/InsertProfilingPointMenuAction.java
@@ -45,7 +45,7 @@ public class InsertProfilingPointMenuAction extends ProfilingAwareAction {
private static final class Singleton {
- final private static InsertProfilingPointMenuAction INSTANCE = new InsertProfilingPointMenuAction();
+ private static final InsertProfilingPointMenuAction INSTANCE = new InsertProfilingPointMenuAction();
}
@ActionID(id = "org.netbeans.modules.profiler.actions.InsertProfilingPointMenuAction", category = "Profile")
diff --git a/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProjectSelector.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProjectSelector.java
index 1f7e630..2309c58 100644
--- a/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProjectSelector.java
+++ b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ProjectSelector.java
@@ -121,7 +121,7 @@ class ProjectSelector extends LazyComboBox<Lookup.Provider> {
private Renderer _renderer;
- final private String extraItemName;
+ private final String extraItemName;
ProjectNameRenderer(String extraItemName) {
this.extraItemName = extraItemName;
diff --git a/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ToggleProfilingPointAction.java b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ToggleProfilingPointAction.java
index 81dd5b3..7014d8d 100644
--- a/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ToggleProfilingPointAction.java
+++ b/profiler/profiler.ppoints/src/org/netbeans/modules/profiler/ppoints/ui/ToggleProfilingPointAction.java
@@ -211,7 +211,7 @@ public class ToggleProfilingPointAction extends AbstractAction implements AWTEve
private ProfilingPointsSwitcher ppSwitcher;
private ProfilingPointFactory[] ppFactories;
- volatile private boolean warningDialogOpened = false;
+ private volatile boolean warningDialogOpened = false;
private int currentFactory;
private KeyStroke acceleratorKeyStroke;
diff --git a/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerPackage.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerPackage.java
index 49b2efb..47fd8f8 100644
--- a/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerPackage.java
+++ b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerPackage.java
@@ -124,7 +124,7 @@ public abstract class TracerPackage implements Positionable {
*
* @param <X> any DataSource type
*/
- public static abstract class SessionAware extends TracerPackage {
+ public abstract static class SessionAware extends TracerPackage {
private PackageStateHandler stateHandler;
@@ -150,7 +150,7 @@ public abstract class TracerPackage implements Positionable {
*
* @return predefined PackageStateHandler which obtains status notifications
*/
- public synchronized final PackageStateHandler getStateHandler() {
+ public final synchronized PackageStateHandler getStateHandler() {
if (stateHandler == null) stateHandler = new PackageStateHandler() {
public void probeAdded(TracerProbe probe, IdeSnapshot snapshot) {
SessionAware.this.probeAdded(probe, snapshot);
diff --git a/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerProbe.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerProbe.java
index 401f1dc..98fda83 100644
--- a/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerProbe.java
+++ b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/TracerProbe.java
@@ -94,7 +94,7 @@ public abstract class TracerProbe {
* An abstract adapter class for receiving Tracer session state notifications.
* See ProbeStateHandler for details.
*/
- public static abstract class SessionAware extends TracerProbe {
+ public abstract static class SessionAware extends TracerProbe {
private ProbeStateHandler stateHandler;
@@ -114,7 +114,7 @@ public abstract class TracerProbe {
*
* @return predefined ProbeStateHandler which obtains status notifications
*/
- public synchronized final ProbeStateHandler getStateHandler() {
+ public final synchronized ProbeStateHandler getStateHandler() {
if (stateHandler == null) stateHandler = new ProbeStateHandler() {
public void probeAdded(IdeSnapshot snapshot) {
SessionAware.this.probeAdded(snapshot);
diff --git a/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/IdeSnapshotAction.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/IdeSnapshotAction.java
index f257b86..d48c2a8 100644
--- a/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/IdeSnapshotAction.java
+++ b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/IdeSnapshotAction.java
@@ -168,7 +168,7 @@ public final class IdeSnapshotAction implements ActionListener {
}
- private static abstract class Filter extends FileFilter {
+ private abstract static class Filter extends FileFilter {
abstract String getExt();
diff --git a/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/DataExport.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/DataExport.java
index a1c9052..b8cae42 100644
--- a/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/DataExport.java
+++ b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/export/DataExport.java
@@ -247,7 +247,7 @@ public final class DataExport {
}
- private static abstract class Filter extends FileFilter {
+ private abstract static class Filter extends FileFilter {
abstract String getExt();
diff --git a/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/ChartPanel.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/ChartPanel.java
index 3865473..1b51b33 100644
--- a/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/ChartPanel.java
+++ b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/impl/timeline/ChartPanel.java
@@ -411,7 +411,7 @@ final class ChartPanel extends JPanel {
}
- private static abstract class OneWayToggleButton extends JToggleButton {
+ private abstract static class OneWayToggleButton extends JToggleButton {
private boolean action;
diff --git a/profiler/profiler.utilities/src/org/netbeans/modules/profiler/utilities/Delegate.java b/profiler/profiler.utilities/src/org/netbeans/modules/profiler/utilities/Delegate.java
index 722091c..94d7114 100644
--- a/profiler/profiler.utilities/src/org/netbeans/modules/profiler/utilities/Delegate.java
+++ b/profiler/profiler.utilities/src/org/netbeans/modules/profiler/utilities/Delegate.java
@@ -22,8 +22,8 @@ package org.netbeans.modules.profiler.utilities;
* A utility class for simple delegation
* @author Jaroslav Bachorik
*/
-abstract public class Delegate<T> {
- volatile private T delegate;
+public abstract class Delegate<T> {
+ private volatile T delegate;
public void setDelegate(T delegate) {
this.delegate = delegate;
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/NetBeansProfiler.java b/profiler/profiler/src/org/netbeans/modules/profiler/NetBeansProfiler.java
index aaaf7e1..5b56505 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/NetBeansProfiler.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/NetBeansProfiler.java
@@ -371,7 +371,7 @@ public abstract class NetBeansProfiler extends Profiler {
private ProfilingMonitor monitor = null;
private TargetAppRunner targetAppRunner;
private FileObject profiledSingleFile;
- final private ProfilerEngineSettings sharedSettings;
+ private final ProfilerEngineSettings sharedSettings;
private final Object setupLock = new Object();
private ProfilingSettings lastProfilingSettings;
@@ -1668,7 +1668,7 @@ public abstract class NetBeansProfiler extends Profiler {
}
new SwingWorker(false) {
- volatile private ProgressDisplayer pd;
+ private volatile ProgressDisplayer pd;
@Override
protected void doInBackground() {
if (isCancelled()) return;
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/ResultsManager.java b/profiler/profiler/src/org/netbeans/modules/profiler/ResultsManager.java
index ce1c349..f60ab13 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/ResultsManager.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/ResultsManager.java
@@ -114,7 +114,7 @@ import org.openide.windows.WindowManager;
"ResultsManager_DifferentObjectSize=<html><b>Object sizes are different.</b><br><br>Size of the same objects differ for each snapshot and their comparison is invalid.<br>The snapshots have likely been taken on different architectures (32bit vs. 64bit).</html>"
})
public final class ResultsManager {
- final private static Logger LOGGER = Logger.getLogger(ResultsManager.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(ResultsManager.class.getName());
//~ Inner Classes ------------------------------------------------------------------------------------------------------------
@@ -180,7 +180,7 @@ public final class ResultsManager {
}
private static class Singleton {
- final private static ResultsManager INSTANCE = new ResultsManager();
+ private static final ResultsManager INSTANCE = new ResultsManager();
}
//~ Methods ------------------------------------------------------------------------------------------------------------------
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/SaveSnapshotAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/SaveSnapshotAction.java
index 7dae2c3..e163e5c 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/SaveSnapshotAction.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/SaveSnapshotAction.java
@@ -51,7 +51,7 @@ class SaveSnapshotAction extends AbstractAction {
public void actionPerformed(ActionEvent e) {
new NBSwingWorker() {
- final private ProgressHandle ph = ProgressHandle.createHandle(Bundle.MSG_SavingSnapshot());
+ private final ProgressHandle ph = ProgressHandle.createHandle(Bundle.MSG_SavingSnapshot());
@Override
protected void doInBackground() {
ph.setInitialDelay(500);
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/actions/AttachAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/AttachAction.java
index 054c610..d692fc4 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/actions/AttachAction.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/actions/AttachAction.java
@@ -39,8 +39,8 @@ import org.openide.util.RequestProcessor;
public final class AttachAction extends AbstractAction {
//~ Constructors -------------------------------------------------------------------------------------------------------------
- final private static class Singleton {
- final private static AttachAction INSTANCE = new AttachAction();
+ private static final class Singleton {
+ private static final AttachAction INSTANCE = new AttachAction();
}
private AttachAction() {
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/actions/GetCmdLineArgumentsAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/GetCmdLineArgumentsAction.java
index e8baf0d..9abd4a7 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/actions/GetCmdLineArgumentsAction.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/actions/GetCmdLineArgumentsAction.java
@@ -60,7 +60,7 @@ import org.openide.util.HelpCtx;
//@ActionRegistration(displayName="#LBL_GetCmdLineArgumentsAction")
//@ActionReference(path="Menu/Profile/Advanced", position=200)
public final class GetCmdLineArgumentsAction extends ProfilingAwareAction {
- final private static int[] enabledStates = new int[]{Profiler.PROFILING_RUNNING};
+ private static final int[] enabledStates = new int[]{Profiler.PROFILING_RUNNING};
//~ Constructors -------------------------------------------------------------------------------------------------------------
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/actions/HeapDumpAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/HeapDumpAction.java
index 5682d99..dfe44ad 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/actions/HeapDumpAction.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/actions/HeapDumpAction.java
@@ -87,8 +87,8 @@ import org.openide.windows.WindowManager;
})
public final class HeapDumpAction extends ProfilingAwareAction {
//~ Inner Classes ------------------------------------------------------------------------------------------------------------
- final private static class Singleton {
- final private static HeapDumpAction INSTANCE = new HeapDumpAction();
+ private static final class Singleton {
+ private static final HeapDumpAction INSTANCE = new HeapDumpAction();
}
private static class ChooseHeapdumpTargetPanel extends JPanel implements HelpCtx.Provider {
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/actions/InternalStatsAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/InternalStatsAction.java
index c527fe5..4560da4 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/actions/InternalStatsAction.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/actions/InternalStatsAction.java
@@ -49,7 +49,7 @@ import org.openide.util.HelpCtx;
//@ActionRegistration(displayName="#LBL_InternalStatsAction")
//@ActionReference(path="Menu/Profile/Advanced", position=300, separatorAfter=400)
public final class InternalStatsAction extends ProfilingAwareAction {
- final private static int[] enabledStates = new int[]{Profiler.PROFILING_RUNNING};
+ private static final int[] enabledStates = new int[]{Profiler.PROFILING_RUNNING};
//~ Constructors -------------------------------------------------------------------------------------------------------------
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/actions/ResetResultsAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/ResetResultsAction.java
index 9a87e22..7d948db 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/actions/ResetResultsAction.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/actions/ResetResultsAction.java
@@ -75,8 +75,8 @@ public final class ResetResultsAction extends CallableSystemAction {
}
}
- final private static class Singleton {
- final private static ResetResultsAction INSTANCE = new ResetResultsAction();
+ private static final class Singleton {
+ private static final ResetResultsAction INSTANCE = new ResetResultsAction();
}
private ResetResultsAction() {
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/actions/RunGCAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/RunGCAction.java
index e3bb8cf..3aa94fa 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/actions/RunGCAction.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/actions/RunGCAction.java
@@ -49,8 +49,8 @@ public final class RunGCAction extends ProfilingAwareAction {
private static final int[] ENABLED_STATES = new int[] { Profiler.PROFILING_RUNNING };
- final private static class Singleton {
- final private static RunGCAction INSTANCE = new RunGCAction();
+ private static final class Singleton {
+ private static final RunGCAction INSTANCE = new RunGCAction();
}
@ActionID(id = "org.netbeans.modules.profiler.actions.RunGCAction", category = "Profile")
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/actions/StopAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/StopAction.java
index 9f7b88c..9c71fb5 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/actions/StopAction.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/actions/StopAction.java
@@ -48,10 +48,10 @@ import org.openide.util.HelpCtx;
"HINT_DetachAction=Detach from the Profiled Application"
})
public final class StopAction extends ProfilingAwareAction {
- final private static int[] enabledStates = new int[]{Profiler.PROFILING_PAUSED, Profiler.PROFILING_RUNNING, Profiler.PROFILING_STARTED};
+ private static final int[] enabledStates = new int[]{Profiler.PROFILING_PAUSED, Profiler.PROFILING_RUNNING, Profiler.PROFILING_STARTED};
- final private static class Singleton {
- final private static StopAction INSTANCE = new StopAction();
+ private static final class Singleton {
+ private static final StopAction INSTANCE = new StopAction();
}
//~ Instance fields ----------------------------------------------------------------------------------------------------------
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/actions/TakeSnapshotAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/TakeSnapshotAction.java
index ed8f308..0a0ce87 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/actions/TakeSnapshotAction.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/actions/TakeSnapshotAction.java
@@ -79,7 +79,7 @@ public final class TakeSnapshotAction extends ProfilingAwareAction {
}
private static final class Singleton {
- final private static TakeSnapshotAction INSTANCE = new TakeSnapshotAction();
+ private static final TakeSnapshotAction INSTANCE = new TakeSnapshotAction();
}
@ActionID(id = "org.netbeans.modules.profiler.actions.TakeSnapshotAction", category = "Profile")
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/actions/TakeThreadDumpAction.java b/profiler/profiler/src/org/netbeans/modules/profiler/actions/TakeThreadDumpAction.java
index 4d4d3b1..4734a46 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/actions/TakeThreadDumpAction.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/actions/TakeThreadDumpAction.java
@@ -51,7 +51,7 @@ public class TakeThreadDumpAction extends ProfilingAwareAction {
private static final class Singleton {
- final private static TakeThreadDumpAction INSTANCE = new TakeThreadDumpAction();
+ private static final TakeThreadDumpAction INSTANCE = new TakeThreadDumpAction();
}
@ActionID(id = "org.netbeans.modules.profiler.actions.TakeThreadDumpAction", category = "Profile")
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerFeature.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerFeature.java
index 9942169..92361d1 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerFeature.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerFeature.java
@@ -84,7 +84,7 @@ public abstract class ProfilerFeature {
public abstract void removeChangeListener(ChangeListener listener);
- public static abstract class Basic extends ProfilerFeature {
+ public abstract static class Basic extends ProfilerFeature {
private Set<ChangeListener> listeners;
@@ -224,16 +224,16 @@ public abstract class ProfilerFeature {
protected void lockContentionMonitoringChanged() {}
- public synchronized final void addChangeListener(ChangeListener listener) {
+ public final synchronized void addChangeListener(ChangeListener listener) {
if (listeners == null) listeners = new HashSet();
listeners.add(listener);
}
- public synchronized final void removeChangeListener(ChangeListener listener) {
+ public final synchronized void removeChangeListener(ChangeListener listener) {
if (listeners != null) listeners.remove(listener);
}
- protected synchronized final void fireChange() {
+ protected final synchronized void fireChange() {
if (listeners == null) return;
ChangeEvent e = new ChangeEvent(this);
for (ChangeListener listener : listeners) listener.stateChanged(e);
@@ -244,7 +244,7 @@ public abstract class ProfilerFeature {
// --- Provider ------------------------------------------------------------
- public static abstract class Provider {
+ public abstract static class Provider {
public abstract ProfilerFeature getFeature(ProfilerSession session);
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerFeatures.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerFeatures.java
index 821fa69..e62a361 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerFeatures.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerFeatures.java
@@ -300,7 +300,7 @@ final class ProfilerFeatures {
}
- static abstract class Listener {
+ abstract static class Listener {
abstract void featuresChanged(ProfilerFeature changed);
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerPlugin.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerPlugin.java
index ebfce7b..c69fdcc 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerPlugin.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerPlugin.java
@@ -57,7 +57,7 @@ public abstract class ProfilerPlugin {
// --- Provider ------------------------------------------------------------
- public static abstract class Provider {
+ public abstract static class Provider {
public abstract ProfilerPlugin createPlugin(Lookup.Provider project, SessionStorage storage);
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerSession.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerSession.java
index 0bc4fce..aba9ccf 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerSession.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerSession.java
@@ -102,7 +102,7 @@ public abstract class ProfilerSession {
private Lookup context;
- protected synchronized final Lookup getContext() { return context; }
+ protected final synchronized Lookup getContext() { return context; }
private final void setContext(Lookup _context) {
synchronized(this) { context = _context; }
@@ -162,7 +162,7 @@ public abstract class ProfilerSession {
}
// Set when configuring profiling session, not a persistent storage!
- public synchronized final boolean isAttach() { return isAttach; }
+ public final synchronized boolean isAttach() { return isAttach; }
public final Profiler getProfiler() { return profiler; }
@@ -357,7 +357,7 @@ public abstract class ProfilerSession {
// --- Provider ------------------------------------------------------------
- public static abstract class Provider {
+ public abstract static class Provider {
public abstract ProfilerSession createSession(Lookup context);
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerSessions.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerSessions.java
index 197d55c..bebe7cf 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerSessions.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/v2/ProfilerSessions.java
@@ -572,7 +572,7 @@ final class ProfilerSessions {
// --- Singleton -------------------------------------------------------
private static final class Singleton {
- final private static StopAction INSTANCE = new StopAction();
+ private static final StopAction INSTANCE = new StopAction();
}
@ActionID(category="Profile", id="org.netbeans.modules.profiler.v2.ProfilerSessions.StopAction") // NOI18N
@ActionRegistration(displayName="#LBL_StopAction", lazy=false) // NOI18N
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/MethodsFeatureModes.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/MethodsFeatureModes.java
index 117c3b0..77b493b 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/MethodsFeatureModes.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/MethodsFeatureModes.java
@@ -135,7 +135,7 @@ import org.openide.util.NbPreferences;
})
final class MethodsFeatureModes {
- private static abstract class MethodsMode extends FeatureMode {
+ private abstract static class MethodsMode extends FeatureMode {
void initialize() {}
@@ -143,7 +143,7 @@ final class MethodsFeatureModes {
}
- private static abstract class SampledMethodsMode extends MethodsMode {
+ private abstract static class SampledMethodsMode extends MethodsMode {
void configureSettings(ProfilingSettings settings) {
super.configureSettings(settings);
@@ -162,7 +162,7 @@ final class MethodsFeatureModes {
}
- static abstract class AllClassesMode extends SampledMethodsMode {
+ abstract static class AllClassesMode extends SampledMethodsMode {
String getID() {
return "AllClassesMode"; // NOI18N
@@ -180,7 +180,7 @@ final class MethodsFeatureModes {
}
- static abstract class ProjectClassesMode extends SampledMethodsMode {
+ abstract static class ProjectClassesMode extends SampledMethodsMode {
private final Collection<Lookup.Provider> selectedProjects;
@@ -393,7 +393,7 @@ final class MethodsFeatureModes {
}
- private static abstract class InstrMethodsMode extends MethodsMode {
+ private abstract static class InstrMethodsMode extends MethodsMode {
// --- External implementation -----------------------------------------
@@ -792,7 +792,7 @@ final class MethodsFeatureModes {
}
- static abstract class SelectedClassesMode extends InstrMethodsMode {
+ abstract static class SelectedClassesMode extends InstrMethodsMode {
abstract void selectForProfiling(Collection<SourceClassInfo> classInfos);
@@ -846,7 +846,7 @@ final class MethodsFeatureModes {
}
- static abstract class SelectedMethodsMode extends InstrMethodsMode {
+ abstract static class SelectedMethodsMode extends InstrMethodsMode {
abstract void selectForProfiling(Collection<SourceMethodInfo> methodInfos);
@@ -901,7 +901,7 @@ final class MethodsFeatureModes {
}
- static abstract class CustomClassesMode extends MethodsMode {
+ abstract static class CustomClassesMode extends MethodsMode {
private static final String CLASSES_FLAG = "CLASSES_FLAG"; // NOI18N
private static final String FILTER_FLAG = "FILTER_FLAG"; // NOI18N
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/ObjectsFeatureModes.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/ObjectsFeatureModes.java
index 49c13fc..3871a4d 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/ObjectsFeatureModes.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/ObjectsFeatureModes.java
@@ -120,14 +120,14 @@ import org.openide.util.NbPreferences;
})
final class ObjectsFeatureModes {
- private static abstract class MemoryMode extends FeatureMode {
+ private abstract static class MemoryMode extends FeatureMode {
void configureSettings(ProfilingSettings settings) {
}
}
- private static abstract class SampledMemoryMode extends MemoryMode {
+ private abstract static class SampledMemoryMode extends MemoryMode {
void configureSettings(ProfilingSettings settings) {
super.configureSettings(settings);
@@ -145,7 +145,7 @@ final class ObjectsFeatureModes {
}
- static abstract class AllClassesMode extends SampledMemoryMode {
+ abstract static class AllClassesMode extends SampledMemoryMode {
String getID() {
return "AllClassesMode"; // NOI18N
@@ -163,7 +163,7 @@ final class ObjectsFeatureModes {
}
- static abstract class ProjectClassesMode extends SampledMemoryMode {
+ abstract static class ProjectClassesMode extends SampledMemoryMode {
private final Collection<Lookup.Provider> selectedProjects;
@@ -376,7 +376,7 @@ final class ObjectsFeatureModes {
}
- static abstract class SelectedClassesMode extends MemoryMode {
+ abstract static class SelectedClassesMode extends MemoryMode {
// --- External implementation -----------------------------------------
@@ -682,7 +682,7 @@ final class ObjectsFeatureModes {
}
- static abstract class CustomClassesMode extends MemoryMode {
+ abstract static class CustomClassesMode extends MemoryMode {
private static final String LIFECYCLE_FLAG = "LIFECYCLE_FLAG"; // NOI18N
private static final String ALLOCATIONS_FLAG = "ALLOCATIONS_FLAG"; // NOI18N
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/SQLFeatureModes.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/SQLFeatureModes.java
index 61f2659..57dad1c 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/SQLFeatureModes.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/v2/features/SQLFeatureModes.java
@@ -53,7 +53,7 @@ import org.openide.util.NbPreferences;
})
class SQLFeatureModes {
- private static abstract class SQLMode extends FeatureMode {
+ private abstract static class SQLMode extends FeatureMode {
private static final String[] JDBC_MARKER_CLASSES = {
JdbcCCTProvider.DRIVER_INTERFACE,
@@ -77,7 +77,7 @@ class SQLFeatureModes {
}
- static abstract class AllQueriesMode extends SQLMode {
+ abstract static class AllQueriesMode extends SQLMode {
String getID() {
return "AllQueriesMode"; // NOI18N
@@ -102,7 +102,7 @@ class SQLFeatureModes {
}
- static abstract class FilteredQueriesMode extends SQLMode {
+ abstract static class FilteredQueriesMode extends SQLMode {
private static final String QUERIES_FILTER_FLAG = "QUERIES_FILTER_FLAG"; // NOI18N
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/ClassMethodSelector.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/ClassMethodSelector.java
index a3d3c5b..77839a8 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/ClassMethodSelector.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/ClassMethodSelector.java
@@ -372,7 +372,7 @@ public final class ClassMethodSelector {
}
- private static abstract class FileSelector extends JPanel {
+ private abstract static class FileSelector extends JPanel {
abstract void fileSelected();
@@ -555,7 +555,7 @@ public final class ClassMethodSelector {
}
- private static abstract class ProjectSelector extends JPanel {
+ private abstract static class ProjectSelector extends JPanel {
abstract void projectSelected();
@@ -652,7 +652,7 @@ public final class ClassMethodSelector {
}
- private static abstract class PackageSelector extends JPanel {
+ private abstract static class PackageSelector extends JPanel {
abstract void packageSelected();
@@ -840,7 +840,7 @@ public final class ClassMethodSelector {
}
- private static abstract class ClassSelector extends JPanel {
+ private abstract static class ClassSelector extends JPanel {
abstract void classSelected();
@@ -1006,7 +1006,7 @@ public final class ClassMethodSelector {
}
- private static abstract class MethodSelector extends JPanel {
+ private abstract static class MethodSelector extends JPanel {
abstract void methodSelected();
@@ -1197,7 +1197,7 @@ public final class ClassMethodSelector {
}
- private static abstract class FilteredListModel<E> implements ListModel<E> {
+ private abstract static class FilteredListModel<E> implements ListModel<E> {
private final Collection<ListDataListener> listeners;
diff --git a/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/SnapshotsWindowUI.java b/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/SnapshotsWindowUI.java
index a7d2760..2bd5628 100644
--- a/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/SnapshotsWindowUI.java
+++ b/profiler/profiler/src/org/netbeans/modules/profiler/v2/impl/SnapshotsWindowUI.java
@@ -662,7 +662,7 @@ public final class SnapshotsWindowUI extends ProfilerTopComponent {
// --- Snapshot wrapper ---------------------------------------------------
- private static abstract class Snapshot implements Comparable {
+ private abstract static class Snapshot implements Comparable {
private final FileObject fo;
private String displayName;
---------------------------------------------------------------------
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
[netbeans] 17/17: Use the blessed modifier order in projects located in java projects
Posted by mk...@apache.org.
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 0cfebd4184b3135ec30eb1417256d1c2f76c1662
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Fri Feb 18 11:13:08 2022 +0100
Use the blessed modifier order in projects located in java projects
---
.../modules/ant/debugger/VerticalGridLayout.java | 2 +-
.../netbeans/modules/ant/grammar/AntGrammar.java | 2 +-
.../CompilerOptionsQueryImplementation.java | 2 +-
.../netbeans/modules/beans/PatternAnalyser.java | 2 +-
.../src/org/netbeans/modules/classfile/CPName.java | 2 +-
.../org/netbeans/modules/classfile/ClassName.java | 8 +--
.../org/netbeans/modules/dbschema/DBElement.java | 2 +-
.../netbeans/modules/dbschema/DBIdentifier.java | 2 +-
.../dbschema/jdbcimpl/DBschemaDataObject.java | 2 +-
.../dbschema/jdbcimpl/TableElementImpl.java | 2 +-
.../wizard/DBSchemaConnectionWizardPanel.java | 2 +-
.../jdbcimpl/wizard/DBSchemaTablesPanel.java | 2 +-
.../dbschema/migration/archiver/MapClassName.java | 4 +-
.../modules/dbschema/util/SQLTypeUtil.java | 12 ++--
.../debugger/jpda/projects/ConstantPool.java | 2 +-
.../jpda/projects/EditorContextSupport.java | 2 +-
.../models/DebuggingTruffleActionsProvider.java | 2 +-
.../modules/debugger/jpda/ui/JavaUtils.java | 2 +-
.../jpda/ui/models/DebuggingActionsProvider.java | 2 +-
.../jpda/ui/models/DebuggingNodeModel.java | 4 +-
.../jpda/ui/models/VariablesSwitchViewAction.java | 2 +-
.../jpda/ui/models/VariablesTreeModelFilterSI.java | 2 +-
.../jpda/visual/remote/RemoteAWTService.java | 4 +-
.../debugger/jpda/visual/JavaComponentInfo.java | 52 ++++++++---------
.../breakpoints/BaseComponentBreakpointImpl.java | 8 +--
.../visual/breakpoints/ComponentBreakpoint.java | 4 +-
.../modules/debugger/jpda/DebuggerConsoleIO.java | 2 +-
.../debugger/jpda/breakpoints/BreakpointImpl.java | 4 +-
.../debugger/jpda/expr/EvaluationContext.java | 2 +-
.../debugger/jpda/expr/EvaluatorVisitor.java | 4 +-
.../debugger/jpda/models/CallStackFrameImpl.java | 2 +-
.../jpda/models/VariableMirrorTranslator.java | 4 +-
.../jpda/testapps/JPDAClassTypeTestApp.java | 4 +-
.../jpda/testapps/MethodBreakpointApp.java | 2 +-
.../netbeans/modules/form/ComponentInspector.java | 2 +-
.../org/netbeans/modules/form/FormDataObject.java | 4 +-
.../src/org/netbeans/modules/form/FormModel.java | 6 +-
.../netbeans/modules/form/FormPropertyContext.java | 2 +-
.../modules/form/FormPropertyEditorManager.java | 2 +-
.../src/org/netbeans/modules/form/FormUtils.java | 2 +-
.../netbeans/modules/form/JavaCodeGenerator.java | 6 +-
.../netbeans/modules/form/RADComponentNode.java | 4 +-
.../modules/form/RADConnectionPropertyEditor.java | 14 ++---
.../modules/form/RADVisualFormContainer.java | 2 +-
.../modules/form/codestructure/CodeStructure.java | 4 +-
.../netbeans/modules/form/forminfo/FormInfo.java | 2 +-
.../layoutsupport/delegates/GridBagCustomizer.java | 4 +-
.../delegates/GridBagLayoutSupport.java | 4 +-
.../layoutsupport/delegates/ScrollPaneSupport.java | 2 +-
.../griddesigner/UndoRedoSupport.java | 2 +-
.../netbeans/modules/form/project/ClassSource.java | 2 +-
.../data/OpenForm/StringArrayCustomEditor.java | 2 +-
.../classpath/AbstractGradleClassPathImpl.java | 2 +-
.../classpath/GlobalClassPathProviderImpl.java | 8 +--
.../gradle/java/output/JDPAProcessorFactory.java | 2 +-
.../gradle/test/GradleTestProgressListener.java | 2 +-
.../modules/i18n/HelpStringCustomEditor.java | 2 +-
.../src/org/netbeans/modules/i18n/I18nSupport.java | 2 +-
.../org/netbeans/modules/i18n/SelectorUtils.java | 6 +-
.../modules/i18n/wizard/I18nWizardDescriptor.java | 4 +-
.../core/api/support/progress/ProgressSupport.java | 6 +-
.../rename/RelationshipMappingRename.java | 2 +-
.../whereused/RelationshipMappingWhereUsed.java | 2 +-
.../j2ee/jpa/refactoring/SourceTestSupport.java | 2 +-
.../j2ee/jpa/verification/JPAProblemFinder.java | 6 +-
.../annotation/parser/AnnotationParser.java | 4 +-
.../persistence/dd/common/PersistenceUnit.java | 4 +-
.../j2ee/persistence/dd/common/Property.java | 4 +-
.../editor/completion/JPACompletionItem.java | 8 +--
.../entitygenerator/DbSchemaEjbGenerator.java | 2 +-
.../j2ee/persistence/jpqleditor/JPQLExecutor.java | 22 ++++----
.../j2ee/persistence/provider/ToplinkProvider.java | 2 +-
.../j2ee/persistence/spi/jpql/ManagedType.java | 2 +-
.../persistence/unit/PersistenceCfgProperties.java | 32 +++++------
.../util/PersistenceProviderComboboxHelper.java | 6 +-
.../wizard/PersistenceClientEntitySelection.java | 2 +-
.../modules/j2ee/persistence/wizard/Util.java | 2 +-
.../persistence/wizard/dbscript/DBScriptPanel.java | 2 +-
.../wizard/fromdb/EntityClassesPanel.java | 2 +-
.../persistence/wizard/fromdb/TableSource.java | 2 +-
.../persistence/wizard/fromdb/TableUISupport.java | 2 +-
.../sourcetestsupport/SourceTestSupport.java | 2 +-
.../java/api/common/applet/AppletSupport.java | 4 +-
.../api/common/classpath/ModuleClassPaths.java | 2 +-
.../java/api/common/impl/RootsAccessor.java | 2 +-
.../api/common/project/BaseActionProvider.java | 12 ++--
.../api/common/project/JavaActionProvider.java | 2 +-
.../common/project/ui/MultiModuleNodeFactory.java | 2 +-
.../modules/java/completion/Utilities.java | 4 +-
.../completion/data/GenericMethodInvocation.java | 2 +-
.../org/netbeans/modules/java/disco/Client.java | 4 +-
.../netbeans/modules/java/disco/DownloadPanel.java | 2 +-
.../java/disco/archive/JDKCommonsUnzip.java | 2 +-
.../modules/java/disco/archive/UnarchiveUtils.java | 2 +-
.../java/editor/base/javadoc/Utilities.java | 4 +-
.../java/editor/base/semantic/UnusedDetector.java | 2 +-
.../semantic/data/MarkCorrespondingMethods1.java | 2 +-
.../data/ReadWriteUseArgumentOfAbstractMethod.java | 2 +-
.../modules/editor/java/JavaCompletionItem.java | 2 +-
.../editor/codegen/EqualsHashCodeGenerator.java | 2 +-
.../java/editor/fold/JavaElementFoldManager.java | 2 +-
.../com/toy/anagrams/lib/StaticWordLibrary.java | 2 +-
.../modules/java/guards/JavaGuardedReader.java | 2 +-
.../java/hints/declarative/test/TestPerformer.java | 2 +-
.../java/hints/spiimpl/options/HintsPanel.java | 2 +-
.../modules/java/hints/analyzer/AnalyzeFolder.java | 2 +-
.../hints/analyzer/ui/AnalyzerTopComponent.java | 2 +-
.../java/hints/errors/ChangeMethodReturnType.java | 2 +-
.../hints/errors/ImplementAllAbstractMethods.java | 2 +-
.../modules/java/hints/errors/ImportClass.java | 2 +-
.../java/hints/jdk/ConvertTextBlockToString.java | 2 +-
.../modules/java/hints/jdk/ConvertToVarHint.java | 2 +-
.../j2seembedded/platform/ConnectionMethod.java | 16 +++---
.../j2seplatform/DebianJavaPlatformDetector.java | 4 +-
.../j2seplatform/SdkManJavaPlatformDetector.java | 2 +-
.../platformdefinition/J2SEPlatformImpl.java | 2 +-
.../queries/DefaultClassPathProvider.java | 8 +--
.../java/j2seplatform/queries/QueriesCache.java | 2 +-
.../modules/java/jarloader/JarDataNode.java | 2 +-
.../j2seproject/api/J2SEProjectPlatformTest.java | 2 +-
.../lsp/server/debugging/attach/Processes.java | 2 +-
.../modules/java/lsp/server/htmlui/Browser.java | 2 +-
.../modules/java/lsp/server/htmlui/Buttons.java | 8 +--
.../modules/java/lsp/server/htmlui/HttpServer.java | 4 +-
.../lsp/server/protocol/WorkspaceServiceImpl.java | 2 +-
.../lsp/server/ui/AbstractGlobalActionContext.java | 2 +-
.../lsp/server/explorer/TreeViewProviderTest.java | 2 +-
.../modules/java/mx/project/SuiteLogicalView.java | 2 +-
.../nativeimage/debugger/actions/Processes.java | 2 +-
.../java/navigation/JavadocTopComponent.java | 2 +-
.../modules/java/navigation/base/Filters.java | 2 +-
.../stackanalyzer/AnalyzeStackTopComponent.java | 2 +-
.../openjdk/project/LogicalViewProviderImpl.java | 2 +-
.../modules/java/platform/PlatformSettings.java | 2 +-
.../preprocessorbridge/spi/JavaSourceUtilImpl.java | 2 +-
.../java/project/ui/ProjectProblemsProviders.java | 4 +-
.../org/netbeans/api/java/source/CodeStyle.java | 4 +-
.../org/netbeans/api/java/source/ScanUtils.java | 2 +-
.../org/netbeans/api/java/source/SourceUtils.java | 2 +-
.../api/java/source/support/ProfileSupport.java | 6 +-
.../java/source/indexing/JavaCustomIndexer.java | 2 +-
.../source/indexing/JavaFileFilterListener.java | 2 +-
.../java/source/indexing/JavaIndexerWorker.java | 2 +-
.../java/source/indexing/TransactionContext.java | 2 +-
.../java/source/parsing/CachingArchive.java | 2 +-
.../modules/java/source/parsing/FileObjects.java | 6 +-
.../java/source/parsing/SourceFileManager.java | 2 +-
.../java/source/save/PositionEstimator.java | 2 +-
.../modules/java/source/usages/BinaryAnalyser.java | 4 +-
.../netbeans/api/java/source/TestUtilities.java | 10 ++--
.../source/parsing/IndexerTransactionTest.java | 4 +-
.../support/CaretAwareJavaSourceTaskFactory.java | 4 +-
.../support/LookupBasedJavaSourceTaskFactory.java | 2 +-
.../SelectionAwareJavaSourceTaskFactory.java | 4 +-
.../org/netbeans/modules/java/IndentFileEntry.java | 2 +-
.../src/org/netbeans/modules/java/JavaNode.java | 2 +-
.../netbeans/modules/java/ui/CategorySupport.java | 2 +-
.../src/org/netbeans/test/java/Common.java | 2 +-
.../java/source/ui/ElementOpenAccessor.java | 4 +-
.../modules/java/testrunner/CommonTestUtil.java | 2 +-
.../netbeans/modules/javadoc/JavadocModule.java | 4 +-
.../netbeans/modules/javadoc/hints/AddTagFix.java | 6 +-
.../modules/javadoc/search/IndexBuilder.java | 4 +-
.../modules/javadoc/search/SearchThreadJdk12.java | 30 +++++-----
.../javadoc/search/SearchThreadJdk12_japan.java | 50 ++++++++--------
.../modules/form/FormEditorOperatorTest.java | 2 +-
.../jshell/editor/OverrideEditorActions.java | 2 +-
.../jshell/env/CompilerOptionsProvider.java | 2 +-
.../modules/jshell/env/SourceLevelProvider.java | 2 +-
.../netbeans/modules/jshell/launch/NIOStreams.java | 2 +-
.../modules/jshell/navigation/NavigationTask.java | 2 +-
.../jshell/support/PersistentSnippetsSupport.java | 2 +-
.../netbeans/modules/junit/TestGeneratorSetup.java | 12 ++--
.../netbeans/modules/junit/api/JUnitTestUtil.java | 16 +++---
.../org/netbeans/lib/jshell/agent/AgentWorker.java | 2 +-
.../netbeans/lib/jshell/agent/NbJShellAgent.java | 2 +-
.../modules/maven/codegen/NewMirrorPanel.java | 8 +--
.../maven/indexer/api/RepositoryPreferences.java | 2 +-
.../maven/indexer/api/RepositoryQueries.java | 6 +-
.../indexer/api/AbstractTestQueryProvider.java | 2 +-
.../netbeans/modules/maven/ActionProviderImpl.java | 4 +-
.../netbeans/modules/maven/NbMavenProjectImpl.java | 2 +-
.../modules/maven/actions/CreateLibraryAction.java | 2 +-
.../support/ReflectionTextComponentUpdater.java | 2 +-
.../modules/maven/api/output/OutputUtils.java | 2 +-
.../maven/classpath/ClassPathProviderImpl.java | 40 ++++++-------
.../maven/customizer/CustomizerProviderImpl.java | 4 +-
.../modules/maven/dependencies/CheckNode.java | 4 +-
.../modules/maven/execute/ActionToGoalUtils.java | 2 +-
.../maven/execute/MavenCommandLineExecutor.java | 2 +-
.../modules/maven/execute/ModelRunConfig.java | 2 +-
.../modules/maven/nodes/DependenciesNode.java | 2 +-
.../modules/maven/options/SettingsPanel.java | 2 +-
.../queries/RepositoryForBinaryQueryImpl.java | 2 +-
.../modules/maven/runjar/MavenExecuteUtils.java | 2 +-
.../nashorn/execution/actions/ExecJSAction.java | 2 +-
.../actions/spi/ContextProviderSupport.java | 4 +-
.../mobility/actions/OpenMIDletEditorTest.java | 2 +-
.../performance/guitracker/ActionTracker.java | 66 +++++++++++-----------
.../utilities/MeasureStartupTimeTestCase.java | 2 +-
.../src/threaddemo/locking/EventLock.java | 2 +-
.../src/threaddemo/util/TwoWaySupport.java | 2 +-
.../eclipse/core/EclipseProjectReference.java | 4 +-
.../eclipse/core/UpgradableProject.java | 2 +-
.../core/spi/UpgradableProjectLookupProvider.java | 2 +-
.../eclipse/gui/ProjectImporterTestCase.java | 2 +-
.../java/callhierarchy/CallHierarchyTasks.java | 2 +-
.../callhierarchy/CallHierarchyTopComponent.java | 2 +-
.../java/plugins/ChangeParamsTransformer.java | 6 +-
.../plugins/ExtractInterfaceRefactoringPlugin.java | 2 +-
.../ExtractSuperclassRefactoringPlugin.java | 2 +-
.../refactoring/java/ui/ContextAnalyzer.java | 8 +--
.../ui/ReplaceConstructorWithBuilderPanel.java | 2 +-
.../refactoring/java/ui/WhereUsedPanel.java | 2 +-
.../java/ui/scope/CustomScopePanel.java | 2 +-
.../test/refactoring/RefactoringTestCase.java | 2 +-
.../selenium2/maven/Selenium2MavenSupportImpl.java | 14 ++---
.../modules/java/hints/spiimpl/JavaFixImpl.java | 2 +-
.../java/hints/spiimpl/batch/BatchSearch.java | 4 +-
.../modules/java/hints/spiimpl/pm/BulkSearch.java | 2 +-
.../java/hints/spiimpl/batch/BatchSearchTest.java | 4 +-
.../completion/completors/BeansRefCompletor.java | 2 +-
.../spring/beans/model/ExclusiveAccess.java | 2 +-
.../spring/beans/model/impl/ObjectProviders.java | 2 +-
.../src/org/netbeans/modules/testng/TestUtil.java | 14 ++---
.../whitelist/project/WhiteListLookupProvider.java | 2 +-
226 files changed, 501 insertions(+), 501 deletions(-)
diff --git a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/VerticalGridLayout.java b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/VerticalGridLayout.java
index 7f8b205..6451c17 100644
--- a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/VerticalGridLayout.java
+++ b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/VerticalGridLayout.java
@@ -49,7 +49,7 @@ public class VerticalGridLayout implements LayoutManager2 {
private final int screenHeight;
- final private Set<Component> components = new LinkedHashSet<Component>();
+ private final Set<Component> components = new LinkedHashSet<Component>();
@Override
public void addLayoutComponent(Component comp, Object constraints) {
diff --git a/java/ant.grammar/src/org/netbeans/modules/ant/grammar/AntGrammar.java b/java/ant.grammar/src/org/netbeans/modules/ant/grammar/AntGrammar.java
index 51c889d..de9eaaf 100644
--- a/java/ant.grammar/src/org/netbeans/modules/ant/grammar/AntGrammar.java
+++ b/java/ant.grammar/src/org/netbeans/modules/ant/grammar/AntGrammar.java
@@ -791,7 +791,7 @@ class AntGrammar implements GrammarQuery {
// Result classes ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- private static abstract class AbstractResultNode extends AbstractNode implements GrammarResult {
+ private abstract static class AbstractResultNode extends AbstractNode implements GrammarResult {
public @Override Icon getIcon(int kind) {
return null;
diff --git a/java/api.java/src/org/netbeans/spi/java/queries/CompilerOptionsQueryImplementation.java b/java/api.java/src/org/netbeans/spi/java/queries/CompilerOptionsQueryImplementation.java
index a762be1..bc35eec 100644
--- a/java/api.java/src/org/netbeans/spi/java/queries/CompilerOptionsQueryImplementation.java
+++ b/java/api.java/src/org/netbeans/spi/java/queries/CompilerOptionsQueryImplementation.java
@@ -46,7 +46,7 @@ public interface CompilerOptionsQueryImplementation {
* Result of finding compiler options, encapsulating the answer as well as the
* ability to listen to it.
*/
- public static abstract class Result {
+ public abstract static class Result {
/**
* Gets the explicit compiler options.
* @return the list of the compiler options
diff --git a/java/beans/src/org/netbeans/modules/beans/PatternAnalyser.java b/java/beans/src/org/netbeans/modules/beans/PatternAnalyser.java
index 9cb2abe..a6bc4c6 100644
--- a/java/beans/src/org/netbeans/modules/beans/PatternAnalyser.java
+++ b/java/beans/src/org/netbeans/modules/beans/PatternAnalyser.java
@@ -78,7 +78,7 @@ public final class PatternAnalyser {
/** deep introspection analyzes also super classes; useful for bean info*/
private boolean deepIntrospection = false;
- final static Logger LOG = Logger.getLogger(PatternAnalyser.class.getName());
+ static final Logger LOG = Logger.getLogger(PatternAnalyser.class.getName());
public PatternAnalyser( FileObject fileObject, BeanPanelUI ui ) {
this(fileObject, ui, false);
diff --git a/java/classfile/src/org/netbeans/modules/classfile/CPName.java b/java/classfile/src/org/netbeans/modules/classfile/CPName.java
index b4a6c79..43ce5ee 100644
--- a/java/classfile/src/org/netbeans/modules/classfile/CPName.java
+++ b/java/classfile/src/org/netbeans/modules/classfile/CPName.java
@@ -29,7 +29,7 @@ package org.netbeans.modules.classfile;
*/
abstract class CPName extends CPEntry {
- final static int INVALID_INDEX = -1;
+ static final int INVALID_INDEX = -1;
int index;
private String name;
diff --git a/java/classfile/src/org/netbeans/modules/classfile/ClassName.java b/java/classfile/src/org/netbeans/modules/classfile/ClassName.java
index 8848552..fce0950 100644
--- a/java/classfile/src/org/netbeans/modules/classfile/ClassName.java
+++ b/java/classfile/src/org/netbeans/modules/classfile/ClassName.java
@@ -43,11 +43,11 @@ public final class ClassName implements Comparable<ClassName>, Comparator<ClassN
private final String type;
private final transient String internalName;
- private volatile transient String externalName;
- private volatile transient String packageName;
- private volatile transient String simpleName;
+ private transient volatile String externalName;
+ private transient volatile String packageName;
+ private transient volatile String simpleName;
- private final static WeakHashMap<String,WeakReference<ClassName>> cache =
+ private static final WeakHashMap<String,WeakReference<ClassName>> cache =
new WeakHashMap<String,WeakReference<ClassName>>();
/**
diff --git a/java/dbschema/src/org/netbeans/modules/dbschema/DBElement.java b/java/dbschema/src/org/netbeans/modules/dbschema/DBElement.java
index bd825f4..4138303 100644
--- a/java/dbschema/src/org/netbeans/modules/dbschema/DBElement.java
+++ b/java/dbschema/src/org/netbeans/modules/dbschema/DBElement.java
@@ -203,7 +203,7 @@ public abstract class DBElement implements Comparable, DBElementProperties {
/** Default implementation of the Impl interface.
* It just holds the property values.
*/
- static abstract class Memory implements DBElement.Impl {
+ abstract static class Memory implements DBElement.Impl {
/** the element for this implementation */
protected DBElement _element;
diff --git a/java/dbschema/src/org/netbeans/modules/dbschema/DBIdentifier.java b/java/dbschema/src/org/netbeans/modules/dbschema/DBIdentifier.java
index 8fdd100..53c8949 100644
--- a/java/dbschema/src/org/netbeans/modules/dbschema/DBIdentifier.java
+++ b/java/dbschema/src/org/netbeans/modules/dbschema/DBIdentifier.java
@@ -24,7 +24,7 @@ package org.netbeans.modules.dbschema;
*/
public final class DBIdentifier {
private String name;
- transient private String fullName = null;
+ private transient String fullName = null;
/** Default constructor
*/
diff --git a/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/DBschemaDataObject.java b/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/DBschemaDataObject.java
index 577e0e0..6bd6d44 100644
--- a/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/DBschemaDataObject.java
+++ b/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/DBschemaDataObject.java
@@ -45,7 +45,7 @@ import org.openide.util.Lookup;
)
public class DBschemaDataObject extends MultiDataObject {
- transient protected SchemaElement schemaElement;
+ protected transient SchemaElement schemaElement;
transient SchemaElementImpl schemaElementImpl;
public DBschemaDataObject (FileObject pf, DBschemaDataLoader loader) throws DataObjectExistsException {
diff --git a/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/TableElementImpl.java b/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/TableElementImpl.java
index d4a7a93..44acf69 100644
--- a/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/TableElementImpl.java
+++ b/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/TableElementImpl.java
@@ -33,7 +33,7 @@ public class TableElementImpl extends DBElementImpl implements TableElement.Impl
private DBElementsCollection columns;
private DBElementsCollection indexes;
private DBElementsCollection keys;
- transient private DBElementsCollection columnPairs;
+ private transient DBElementsCollection columnPairs;
private String table;
diff --git a/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/wizard/DBSchemaConnectionWizardPanel.java b/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/wizard/DBSchemaConnectionWizardPanel.java
index 0a2b157..8c641a1 100644
--- a/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/wizard/DBSchemaConnectionWizardPanel.java
+++ b/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/wizard/DBSchemaConnectionWizardPanel.java
@@ -22,7 +22,7 @@ package org.netbeans.modules.dbschema.jdbcimpl.wizard;
import java.awt.Component;
import org.openide.util.HelpCtx;
-final public class DBSchemaConnectionWizardPanel extends DBSchemaPanel {
+public final class DBSchemaConnectionWizardPanel extends DBSchemaPanel {
/** aggregation, instance of UI component of this wizard panel */
private DBSchemaConnectionPanel panelUI;
diff --git a/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/wizard/DBSchemaTablesPanel.java b/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/wizard/DBSchemaTablesPanel.java
index 5777ef5..4c5f11f 100644
--- a/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/wizard/DBSchemaTablesPanel.java
+++ b/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/wizard/DBSchemaTablesPanel.java
@@ -709,7 +709,7 @@ public class DBSchemaTablesPanel extends JPanel implements ListDataListener {
}
}
- private static abstract class Handler {
+ private abstract static class Handler {
public abstract void handle(Parameters params);
diff --git a/java/dbschema/src/org/netbeans/modules/dbschema/migration/archiver/MapClassName.java b/java/dbschema/src/org/netbeans/modules/dbschema/migration/archiver/MapClassName.java
index e9cd93c..826cef4 100644
--- a/java/dbschema/src/org/netbeans/modules/dbschema/migration/archiver/MapClassName.java
+++ b/java/dbschema/src/org/netbeans/modules/dbschema/migration/archiver/MapClassName.java
@@ -27,7 +27,7 @@ public class MapClassName {
static String LEGACYPREFIX= "com.sun.forte4j.modules.dbmodel.";
static String CURRENTPREFIX= "org.netbeans.modules.dbschema.";
- static public String getClassNameToken(String realClassName){
+ public static String getClassNameToken(String realClassName){
if (realClassName.startsWith(CURRENTPREFIX)){
realClassName = LEGACYPREFIX + realClassName.substring(CURRENTPREFIX.length(),realClassName.length());
}
@@ -35,7 +35,7 @@ public class MapClassName {
return realClassName;
}
- static public String getRealClassName(String token){
+ public static String getRealClassName(String token){
if (token.startsWith(LEGACYPREFIX)){
token = CURRENTPREFIX + token.substring(LEGACYPREFIX.length(),token.length());
}
diff --git a/java/dbschema/src/org/netbeans/modules/dbschema/util/SQLTypeUtil.java b/java/dbschema/src/org/netbeans/modules/dbschema/util/SQLTypeUtil.java
index ad6874d..08f8f3c 100644
--- a/java/dbschema/src/org/netbeans/modules/dbschema/util/SQLTypeUtil.java
+++ b/java/dbschema/src/org/netbeans/modules/dbschema/util/SQLTypeUtil.java
@@ -43,7 +43,7 @@ public class SQLTypeUtil extends Object {
* @param sqlType the type number from java.sql.Types
* @return the type name
*/
- static public String getSqlTypeString(int sqlType) {
+ public static String getSqlTypeString(int sqlType) {
switch (sqlType) {
case Types.BIGINT:
return "BIGINT"; //NOI18N
@@ -121,7 +121,7 @@ public class SQLTypeUtil extends Object {
* @param type the type from java.sql.Types
* @return true if the given type is numeric type; false otherwise
*/
- static public boolean isNumeric(int type) {
+ public static boolean isNumeric(int type) {
switch (type) {
case Types.BIGINT:
case Types.BIT:
@@ -145,7 +145,7 @@ public class SQLTypeUtil extends Object {
* @param type the type from java.sql.Types
* @return true if the given type is character type; false otherwise
*/
- static public boolean isCharacter(int type) {
+ public static boolean isCharacter(int type) {
switch (type) {
case Types.BINARY:
case Types.CHAR:
@@ -168,7 +168,7 @@ public class SQLTypeUtil extends Object {
* @param type the type from java.sql.Types return true if the give type is
* blob type; false otherwise
*/
- static public boolean isBlob(int type) {
+ public static boolean isBlob(int type) {
switch (type) {
case Types.BLOB:
case Types.CLOB:
@@ -193,7 +193,7 @@ public class SQLTypeUtil extends Object {
* @param type the type from java.sql.Types return true if the give type is
* lob type; false otherwise
*/
- static public boolean isLob(int type) {
+ public static boolean isLob(int type) {
return (isBlob(type)
|| (Types.CLOB == type)
|| (Types.LONGVARCHAR == type));
@@ -206,7 +206,7 @@ public class SQLTypeUtil extends Object {
* @param type2 second type to compare
* @return true if the types are compatible; false otherwise
*/
- static public boolean isCompatibleType(int type1, int type2) {
+ public static boolean isCompatibleType(int type1, int type2) {
return ((type1 == type2)
|| (isCharacter(type1) && isCharacter(type2))
|| (isNumeric(type1) && isNumeric(type2))
diff --git a/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/ConstantPool.java b/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/ConstantPool.java
index 646e47e..e9d9b1b 100644
--- a/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/ConstantPool.java
+++ b/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/ConstantPool.java
@@ -175,7 +175,7 @@ public class ConstantPool {
// Entries inner classes
- public static abstract class Entry {
+ public abstract static class Entry {
private final byte tag;
diff --git a/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/EditorContextSupport.java b/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/EditorContextSupport.java
index fbdb8e5..4d33488 100644
--- a/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/EditorContextSupport.java
+++ b/java/debugger.jpda.projects/src/org/netbeans/modules/debugger/jpda/projects/EditorContextSupport.java
@@ -1441,7 +1441,7 @@ public final class EditorContextSupport {
}
- private static abstract class ScanRunnable <E extends Throwable> implements Runnable {
+ private abstract static class ScanRunnable <E extends Throwable> implements Runnable {
private Future<Void>[] resultPtr;
private E[] excPtr;
diff --git a/java/debugger.jpda.truffle/src/org/netbeans/modules/debugger/jpda/truffle/frames/models/DebuggingTruffleActionsProvider.java b/java/debugger.jpda.truffle/src/org/netbeans/modules/debugger/jpda/truffle/frames/models/DebuggingTruffleActionsProvider.java
index b982310..68d28d8 100644
--- a/java/debugger.jpda.truffle/src/org/netbeans/modules/debugger/jpda/truffle/frames/models/DebuggingTruffleActionsProvider.java
+++ b/java/debugger.jpda.truffle/src/org/netbeans/modules/debugger/jpda/truffle/frames/models/DebuggingTruffleActionsProvider.java
@@ -383,7 +383,7 @@ public class DebuggingTruffleActionsProvider implements NodeActionsProviderFilte
);
}
- static abstract class LazyActionPerformer implements Models.ActionPerformer {
+ abstract static class LazyActionPerformer implements Models.ActionPerformer {
private final RequestProcessor rp;
diff --git a/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/JavaUtils.java b/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/JavaUtils.java
index ae4031f..3055db6 100644
--- a/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/JavaUtils.java
+++ b/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/JavaUtils.java
@@ -151,7 +151,7 @@ public class JavaUtils {
};
}
- private static abstract class ScanRunnable <E extends Throwable> implements Runnable {
+ private abstract static class ScanRunnable <E extends Throwable> implements Runnable {
private Future<Void>[] resultPtr;
private E[] excPtr;
diff --git a/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/DebuggingActionsProvider.java b/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/DebuggingActionsProvider.java
index 484cbf8..ca92a31 100644
--- a/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/DebuggingActionsProvider.java
+++ b/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/DebuggingActionsProvider.java
@@ -222,7 +222,7 @@ public class DebuggingActionsProvider implements NodeActionsProvider {
);
}
- static abstract class LazyActionPerformer implements Models.ActionPerformer {
+ abstract static class LazyActionPerformer implements Models.ActionPerformer {
private RequestProcessor rp;
diff --git a/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/DebuggingNodeModel.java b/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/DebuggingNodeModel.java
index ad9cc49..1420fa3 100644
--- a/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/DebuggingNodeModel.java
+++ b/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/DebuggingNodeModel.java
@@ -1017,7 +1017,7 @@ public class DebuggingNodeModel implements ExtendedNodeModel {
}
- private final static class ListenerDetaching {
+ private static final class ListenerDetaching {
private String propertyName;
private Session session;
@@ -1032,7 +1032,7 @@ public class DebuggingNodeModel implements ExtendedNodeModel {
}
}
- private final static class FrameUIInfo {
+ private static final class FrameUIInfo {
String sourcePath;
String className;
String url;
diff --git a/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesSwitchViewAction.java b/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesSwitchViewAction.java
index 8c5b235..ff0248b 100644
--- a/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesSwitchViewAction.java
+++ b/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesSwitchViewAction.java
@@ -108,7 +108,7 @@ public class VariablesSwitchViewAction implements NodeActionsProviderFilter {
return a;
}
- private final static class SwitchViewAction extends AbstractAction implements Presenter.Popup {
+ private static final class SwitchViewAction extends AbstractAction implements Presenter.Popup {
private String id;
private String treeNodeFormat;
diff --git a/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesTreeModelFilterSI.java b/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesTreeModelFilterSI.java
index 5cb8caa..e28b37b 100644
--- a/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesTreeModelFilterSI.java
+++ b/java/debugger.jpda.ui/src/org/netbeans/modules/debugger/jpda/ui/models/VariablesTreeModelFilterSI.java
@@ -352,7 +352,7 @@ NodeModel, TableModel, NodeActionsProvider {
}
}
- private static abstract class SpecialNode {
+ private abstract static class SpecialNode {
protected ObjectVariable object;
protected SpecialNode(ObjectVariable parent) {
diff --git a/java/debugger.jpda.visual/remotesrc/org/netbeans/modules/debugger/jpda/visual/remote/RemoteAWTService.java b/java/debugger.jpda.visual/remotesrc/org/netbeans/modules/debugger/jpda/visual/remote/RemoteAWTService.java
index da67cc0..aa8df65 100644
--- a/java/debugger.jpda.visual/remotesrc/org/netbeans/modules/debugger/jpda/visual/remote/RemoteAWTService.java
+++ b/java/debugger.jpda.visual/remotesrc/org/netbeans/modules/debugger/jpda/visual/remote/RemoteAWTService.java
@@ -396,8 +396,8 @@ public class RemoteAWTService {
private static class ComponentInfo {
- private final static int INT_DATA_LENGTH = 8;
- private final static ComponentInfo[] NO_SUBCOMPONENTS = new ComponentInfo[] {};
+ private static final int INT_DATA_LENGTH = 8;
+ private static final ComponentInfo[] NO_SUBCOMPONENTS = new ComponentInfo[] {};
private Component c;
private String name;
diff --git a/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/JavaComponentInfo.java b/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/JavaComponentInfo.java
index 16a1663..0f79e51 100644
--- a/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/JavaComponentInfo.java
+++ b/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/JavaComponentInfo.java
@@ -82,7 +82,7 @@ import org.openide.util.RequestProcessor;
*
* @author Jaroslav Bachorik
*/
-abstract public class JavaComponentInfo implements ComponentInfo {
+public abstract class JavaComponentInfo implements ComponentInfo {
private static final JavaComponentInfo[] NO_SUBCOMPONENTS = new JavaComponentInfo[]{};
private static final int MAX_TEXT_LENGTH = 80;
@@ -119,7 +119,7 @@ abstract public class JavaComponentInfo implements ComponentInfo {
this.uid = component.uniqueID();
}
- final protected void init() throws RetrievalException {
+ protected final void init() throws RetrievalException {
retrieve();
addProperties();
if (!RemoteAWTScreenshot.FAST_FIELDS_SEARCH) {
@@ -127,13 +127,13 @@ abstract public class JavaComponentInfo implements ComponentInfo {
}
}
- abstract protected void retrieve() throws RetrievalException;
+ protected abstract void retrieve() throws RetrievalException;
- final public JPDAThreadImpl getThread() {
+ public final JPDAThreadImpl getThread() {
return thread;
}
- final public ObjectReference getComponent() {
+ public final ObjectReference getComponent() {
return component;
}
@@ -142,11 +142,11 @@ abstract public class JavaComponentInfo implements ComponentInfo {
return VisualDebuggerListener.getStackOf(thread.getDebugger(), component);
}
- final public String getName() {
+ public final String getName() {
return name;
}
- final public String getTypeName() {
+ public final String getTypeName() {
int d = type.lastIndexOf('.');
String typeName;
if (d > 0) {
@@ -157,7 +157,7 @@ abstract public class JavaComponentInfo implements ComponentInfo {
return typeName;
}
- final public void setComponentText(String componentText) {
+ public final void setComponentText(String componentText) {
if (componentText.length() > MAX_TEXT_LENGTH) {
this.componentText = componentText.substring(0, MAX_TEXT_LENGTH) + "...";
} else {
@@ -197,15 +197,15 @@ abstract public class JavaComponentInfo implements ComponentInfo {
return (fieldInfo != null) ? fieldInfo.getName() + " " : "";
}
- final public String getType() {
+ public final String getType() {
return type;
}
- final public FieldInfo getField() {
+ public final FieldInfo getField() {
return fieldInfo;
}
- final public boolean isCustomType() {
+ public final boolean isCustomType() {
return isCustomType(type);
}
@@ -217,12 +217,12 @@ abstract public class JavaComponentInfo implements ComponentInfo {
}
@Override
- final public Rectangle getBounds() {
+ public final Rectangle getBounds() {
return bounds;
}
@Override
- final public Rectangle getWindowBounds() {
+ public final Rectangle getWindowBounds() {
if (windowBounds == null) {
return bounds;
} else {
@@ -230,21 +230,21 @@ abstract public class JavaComponentInfo implements ComponentInfo {
}
}
- final public void addPropertySet(PropertySet ps) {
+ public final void addPropertySet(PropertySet ps) {
propertySets.add(ps);
}
@Override
- final public PropertySet[] getPropertySets() {
+ public final PropertySet[] getPropertySets() {
return propertySets.toArray(new PropertySet[]{});
}
- final protected void setSubComponents(JavaComponentInfo[] subComponents) {
+ protected final void setSubComponents(JavaComponentInfo[] subComponents) {
this.subComponents = subComponents;
}
@Override
- final public JavaComponentInfo[] getSubComponents() {
+ public final JavaComponentInfo[] getSubComponents() {
if (subComponents == null) {
return NO_SUBCOMPONENTS;
} else {
@@ -253,44 +253,44 @@ abstract public class JavaComponentInfo implements ComponentInfo {
}
@Override
- final public void addPropertyChangeListener(PropertyChangeListener propertyChangeListener) {
+ public final void addPropertyChangeListener(PropertyChangeListener propertyChangeListener) {
pchs.addPropertyChangeListener(propertyChangeListener);
}
@Override
- final public void removePropertyChangeListener(PropertyChangeListener propertyChangeListener) {
+ public final void removePropertyChangeListener(PropertyChangeListener propertyChangeListener) {
pchs.removePropertyChangeListener(propertyChangeListener);
}
- final protected void firePropertyChange(String name, Object o, Object n) {
+ protected final void firePropertyChange(String name, Object o, Object n) {
pchs.firePropertyChange(name, o, n);
}
- final public void setFieldInfo(FieldInfo fieldInfo) {
+ public final void setFieldInfo(FieldInfo fieldInfo) {
this.fieldInfo = fieldInfo;
}
- final public void setBounds(Rectangle r) {
+ public final void setBounds(Rectangle r) {
this.bounds = r;
}
- final public void setWindowBounds(Rectangle rectangle) {
+ public final void setWindowBounds(Rectangle rectangle) {
this.windowBounds = rectangle;
}
- final public void setName(String value) {
+ public final void setName(String value) {
this.name = value;
}
- final public void setComponent(ObjectReference component) {
+ public final void setComponent(ObjectReference component) {
this.component = component;
}
- final public void setType(String name) {
+ public final void setType(String name) {
this.type = name;
}
diff --git a/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/breakpoints/BaseComponentBreakpointImpl.java b/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/breakpoints/BaseComponentBreakpointImpl.java
index 28d2837..3eab4d0 100644
--- a/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/breakpoints/BaseComponentBreakpointImpl.java
+++ b/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/breakpoints/BaseComponentBreakpointImpl.java
@@ -38,7 +38,7 @@ import org.netbeans.modules.debugger.jpda.visual.JavaComponentInfo;
*
* @author jbachorik
*/
-abstract public class BaseComponentBreakpointImpl extends ComponentBreakpointImpl implements PropertyChangeListener {
+public abstract class BaseComponentBreakpointImpl extends ComponentBreakpointImpl implements PropertyChangeListener {
protected ComponentBreakpoint cb;
protected JPDADebugger debugger;
@@ -49,9 +49,9 @@ abstract public class BaseComponentBreakpointImpl extends ComponentBreakpointImp
cb.addPropertyChangeListener(this);
}
- abstract protected void initServiceBreakpoints();
+ protected abstract void initServiceBreakpoints();
- final protected void addMethodBreakpoint(MethodBreakpoint mb, ObjectVariable variableComponent) {
+ protected final void addMethodBreakpoint(MethodBreakpoint mb, ObjectVariable variableComponent) {
mb.setHidden(true);
mb.setInstanceFilters(debugger, new ObjectVariable[] { variableComponent });
mb.addJPDABreakpointListener(new JPDABreakpointListener() {
@@ -64,7 +64,7 @@ abstract public class BaseComponentBreakpointImpl extends ComponentBreakpointImp
serviceBreakpoints.add(mb);
}
- final protected void navigateToCustomCode(final JPDAThread thread) {
+ protected final void navigateToCustomCode(final JPDAThread thread) {
CallStackFrame callStackFrame = null;
try {
CallStackFrame[] callStack = thread.getCallStack();
diff --git a/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/breakpoints/ComponentBreakpoint.java b/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/breakpoints/ComponentBreakpoint.java
index 3940ba5..ecdcdf0 100644
--- a/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/breakpoints/ComponentBreakpoint.java
+++ b/java/debugger.jpda.visual/src/org/netbeans/modules/debugger/jpda/visual/breakpoints/ComponentBreakpoint.java
@@ -33,7 +33,7 @@ import org.netbeans.modules.debugger.jpda.visual.spi.ComponentInfo;
* @author Martin Entlicher
* @author Jaroslav Bachorik
*/
-abstract public class ComponentBreakpoint extends Breakpoint {
+public abstract class ComponentBreakpoint extends Breakpoint {
public static final int TYPE_ADD = 1;
public static final int TYPE_REMOVE = 2;
public static final int TYPE_SHOW = 4;
@@ -82,7 +82,7 @@ abstract public class ComponentBreakpoint extends Breakpoint {
firePropertyChange(PROP_TYPE, oldType, type);
}
- abstract public int supportedTypes();
+ public abstract int supportedTypes();
/*private void notifyRemoved() {
DebuggerManager.getDebuggerManager().removeDebuggerListener(serviceBreakpointListenerWeak);
diff --git a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/DebuggerConsoleIO.java b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/DebuggerConsoleIO.java
index e5d9237..3e61911 100644
--- a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/DebuggerConsoleIO.java
+++ b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/DebuggerConsoleIO.java
@@ -54,7 +54,7 @@ public final class DebuggerConsoleIO {
output.getIOManager().println(text, line, important);
}
- public final static class Line {
+ public static final class Line {
private final String url;
private final int lineNumber;
diff --git a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/breakpoints/BreakpointImpl.java b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/breakpoints/BreakpointImpl.java
index c9c6b3a..eac1a1d 100644
--- a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/breakpoints/BreakpointImpl.java
+++ b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/breakpoints/BreakpointImpl.java
@@ -301,7 +301,7 @@ public abstract class BreakpointImpl implements ConditionedExecutor, PropertyCha
}
}
- synchronized protected void removeAllEventRequests () {
+ protected synchronized void removeAllEventRequests () {
if (requests.isEmpty()) return;
VirtualMachine vm = getDebugger().getVirtualMachine();
if (vm == null) return;
@@ -324,7 +324,7 @@ public abstract class BreakpointImpl implements ConditionedExecutor, PropertyCha
requests = new LinkedList<EventRequest>();
}
- synchronized private void removeEventRequest(EventRequest r) {
+ private synchronized void removeEventRequest(EventRequest r) {
VirtualMachine vm = getDebugger().getVirtualMachine();
if (vm == null) return;
try {
diff --git a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/EvaluationContext.java b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/EvaluationContext.java
index 7bd8701..1295208 100644
--- a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/EvaluationContext.java
+++ b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/EvaluationContext.java
@@ -374,7 +374,7 @@ public class EvaluationContext {
}
- public static abstract class VariableInfo {
+ public abstract static class VariableInfo {
public abstract void setValue(Value value) throws IllegalStateException;
diff --git a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/EvaluatorVisitor.java b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/EvaluatorVisitor.java
index 251a458..c4c6d2e 100644
--- a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/EvaluatorVisitor.java
+++ b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/expr/EvaluatorVisitor.java
@@ -4624,7 +4624,7 @@ public class EvaluatorVisitor extends ErrorAwareTreePathScanner<Mirror, Evaluati
public UnsuitableArgumentsException() {}
}
- static abstract class ArtificialMirror implements Mirror {
+ abstract static class ArtificialMirror implements Mirror {
@Override
public VirtualMachine virtualMachine() {
@@ -4635,7 +4635,7 @@ public class EvaluatorVisitor extends ErrorAwareTreePathScanner<Mirror, Evaluati
}
- private static abstract class CommandMirror extends ArtificialMirror {
+ private abstract static class CommandMirror extends ArtificialMirror {
}
diff --git a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/CallStackFrameImpl.java b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/CallStackFrameImpl.java
index e9bd854..608c08e 100644
--- a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/CallStackFrameImpl.java
+++ b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/CallStackFrameImpl.java
@@ -1012,7 +1012,7 @@ public class CallStackFrameImpl implements CallStackFrame {
return Collections.unmodifiableList(frameMonitors);
}
- private final static class EqualsInfo {
+ private static final class EqualsInfo {
private JPDAThread thread;
private int depth;
diff --git a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/VariableMirrorTranslator.java b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/VariableMirrorTranslator.java
index f616e14..dbbbd7a 100644
--- a/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/VariableMirrorTranslator.java
+++ b/java/debugger.jpda/src/org/netbeans/modules/debugger/jpda/models/VariableMirrorTranslator.java
@@ -143,7 +143,7 @@ public class VariableMirrorTranslator {
return null;
}
- static private Object createPristineInstanceOf(Class clazz) {
+ private static Object createPristineInstanceOf(Class clazz) {
try {
//return clazz.newInstance(); - not sufficient
Constructor constructor;
@@ -185,7 +185,7 @@ public class VariableMirrorTranslator {
}
}
- static private Object createMirrorObject(ObjectReference value, ReferenceType type,
+ private static Object createMirrorObject(ObjectReference value, ReferenceType type,
Class clazz, Map<Value, Object> mirrorsMap)
throws ClassNotPreparedExceptionWrapper,
InternalExceptionWrapper,
diff --git a/java/debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/JPDAClassTypeTestApp.java b/java/debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/JPDAClassTypeTestApp.java
index d2d8c6d..2f045a9 100644
--- a/java/debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/JPDAClassTypeTestApp.java
+++ b/java/debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/JPDAClassTypeTestApp.java
@@ -53,7 +53,7 @@ public class JPDAClassTypeTestApp implements EventListener, SwingConstants {
static class MultiImpl extends SuperImpl implements Runnable, Intrfc1, Intrfc2 {
- private final static Class multiIntrfc = getPreparedInterface();
+ private static final Class multiIntrfc = getPreparedInterface();
public static Class getPreparedInterface() {
new Intrfc6() {
@@ -71,7 +71,7 @@ public class JPDAClassTypeTestApp implements EventListener, SwingConstants {
}
}
- private static abstract class SuperImpl implements Intrfc2, Intrfc3, Intrfc4 {
+ private abstract static class SuperImpl implements Intrfc2, Intrfc3, Intrfc4 {
public SuperImpl() {
}
diff --git a/java/debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/MethodBreakpointApp.java b/java/debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/MethodBreakpointApp.java
index f2f3c5b..faee174 100644
--- a/java/debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/MethodBreakpointApp.java
+++ b/java/debugger.jpda/test/unit/src/org/netbeans/api/debugger/jpda/testapps/MethodBreakpointApp.java
@@ -99,7 +99,7 @@ public class MethodBreakpointApp {
}
}
- private static abstract class AbstractInner {
+ private abstract static class AbstractInner {
public abstract double compute();
diff --git a/java/form/src/org/netbeans/modules/form/ComponentInspector.java b/java/form/src/org/netbeans/modules/form/ComponentInspector.java
index ad6b7c0..bb6f83a 100644
--- a/java/form/src/org/netbeans/modules/form/ComponentInspector.java
+++ b/java/form/src/org/netbeans/modules/form/ComponentInspector.java
@@ -621,7 +621,7 @@ public class ComponentInspector extends JPanel
// }
// }
- final public static class ResolvableHelper implements java.io.Serializable {
+ public static final class ResolvableHelper implements java.io.Serializable {
static final long serialVersionUID = 7424646018839457544L;
public Object readResolve() {
return new TopComponent() {
diff --git a/java/form/src/org/netbeans/modules/form/FormDataObject.java b/java/form/src/org/netbeans/modules/form/FormDataObject.java
index 75ecd10..a9a529b 100644
--- a/java/form/src/org/netbeans/modules/form/FormDataObject.java
+++ b/java/form/src/org/netbeans/modules/form/FormDataObject.java
@@ -40,8 +40,8 @@ import org.openide.util.Lookup;
* @author Ian Formanek, Petr Hamernik
*/
public class FormDataObject extends MultiDataObject {
- transient private EditorSupport formEditor;
- transient private OpenEdit openEdit;
+ private transient EditorSupport formEditor;
+ private transient OpenEdit openEdit;
/** The entry for the .form file */
FileEntry formEntry;
diff --git a/java/form/src/org/netbeans/modules/form/FormModel.java b/java/form/src/org/netbeans/modules/form/FormModel.java
index e3986cb..f992bb0 100644
--- a/java/form/src/org/netbeans/modules/form/FormModel.java
+++ b/java/form/src/org/netbeans/modules/form/FormModel.java
@@ -57,7 +57,7 @@ public class FormModel
NB71, // since NB 7.1, form file version 1.8
NB74 // since NB 7.4, form file version 1.9
}
- final static FormVersion LATEST_VERSION = FormVersion.NB74;
+ static final FormVersion LATEST_VERSION = FormVersion.NB74;
private String leadingComment;
@@ -1396,9 +1396,9 @@ public class FormModel
// ---------------
/** For debugging purposes only. */
- static private int traceCount = 0;
+ private static int traceCount = 0;
/** For debugging purposes only. */
- static private final boolean TRACE = false;
+ private static final boolean TRACE = false;
/** For debugging purposes only. */
static void t(String str) {
if (TRACE)
diff --git a/java/form/src/org/netbeans/modules/form/FormPropertyContext.java b/java/form/src/org/netbeans/modules/form/FormPropertyContext.java
index 00fafe4..f5c3eee 100644
--- a/java/form/src/org/netbeans/modules/form/FormPropertyContext.java
+++ b/java/form/src/org/netbeans/modules/form/FormPropertyContext.java
@@ -160,6 +160,6 @@ public interface FormPropertyContext {
return theInstance;
}
- static private EmptyImpl theInstance = null;
+ private static EmptyImpl theInstance = null;
}
}
diff --git a/java/form/src/org/netbeans/modules/form/FormPropertyEditorManager.java b/java/form/src/org/netbeans/modules/form/FormPropertyEditorManager.java
index b96140e..89cebb3 100644
--- a/java/form/src/org/netbeans/modules/form/FormPropertyEditorManager.java
+++ b/java/form/src/org/netbeans/modules/form/FormPropertyEditorManager.java
@@ -38,7 +38,7 @@ import java.util.logging.Logger;
*
* @author Ian Formanek, Tomas Pavek
*/
-final public class FormPropertyEditorManager {
+public final class FormPropertyEditorManager {
/**
* Maps property type to property editor class. There are 2 maps - one for
diff --git a/java/form/src/org/netbeans/modules/form/FormUtils.java b/java/form/src/org/netbeans/modules/form/FormUtils.java
index 74c14d6..9c09478 100644
--- a/java/form/src/org/netbeans/modules/form/FormUtils.java
+++ b/java/form/src/org/netbeans/modules/form/FormUtils.java
@@ -1373,7 +1373,7 @@ public class FormUtils
// -----
- private static abstract class DefaultValueDeviation {
+ private abstract static class DefaultValueDeviation {
protected Object[] values;
DefaultValueDeviation(Object[] values) {
this.values = values;
diff --git a/java/form/src/org/netbeans/modules/form/JavaCodeGenerator.java b/java/form/src/org/netbeans/modules/form/JavaCodeGenerator.java
index 7e422e8..29296e0 100644
--- a/java/form/src/org/netbeans/modules/form/JavaCodeGenerator.java
+++ b/java/form/src/org/netbeans/modules/form/JavaCodeGenerator.java
@@ -4078,7 +4078,7 @@ class JavaCodeGenerator extends CodeGenerator {
// {{{ CodeGenerateEditor
//
- final public static class CodeGenerateEditor extends PropertyEditorSupport
+ public static final class CodeGenerateEditor extends PropertyEditorSupport
{
private RADComponent component;
@@ -4582,7 +4582,7 @@ class JavaCodeGenerator extends CodeGenerator {
}
- public final static class LayoutCodeTargetEditor
+ public static final class LayoutCodeTargetEditor
extends org.netbeans.modules.form.editors.EnumEditor
{
public LayoutCodeTargetEditor() {
@@ -4613,7 +4613,7 @@ class JavaCodeGenerator extends CodeGenerator {
}
}
- public final static class ListenerGenerationStyleEditor
+ public static final class ListenerGenerationStyleEditor
extends org.netbeans.modules.form.editors.EnumEditor
{
public ListenerGenerationStyleEditor() {
diff --git a/java/form/src/org/netbeans/modules/form/RADComponentNode.java b/java/form/src/org/netbeans/modules/form/RADComponentNode.java
index d5bce2f..c419848 100644
--- a/java/form/src/org/netbeans/modules/form/RADComponentNode.java
+++ b/java/form/src/org/netbeans/modules/form/RADComponentNode.java
@@ -50,10 +50,10 @@ import org.openide.util.datatransfer.PasteType;
public class RADComponentNode extends FormNode
implements RADComponentCookie, FormPropertyCookie {
- private final static MessageFormat nodeNameFormat =
+ private static final MessageFormat nodeNameFormat =
new MessageFormat(
FormUtils.getBundleString("FMT_ComponentNodeName")); // NOI18N
- private final static MessageFormat nodeNoNameFormat =
+ private static final MessageFormat nodeNoNameFormat =
new MessageFormat(
FormUtils.getBundleString("FMT_UnnamedComponentNodeName")); // NOI18N
diff --git a/java/form/src/org/netbeans/modules/form/RADConnectionPropertyEditor.java b/java/form/src/org/netbeans/modules/form/RADConnectionPropertyEditor.java
index 77b1906..f528880 100644
--- a/java/form/src/org/netbeans/modules/form/RADConnectionPropertyEditor.java
+++ b/java/form/src/org/netbeans/modules/form/RADConnectionPropertyEditor.java
@@ -280,11 +280,11 @@ public class RADConnectionPropertyEditor
// implementation class for FormDesignValue
public static class RADConnectionDesignValue implements FormDesignValue { //, java.io.Serializable {
- public final static int TYPE_PROPERTY = 0;
- public final static int TYPE_METHOD = 1;
- public final static int TYPE_CODE = 2;
- public final static int TYPE_VALUE = 3;
- public final static int TYPE_BEAN = 4;
+ public static final int TYPE_PROPERTY = 0;
+ public static final int TYPE_METHOD = 1;
+ public static final int TYPE_CODE = 2;
+ public static final int TYPE_VALUE = 3;
+ public static final int TYPE_BEAN = 4;
/** Determines the type of connection design value */
int type;
@@ -300,8 +300,8 @@ public class RADConnectionPropertyEditor
String value = null; // used if type = TYPE_VALUE
String requiredTypeName = null; // used if type = TYPE_VALUE
- transient private boolean needsInit = false; // used for deserialization init if type = TYPE_PROPERTY or TYPE_METHOD or TYPE_BEAN
- transient private FormModel formModel; // used for deserialization init if type = TYPE_PROPERTY or TYPE_METHOD or TYPE_BEAN
+ private transient boolean needsInit = false; // used for deserialization init if type = TYPE_PROPERTY or TYPE_METHOD or TYPE_BEAN
+ private transient FormModel formModel; // used for deserialization init if type = TYPE_PROPERTY or TYPE_METHOD or TYPE_BEAN
static final long serialVersionUID =147134837271021412L;
RADConnectionDesignValue(RADComponent comp) {
diff --git a/java/form/src/org/netbeans/modules/form/RADVisualFormContainer.java b/java/form/src/org/netbeans/modules/form/RADVisualFormContainer.java
index cf3ccc3..be389ea 100644
--- a/java/form/src/org/netbeans/modules/form/RADVisualFormContainer.java
+++ b/java/form/src/org/netbeans/modules/form/RADVisualFormContainer.java
@@ -539,7 +539,7 @@ public class RADVisualFormContainer extends RADVisualContainer implements FormCo
// ------------------------------------------------------------------------------------------
// Innerclasses
- final public static class SizePolicyEditor extends java.beans.PropertyEditorSupport {
+ public static final class SizePolicyEditor extends java.beans.PropertyEditorSupport {
/** Display Names for alignment. */
private static final String[] names = {
FormUtils.getBundleString("VALUE_sizepolicy_full"), // NOI18N
diff --git a/java/form/src/org/netbeans/modules/form/codestructure/CodeStructure.java b/java/form/src/org/netbeans/modules/form/codestructure/CodeStructure.java
index 687134d..2991acb 100644
--- a/java/form/src/org/netbeans/modules/form/codestructure/CodeStructure.java
+++ b/java/form/src/org/netbeans/modules/form/codestructure/CodeStructure.java
@@ -1046,9 +1046,9 @@ public class CodeStructure {
// ---------------
/** For debugging purposes only. */
- static private int traceCount = 0;
+ private static int traceCount = 0;
/** For debugging purposes only. */
- static private final boolean TRACE = false;
+ private static final boolean TRACE = false;
/** For debugging purposes only. */
static void t(String str) {
if (TRACE)
diff --git a/java/form/src/org/netbeans/modules/form/forminfo/FormInfo.java b/java/form/src/org/netbeans/modules/form/forminfo/FormInfo.java
index 0f9ba90..6c55a67 100644
--- a/java/form/src/org/netbeans/modules/form/forminfo/FormInfo.java
+++ b/java/form/src/org/netbeans/modules/form/forminfo/FormInfo.java
@@ -35,7 +35,7 @@ import org.openide.nodes.Node;
public abstract class FormInfo
{
/** Constant for empty list of properties */
- public final static Node.Property[] NO_PROPERTIES = new Node.Property[0];
+ public static final Node.Property[] NO_PROPERTIES = new Node.Property[0];
/** Used to create the design-time instance of the form object, which is used
* only for displaing properties and events of the form. I.e. it is not
diff --git a/java/form/src/org/netbeans/modules/form/layoutsupport/delegates/GridBagCustomizer.java b/java/form/src/org/netbeans/modules/form/layoutsupport/delegates/GridBagCustomizer.java
index 2942015..4526e5b 100644
--- a/java/form/src/org/netbeans/modules/form/layoutsupport/delegates/GridBagCustomizer.java
+++ b/java/form/src/org/netbeans/modules/form/layoutsupport/delegates/GridBagCustomizer.java
@@ -36,7 +36,7 @@ import org.netbeans.modules.form.layoutsupport.LayoutSupportManager;
*
* @author Petr Hrebejk
*/
-final public class GridBagCustomizer extends JPanel implements Customizer
+public final class GridBagCustomizer extends JPanel implements Customizer
{
/** bundle to obtain text information from */
// private static java.util.ResourceBundle bundle = org.openide.util.NbBundle.getBundle(GridBagCustomizer.class);
@@ -1260,7 +1260,7 @@ final public class GridBagCustomizer extends JPanel implements Customizer
public static class Window extends JDialog implements Customizer, ActionListener {
- final private GridBagCustomizer customizerPanel;
+ private final GridBagCustomizer customizerPanel;
private boolean packCalled;
public Window() {
super(org.openide.windows.WindowManager.getDefault().getMainWindow());
diff --git a/java/form/src/org/netbeans/modules/form/layoutsupport/delegates/GridBagLayoutSupport.java b/java/form/src/org/netbeans/modules/form/layoutsupport/delegates/GridBagLayoutSupport.java
index aa64cda..a194be4 100644
--- a/java/form/src/org/netbeans/modules/form/layoutsupport/delegates/GridBagLayoutSupport.java
+++ b/java/form/src/org/netbeans/modules/form/layoutsupport/delegates/GridBagLayoutSupport.java
@@ -544,8 +544,8 @@ public class GridBagLayoutSupport extends AbstractLayoutSupport {
* Comparator of <code>LayoutInfo</code> objects.
*/
private static class LayoutInfoComparator implements java.util.Comparator<LayoutInfo>{
- final static int XAXIS = 0;
- final static int YAXIS = 1;
+ static final int XAXIS = 0;
+ static final int YAXIS = 1;
int cord;
public LayoutInfoComparator(int cord){
diff --git a/java/form/src/org/netbeans/modules/form/layoutsupport/delegates/ScrollPaneSupport.java b/java/form/src/org/netbeans/modules/form/layoutsupport/delegates/ScrollPaneSupport.java
index f1fe94a..2ee3579 100644
--- a/java/form/src/org/netbeans/modules/form/layoutsupport/delegates/ScrollPaneSupport.java
+++ b/java/form/src/org/netbeans/modules/form/layoutsupport/delegates/ScrollPaneSupport.java
@@ -155,7 +155,7 @@ public class ScrollPaneSupport extends AbstractLayoutSupport {
return false; // cannot remove component from JSplitPane
}
- static private void ensureFakePeerAttached(Component comp) {
+ private static void ensureFakePeerAttached(Component comp) {
FakePeerSupport.attachFakePeer(comp);
if (comp instanceof Container)
FakePeerSupport.attachFakePeerRecursively((Container)comp);
diff --git a/java/form/src/org/netbeans/modules/form/layoutsupport/griddesigner/UndoRedoSupport.java b/java/form/src/org/netbeans/modules/form/layoutsupport/griddesigner/UndoRedoSupport.java
index 39d3383..7b7bc94 100644
--- a/java/form/src/org/netbeans/modules/form/layoutsupport/griddesigner/UndoRedoSupport.java
+++ b/java/form/src/org/netbeans/modules/form/layoutsupport/griddesigner/UndoRedoSupport.java
@@ -111,7 +111,7 @@ public class UndoRedoSupport {
return redoAction;
}
- static abstract class DelegateAction extends AbstractAction {
+ abstract static class DelegateAction extends AbstractAction {
protected Action delegate;
protected DelegateAction(Action delegate) {
diff --git a/java/form/src/org/netbeans/modules/form/project/ClassSource.java b/java/form/src/org/netbeans/modules/form/project/ClassSource.java
index e23147b..924a247 100644
--- a/java/form/src/org/netbeans/modules/form/project/ClassSource.java
+++ b/java/form/src/org/netbeans/modules/form/project/ClassSource.java
@@ -107,7 +107,7 @@ public final class ClassSource {
/**
* One logical component of the classpath.
*/
- public static abstract class Entry {
+ public abstract static class Entry {
/** List of folder URLs (dirs or roots of JARs) making up the classpath. */
public abstract List<URL> getClasspath();
/** Tries to add the classpath entries to a project, as with {@link ProjectClassPathModifier}.
diff --git a/java/form/test/qa-functional/data/OpenForm/StringArrayCustomEditor.java b/java/form/test/qa-functional/data/OpenForm/StringArrayCustomEditor.java
index 4ca63e6..6a569ca 100644
--- a/java/form/test/qa-functional/data/OpenForm/StringArrayCustomEditor.java
+++ b/java/form/test/qa-functional/data/OpenForm/StringArrayCustomEditor.java
@@ -41,7 +41,7 @@ public class StringArrayCustomEditor extends javax.swing.JPanel {
private Vector itemsVector;
private StringArrayCustomizable editor;
- private final static int DEFAULT_WIDTH = 400;
+ private static final int DEFAULT_WIDTH = 400;
static final long serialVersionUID =-4347656479280614636L;
diff --git a/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/AbstractGradleClassPathImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/AbstractGradleClassPathImpl.java
index f50e255..dce286d 100644
--- a/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/AbstractGradleClassPathImpl.java
+++ b/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/AbstractGradleClassPathImpl.java
@@ -127,7 +127,7 @@ abstract class AbstractGradleClassPathImpl implements FlaggedClassPathImplementa
}
}
- synchronized final void clearResourceCache() {
+ final synchronized void clearResourceCache() {
resources = null;
support.firePropertyChange(ClassPathImplementation.PROP_RESOURCES, null, null);
}
diff --git a/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/GlobalClassPathProviderImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/GlobalClassPathProviderImpl.java
index f962854..9930539 100644
--- a/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/GlobalClassPathProviderImpl.java
+++ b/java/gradle.java/src/org/netbeans/modules/gradle/java/classpath/GlobalClassPathProviderImpl.java
@@ -39,10 +39,10 @@ public class GlobalClassPathProviderImpl extends ProjectOpenedHook implements Pr
final Project project;
- private final static int BOOT = 0;
- private final static int SOURCE = 2;
- private final static int COMPILE = 4;
- private final static int RUNTIME = 6;
+ private static final int BOOT = 0;
+ private static final int SOURCE = 2;
+ private static final int COMPILE = 4;
+ private static final int RUNTIME = 6;
final ClassPath[] cache = new ClassPath[RUNTIME + 2];
diff --git a/java/gradle.java/src/org/netbeans/modules/gradle/java/output/JDPAProcessorFactory.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/output/JDPAProcessorFactory.java
index e7e00f9..fbb4762 100644
--- a/java/gradle.java/src/org/netbeans/modules/gradle/java/output/JDPAProcessorFactory.java
+++ b/java/gradle.java/src/org/netbeans/modules/gradle/java/output/JDPAProcessorFactory.java
@@ -44,7 +44,7 @@ public class JDPAProcessorFactory implements OutputProcessorFactory {
private static class JDPAOutputProcessor implements OutputProcessor {
- private final static Pattern JDPA_LISTEN = Pattern.compile("Listening for transport dt_socket at address: (\\d+)");
+ private static final Pattern JDPA_LISTEN = Pattern.compile("Listening for transport dt_socket at address: (\\d+)");
final RunConfig cfg;
boolean activated;
diff --git a/java/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestProgressListener.java b/java/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestProgressListener.java
index 97a215c..1709b01 100644
--- a/java/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestProgressListener.java
+++ b/java/gradle.test/src/org/netbeans/modules/gradle/test/GradleTestProgressListener.java
@@ -65,7 +65,7 @@ import org.openide.util.Lookup;
@ProjectServiceProvider(service = GradleProgressListenerProvider.class, projectType = NbGradleProject.GRADLE_PLUGIN_TYPE + "/java")
public final class GradleTestProgressListener implements ProgressListener, GradleProgressListenerProvider {
- final private Project project;
+ private final Project project;
TestSession session;
Map<String, Testcase> runningTests = new ConcurrentHashMap<>();
diff --git a/java/i18n/src/org/netbeans/modules/i18n/HelpStringCustomEditor.java b/java/i18n/src/org/netbeans/modules/i18n/HelpStringCustomEditor.java
index 24ff9a1..77f2e98 100644
--- a/java/i18n/src/org/netbeans/modules/i18n/HelpStringCustomEditor.java
+++ b/java/i18n/src/org/netbeans/modules/i18n/HelpStringCustomEditor.java
@@ -220,7 +220,7 @@ public class HelpStringCustomEditor extends JPanel {
}
} // End of nested class ReplaceCodeEditor.
- private static abstract class StringEditor extends PropertyEditorSupport implements ExPropertyEditor {
+ private abstract static class StringEditor extends PropertyEditorSupport implements ExPropertyEditor {
private static boolean useRaw = Boolean.getBoolean("netbeans.stringEditor.useRawCharacters");
// bugfix# 9219 added editable field and isEditable() "getter" to be used in StringCustomEditor
diff --git a/java/i18n/src/org/netbeans/modules/i18n/I18nSupport.java b/java/i18n/src/org/netbeans/modules/i18n/I18nSupport.java
index d947982..238900b 100644
--- a/java/i18n/src/org/netbeans/modules/i18n/I18nSupport.java
+++ b/java/i18n/src/org/netbeans/modules/i18n/I18nSupport.java
@@ -197,7 +197,7 @@ public abstract class I18nSupport {
}
/** Factory inteface for creating {@code I18nSupport} instances. */
- public static abstract class Factory {
+ public abstract static class Factory {
/** Gets <code>I18nSupport</code> instance for specified data object and document.
* @exception IOException when the document could not be loaded */
diff --git a/java/i18n/src/org/netbeans/modules/i18n/SelectorUtils.java b/java/i18n/src/org/netbeans/modules/i18n/SelectorUtils.java
index 2fc95e5..975bb4f 100644
--- a/java/i18n/src/org/netbeans/modules/i18n/SelectorUtils.java
+++ b/java/i18n/src/org/netbeans/modules/i18n/SelectorUtils.java
@@ -105,7 +105,7 @@ public class SelectorUtils {
* @param prj the project to select from
* @return DataObject representing the selected bundle file or null
*/
- static public DataObject selectBundle(Project prj, FileObject file) {
+ public static DataObject selectBundle(Project prj, FileObject file) {
try {
Node root = bundlesNode(prj, file, true);
@@ -150,7 +150,7 @@ public class SelectorUtils {
* @param includeFiles specifies whether to show jar files or just folders
* @return root <code>Node</code>
*/
- static public Node bundlesNode(Project prj, FileObject file, boolean includeFiles) {
+ public static Node bundlesNode(Project prj, FileObject file, boolean includeFiles) {
List<Node> nodes = new LinkedList<Node>();
if (prj == null) {
prj = FileOwnerQuery.getOwner(file);
@@ -246,7 +246,7 @@ public class SelectorUtils {
* @return root Node of source files from <code>prj</code> filtered
* by <code>filter</code>
**/
- static public Node sourcesNode(Project prj, FilteredNode.NodeFilter filter) {
+ public static Node sourcesNode(Project prj, FilteredNode.NodeFilter filter) {
Sources src = ProjectUtils.getSources(prj);
SourceGroup[] srcgrps = src.getSourceGroups(JavaProjectConstants.SOURCES_TYPE_JAVA);
java.util.List<Node> nodes = new ArrayList<Node>();
diff --git a/java/i18n/src/org/netbeans/modules/i18n/wizard/I18nWizardDescriptor.java b/java/i18n/src/org/netbeans/modules/i18n/wizard/I18nWizardDescriptor.java
index 63c1dda..0583e41 100644
--- a/java/i18n/src/org/netbeans/modules/i18n/wizard/I18nWizardDescriptor.java
+++ b/java/i18n/src/org/netbeans/modules/i18n/wizard/I18nWizardDescriptor.java
@@ -68,7 +68,7 @@ final class I18nWizardDescriptor extends WizardDescriptor {
*
* @see org.openide.WizardDescriptor.Panel
*/
- public static abstract class Panel
+ public abstract static class Panel
implements WizardDescriptor.Panel<I18nWizardDescriptor.Settings> {
/** Reference to panel. */
@@ -83,7 +83,7 @@ final class I18nWizardDescriptor extends WizardDescriptor {
/** Gets component to display. Implements <code>WizardDescriptor.Panel</code> interface method.
* @return this instance */
- public synchronized final Component getComponent() {
+ public final synchronized Component getComponent() {
if (component == null) {
component = createComponent();
}
diff --git a/java/j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/api/support/progress/ProgressSupport.java b/java/j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/api/support/progress/ProgressSupport.java
index b12b5db..fa59cf9 100644
--- a/java/j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/api/support/progress/ProgressSupport.java
+++ b/java/j2ee.core.utilities/src/org/netbeans/modules/j2ee/core/api/support/progress/ProgressSupport.java
@@ -331,7 +331,7 @@ public final class ProgressSupport {
* Describes an action. See also {@link EventThreadAction} and
* {@link BackgroundAction}.
*/
- public static abstract class Action {
+ public abstract static class Action {
/**
* Constructs a new action, by default {@link #isEnabled enabled}.
@@ -404,7 +404,7 @@ public final class ProgressSupport {
* Describes an event thread action, that is, one that should be run
* in the event dispatching thread.
*/
- public static abstract class EventThreadAction extends Action {
+ public abstract static class EventThreadAction extends Action {
private final boolean cancellable;
@@ -430,7 +430,7 @@ public final class ProgressSupport {
* Describes a background action, that is, one that should be run
* in a background thread under a progress dialog.
*/
- public static abstract class BackgroundAction extends Action {
+ public abstract static class BackgroundAction extends Action {
private final boolean cancellable;
diff --git a/java/j2ee.jpa.refactoring/src/org/netbeans/modules/j2ee/jpa/refactoring/rename/RelationshipMappingRename.java b/java/j2ee.jpa.refactoring/src/org/netbeans/modules/j2ee/jpa/refactoring/rename/RelationshipMappingRename.java
index 5e741a9..b32983f 100644
--- a/java/j2ee.jpa.refactoring/src/org/netbeans/modules/j2ee/jpa/refactoring/rename/RelationshipMappingRename.java
+++ b/java/j2ee.jpa.refactoring/src/org/netbeans/modules/j2ee/jpa/refactoring/rename/RelationshipMappingRename.java
@@ -77,7 +77,7 @@ import org.openide.util.lookup.Lookups;
public final class RelationshipMappingRename extends JavaRefactoringPlugin {
private final RenameRefactoring rename;
- private final static Logger LOG = Logger.getLogger(RelationshipMappingRename.class.getName());
+ private static final Logger LOG = Logger.getLogger(RelationshipMappingRename.class.getName());
public RelationshipMappingRename(RenameRefactoring rename) {
this.rename = rename;
diff --git a/java/j2ee.jpa.refactoring/src/org/netbeans/modules/j2ee/jpa/refactoring/whereused/RelationshipMappingWhereUsed.java b/java/j2ee.jpa.refactoring/src/org/netbeans/modules/j2ee/jpa/refactoring/whereused/RelationshipMappingWhereUsed.java
index 197496e..359315b 100644
--- a/java/j2ee.jpa.refactoring/src/org/netbeans/modules/j2ee/jpa/refactoring/whereused/RelationshipMappingWhereUsed.java
+++ b/java/j2ee.jpa.refactoring/src/org/netbeans/modules/j2ee/jpa/refactoring/whereused/RelationshipMappingWhereUsed.java
@@ -73,7 +73,7 @@ import org.openide.util.lookup.Lookups;
public final class RelationshipMappingWhereUsed extends JavaRefactoringPlugin {
private final WhereUsedQuery whereUsedQuery;
- private final static Logger LOG = Logger.getLogger(RelationshipMappingWhereUsed.class.getName());
+ private static final Logger LOG = Logger.getLogger(RelationshipMappingWhereUsed.class.getName());
public RelationshipMappingWhereUsed(WhereUsedQuery refactoring) {
this.whereUsedQuery = refactoring;
diff --git a/java/j2ee.jpa.refactoring/test/unit/src/org/netbeans/modules/j2ee/jpa/refactoring/SourceTestSupport.java b/java/j2ee.jpa.refactoring/test/unit/src/org/netbeans/modules/j2ee/jpa/refactoring/SourceTestSupport.java
index 97c4ce8..621b563 100644
--- a/java/j2ee.jpa.refactoring/test/unit/src/org/netbeans/modules/j2ee/jpa/refactoring/SourceTestSupport.java
+++ b/java/j2ee.jpa.refactoring/test/unit/src/org/netbeans/modules/j2ee/jpa/refactoring/SourceTestSupport.java
@@ -144,7 +144,7 @@ public abstract class SourceTestSupport extends NbTestCase{
}
- static private class JavaFileResolver extends MIMEResolver
+ private static class JavaFileResolver extends MIMEResolver
{
public JavaFileResolver() {
diff --git a/java/j2ee.jpa.verification/src/org/netbeans/modules/j2ee/jpa/verification/JPAProblemFinder.java b/java/j2ee.jpa.verification/src/org/netbeans/modules/j2ee/jpa/verification/JPAProblemFinder.java
index b30c9de..75de928 100644
--- a/java/j2ee.jpa.verification/src/org/netbeans/modules/j2ee/jpa/verification/JPAProblemFinder.java
+++ b/java/j2ee.jpa.verification/src/org/netbeans/modules/j2ee/jpa/verification/JPAProblemFinder.java
@@ -58,9 +58,9 @@ public abstract class JPAProblemFinder {
private JPAProblemContext context = null;
private List<ErrorDescription> problemsFound = new ArrayList<ErrorDescription>();
- public final static Logger LOG = Logger.getLogger(JPAProblemFinder.class.getName());
- private final static String PERSISTENCE_SCOPES_LISTENER = "jpa.verification.scopes_listener"; //NOI18N
- private final static Object singleInstanceLock = new Object();
+ public static final Logger LOG = Logger.getLogger(JPAProblemFinder.class.getName());
+ private static final String PERSISTENCE_SCOPES_LISTENER = "jpa.verification.scopes_listener"; //NOI18N
+ private static final Object singleInstanceLock = new Object();
private static JPAProblemFinder runningInstance = null;
private static boolean usgLogged;
diff --git a/java/j2ee.metadata.model.support/src/org/netbeans/modules/j2ee/metadata/model/api/support/annotation/parser/AnnotationParser.java b/java/j2ee.metadata.model.support/src/org/netbeans/modules/j2ee/metadata/model/api/support/annotation/parser/AnnotationParser.java
index f7f18b1..2f12ff4 100644
--- a/java/j2ee.metadata.model.support/src/org/netbeans/modules/j2ee/metadata/model/api/support/annotation/parser/AnnotationParser.java
+++ b/java/j2ee.metadata.model.support/src/org/netbeans/modules/j2ee/metadata/model/api/support/annotation/parser/AnnotationParser.java
@@ -78,7 +78,7 @@ import org.openide.util.Parameters;
*/
public final class AnnotationParser {
- private final static Set<Class<?>> PRIMITIVE_WRAPPERS = new HashSet<Class<?>>();
+ private static final Set<Class<?>> PRIMITIVE_WRAPPERS = new HashSet<Class<?>>();
private final Map<String, ValueProvider> providers = new HashMap<String, ValueProvider>();
private final AnnotationHelper helper;
@@ -343,7 +343,7 @@ public final class AnnotationParser {
/**
* Simple <code>DefaultProvider</code> implementation.
*/
- private final static class DefaultProviderImpl implements DefaultProvider {
+ private static final class DefaultProviderImpl implements DefaultProvider {
private final Object defaultValue;
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/common/PersistenceUnit.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/common/PersistenceUnit.java
index 16fa589..ee70897 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/common/PersistenceUnit.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/common/PersistenceUnit.java
@@ -37,8 +37,8 @@ public interface PersistenceUnit {
static public final String PROPERTIES = "Properties"; // NOI18N
//
- static public final String JTA_TRANSACTIONTYPE="JTA";//NOI18N
- static public final String RESOURCE_LOCAL_TRANSACTIONTYPE="RESOURCE_LOCAL";//NOI18N
+ public static final String JTA_TRANSACTIONTYPE="JTA";//NOI18N
+ public static final String RESOURCE_LOCAL_TRANSACTIONTYPE="RESOURCE_LOCAL";//NOI18N
public void setName(java.lang.String value);
public java.lang.String getName();
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/common/Property.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/common/Property.java
index 1ffda21..872b350 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/common/Property.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/dd/common/Property.java
@@ -24,8 +24,8 @@ package org.netbeans.modules.j2ee.persistence.dd.common;
* @author sp153251
*/
public interface Property {
- static public final String NAME = "Name"; // NOI18N
- static public final String VALUE = "Value"; // NOI18N
+ public static final String NAME = "Name"; // NOI18N
+ public static final String VALUE = "Value"; // NOI18N
public void setName(java.lang.String value);
public java.lang.String getName();
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/JPACompletionItem.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/JPACompletionItem.java
index cb5b150..4ce2e59 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/JPACompletionItem.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/JPACompletionItem.java
@@ -689,9 +689,9 @@ public abstract class JPACompletionItem implements CompletionItem {
}
public static final class IndexElementItem extends DBElementItem {
- public final static String ASC = "ASC";
- public final static String DESC = "DESC";
- public final static String[] PARAMS = {ASC, DESC};
+ public static final String ASC = "ASC";
+ public static final String DESC = "DESC";
+ public static final String[] PARAMS = {ASC, DESC};
private final int shift;
protected static CCPaintComponent.TableElementPaintComponent paintComponent = null;
@@ -851,7 +851,7 @@ public abstract class JPACompletionItem implements CompletionItem {
}
}
- abstract private static class PersistenceXmlCompletionItem extends JPACompletionItem {
+ private abstract static class PersistenceXmlCompletionItem extends JPACompletionItem {
/////////
protected int substitutionOffset;
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/entitygenerator/DbSchemaEjbGenerator.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/entitygenerator/DbSchemaEjbGenerator.java
index 0f52d33..9f416f0 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/entitygenerator/DbSchemaEjbGenerator.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/entitygenerator/DbSchemaEjbGenerator.java
@@ -55,7 +55,7 @@ public class DbSchemaEjbGenerator {
private Set<String> tablesReferecedByOtherTables;
private Set<String> primaryKeyIsForeignKeyTables;
private final CollectionType colectionType;
- private final static Logger LOGGER = Logger.getLogger(DbSchemaEjbGenerator.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(DbSchemaEjbGenerator.class.getName());
private boolean useColumNamesInRelations = false;
//private ArrayList<String> warningMessages;
private final boolean generateUnresolvedRelationships;
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/JPQLExecutor.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/JPQLExecutor.java
index 0165e11..c7a9983 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/JPQLExecutor.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/jpqleditor/JPQLExecutor.java
@@ -66,17 +66,17 @@ import org.netbeans.modules.j2ee.persistence.spi.jpql.ManagedTypeProvider;
*/
public class JPQLExecutor {
- static private final String ECLIPSELINK_QUERY = "org.eclipse.persistence.jpa.JpaQuery";//NOI18N
- static private final String ECLIPSELINK_QUERY_SQL0 = "getDatabaseQuery";//NOI18N
- static private final String ECLIPSELINK_QUERY_SQL1 = "getSQLString";//NOI18N
- static private final String HIBERNATE_QUERY = "org.hibernate.ejb.HibernateQuery";//NOI18N
- static private final String HIBERNATE_QUERY_SQL0 = "getSessionFactory";//NOI18N
- static private final String HIBERNATE_QUERY_SQL1 = "getQueryPlanCache";//NOI18N
- static private final String HIBERNATE_QUERY_SQL2 = "getHQLQueryPlan";//NOI18N
- static private final String HIBERNATE_QUERY_SQL3 = "getTranslators";//NOI18N
- static private final String HIBERNATE_QUERY_SQL4 = "getSQLString";//NOI18N
- static private final String OPENJPA_QUERY = "org.apache.openjpa.persistence.QueryImpl";//NOI18N
- static private final String OPENJPA_QUERY_SQL = "getQueryString";//NOI18N
+ private static final String ECLIPSELINK_QUERY = "org.eclipse.persistence.jpa.JpaQuery";//NOI18N
+ private static final String ECLIPSELINK_QUERY_SQL0 = "getDatabaseQuery";//NOI18N
+ private static final String ECLIPSELINK_QUERY_SQL1 = "getSQLString";//NOI18N
+ private static final String HIBERNATE_QUERY = "org.hibernate.ejb.HibernateQuery";//NOI18N
+ private static final String HIBERNATE_QUERY_SQL0 = "getSessionFactory";//NOI18N
+ private static final String HIBERNATE_QUERY_SQL1 = "getQueryPlanCache";//NOI18N
+ private static final String HIBERNATE_QUERY_SQL2 = "getHQLQueryPlan";//NOI18N
+ private static final String HIBERNATE_QUERY_SQL3 = "getTranslators";//NOI18N
+ private static final String HIBERNATE_QUERY_SQL4 = "getSQLString";//NOI18N
+ private static final String OPENJPA_QUERY = "org.apache.openjpa.persistence.QueryImpl";//NOI18N
+ private static final String OPENJPA_QUERY_SQL = "getQueryString";//NOI18N
/**
* Executes given JPQL query and returns the result.
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/provider/ToplinkProvider.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/provider/ToplinkProvider.java
index 0d1a942..ff73f99 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/provider/ToplinkProvider.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/provider/ToplinkProvider.java
@@ -40,7 +40,7 @@ class ToplinkProvider extends Provider{
*/
private static final String PREFERRED_PROVIDER_CLASS = "oracle.toplink.essentials.PersistenceProvider"; //NOI18N
private static final String ALTERNATIVE_PROVIDER_CLASS = "oracle.toplink.essentials.ejb.cmp3.EntityManagerFactoryProvider";//NOI18N
- private final static String ECLIPSELINK_PROVIDER_CLASS = "org.eclipse.persistence.jpa.PersistenceProvider";//NOI18N
+ private static final String ECLIPSELINK_PROVIDER_CLASS = "org.eclipse.persistence.jpa.PersistenceProvider";//NOI18N
/**
* Creates a new instance using the preferred provider class.
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/jpql/ManagedType.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/jpql/ManagedType.java
index f95ce77..e1f515c 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/jpql/ManagedType.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/spi/jpql/ManagedType.java
@@ -41,7 +41,7 @@ import org.netbeans.modules.j2ee.persistence.spi.jpql.support.JPAAttribute;
*
* @author sp153251
*/
-abstract public class ManagedType implements IManagedType {
+public abstract class ManagedType implements IManagedType {
private final PersistentObject element;
private final IManagedTypeProvider provider;
private Map<String, IMapping> mappings;
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/unit/PersistenceCfgProperties.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/unit/PersistenceCfgProperties.java
index ea652f7..a12c8ad 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/unit/PersistenceCfgProperties.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/unit/PersistenceCfgProperties.java
@@ -36,22 +36,22 @@ import org.netbeans.modules.j2ee.persistence.provider.ProviderUtil;
public class PersistenceCfgProperties {
// String[] for selecting one of the values
- private final static String[] TRUE_FALSE = new String[]{"true", "false"}; // NOI18N
- private final static String[] SCHEMA_GEN_OPTIONS = new String[]{"none", "create", "drop-and-create", "drop"};
- private final static String[] SCHEMA_GEN_SOURCE_TYPES = new String[]{"metadata", "script", "metadata-then-script", "script-then-metadata"};
+ private static final String[] TRUE_FALSE = new String[]{"true", "false"}; // NOI18N
+ private static final String[] SCHEMA_GEN_OPTIONS = new String[]{"none", "create", "drop-and-create", "drop"};
+ private static final String[] SCHEMA_GEN_SOURCE_TYPES = new String[]{"metadata", "script", "metadata-then-script", "script-then-metadata"};
//eclipselink
- private final static String[] EL_CACHE_TYPES = new String[]{"Full", "Weak", "Soft", "SoftWeak", "HardWeak", "NONE"};//NOI18N
- private final static String[] EL_FLUSH_CLEAR_CACHE = new String[]{"Drop", "DropInvalidate", "Merge"};//NOI18N
- private final static String[] EL_WEAWING = new String[] {"true", "false", "static"};//NOI18N
- private final static String[] EL_PROFILER = new String[]{"PerformanceProfiler", "QueryMonitor", "NoProfiler"};//NOI18N
- private final static String[] EL_CONTEXT_REFMODE = new String[]{"HARD", "WEAK", "FORCE_WEAK"};//NOI18N
- private final static String[] EL_BATCHWRITER = new String[]{"JDBC", "Buffered", "Oracle-JDBC", "None"};//NOI18N
- private final static String[] EL_EXCLUSIVE_CON_MODE = new String[]{"Transactional", "Isolated", "Always"};//NOI18N
- private final static String[] EL_LOGGER = new String[]{"DefaultLogger", "JavaLogger", "ServerLogger"};//NOI18N
- private final static String[] EL_LOGGER_LEVEL = new String[]{"OFF", "SEVERE", "WARNING", "INFO", "CONFIG", "FINE", "FINER", "FINEST", "ALL"};//NOI18N
- private final static String[] EL_TARGET_DATABASE = new String[]{"Access", "Attunity", "Auto", "Cloudscape", "Database", "DB2Mainframe", "DB2", "DB2Z", "DBase", "Derby", "Firebird", "H2", "HANA", "HSQL", "Informix11", "Informix", "JavaDB", "MaxDB", "MySQL", "Oracle10", "Oracle11", "Oracle12", "Oracle18", "Oracle19", "Oracle8", "Oracle9", "Oracle", "Pervasive", "PointBase", "PostgreSQL", "SQLAnywhere", "SQLServer", "Sybase", "Symfoware", "TimesTen7", "TimesTen"};//NOI18N
- private final static String[] EL_TARGET_SERVER = new String[]{"None", "Glassfish", "JBoss", "Oc4j", "SAPNetWeaver_7_1", "SunAS9Server", "WebLogic_10", "WebLogic_12", "WebLogic_9", "WebLogic", "WebSphere_6_1", "WebSphere_7", "WebSphere_EJBEmbeddable", "WebSphere_Liberty", "WebSphere"};//NOI18N
- private final static String[] EL_DDL_GEN_MODE = new String[]{"both", "database", "sql-script"};//NOI18N
+ private static final String[] EL_CACHE_TYPES = new String[]{"Full", "Weak", "Soft", "SoftWeak", "HardWeak", "NONE"};//NOI18N
+ private static final String[] EL_FLUSH_CLEAR_CACHE = new String[]{"Drop", "DropInvalidate", "Merge"};//NOI18N
+ private static final String[] EL_WEAWING = new String[] {"true", "false", "static"};//NOI18N
+ private static final String[] EL_PROFILER = new String[]{"PerformanceProfiler", "QueryMonitor", "NoProfiler"};//NOI18N
+ private static final String[] EL_CONTEXT_REFMODE = new String[]{"HARD", "WEAK", "FORCE_WEAK"};//NOI18N
+ private static final String[] EL_BATCHWRITER = new String[]{"JDBC", "Buffered", "Oracle-JDBC", "None"};//NOI18N
+ private static final String[] EL_EXCLUSIVE_CON_MODE = new String[]{"Transactional", "Isolated", "Always"};//NOI18N
+ private static final String[] EL_LOGGER = new String[]{"DefaultLogger", "JavaLogger", "ServerLogger"};//NOI18N
+ private static final String[] EL_LOGGER_LEVEL = new String[]{"OFF", "SEVERE", "WARNING", "INFO", "CONFIG", "FINE", "FINER", "FINEST", "ALL"};//NOI18N
+ private static final String[] EL_TARGET_DATABASE = new String[]{"Access", "Attunity", "Auto", "Cloudscape", "Database", "DB2Mainframe", "DB2", "DB2Z", "DBase", "Derby", "Firebird", "H2", "HANA", "HSQL", "Informix11", "Informix", "JavaDB", "MaxDB", "MySQL", "Oracle10", "Oracle11", "Oracle12", "Oracle18", "Oracle19", "Oracle8", "Oracle9", "Oracle", "Pervasive", "PointBase", "PostgreSQL", "SQLAnywhere", "SQLServer", "Sybase", "Symfoware", "TimesTen7", "TimesTen"};//NOI18N
+ private static final String[] EL_TARGET_SERVER = new String[]{"None", "Glassfish", "JBoss", "Oc4j", "SAPNetWeaver_7_1", "SunAS9Server", "WebLogic_10", "WebLogic_12", "WebLogic_9", "WebLogic", "WebSphere_6_1", "WebSphere_7", "WebSphere_EJBEmbeddable", "WebSphere_Liberty", "WebSphere"};//NOI18N
+ private static final String[] EL_DDL_GEN_MODE = new String[]{"both", "database", "sql-script"};//NOI18N
private static final Map<Provider, Map<String, String[]>> possiblePropertyValues = new HashMap<Provider, Map<String, String[]>>();
@@ -248,7 +248,7 @@ public class PersistenceCfgProperties {
return ret;
}
- private final static class KeyOrder implements Comparator<String>{
+ private static final class KeyOrder implements Comparator<String>{
@Override
public int compare(String o1, String o2) {
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/util/PersistenceProviderComboboxHelper.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/util/PersistenceProviderComboboxHelper.java
index a0d363f..ca0d50c 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/util/PersistenceProviderComboboxHelper.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/util/PersistenceProviderComboboxHelper.java
@@ -59,9 +59,9 @@ import org.openide.util.Parameters;
*/
public final class PersistenceProviderComboboxHelper {
- private final static String SEPARATOR = "PersistenceProviderComboboxHelper.SEPARATOR";
- private final static String EMPTY = "PersistenceProviderComboboxHelper.EMPTY";
- private final static Provider preferredProvider = ProviderUtil.ECLIPSELINK_PROVIDER;
+ private static final String SEPARATOR = "PersistenceProviderComboboxHelper.SEPARATOR";
+ private static final String EMPTY = "PersistenceProviderComboboxHelper.EMPTY";
+ private static final Provider preferredProvider = ProviderUtil.ECLIPSELINK_PROVIDER;
private final PersistenceProviderSupplier providerSupplier;
private final Project project;
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/PersistenceClientEntitySelection.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/PersistenceClientEntitySelection.java
index 8e830ef..c7e81b3 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/PersistenceClientEntitySelection.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/PersistenceClientEntitySelection.java
@@ -32,7 +32,7 @@ import org.openide.util.HelpCtx;
* @author Pavel Buzek
*/
public final class PersistenceClientEntitySelection implements WizardDescriptor.Panel, WizardDescriptor.FinishablePanel, ChangeListener {
- public final static String DISABLENOIDSELECTION = "disableNoIdSelection";//NOI18N, used to control if entities without id can be selected
+ public static final String DISABLENOIDSELECTION = "disableNoIdSelection";//NOI18N, used to control if entities without id can be selected
private WizardDescriptor wizardDescriptor;
private String panelName;
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/Util.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/Util.java
index 9dfae65..5800f11 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/Util.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/Util.java
@@ -786,7 +786,7 @@ public class Util {
* @return true if the given <code>candidate</code> represents a unique
* name within the names of the given <code>punits</code>, false otherwise.
*/
- static private boolean isUnique(String candidate, PersistenceUnit[] punits) {
+ private static boolean isUnique(String candidate, PersistenceUnit[] punits) {
for (PersistenceUnit punit : punits) {
if (candidate.equals(punit.getName())) {
return false;
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/dbscript/DBScriptPanel.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/dbscript/DBScriptPanel.java
index 8f7f000..79e1897 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/dbscript/DBScriptPanel.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/dbscript/DBScriptPanel.java
@@ -55,7 +55,7 @@ import org.openide.util.NbBundle;
*/
public class DBScriptPanel extends javax.swing.JPanel {
- private final static Logger LOGGER = Logger.getLogger(DBScriptPanel.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(DBScriptPanel.class.getName());
private static final String EXTENSION = "sql";//NOI18N
private final ChangeSupport changeSupport = new ChangeSupport(this);
private JTextComponent packageComboBoxEditor;
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/EntityClassesPanel.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/EntityClassesPanel.java
index 4338264..c32fc7e 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/EntityClassesPanel.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/EntityClassesPanel.java
@@ -76,7 +76,7 @@ import org.openide.util.NbBundle;
*/
public class EntityClassesPanel extends javax.swing.JPanel {
- private final static Logger LOGGER = Logger.getLogger(EntityClassesPanel.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(EntityClassesPanel.class.getName());
private final ChangeSupport changeSupport = new ChangeSupport(this);
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/TableSource.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/TableSource.java
index 435a699..79f92d1 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/TableSource.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/TableSource.java
@@ -39,7 +39,7 @@ public class TableSource {
public enum Type { DATA_SOURCE, CONNECTION, SCHEMA_FILE };
- private final static Map<Project, TableSource> PROJECT_TO_SOURCE = new WeakHashMap<Project, TableSource>();
+ private static final Map<Project, TableSource> PROJECT_TO_SOURCE = new WeakHashMap<Project, TableSource>();
private final Type type;
private final String name;
diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/TableUISupport.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/TableUISupport.java
index bce6269..3138599 100644
--- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/TableUISupport.java
+++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/wizard/fromdb/TableUISupport.java
@@ -122,7 +122,7 @@ public class TableUISupport {
}
}
- private static abstract class TableModel extends AbstractListModel {
+ private abstract static class TableModel extends AbstractListModel {
public abstract Table getElementAt(int index);
}
diff --git a/java/j2ee.persistence/test/unit/src/org/netbeans/modules/j2ee/persistence/sourcetestsupport/SourceTestSupport.java b/java/j2ee.persistence/test/unit/src/org/netbeans/modules/j2ee/persistence/sourcetestsupport/SourceTestSupport.java
index fd62459..0250fb8 100644
--- a/java/j2ee.persistence/test/unit/src/org/netbeans/modules/j2ee/persistence/sourcetestsupport/SourceTestSupport.java
+++ b/java/j2ee.persistence/test/unit/src/org/netbeans/modules/j2ee/persistence/sourcetestsupport/SourceTestSupport.java
@@ -127,7 +127,7 @@ public abstract class SourceTestSupport extends NbTestCase {
}
- static private class JavaFileResolver extends MIMEResolver
+ private static class JavaFileResolver extends MIMEResolver
{
public JavaFileResolver() {
diff --git a/java/java.api.common/src/org/netbeans/modules/java/api/common/applet/AppletSupport.java b/java/java.api.common/src/org/netbeans/modules/java/api/common/applet/AppletSupport.java
index 447bbcc..afd5fb7 100644
--- a/java/java.api.common/src/org/netbeans/modules/java/api/common/applet/AppletSupport.java
+++ b/java/java.api.common/src/org/netbeans/modules/java/api/common/applet/AppletSupport.java
@@ -60,8 +60,8 @@ public class AppletSupport {
/** constant for class extension */
private static final String CLASS_EXT = "class"; // NOI18N
- private final static String POLICY_FILE_NAME = "applet";
- private final static String POLICY_FILE_EXT = "policy";
+ private static final String POLICY_FILE_NAME = "applet";
+ private static final String POLICY_FILE_EXT = "policy";
private AppletSupport() {}
diff --git a/java/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPaths.java b/java/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPaths.java
index 2fb8d6f..7ea5c50 100644
--- a/java/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPaths.java
+++ b/java/java.api.common/src/org/netbeans/modules/java/api/common/classpath/ModuleClassPaths.java
@@ -1322,7 +1322,7 @@ final class ModuleClassPaths {
}
}
- private static abstract class BaseClassPathImplementation implements ClassPathImplementation {
+ private abstract static class BaseClassPathImplementation implements ClassPathImplementation {
private final PropertyChangeSupport listeners;
//@GuardedBy("this")
diff --git a/java/java.api.common/src/org/netbeans/modules/java/api/common/impl/RootsAccessor.java b/java/java.api.common/src/org/netbeans/modules/java/api/common/impl/RootsAccessor.java
index 2a5a48e..44458c0 100644
--- a/java/java.api.common/src/org/netbeans/modules/java/api/common/impl/RootsAccessor.java
+++ b/java/java.api.common/src/org/netbeans/modules/java/api/common/impl/RootsAccessor.java
@@ -32,7 +32,7 @@ public abstract class RootsAccessor {
private static volatile RootsAccessor instance;
- public synchronized static RootsAccessor getInstance() {
+ public static synchronized RootsAccessor getInstance() {
if (instance == null) {
try {
Class.forName(Roots.class.getName(),true,RootsAccessor.class.getClassLoader());
diff --git a/java/java.api.common/src/org/netbeans/modules/java/api/common/project/BaseActionProvider.java b/java/java.api.common/src/org/netbeans/modules/java/api/common/project/BaseActionProvider.java
index 5603835..59268ff 100644
--- a/java/java.api.common/src/org/netbeans/modules/java/api/common/project/BaseActionProvider.java
+++ b/java/java.api.common/src/org/netbeans/modules/java/api/common/project/BaseActionProvider.java
@@ -127,20 +127,20 @@ public abstract class BaseActionProvider implements ActionProvider {
this.delegate = new AtomicReference<>();
}
- abstract protected String[] getPlatformSensitiveActions();
+ protected abstract String[] getPlatformSensitiveActions();
- abstract protected String[] getActionsDisabledForQuickRun();
+ protected abstract String[] getActionsDisabledForQuickRun();
/** Return map from commands to ant targets */
- abstract public Map<String,String[]> getCommands();
+ public abstract Map<String,String[]> getCommands();
/**Return set of commands which are affected by background scanning*/
- abstract protected Set<String> getScanSensitiveActions();
+ protected abstract Set<String> getScanSensitiveActions();
/**Return set of commands which need java model up to date*/
- abstract protected Set<String> getJavaModelActions();
+ protected abstract Set<String> getJavaModelActions();
- abstract protected boolean isCompileOnSaveEnabled();
+ protected abstract boolean isCompileOnSaveEnabled();
/**
* Returns CoS update status.
diff --git a/java/java.api.common/src/org/netbeans/modules/java/api/common/project/JavaActionProvider.java b/java/java.api.common/src/org/netbeans/modules/java/api/common/project/JavaActionProvider.java
index 58f319c..a28d199 100644
--- a/java/java.api.common/src/org/netbeans/modules/java/api/common/project/JavaActionProvider.java
+++ b/java/java.api.common/src/org/netbeans/modules/java/api/common/project/JavaActionProvider.java
@@ -371,7 +371,7 @@ public final class JavaActionProvider implements ActionProvider {
}
- public static abstract class ScriptAction implements Action {
+ public abstract static class ScriptAction implements Action {
private final String command;
private final String displayName;
private final Set<ActionProviderSupport.ActionFlag> actionFlags;
diff --git a/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/MultiModuleNodeFactory.java b/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/MultiModuleNodeFactory.java
index 018bf5f..0c4ec7f 100644
--- a/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/MultiModuleNodeFactory.java
+++ b/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/MultiModuleNodeFactory.java
@@ -1094,7 +1094,7 @@ public final class MultiModuleNodeFactory implements NodeFactory {
}
}
- private final static class Key {
+ private static final class Key {
private final boolean sources;
private final boolean tests;
private final boolean generated;
diff --git a/java/java.completion/src/org/netbeans/modules/java/completion/Utilities.java b/java/java.completion/src/org/netbeans/modules/java/completion/Utilities.java
index e1f3c37..7b92de8 100644
--- a/java/java.completion/src/org/netbeans/modules/java/completion/Utilities.java
+++ b/java/java.completion/src/org/netbeans/modules/java/completion/Utilities.java
@@ -208,8 +208,8 @@ public final class Utilities {
return showDeprecatedMembers;
}
- static private final AtomicReference<Collection<String>> excludeRef = new AtomicReference<>();
- static private final AtomicReference<Collection<String>> includeRef = new AtomicReference<>();
+ private static final AtomicReference<Collection<String>> excludeRef = new AtomicReference<>();
+ private static final AtomicReference<Collection<String>> includeRef = new AtomicReference<>();
private static void updateExcluder(AtomicReference<Collection<String>> existing, String updated) {
Collection<String> nue = new LinkedList<>();
diff --git a/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericMethodInvocation.java b/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericMethodInvocation.java
index 6e5fb77..a4b6efa 100644
--- a/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericMethodInvocation.java
+++ b/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/GenericMethodInvocation.java
@@ -38,5 +38,5 @@ public class GenericMethodInvocation {
}
- public static abstract class Joint implements CharSequence, Runnable {}
+ public abstract static class Joint implements CharSequence, Runnable {}
}
diff --git a/java/java.disco/src/org/netbeans/modules/java/disco/Client.java b/java/java.disco/src/org/netbeans/modules/java/disco/Client.java
index 9150f40..de8a3c3 100644
--- a/java/java.disco/src/org/netbeans/modules/java/disco/Client.java
+++ b/java/java.disco/src/org/netbeans/modules/java/disco/Client.java
@@ -47,7 +47,7 @@ import java.util.stream.Collectors;
public class Client {
- private final static Client INSTANCE = new Client();
+ private static final Client INSTANCE = new Client();
private DiscoClient client = null;
@@ -69,7 +69,7 @@ public class Client {
private Client() {
}
- public synchronized final List<MajorVersion> getAllLTSVersions() {
+ public final synchronized List<MajorVersion> getAllLTSVersions() {
Queue<MajorVersion> majorVersions = getDisco().getAllMajorVersions(false);
return majorVersions.stream()
.filter(majorVersion -> majorVersion.isMaintained())
diff --git a/java/java.disco/src/org/netbeans/modules/java/disco/DownloadPanel.java b/java/java.disco/src/org/netbeans/modules/java/disco/DownloadPanel.java
index 4176ade..5085b9c 100644
--- a/java/java.disco/src/org/netbeans/modules/java/disco/DownloadPanel.java
+++ b/java/java.disco/src/org/netbeans/modules/java/disco/DownloadPanel.java
@@ -44,7 +44,7 @@ import org.openide.windows.InputOutput;
@SuppressWarnings("initialization")
public class DownloadPanel extends javax.swing.JPanel {
- public final static String PROP_DOWNLOAD_FINISHED = "downloadFinished";
+ public static final String PROP_DOWNLOAD_FINISHED = "downloadFinished";
private boolean downloadFinished;
private File download;
diff --git a/java/java.disco/src/org/netbeans/modules/java/disco/archive/JDKCommonsUnzip.java b/java/java.disco/src/org/netbeans/modules/java/disco/archive/JDKCommonsUnzip.java
index d7678be..6c4cef1 100644
--- a/java/java.disco/src/org/netbeans/modules/java/disco/archive/JDKCommonsUnzip.java
+++ b/java/java.disco/src/org/netbeans/modules/java/disco/archive/JDKCommonsUnzip.java
@@ -26,7 +26,7 @@ import org.openide.windows.InputOutput;
public class JDKCommonsUnzip extends CommonsUnzip {
- private final static File[] EMPTY_FILES = new File[0];
+ private static final File[] EMPTY_FILES = new File[0];
@Override
public void uncompress(File zip, File targetDir, InputOutput io) throws IOException {
diff --git a/java/java.disco/src/org/netbeans/modules/java/disco/archive/UnarchiveUtils.java b/java/java.disco/src/org/netbeans/modules/java/disco/archive/UnarchiveUtils.java
index 65e3360..83f7608 100644
--- a/java/java.disco/src/org/netbeans/modules/java/disco/archive/UnarchiveUtils.java
+++ b/java/java.disco/src/org/netbeans/modules/java/disco/archive/UnarchiveUtils.java
@@ -24,7 +24,7 @@ import org.openide.windows.InputOutput;
public class UnarchiveUtils {
- private final static Unarchiver[] zipUnarchivers = new Unarchiver[]{
+ private static final Unarchiver[] zipUnarchivers = new Unarchiver[]{
new CommandLineUnzip(),
new CommandLineUntar(),
new JDKCommonsUnzip()
diff --git a/java/java.editor.base/src/org/netbeans/modules/java/editor/base/javadoc/Utilities.java b/java/java.editor.base/src/org/netbeans/modules/java/editor/base/javadoc/Utilities.java
index 7dc6994..3000021 100644
--- a/java/java.editor.base/src/org/netbeans/modules/java/editor/base/javadoc/Utilities.java
+++ b/java/java.editor.base/src/org/netbeans/modules/java/editor/base/javadoc/Utilities.java
@@ -210,8 +210,8 @@ public final class Utilities {
return showDeprecatedMembers;
}
- static private final AtomicReference<Collection<String>> excludeRef = new AtomicReference<>();
- static private final AtomicReference<Collection<String>> includeRef = new AtomicReference<>();
+ private static final AtomicReference<Collection<String>> excludeRef = new AtomicReference<>();
+ private static final AtomicReference<Collection<String>> includeRef = new AtomicReference<>();
private static void updateExcluder(AtomicReference<Collection<String>> existing, String updated) {
Collection<String> nue = new LinkedList<>();
diff --git a/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/UnusedDetector.java b/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/UnusedDetector.java
index 2353391..2f1a47a 100644
--- a/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/UnusedDetector.java
+++ b/java/java.editor.base/src/org/netbeans/modules/java/editor/base/semantic/UnusedDetector.java
@@ -130,7 +130,7 @@ public class UnusedDetector {
}
/** Detects static final long SerialVersionUID
- * @return true if element is final static long serialVersionUID
+ * @return true if element is static final long serialVersionUID
*/
private static boolean isSerialSpecField(CompilationInfo info, Element el) {
if (el.getModifiers().contains(Modifier.FINAL)
diff --git a/java/java.editor.base/test/unit/data/org/netbeans/modules/java/editor/base/semantic/data/MarkCorrespondingMethods1.java b/java/java.editor.base/test/unit/data/org/netbeans/modules/java/editor/base/semantic/data/MarkCorrespondingMethods1.java
index 00efd79..7754abd 100644
--- a/java/java.editor.base/test/unit/data/org/netbeans/modules/java/editor/base/semantic/data/MarkCorrespondingMethods1.java
+++ b/java/java.editor.base/test/unit/data/org/netbeans/modules/java/editor/base/semantic/data/MarkCorrespondingMethods1.java
@@ -96,7 +96,7 @@ public class MarkCorrespondingMethods1 extends AbstractList<String> implements C
}
- public static abstract class X implements CharSequence {
+ public abstract static class X implements CharSequence {
public @Override int hashCode() {
return 0;
}
diff --git a/java/java.editor.base/test/unit/data/org/netbeans/modules/java/editor/base/semantic/data/ReadWriteUseArgumentOfAbstractMethod.java b/java/java.editor.base/test/unit/data/org/netbeans/modules/java/editor/base/semantic/data/ReadWriteUseArgumentOfAbstractMethod.java
index 1ab0766..6d1ab8e 100644
--- a/java/java.editor.base/test/unit/data/org/netbeans/modules/java/editor/base/semantic/data/ReadWriteUseArgumentOfAbstractMethod.java
+++ b/java/java.editor.base/test/unit/data/org/netbeans/modules/java/editor/base/semantic/data/ReadWriteUseArgumentOfAbstractMethod.java
@@ -14,7 +14,7 @@ public class ReadWriteUseArgumentOfAbstractMethod {
}
- public static abstract class Z {
+ public abstract static class Z {
public abstract void test(int arg1, Object arg2);
diff --git a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItem.java b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItem.java
index 236b84c..664d41f 100644
--- a/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItem.java
+++ b/java/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionItem.java
@@ -604,7 +604,7 @@ public abstract class JavaCompletionItem implements CompletionItem {
return null;
}
- static abstract class WhiteListJavaCompletionItem<T extends Element> extends JavaCompletionItem {
+ abstract static class WhiteListJavaCompletionItem<T extends Element> extends JavaCompletionItem {
private static final String WARNING = "org/netbeans/modules/java/editor/resources/warning_badge.gif"; //NOI18N
private static ImageIcon warningIcon;
diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/codegen/EqualsHashCodeGenerator.java b/java/java.editor/src/org/netbeans/modules/java/editor/codegen/EqualsHashCodeGenerator.java
index 238e2b0..51cec2c 100644
--- a/java/java.editor/src/org/netbeans/modules/java/editor/codegen/EqualsHashCodeGenerator.java
+++ b/java/java.editor/src/org/netbeans/modules/java/editor/codegen/EqualsHashCodeGenerator.java
@@ -126,7 +126,7 @@ public class EqualsHashCodeGenerator implements CodeGenerator {
}
}
- final private JTextComponent component;
+ private final JTextComponent component;
final ElementNode.Description description;
final boolean generateEquals;
final boolean generateHashCode;
diff --git a/java/java.editor/src/org/netbeans/modules/java/editor/fold/JavaElementFoldManager.java b/java/java.editor/src/org/netbeans/modules/java/editor/fold/JavaElementFoldManager.java
index e2e35d0..08a7f4c 100644
--- a/java/java.editor/src/org/netbeans/modules/java/editor/fold/JavaElementFoldManager.java
+++ b/java/java.editor/src/org/netbeans/modules/java/editor/fold/JavaElementFoldManager.java
@@ -173,7 +173,7 @@ public class JavaElementFoldManager implements FoldManager {
static final class JavaElementFoldTask extends ScanningCancellableTask<CompilationInfo> {
//XXX: this will hold JavaElementFoldTask as long as the FileObject exists:
- private final static Map<DataObject, JavaElementFoldTask> file2Task = new WeakHashMap<DataObject, JavaElementFoldTask>();
+ private static final Map<DataObject, JavaElementFoldTask> file2Task = new WeakHashMap<DataObject, JavaElementFoldTask>();
private AtomicLong version = new AtomicLong(0);
diff --git a/java/java.examples/anagrams/src/com/toy/anagrams/lib/StaticWordLibrary.java b/java/java.examples/anagrams/src/com/toy/anagrams/lib/StaticWordLibrary.java
index 216d88d..4e0a3e9 100644
--- a/java/java.examples/anagrams/src/com/toy/anagrams/lib/StaticWordLibrary.java
+++ b/java/java.examples/anagrams/src/com/toy/anagrams/lib/StaticWordLibrary.java
@@ -121,7 +121,7 @@ final class StaticWordLibrary extends WordLibrary {
"rtdatioialn"
};
- final static WordLibrary DEFAULT = new StaticWordLibrary();
+ static final WordLibrary DEFAULT = new StaticWordLibrary();
/**
* Singleton class.
diff --git a/java/java.guards/src/org/netbeans/modules/java/guards/JavaGuardedReader.java b/java/java.guards/src/org/netbeans/modules/java/guards/JavaGuardedReader.java
index 76ace08..f878998 100644
--- a/java/java.guards/src/org/netbeans/modules/java/guards/JavaGuardedReader.java
+++ b/java/java.guards/src/org/netbeans/modules/java/guards/JavaGuardedReader.java
@@ -40,7 +40,7 @@ import org.openide.util.NbBundle;
final class JavaGuardedReader {
/** The prefix of all magic strings */
- final static String MAGIC_PREFIX = "//GEN-"; // NOI18N
+ static final String MAGIC_PREFIX = "//GEN-"; // NOI18N
Pattern magicsAsRE;
diff --git a/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/test/TestPerformer.java b/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/test/TestPerformer.java
index a795a3e..9eadafd 100644
--- a/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/test/TestPerformer.java
+++ b/java/java.hints.declarative/src/org/netbeans/modules/java/hints/declarative/test/TestPerformer.java
@@ -180,7 +180,7 @@ public class TestPerformer {
* @param content the contents of the returned file.
* @return the created file
*/
- private final static FileObject copyStringToFile (FileObject f, String content) throws Exception {
+ private static final FileObject copyStringToFile (FileObject f, String content) throws Exception {
OutputStream os = f.getOutputStream();
InputStream is = new ByteArrayInputStream(content.getBytes("UTF-8"));
FileUtil.copy(is, os);
diff --git a/java/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanel.java b/java/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanel.java
index 3854d95..1de47e0 100644
--- a/java/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanel.java
+++ b/java/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanel.java
@@ -111,7 +111,7 @@ public final class HintsPanel extends javax.swing.JPanel {
private static final String DECLARATIVE_HINT_TEMPLATE_LOCATION = "org-netbeans-modules-java-hints/templates/Inspection.hint";
static final String[] EXTRA_NODE_KEYWORDS = new String[] {"CTL_DepScanning", "CTL_Scope_Desc", "CTL_Scope_Label"};
- private final static RequestProcessor WORKER = new RequestProcessor(HintsPanel.class.getName(), 1, false, false);
+ private static final RequestProcessor WORKER = new RequestProcessor(HintsPanel.class.getName(), 1, false, false);
private HintsPanelLogic logic;
private DefaultTreeModel errorTreeModel;
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/analyzer/AnalyzeFolder.java b/java/java.hints/src/org/netbeans/modules/java/hints/analyzer/AnalyzeFolder.java
index 101957b..42391d5 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/analyzer/AnalyzeFolder.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/analyzer/AnalyzeFolder.java
@@ -111,7 +111,7 @@ public final class AnalyzeFolder extends AbstractAction implements ContextAwareA
return new AnalyzeFolder(actionContext);
}
- public final static class ToolsAction extends SystemAction implements ContextAwareAction {
+ public static final class ToolsAction extends SystemAction implements ContextAwareAction {
private Action delegate;
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/analyzer/ui/AnalyzerTopComponent.java b/java/java.hints/src/org/netbeans/modules/java/hints/analyzer/ui/AnalyzerTopComponent.java
index 66d0db0..892a90f 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/analyzer/ui/AnalyzerTopComponent.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/analyzer/ui/AnalyzerTopComponent.java
@@ -370,7 +370,7 @@ private void fixOnNextActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIR
protected String preferredID() {
return PREFERRED_ID;
}
- final static class ResolvableHelper implements Serializable {
+ static final class ResolvableHelper implements Serializable {
private static final long serialVersionUID = 1L;
public Object readResolve() {
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/errors/ChangeMethodReturnType.java b/java/java.hints/src/org/netbeans/modules/java/hints/errors/ChangeMethodReturnType.java
index 952cef1..dfcfd14 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/errors/ChangeMethodReturnType.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/errors/ChangeMethodReturnType.java
@@ -49,7 +49,7 @@ import org.openide.util.NbBundle;
*/
public class ChangeMethodReturnType implements ErrorRule<Void> {
- private final static Set<String> CODES = new HashSet<String>(Arrays.asList(
+ private static final Set<String> CODES = new HashSet<String>(Arrays.asList(
"compiler.err.cant.ret.val.from.meth.decl.void",
"compiler.err.prob.found.req"
));
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/errors/ImplementAllAbstractMethods.java b/java/java.hints/src/org/netbeans/modules/java/hints/errors/ImplementAllAbstractMethods.java
index 6089365..7e2c000 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/errors/ImplementAllAbstractMethods.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/errors/ImplementAllAbstractMethods.java
@@ -282,7 +282,7 @@ public final class ImplementAllAbstractMethods implements ErrorRule<Object>, Ove
return basic;
}
- static abstract class ImplementFixBase extends CreateFixBase implements Task<WorkingCopy>, DebugFix {
+ abstract static class ImplementFixBase extends CreateFixBase implements Task<WorkingCopy>, DebugFix {
protected final JavaSource source;
protected final TreePathHandle handle;
protected final ElementHandle<TypeElement> implementType;
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/errors/ImportClass.java b/java/java.hints/src/org/netbeans/modules/java/hints/errors/ImportClass.java
index 15018a2..9b4bdce 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/errors/ImportClass.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/errors/ImportClass.java
@@ -357,7 +357,7 @@ public final class ImportClass implements ErrorRule<Void>{
}
@Messages("WRN_FileInvalid=Cannot resolve file - already deleted?")
- static abstract class FixBase implements EnhancedFix {
+ abstract static class FixBase implements EnhancedFix {
static final Logger LOG = Logger.getLogger(FixImport.class.getName());
protected final String fqn;
protected final ElementHandle<Element> toImport;
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertTextBlockToString.java b/java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertTextBlockToString.java
index b00b307..5e8d2ed 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertTextBlockToString.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertTextBlockToString.java
@@ -98,7 +98,7 @@ public class ConvertTextBlockToString {
ctx.getWorkingCopy().rewrite(ctx.getPath().getLeaf(), ext);
}
- static private ExpressionTree buildTree(String textBlockLines[], int currentLine, TransformationContext ctx) {
+ private static ExpressionTree buildTree(String textBlockLines[], int currentLine, TransformationContext ctx) {
if (currentLine == 0) {
return ctx.getWorkingCopy().getTreeMaker().Literal(textBlockLines[0] + "\n");// NOI18N
}
diff --git a/java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToVarHint.java b/java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToVarHint.java
index f1a19da..027c952 100644
--- a/java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToVarHint.java
+++ b/java/java.hints/src/org/netbeans/modules/java/hints/jdk/ConvertToVarHint.java
@@ -63,7 +63,7 @@ import org.netbeans.spi.java.hints.TriggerPatterns;
public class ConvertToVarHint {
// hint will be disabled for error codes present in SKIPPED_ERROR_CODES.
- private final static String[] SKIPPED_ERROR_CODES = {
+ private static final String[] SKIPPED_ERROR_CODES = {
"compiler.err.generic.array.creation" //NOI18N
};
diff --git a/java/java.j2seembedded/src/org/netbeans/modules/java/j2seembedded/platform/ConnectionMethod.java b/java/java.j2seembedded/src/org/netbeans/modules/java/j2seembedded/platform/ConnectionMethod.java
index f116661..9404989 100644
--- a/java/java.j2seembedded/src/org/netbeans/modules/java/j2seembedded/platform/ConnectionMethod.java
+++ b/java/java.j2seembedded/src/org/netbeans/modules/java/j2seembedded/platform/ConnectionMethod.java
@@ -40,13 +40,13 @@ public final class ConnectionMethod {
private static final Logger LOG = Logger.getLogger(ConnectionMethod.class.getName());
- private final static String PLAT_PROP_HOST = "platform.host"; //NOI18N
- private final static String PLAT_PROP_PORT = "platform.port"; //NOI18N
+ private static final String PLAT_PROP_HOST = "platform.host"; //NOI18N
+ private static final String PLAT_PROP_PORT = "platform.port"; //NOI18N
- public static abstract class Authentification {
+ public abstract static class Authentification {
- private final static String PLAT_PROP_AUTH_KIND = "platform.auth.kind"; //NOI18N
- private final static String PLAT_PROP_AUTH_USER = "platform.auth.username"; //NOI18N
+ private static final String PLAT_PROP_AUTH_KIND = "platform.auth.kind"; //NOI18N
+ private static final String PLAT_PROP_AUTH_USER = "platform.auth.username"; //NOI18N
public static enum Kind {
@@ -170,7 +170,7 @@ public final class ConnectionMethod {
public static final class Password extends Authentification {
- private final static String PLAT_PROP_AUTH_PASSWD = "platform.auth.passwd"; //NOI18N
+ private static final String PLAT_PROP_AUTH_PASSWD = "platform.auth.passwd"; //NOI18N
private final String password; //TODO: Store in keystore
@@ -206,8 +206,8 @@ public final class ConnectionMethod {
public static final class Key extends Authentification {
- private final static String PLAT_PROP_AUTH_KEYSTORE = "platform.auth.keystore"; //NOI18N
- private final static String PLAT_PROP_AUTH_PASSPHRASE = "platform.auth.passphrase"; //NOI18N
+ private static final String PLAT_PROP_AUTH_KEYSTORE = "platform.auth.keystore"; //NOI18N
+ private static final String PLAT_PROP_AUTH_PASSPHRASE = "platform.auth.passphrase"; //NOI18N
private final File keyStore;
private final String passPhrase; //TODO: Store in keystore
diff --git a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/DebianJavaPlatformDetector.java b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/DebianJavaPlatformDetector.java
index 8ba9529..f1bcb2b 100644
--- a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/DebianJavaPlatformDetector.java
+++ b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/DebianJavaPlatformDetector.java
@@ -34,8 +34,8 @@ import org.openide.util.Lookup;
* @author lkishalmi
*/
public class DebianJavaPlatformDetector implements Runnable {
- final static File DEBIAN_JAVA_DIR = new File("/usr/lib/jvm"); //NOI18N
- final static String JAVA_DIR_MATCHER = "java-(\\d+)-openjdk-(amd64|arm64|i386)"; //NOI18N
+ static final File DEBIAN_JAVA_DIR = new File("/usr/lib/jvm"); //NOI18N
+ static final String JAVA_DIR_MATCHER = "java-(\\d+)-openjdk-(amd64|arm64|i386)"; //NOI18N
@Override
public void run() {
diff --git a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/SdkManJavaPlatformDetector.java b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/SdkManJavaPlatformDetector.java
index 49109b7..320d27f 100644
--- a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/SdkManJavaPlatformDetector.java
+++ b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/SdkManJavaPlatformDetector.java
@@ -33,7 +33,7 @@ import org.openide.util.Lookup;
*/
public class SdkManJavaPlatformDetector implements Runnable {
- final static File SDKMAN_JAVA_DIR = new File(System.getProperty("user.home"), ".sdkman/candidates/java"); //NOI18N
+ static final File SDKMAN_JAVA_DIR = new File(System.getProperty("user.home"), ".sdkman/candidates/java"); //NOI18N
@Override
public void run() {
diff --git a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/platformdefinition/J2SEPlatformImpl.java b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/platformdefinition/J2SEPlatformImpl.java
index 9cfa830..99d5527 100644
--- a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/platformdefinition/J2SEPlatformImpl.java
+++ b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/platformdefinition/J2SEPlatformImpl.java
@@ -219,7 +219,7 @@ public class J2SEPlatformImpl extends JavaPlatform implements PropertyChangeList
* of display name
* @param name the new display name
*/
- final protected void internalSetDisplayName (String name) {
+ protected final void internalSetDisplayName (String name) {
this.displayName = name;
}
diff --git a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/queries/DefaultClassPathProvider.java b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/queries/DefaultClassPathProvider.java
index 443e508..032040d 100644
--- a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/queries/DefaultClassPathProvider.java
+++ b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/queries/DefaultClassPathProvider.java
@@ -498,8 +498,8 @@ public class DefaultClassPathProvider implements ClassPathProvider, PropertyChan
private boolean inString = false;
private boolean backslashLast = false;
private boolean separatorLast = false;
- static private final char separators[] = {'.'}; // dot is enough here...
- static private final char whitespaces[] = {' ', '\t', '\r', '\n'};
+ private static final char separators[] = {'.'}; // dot is enough here...
+ private static final char whitespaces[] = {' ', '\t', '\r', '\n'};
public SourceReader(InputStream in) {
super(in);
@@ -638,7 +638,7 @@ public class DefaultClassPathProvider implements ClassPathProvider, PropertyChan
return (cc == -1) ? -1 : 0;
}
- static private boolean isSeparator(int c) {
+ private static boolean isSeparator(int c) {
for (int i=0; i < separators.length; i++) {
if (c == separators[i]) {
return true;
@@ -647,7 +647,7 @@ public class DefaultClassPathProvider implements ClassPathProvider, PropertyChan
return false;
}
- static private boolean isWhitespace(int c) {
+ private static boolean isWhitespace(int c) {
for (int i=0; i < whitespaces.length; i++) {
if (c == whitespaces[i]) {
return true;
diff --git a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/queries/QueriesCache.java b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/queries/QueriesCache.java
index e651da8..8c66033 100644
--- a/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/queries/QueriesCache.java
+++ b/java/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/queries/QueriesCache.java
@@ -190,7 +190,7 @@ final class QueriesCache<T extends QueriesCache.ResultBase> {
return sources;
}
- static abstract class ResultBase {
+ abstract static class ResultBase {
private final ChangeSupport cs = new ChangeSupport(this);
public void addChangeListener(@NonNull final ChangeListener l) {
diff --git a/java/java.j2seplatform/src/org/netbeans/modules/java/jarloader/JarDataNode.java b/java/java.j2seplatform/src/org/netbeans/modules/java/jarloader/JarDataNode.java
index 3ff765e..b87acee 100644
--- a/java/java.j2seplatform/src/org/netbeans/modules/java/jarloader/JarDataNode.java
+++ b/java/java.j2seplatform/src/org/netbeans/modules/java/jarloader/JarDataNode.java
@@ -80,7 +80,7 @@ final class JarDataNode extends DataNode {
* So, in order to fix #83595, here is a little hack that schedules
* replacement of this dummy children on addNotify call.
*/
- final static class DummyChildren extends Children implements Runnable {
+ static final class DummyChildren extends Children implements Runnable {
private JarDataNode node;
diff --git a/java/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/api/J2SEProjectPlatformTest.java b/java/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/api/J2SEProjectPlatformTest.java
index afd451e..320d488 100644
--- a/java/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/api/J2SEProjectPlatformTest.java
+++ b/java/java.j2seproject/test/unit/src/org/netbeans/modules/java/j2seproject/api/J2SEProjectPlatformTest.java
@@ -125,7 +125,7 @@ public class J2SEProjectPlatformTest extends NbTestCase {
- private final static class MockJavaPlatformProvider implements JavaPlatformProvider {
+ private static final class MockJavaPlatformProvider implements JavaPlatformProvider {
private static final MockJavaPlatformProvider INSTANCE = new MockJavaPlatformProvider();
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/attach/Processes.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/attach/Processes.java
index c7a045d..7166562 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/attach/Processes.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/attach/Processes.java
@@ -182,7 +182,7 @@ final class Processes {
}
}
- final static class ProcessInfo {
+ static final class ProcessInfo {
private final long pid;
private final String executable;
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/htmlui/Browser.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/htmlui/Browser.java
index 0ad2c6e..f9ac76e 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/htmlui/Browser.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/htmlui/Browser.java
@@ -215,7 +215,7 @@ Executor, Closeable {
* to {@link Browser#Browser(org.netbeans.html.presenters.browser.Browser.Config) }
* constructor.
*/
- public final static class Config implements Cloneable {
+ public static final class Config implements Cloneable {
private Consumer<URI> browser;
Integer port;
boolean debug = Boolean.getBoolean("com.dukescript.presenters.browserDebug");
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/htmlui/Buttons.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/htmlui/Buttons.java
index c548991..279650a 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/htmlui/Buttons.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/htmlui/Buttons.java
@@ -62,7 +62,7 @@ public final class Buttons {
+ "footer.appendChild(button);\n"
+ "return button;\n"
)
- public native static Object createButton0(String id, HTMLViewerSpi.Context callback);
+ public static native Object createButton0(String id, HTMLViewerSpi.Context callback);
static void clickButton0(String id, Object callback) {
HTMLViewerSpi.Context ctx = (HTMLViewerSpi.Context) callback;
@@ -70,12 +70,12 @@ public final class Buttons {
}
@JavaScriptBody(args = { "b" }, body = "return b.id;")
- public native static String buttonName0(Object b);
+ public static native String buttonName0(Object b);
@JavaScriptBody(args = { "b", "text" }, body = "b.innerHTML = text;")
- public native static void buttonText0(Object b, String text);
+ public static native void buttonText0(Object b, String text);
@JavaScriptBody(args = { "b", "disabled" }, body = "return b.disabled = disabled;")
- public native static String buttonDisabled0(Object b, boolean disabled);
+ public static native String buttonDisabled0(Object b, boolean disabled);
}
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/htmlui/HttpServer.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/htmlui/HttpServer.java
index 8f6fa86..bd24cd5 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/htmlui/HttpServer.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/htmlui/HttpServer.java
@@ -52,11 +52,11 @@ abstract class HttpServer<Request, Response, WebSocket, Runner> {
abstract Runner initializeRunner(String id);
abstract void runSafe(Runner runner, Runnable code, Fn.Presenter presenter);
- static abstract class Handler {
+ abstract static class Handler {
abstract <Request, Response> void service(HttpServer<Request, Response, ?, ?> server, Request rqst, Response rspns) throws IOException;
}
- static abstract class WebSocketApplication {
+ abstract static class WebSocketApplication {
abstract <WebSocket> void onMessage(HttpServer<?, ?, WebSocket, ?> server, WebSocket socket, String text);
}
}
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceServiceImpl.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceServiceImpl.java
index 103fc47..c2ccd5b 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceServiceImpl.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/protocol/WorkspaceServiceImpl.java
@@ -950,7 +950,7 @@ public final class WorkspaceServiceImpl implements WorkspaceService, LanguageCli
checkStatus();
}
- synchronized final void checkStatus() {
+ final synchronized void checkStatus() {
if (running == 0) {
try {
wait(100);
diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractGlobalActionContext.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractGlobalActionContext.java
index e850dba..e111f78 100644
--- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractGlobalActionContext.java
+++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/ui/AbstractGlobalActionContext.java
@@ -38,7 +38,7 @@ public class AbstractGlobalActionContext implements ContextGlobalProvider, Looku
/**
* Holder class that is inserted & looked up in the default Lookup.
*/
- final static class ContextHolder {
+ static final class ContextHolder {
final Lookup context;
public ContextHolder(Lookup context) {
diff --git a/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/explorer/TreeViewProviderTest.java b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/explorer/TreeViewProviderTest.java
index 9298304..1da2202 100644
--- a/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/explorer/TreeViewProviderTest.java
+++ b/java/java.lsp.server/test/unit/src/org/netbeans/modules/java/lsp/server/explorer/TreeViewProviderTest.java
@@ -154,7 +154,7 @@ public class TreeViewProviderTest {
assertNotNull(map.get(grandParentId));
}
- final static class TreeViewProviderImpl extends TreeViewProvider {
+ static final class TreeViewProviderImpl extends TreeViewProvider {
private Set<Node> changed = new HashSet<>();
TreeViewProviderImpl(ExplorerManager em, TreeNodeRegistry r) {
diff --git a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteLogicalView.java b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteLogicalView.java
index 06a78ee..b0e6986 100644
--- a/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteLogicalView.java
+++ b/java/java.mx.project/src/org/netbeans/modules/java/mx/project/SuiteLogicalView.java
@@ -197,7 +197,7 @@ final class SuiteLogicalView implements LogicalViewProvider {
refresh(false);
}
- private static abstract class Key {
+ private abstract static class Key {
public final Group group;
public Key(Group group) {
diff --git a/java/java.nativeimage.debugger/src/org/netbeans/modules/java/nativeimage/debugger/actions/Processes.java b/java/java.nativeimage.debugger/src/org/netbeans/modules/java/nativeimage/debugger/actions/Processes.java
index 2604129..59a3b5b 100644
--- a/java/java.nativeimage.debugger/src/org/netbeans/modules/java/nativeimage/debugger/actions/Processes.java
+++ b/java/java.nativeimage.debugger/src/org/netbeans/modules/java/nativeimage/debugger/actions/Processes.java
@@ -182,7 +182,7 @@ final class Processes {
}
}
- final static class ProcessInfo {
+ static final class ProcessInfo {
private final long pid;
private final String executable;
diff --git a/java/java.navigation/src/org/netbeans/modules/java/navigation/JavadocTopComponent.java b/java/java.navigation/src/org/netbeans/modules/java/navigation/JavadocTopComponent.java
index 3e9d31d..ca36b09 100644
--- a/java/java.navigation/src/org/netbeans/modules/java/navigation/JavadocTopComponent.java
+++ b/java/java.navigation/src/org/netbeans/modules/java/navigation/JavadocTopComponent.java
@@ -171,7 +171,7 @@ public final class JavadocTopComponent extends TopComponent {
return PREFERRED_ID;
}
- final static class ResolvableHelper implements Serializable {
+ static final class ResolvableHelper implements Serializable {
private static final long serialVersionUID = 1L;
public Object readResolve() {
return JavadocTopComponent.getDefault();
diff --git a/java/java.navigation/src/org/netbeans/modules/java/navigation/base/Filters.java b/java/java.navigation/src/org/netbeans/modules/java/navigation/base/Filters.java
index 074ec67..1fb14e5 100644
--- a/java/java.navigation/src/org/netbeans/modules/java/navigation/base/Filters.java
+++ b/java/java.navigation/src/org/netbeans/modules/java/navigation/base/Filters.java
@@ -103,7 +103,7 @@ public abstract class Filters<T> {
return fm.getComponent(buttons);
}
- public synchronized final FiltersManager getFiltersManager() {
+ public final synchronized FiltersManager getFiltersManager() {
if (filtersManager == null) {
filtersManager = createFilters();
}
diff --git a/java/java.navigation/src/org/netbeans/modules/java/stackanalyzer/AnalyzeStackTopComponent.java b/java/java.navigation/src/org/netbeans/modules/java/stackanalyzer/AnalyzeStackTopComponent.java
index 6d089f4..52010e4 100644
--- a/java/java.navigation/src/org/netbeans/modules/java/stackanalyzer/AnalyzeStackTopComponent.java
+++ b/java/java.navigation/src/org/netbeans/modules/java/stackanalyzer/AnalyzeStackTopComponent.java
@@ -312,7 +312,7 @@ final class AnalyzeStackTopComponent extends TopComponent {
}
- final static class ResolvableHelper implements Serializable {
+ static final class ResolvableHelper implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/LogicalViewProviderImpl.java b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/LogicalViewProviderImpl.java
index a431477..d4fd90b 100644
--- a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/LogicalViewProviderImpl.java
+++ b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/LogicalViewProviderImpl.java
@@ -222,7 +222,7 @@ public class LogicalViewProviderImpl implements LogicalViewProvider {
refresh(false);
}
- private static abstract class Key {
+ private abstract static class Key {
public final SourceGroup group;
public Key(SourceGroup group) {
diff --git a/java/java.platform.ui/src/org/netbeans/modules/java/platform/PlatformSettings.java b/java/java.platform.ui/src/org/netbeans/modules/java/platform/PlatformSettings.java
index 886b2fd..2ce94ea 100644
--- a/java/java.platform.ui/src/org/netbeans/modules/java/platform/PlatformSettings.java
+++ b/java/java.platform.ui/src/org/netbeans/modules/java/platform/PlatformSettings.java
@@ -89,7 +89,7 @@ public class PlatformSettings {
}
- public synchronized static PlatformSettings getDefault () {
+ public static synchronized PlatformSettings getDefault () {
return INSTANCE;
}
}
diff --git a/java/java.preprocessorbridge/src/org/netbeans/modules/java/preprocessorbridge/spi/JavaSourceUtilImpl.java b/java/java.preprocessorbridge/src/org/netbeans/modules/java/preprocessorbridge/spi/JavaSourceUtilImpl.java
index e7dd19f..eea307a 100644
--- a/java/java.preprocessorbridge/src/org/netbeans/modules/java/preprocessorbridge/spi/JavaSourceUtilImpl.java
+++ b/java/java.preprocessorbridge/src/org/netbeans/modules/java/preprocessorbridge/spi/JavaSourceUtilImpl.java
@@ -72,7 +72,7 @@ public abstract class JavaSourceUtilImpl {
@CheckForNull
protected abstract ModuleInfoHandle getModuleInfoHandle(@NonNull Object javaSource) throws IOException;
- public static abstract class ModuleInfoHandle {
+ public abstract static class ModuleInfoHandle {
@CheckForNull
public abstract String parseModuleName() throws IOException;
diff --git a/java/java.project.ui/src/org/netbeans/modules/java/project/ui/ProjectProblemsProviders.java b/java/java.project.ui/src/org/netbeans/modules/java/project/ui/ProjectProblemsProviders.java
index 9f39b5c..48998f2 100644
--- a/java/java.project.ui/src/org/netbeans/modules/java/project/ui/ProjectProblemsProviders.java
+++ b/java/java.project.ui/src/org/netbeans/modules/java/project/ui/ProjectProblemsProviders.java
@@ -603,7 +603,7 @@ public class ProjectProblemsProviders {
//<editor-fold defaultstate="collapsed" desc="Resolver implementations">
- private static abstract class BaseResolver implements ProjectProblemResolver {
+ private abstract static class BaseResolver implements ProjectProblemResolver {
protected final RefType type;
protected final String id;
@@ -815,7 +815,7 @@ public class ProjectProblemsProviders {
}
}
- private static abstract class ReferenceResolver extends BaseResolver {
+ private abstract static class ReferenceResolver extends BaseResolver {
static File lastSelectedFile;
diff --git a/java/java.source.base/src/org/netbeans/api/java/source/CodeStyle.java b/java/java.source.base/src/org/netbeans/api/java/source/CodeStyle.java
index 4fc0a26..1e8859b 100644
--- a/java/java.source.base/src/org/netbeans/api/java/source/CodeStyle.java
+++ b/java/java.source.base/src/org/netbeans/api/java/source/CodeStyle.java
@@ -91,7 +91,7 @@ public final class CodeStyle {
*
* @since 0.39
*/
- public synchronized static CodeStyle getDefault(FileObject file) {
+ public static synchronized CodeStyle getDefault(FileObject file) {
Preferences prefs = CodeStylePreferences.get(file, JavacParser.MIME_TYPE).getPreferences();
return FmtOptions.codeStyleProducer.create(prefs);
}
@@ -107,7 +107,7 @@ public final class CodeStyle {
*
* @since 0.39
*/
- public synchronized static CodeStyle getDefault(Document doc) {
+ public static synchronized CodeStyle getDefault(Document doc) {
Preferences prefs = CodeStylePreferences.get(doc, JavacParser.MIME_TYPE).getPreferences();
return FmtOptions.codeStyleProducer.create(prefs);
}
diff --git a/java/java.source.base/src/org/netbeans/api/java/source/ScanUtils.java b/java/java.source.base/src/org/netbeans/api/java/source/ScanUtils.java
index 52f2f5b..ebd42a6 100644
--- a/java/java.source.base/src/org/netbeans/api/java/source/ScanUtils.java
+++ b/java/java.source.base/src/org/netbeans/api/java/source/ScanUtils.java
@@ -412,7 +412,7 @@ public final class ScanUtils {
*/
private static final ThreadLocal<Boolean> retryGuard = new ThreadLocal<Boolean>();
- private final static class FinishedFuture implements Future<Void> {
+ private static final class FinishedFuture implements Future<Void> {
@Override
public boolean cancel(boolean mayInterruptIfRunning) {
return false;
diff --git a/java/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java b/java/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
index 5f34aa3..6cd7728 100644
--- a/java/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
+++ b/java/java.source.base/src/org/netbeans/api/java/source/SourceUtils.java
@@ -650,7 +650,7 @@ public class SourceUtils {
return null;
}
- private static abstract class Match {
+ private abstract static class Match {
private final String name;
diff --git a/java/java.source.base/src/org/netbeans/api/java/source/support/ProfileSupport.java b/java/java.source.base/src/org/netbeans/api/java/source/support/ProfileSupport.java
index 8228d96..38e4371 100644
--- a/java/java.source.base/src/org/netbeans/api/java/source/support/ProfileSupport.java
+++ b/java/java.source.base/src/org/netbeans/api/java/source/support/ProfileSupport.java
@@ -377,7 +377,7 @@ public class ProfileSupport {
}
- private static abstract class Validator implements Runnable {
+ private abstract static class Validator implements Runnable {
protected final Context context;
protected final URL root;
@@ -475,7 +475,7 @@ public class ProfileSupport {
return new BinaryValidator(root, context);
}
- private final static class BinaryValidator extends Validator {
+ private static final class BinaryValidator extends Validator {
private BinaryValidator(
@NonNull final URL root,
@@ -552,7 +552,7 @@ public class ProfileSupport {
}
- private final static class SourceValidator extends Validator {
+ private static final class SourceValidator extends Validator {
private final File cacheRoot;
private final ClasspathInfo resolveCps;
diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaCustomIndexer.java b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaCustomIndexer.java
index 7ffe4a2..8661029 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaCustomIndexer.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaCustomIndexer.java
@@ -1438,7 +1438,7 @@ public class JavaCustomIndexer extends CustomIndexer {
}
}
- private static abstract class Check implements Callable<Boolean> {
+ private abstract static class Check implements Callable<Boolean> {
protected final Context ctx;
diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaFileFilterListener.java b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaFileFilterListener.java
index 6316d9a..aa3307c 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaFileFilterListener.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaFileFilterListener.java
@@ -123,7 +123,7 @@ final class JavaFileFilterListener implements ChangeListener {
}
return result;
}
- synchronized static JavaFileFilterListener getDefault() {
+ static synchronized JavaFileFilterListener getDefault() {
if (instance == null) {
instance = new JavaFileFilterListener();
}
diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaIndexerWorker.java b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaIndexerWorker.java
index d8eaf39..551fcd8 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaIndexerWorker.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/JavaIndexerWorker.java
@@ -178,7 +178,7 @@ public final class JavaIndexerWorker {
}
}
- private static abstract class SuspendableIterator implements Iterator<CompileTuple> {
+ private abstract static class SuspendableIterator implements Iterator<CompileTuple> {
private final SuspendStatus suspendStatus;
diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/TransactionContext.java b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/TransactionContext.java
index 9d24482..6a796bf 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/TransactionContext.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/TransactionContext.java
@@ -229,7 +229,7 @@ public final class TransactionContext {
/**
* Transaction service which can be registered into the {@link TransactionContext}.
*/
- public static abstract class Service {
+ public abstract static class Service {
/**
* Called to commit changes done during the transaction.
* @throws IOException in case of IO error.
diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchive.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchive.java
index cab1fff..6c5f584 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchive.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/CachingArchive.java
@@ -66,7 +66,7 @@ public class CachingArchive implements Archive, FileChangeListener {
//@GuardedBy("this")
byte[] names;// = new byte[16384];
private int nameOffset = 0;
- final static int[] EMPTY = new int[0];
+ static final int[] EMPTY = new int[0];
//@GuardedBy("this")
private Map<String, Folder> folders;
private volatile Boolean multiRelease;
diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/FileObjects.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/FileObjects.java
index 1208cf7..e0fde25 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/FileObjects.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/FileObjects.java
@@ -1012,7 +1012,7 @@ public class FileObjects {
//</editor-fold>
//<editor-fold defaultstate="collapsed" desc="JavaFileObject implementation">
- public static abstract class Base implements InferableJavaFileObject {
+ public abstract static class Base implements InferableJavaFileObject {
protected final JavaFileObject.Kind kind;
protected final String pkgName;
@@ -1163,7 +1163,7 @@ public class FileObjects {
}
}
- public static abstract class PrefetchableBase extends Base implements PrefetchableJavaFileObject {
+ public abstract static class PrefetchableBase extends Base implements PrefetchableJavaFileObject {
private volatile CharSequence data;
@@ -1348,7 +1348,7 @@ public class FileObjects {
}
}
- private static abstract class PathBase extends Base {
+ private abstract static class PathBase extends Base {
private volatile URI uriCache;
diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/SourceFileManager.java b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/SourceFileManager.java
index 39a89cd..6344221 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/parsing/SourceFileManager.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/parsing/SourceFileManager.java
@@ -339,7 +339,7 @@ public class SourceFileManager implements JavaFileManager {
}
}
- public static abstract class ModifiedFilesTransaction extends TransactionContext.Service {
+ public abstract static class ModifiedFilesTransaction extends TransactionContext.Service {
public abstract void cacheUpdated(@NonNull final URI file);
abstract void begin();
}
diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/save/PositionEstimator.java b/java/java.source.base/src/org/netbeans/modules/java/source/save/PositionEstimator.java
index 8e69d00..17cf4c0 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/save/PositionEstimator.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/save/PositionEstimator.java
@@ -777,7 +777,7 @@ public abstract class PositionEstimator {
}
- private static abstract class BaseEstimator extends PositionEstimator {
+ private abstract static class BaseEstimator extends PositionEstimator {
JavaTokenId precToken;
private ArrayList<String> separatorList;
diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/usages/BinaryAnalyser.java b/java/java.source.base/src/org/netbeans/modules/java/source/usages/BinaryAnalyser.java
index 5111c32..a632c0c 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/usages/BinaryAnalyser.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/usages/BinaryAnalyser.java
@@ -155,7 +155,7 @@ public class BinaryAnalyser {
}
- public static abstract class Config {
+ public abstract static class Config {
public enum UsagesLevel {
BASIC("basic"), //NOI18N
@@ -1147,7 +1147,7 @@ public class BinaryAnalyser {
//</editor-fold>
//<editor-fold defaultstate="collapsed" desc="RootProcessor implementations">
- private static abstract class RootProcessor {
+ private abstract static class RootProcessor {
private static final Comparator<Pair<ElementHandle<TypeElement>,Long>> COMPARATOR = new Comparator<Pair<ElementHandle<TypeElement>,Long>>() {
@Override
public int compare(
diff --git a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/TestUtilities.java b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/TestUtilities.java
index d3be7ed..3020799 100644
--- a/java/java.source.base/test/unit/src/org/netbeans/api/java/source/TestUtilities.java
+++ b/java/java.source.base/test/unit/src/org/netbeans/api/java/source/TestUtilities.java
@@ -137,7 +137,7 @@ public final class TestUtilities {
* @param f the file to be read
* @return the contents of the file(s).
*/
- public final static String copyFileToString (java.io.File f) throws java.io.IOException {
+ public static final String copyFileToString (java.io.File f) throws java.io.IOException {
int s = (int)f.length ();
byte[] data = new byte[s];
int len = new FileInputStream (f).read (data);
@@ -152,7 +152,7 @@ public final class TestUtilities {
* @param f the file to be read
* @return the contents of the file(s).
*/
- public final static String copyGZipFileToString (java.io.File f) throws java.io.IOException {
+ public static final String copyGZipFileToString (java.io.File f) throws java.io.IOException {
GZIPInputStream is = new GZIPInputStream(new FileInputStream(f));
byte[] arr = new byte[256 * 256];
int first = 0;
@@ -171,7 +171,7 @@ public final class TestUtilities {
* @param content the contents of the returned file.
* @return the created file
*/
- public final static File copyStringToFile (File f, String content) throws Exception {
+ public static final File copyStringToFile (File f, String content) throws Exception {
FileOutputStream os = new FileOutputStream(f);
InputStream is = new ByteArrayInputStream(content.getBytes("UTF-8"));
FileUtil.copy(is, os);
@@ -188,7 +188,7 @@ public final class TestUtilities {
* @param content the contents of the returned file.
* @return the created file
*/
- public final static FileObject copyStringToFile (FileObject f, String content) throws Exception {
+ public static final FileObject copyStringToFile (FileObject f, String content) throws Exception {
OutputStream os = f.getOutputStream();
InputStream is = new ByteArrayInputStream(content.getBytes("UTF-8"));
FileUtil.copy(is, os);
@@ -205,7 +205,7 @@ public final class TestUtilities {
*
* @param urls to analyze
*/
- public final static void analyzeBinaries(final Collection<URL> urls) throws IOException {
+ public static final void analyzeBinaries(final Collection<URL> urls) throws IOException {
final ClasspathInfo cpInfo = ClasspathInfo.create(EMPTY, EMPTY, EMPTY);
final ClassIndexManager mgr = ClassIndexManager.getDefault();
final JavaSource js = JavaSource.create(cpInfo);
diff --git a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/IndexerTransactionTest.java b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/IndexerTransactionTest.java
index 7bf67d3..9823c1c 100644
--- a/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/IndexerTransactionTest.java
+++ b/java/java.source.base/test/unit/src/org/netbeans/modules/java/source/parsing/IndexerTransactionTest.java
@@ -640,8 +640,8 @@ public class IndexerTransactionTest extends NbTestCase {
public static class SFBQImpl implements SourceForBinaryQueryImplementation {
- final static Map<URL,FileObject> map = new HashMap<URL,FileObject> ();
- final static Map<URL,Result> results = new HashMap<URL,Result> ();
+ static final Map<URL,FileObject> map = new HashMap<URL,FileObject> ();
+ static final Map<URL,Result> results = new HashMap<URL,Result> ();
public SFBQImpl () {
diff --git a/java/java.source/src/org/netbeans/api/java/source/support/CaretAwareJavaSourceTaskFactory.java b/java/java.source/src/org/netbeans/api/java/source/support/CaretAwareJavaSourceTaskFactory.java
index 9515fed..e0b3d42 100644
--- a/java/java.source/src/org/netbeans/api/java/source/support/CaretAwareJavaSourceTaskFactory.java
+++ b/java/java.source/src/org/netbeans/api/java/source/support/CaretAwareJavaSourceTaskFactory.java
@@ -121,7 +121,7 @@ public abstract class CaretAwareJavaSourceTaskFactory extends JavaSourceTaskFact
* @param file file from which the position should be found
* @return caret position in the current {@link JTextComponent} for a given file.
*/
- public synchronized static int getLastPosition(FileObject file) {
+ public static synchronized int getLastPosition(FileObject file) {
if (file == null) {
throw new NullPointerException("Cannot pass null file!");
}
@@ -136,7 +136,7 @@ public abstract class CaretAwareJavaSourceTaskFactory extends JavaSourceTaskFact
return position;
}
- synchronized static void setLastPosition(FileObject file, int position) {
+ static synchronized void setLastPosition(FileObject file, int position) {
file2LastPosition.put(file, position);
}
diff --git a/java/java.source/src/org/netbeans/api/java/source/support/LookupBasedJavaSourceTaskFactory.java b/java/java.source/src/org/netbeans/api/java/source/support/LookupBasedJavaSourceTaskFactory.java
index 7946a6e..0abfeba 100644
--- a/java/java.source/src/org/netbeans/api/java/source/support/LookupBasedJavaSourceTaskFactory.java
+++ b/java/java.source/src/org/netbeans/api/java/source/support/LookupBasedJavaSourceTaskFactory.java
@@ -107,7 +107,7 @@ public abstract class LookupBasedJavaSourceTaskFactory extends JavaSourceTaskFac
*
* @param lookup new {@link Lookup}
*/
- protected synchronized final void setLookup(Lookup lookup) {
+ protected final synchronized void setLookup(Lookup lookup) {
if (fileObjectResult != null) {
fileObjectResult.removeLookupListener(listener);
}
diff --git a/java/java.source/src/org/netbeans/api/java/source/support/SelectionAwareJavaSourceTaskFactory.java b/java/java.source/src/org/netbeans/api/java/source/support/SelectionAwareJavaSourceTaskFactory.java
index 804bea7..b618e09 100644
--- a/java/java.source/src/org/netbeans/api/java/source/support/SelectionAwareJavaSourceTaskFactory.java
+++ b/java/java.source/src/org/netbeans/api/java/source/support/SelectionAwareJavaSourceTaskFactory.java
@@ -127,7 +127,7 @@ public abstract class SelectionAwareJavaSourceTaskFactory extends JavaSourceTask
* @return selection span in the current {@link JTextComponent} for a given file.
* <code>null</code> if no selection available so far.
*/
- public synchronized static int[] getLastSelection(FileObject file) {
+ public static synchronized int[] getLastSelection(FileObject file) {
if (file == null) {
throw new NullPointerException("Cannot pass null file!");
}
@@ -143,7 +143,7 @@ public abstract class SelectionAwareJavaSourceTaskFactory extends JavaSourceTask
return new int[] {startPosition, endPosition};
}
- private synchronized static void setLastSelection(FileObject file, int startPosition, int endPosition) {
+ private static synchronized void setLastSelection(FileObject file, int startPosition, int endPosition) {
file2SelectionStartPosition.put(file, startPosition);
file2SelectionEndPosition.put(file, endPosition);
}
diff --git a/java/java.source/src/org/netbeans/modules/java/IndentFileEntry.java b/java/java.source/src/org/netbeans/modules/java/IndentFileEntry.java
index 8b3ea5b..4806411 100644
--- a/java/java.source/src/org/netbeans/modules/java/IndentFileEntry.java
+++ b/java/java.source/src/org/netbeans/modules/java/IndentFileEntry.java
@@ -160,7 +160,7 @@ public abstract class IndentFileEntry extends FileEntry.Format {
}
/** The prefix of all magic strings */
- private final static String MAGIC_PREFIX = "//GEN-"; // NOI18N
+ private static final String MAGIC_PREFIX = "//GEN-"; // NOI18N
static String fixupGuardedBlocks(String indentedLine) {
int offset = indentedLine.indexOf(MAGIC_PREFIX);
diff --git a/java/java.source/src/org/netbeans/modules/java/JavaNode.java b/java/java.source/src/org/netbeans/modules/java/JavaNode.java
index b99e750..8399004 100644
--- a/java/java.source/src/org/netbeans/modules/java/JavaNode.java
+++ b/java/java.source/src/org/netbeans/modules/java/JavaNode.java
@@ -456,7 +456,7 @@ public final class JavaNode extends DataNode implements ChangeListener {
return result;
}
- private static abstract class IconTask implements Runnable {
+ private abstract static class IconTask implements Runnable {
protected final JavaNode node;
IconTask(@NonNull final JavaNode node) {
diff --git a/java/java.source/src/org/netbeans/modules/java/ui/CategorySupport.java b/java/java.source/src/org/netbeans/modules/java/ui/CategorySupport.java
index da8aed1..1e9b5e9 100644
--- a/java/java.source/src/org/netbeans/modules/java/ui/CategorySupport.java
+++ b/java/java.source/src/org/netbeans/modules/java/ui/CategorySupport.java
@@ -555,7 +555,7 @@ public class CategorySupport implements ActionListener, ChangeListener, ListData
}
}
- static abstract class DocumentCategorySupport extends CategorySupport {
+ abstract static class DocumentCategorySupport extends CategorySupport {
/**
* Two Sources are used. While one Source document is displayed by the preview JEditorPane,
* the other source may be formatted in the RP. The editor then switch between those sources.
diff --git a/java/java.source/test/qa-functional/src/org/netbeans/test/java/Common.java b/java/java.source/test/qa-functional/src/org/netbeans/test/java/Common.java
index c4d25e4..cffbe57 100644
--- a/java/java.source/test/qa-functional/src/org/netbeans/test/java/Common.java
+++ b/java/java.source/test/qa-functional/src/org/netbeans/test/java/Common.java
@@ -121,7 +121,7 @@ public class Common extends Object {
* @param i
* @return for i=1 "newMethod1"
*/
- static public String getMethodName(int i){
+ public static String getMethodName(int i){
return concat(METHODS,i);
}
diff --git a/java/java.sourceui/src/org/netbeans/modules/java/source/ui/ElementOpenAccessor.java b/java/java.sourceui/src/org/netbeans/modules/java/source/ui/ElementOpenAccessor.java
index 2789371..41b479c 100644
--- a/java/java.sourceui/src/org/netbeans/modules/java/source/ui/ElementOpenAccessor.java
+++ b/java/java.sourceui/src/org/netbeans/modules/java/source/ui/ElementOpenAccessor.java
@@ -32,11 +32,11 @@ public abstract class ElementOpenAccessor {
private static ElementOpenAccessor instance;
- public synchronized static ElementOpenAccessor getInstance() {
+ public static synchronized ElementOpenAccessor getInstance() {
return instance;
}
- public synchronized static void setInstance(ElementOpenAccessor instance) {
+ public static synchronized void setInstance(ElementOpenAccessor instance) {
ElementOpenAccessor.instance = instance;
}
diff --git a/java/java.testrunner/src/org/netbeans/modules/java/testrunner/CommonTestUtil.java b/java/java.testrunner/src/org/netbeans/modules/java/testrunner/CommonTestUtil.java
index 4910fd5..b2ea4e0 100644
--- a/java/java.testrunner/src/org/netbeans/modules/java/testrunner/CommonTestUtil.java
+++ b/java/java.testrunner/src/org/netbeans/modules/java/testrunner/CommonTestUtil.java
@@ -38,7 +38,7 @@ import org.openide.filesystems.URLMapper;
* @version 1.1
*/
public class CommonTestUtil {
- static private final String JAVA_SOURCES_SUFFIX = "java"; //NOI18N
+ private static final String JAVA_SOURCES_SUFFIX = "java"; //NOI18N
/**
*/
diff --git a/java/javadoc/src/org/netbeans/modules/javadoc/JavadocModule.java b/java/javadoc/src/org/netbeans/modules/javadoc/JavadocModule.java
index 7ab5eb2..7121edf 100644
--- a/java/javadoc/src/org/netbeans/modules/javadoc/JavadocModule.java
+++ b/java/javadoc/src/org/netbeans/modules/javadoc/JavadocModule.java
@@ -35,13 +35,13 @@ public final class JavadocModule extends ModuleInstall {
private static Collection<TopComponent> floatingTopComponents;
- public synchronized static void registerTopComponent(TopComponent tc) {
+ public static synchronized void registerTopComponent(TopComponent tc) {
if (floatingTopComponents == null)
floatingTopComponents = new LinkedList<>();
floatingTopComponents.add(tc);
}
- public synchronized static void unregisterTopComponent(TopComponent tc) {
+ public static synchronized void unregisterTopComponent(TopComponent tc) {
if (floatingTopComponents == null)
return;
floatingTopComponents.remove(tc);
diff --git a/java/javadoc/src/org/netbeans/modules/javadoc/hints/AddTagFix.java b/java/javadoc/src/org/netbeans/modules/javadoc/hints/AddTagFix.java
index 19cc2e3..de835b4 100644
--- a/java/javadoc/src/org/netbeans/modules/javadoc/hints/AddTagFix.java
+++ b/java/javadoc/src/org/netbeans/modules/javadoc/hints/AddTagFix.java
@@ -146,9 +146,9 @@ abstract class AddTagFix extends JavaFix {
*/
private static class TagComparator implements Comparator<DocTree> {
- private final static int HIGHER = -1;
- private final static int EQUAL = 0;
- private final static int LOWER = 1;
+ private static final int HIGHER = -1;
+ private static final int EQUAL = 0;
+ private static final int LOWER = 1;
@Override
public int compare(DocTree t, DocTree t1) {
diff --git a/java/javadoc/src/org/netbeans/modules/javadoc/search/IndexBuilder.java b/java/javadoc/src/org/netbeans/modules/javadoc/search/IndexBuilder.java
index 7633d60..276aa41 100644
--- a/java/javadoc/src/org/netbeans/modules/javadoc/search/IndexBuilder.java
+++ b/java/javadoc/src/org/netbeans/modules/javadoc/search/IndexBuilder.java
@@ -92,7 +92,7 @@ public class IndexBuilder implements Runnable, ChangeListener {
* Get the default index builder instance.
* It will start parsing asynch.
*/
- public synchronized static IndexBuilder getDefault() {
+ public static synchronized IndexBuilder getDefault() {
if (INSTANCE != null) {
return INSTANCE;
}
@@ -268,7 +268,7 @@ public class IndexBuilder implements Runnable, ChangeListener {
return title != null? title.trim(): title;
}
- private synchronized static void scheduleTask() {
+ private static synchronized void scheduleTask() {
if (task == null) {
task = new RequestProcessor(IndexBuilder.class).create(getDefault()); // NOI18N
}
diff --git a/java/javadoc/src/org/netbeans/modules/javadoc/search/SearchThreadJdk12.java b/java/javadoc/src/org/netbeans/modules/javadoc/search/SearchThreadJdk12.java
index 001ca4c..7232076 100644
--- a/java/javadoc/src/org/netbeans/modules/javadoc/search/SearchThreadJdk12.java
+++ b/java/javadoc/src/org/netbeans/modules/javadoc/search/SearchThreadJdk12.java
@@ -207,25 +207,25 @@ class SearchThreadJdk12 extends IndexSearchThread {
/* These are constants for the inner class */
- static private final String STR_CLASS = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_CLASS" ); //NOI18N
- static private final String STR_INTERFACE = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_INTERFACE" ); //NOI18N
- static private final String STR_EXCEPTION = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_EXCEPTION" ); //NOI18N
- static private final String STR_CONSTRUCTOR = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_CONSTRUCTOR" ); //NOI18N
- static private final String STR_METHOD = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_METHOD" ); //NOI18N
- static private final String STR_ERROR = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_ERROR" ); //NOI18N
- static private final String STR_VARIABLE = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_VARIABLE" ); //NOI18N
- static private final String STR_STATIC = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_STATIC" ); //NOI18N
- static private final String STR_DASH = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_DASH" ); //NOI18N
- static private final String STR_PACKAGE = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_PACKAGE" ); //NOI18N
+ private static final String STR_CLASS = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_CLASS" ); //NOI18N
+ private static final String STR_INTERFACE = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_INTERFACE" ); //NOI18N
+ private static final String STR_EXCEPTION = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_EXCEPTION" ); //NOI18N
+ private static final String STR_CONSTRUCTOR = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_CONSTRUCTOR" ); //NOI18N
+ private static final String STR_METHOD = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_METHOD" ); //NOI18N
+ private static final String STR_ERROR = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_ERROR" ); //NOI18N
+ private static final String STR_VARIABLE = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_VARIABLE" ); //NOI18N
+ private static final String STR_STATIC = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_STATIC" ); //NOI18N
+ private static final String STR_DASH = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_DASH" ); //NOI18N
+ private static final String STR_PACKAGE = NbBundle.getMessage(SearchThreadJdk12.class, "JDK12_PACKAGE" ); //NOI18N
private static final String STR_ENUM = NbBundle.getMessage(SearchThreadJdk12.class, "JDK15_ENUM"); //NOI18N
private static final String STR_ANNTYPE = NbBundle.getMessage(SearchThreadJdk12.class, "JDK15_ANNOTATION_TYPE"); //NOI18N
- static private final int IN_BALAST = 0;
- static private final int IN_DT = 1;
- static private final int IN_AREF = 2;
+ private static final int IN_BALAST = 0;
+ private static final int IN_DT = 1;
+ private static final int IN_AREF = 2;
// static private final int IN_B = 3;
- static private final int IN_DESCRIPTION = 4;
- static private final int IN_DESCRIPTION_SUFFIX = 5;
+ private static final int IN_DESCRIPTION = 4;
+ private static final int IN_DESCRIPTION_SUFFIX = 5;
/** This inner class parses the JDK 1.2 Documentation index and returns
* found indexItems.
diff --git a/java/javadoc/src/org/netbeans/modules/javadoc/search/SearchThreadJdk12_japan.java b/java/javadoc/src/org/netbeans/modules/javadoc/search/SearchThreadJdk12_japan.java
index a22aa9b..98753c6 100644
--- a/java/javadoc/src/org/netbeans/modules/javadoc/search/SearchThreadJdk12_japan.java
+++ b/java/javadoc/src/org/netbeans/modules/javadoc/search/SearchThreadJdk12_japan.java
@@ -207,39 +207,39 @@ class SearchThreadJdk12_japan extends IndexSearchThread {
/* These are constants for the inner class */
- static private final String STR_CLASS = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_CLASS" ); //NOI18N
- static private final String STR_INTERFACE = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_INTERFACE" ); //NOI18N
- static private final String STR_EXCEPTION = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_EXCEPTION" ); //NOI18N
- static private final String STR_CONSTRUCTOR = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_CONSTRUCTOR" ); //NOI18N
- static private final String STR_METHOD = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_METHOD" ); //NOI18N
- static private final String STR_ERROR = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_ERROR" ); //NOI18N
- static private final String STR_VARIABLE = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_VARIABLE" ); //NOI18N
- static private final String STR_STATIC = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_STATIC" ); //NOI18N
- static private final String STR_DASH = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_DASH" ); //NOI18N
- static private final String STR_PACKAGE = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_PACKAGE" ); //NOI18N
+ private static final String STR_CLASS = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_CLASS" ); //NOI18N
+ private static final String STR_INTERFACE = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_INTERFACE" ); //NOI18N
+ private static final String STR_EXCEPTION = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_EXCEPTION" ); //NOI18N
+ private static final String STR_CONSTRUCTOR = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_CONSTRUCTOR" ); //NOI18N
+ private static final String STR_METHOD = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_METHOD" ); //NOI18N
+ private static final String STR_ERROR = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_ERROR" ); //NOI18N
+ private static final String STR_VARIABLE = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_VARIABLE" ); //NOI18N
+ private static final String STR_STATIC = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_STATIC" ); //NOI18N
+ private static final String STR_DASH = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_DASH" ); //NOI18N
+ private static final String STR_PACKAGE = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK12_PACKAGE" ); //NOI18N
private static final String STR_ENUM = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK15_ENUM"); //NOI18N
private static final String STR_ANNTYPE = NbBundle.getMessage(SearchThreadJdk12_japan.class, "JDK15_ANNOTATION_TYPE"); //NOI18N
/* Same translations from JDK javadoc */
- static private final String STR_CLASS_LOC = "\u30AF\u30E9\u30B9"; //NOI18N
- static private final String STR_INTERFACE_LOC = "\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9"; //NOI18N
- static private final String STR_EXCEPTION_LOC = "\u4F8B\u5916"; //NOI18N
- static private final String STR_CONSTRUCTOR_LOC = "\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF"; //NOI18N
- static private final String STR_METHOD_LOC = "\u30E1\u30BD\u30C3\u30C9"; //NOI18N
- static private final String STR_ERROR_LOC = "\u30A8\u30E9\u30FC"; //NOI18N
- static private final String STR_VARIABLE_LOC = "\u5909\u6570"; //NOI18N
- static private final String STR_STATIC_LOC = "static"; //NOI18N
- static private final String STR_DASH_LOC = "-"; //NOI18N
- static private final String STR_PACKAGE_LOC = "\u30D1\u30C3\u30B1\u30FC\u30B8"; //NOI18N
+ private static final String STR_CLASS_LOC = "\u30AF\u30E9\u30B9"; //NOI18N
+ private static final String STR_INTERFACE_LOC = "\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9"; //NOI18N
+ private static final String STR_EXCEPTION_LOC = "\u4F8B\u5916"; //NOI18N
+ private static final String STR_CONSTRUCTOR_LOC = "\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF"; //NOI18N
+ private static final String STR_METHOD_LOC = "\u30E1\u30BD\u30C3\u30C9"; //NOI18N
+ private static final String STR_ERROR_LOC = "\u30A8\u30E9\u30FC"; //NOI18N
+ private static final String STR_VARIABLE_LOC = "\u5909\u6570"; //NOI18N
+ private static final String STR_STATIC_LOC = "static"; //NOI18N
+ private static final String STR_DASH_LOC = "-"; //NOI18N
+ private static final String STR_PACKAGE_LOC = "\u30D1\u30C3\u30B1\u30FC\u30B8"; //NOI18N
private static final String STR_ENUM_LOC = "\u5217\u6319\u578B"; //NOI18N
private static final String STR_ANNTYPE_LOC = "\u6CE8\u91C8\u578B"; //NOI18N
- static private final int IN_BALAST = 0;
- static private final int IN_DT = 1;
- static private final int IN_AREF = 2;
+ private static final int IN_BALAST = 0;
+ private static final int IN_DT = 1;
+ private static final int IN_AREF = 2;
// static private final int IN_B = 3;
- static private final int IN_DESCRIPTION = 4;
- static private final int IN_DESCRIPTION_SUFFIX = 5;
+ private static final int IN_DESCRIPTION = 4;
+ private static final int IN_DESCRIPTION_SUFFIX = 5;
/** This inner class parses the JDK 1.2 Documentation index and returns
* found indexItems.
diff --git a/java/jellytools.java/test/qa-functional/src/org/netbeans/jellytools/modules/form/FormEditorOperatorTest.java b/java/jellytools.java/test/qa-functional/src/org/netbeans/jellytools/modules/form/FormEditorOperatorTest.java
index e275969..786e3fb 100644
--- a/java/jellytools.java/test/qa-functional/src/org/netbeans/jellytools/modules/form/FormEditorOperatorTest.java
+++ b/java/jellytools.java/test/qa-functional/src/org/netbeans/jellytools/modules/form/FormEditorOperatorTest.java
@@ -39,7 +39,7 @@ import org.netbeans.jemmy.operators.JFrameOperator;
public class FormEditorOperatorTest extends JellyTestCase {
private static final String SAMPLE_FRAME = "JFrameSample.java";
- public final static String[] tests = new String[]{
+ public static final String[] tests = new String[]{
"testOpen",
"testSourceButton",
"testEditor",
diff --git a/java/jshell.support/src/org/netbeans/modules/jshell/editor/OverrideEditorActions.java b/java/jshell.support/src/org/netbeans/modules/jshell/editor/OverrideEditorActions.java
index 94382c9..4f726bb 100644
--- a/java/jshell.support/src/org/netbeans/modules/jshell/editor/OverrideEditorActions.java
+++ b/java/jshell.support/src/org/netbeans/modules/jshell/editor/OverrideEditorActions.java
@@ -214,7 +214,7 @@ public class OverrideEditorActions {
* They delegate to some action for the standard implementation, and
* divert under certain conditions (i.e. caret in the editable area etc)
*/
- public static abstract class DelegatingAction extends BaseAction {
+ public abstract static class DelegatingAction extends BaseAction {
/**
* Action ID to delegate, by default the action ID itself
*/
diff --git a/java/jshell.support/src/org/netbeans/modules/jshell/env/CompilerOptionsProvider.java b/java/jshell.support/src/org/netbeans/modules/jshell/env/CompilerOptionsProvider.java
index 695a5f0..5ecbd39 100644
--- a/java/jshell.support/src/org/netbeans/modules/jshell/env/CompilerOptionsProvider.java
+++ b/java/jshell.support/src/org/netbeans/modules/jshell/env/CompilerOptionsProvider.java
@@ -46,7 +46,7 @@ public final class CompilerOptionsProvider implements CompilerOptionsQueryImplem
return new R(jshe);
}
- final static class R extends Result {
+ static final class R extends Result {
private final JShellEnvironment env;
public R(JShellEnvironment env) {
diff --git a/java/jshell.support/src/org/netbeans/modules/jshell/env/SourceLevelProvider.java b/java/jshell.support/src/org/netbeans/modules/jshell/env/SourceLevelProvider.java
index ef24492..1a0a79c 100644
--- a/java/jshell.support/src/org/netbeans/modules/jshell/env/SourceLevelProvider.java
+++ b/java/jshell.support/src/org/netbeans/modules/jshell/env/SourceLevelProvider.java
@@ -44,7 +44,7 @@ public class SourceLevelProvider implements SourceLevelQueryImplementation2 {
return new R(jshe);
}
- final static class R implements Result {
+ static final class R implements Result {
private final JShellEnvironment jshe;
public R(JShellEnvironment jshe) {
diff --git a/java/jshell.support/src/org/netbeans/modules/jshell/launch/NIOStreams.java b/java/jshell.support/src/org/netbeans/modules/jshell/launch/NIOStreams.java
index b7dc64d..6242b19 100644
--- a/java/jshell.support/src/org/netbeans/modules/jshell/launch/NIOStreams.java
+++ b/java/jshell.support/src/org/netbeans/modules/jshell/launch/NIOStreams.java
@@ -241,7 +241,7 @@ class NIOStreams {
* Simple implementation of Output, which will block until the SocketChannel
* does not accept all the data to be sent.
*/
- private final static class Output extends OutputStream {
+ private static final class Output extends OutputStream {
private final SocketChannel channel;
private final Selector selector;
private final int timeout;
diff --git a/java/jshell.support/src/org/netbeans/modules/jshell/navigation/NavigationTask.java b/java/jshell.support/src/org/netbeans/modules/jshell/navigation/NavigationTask.java
index 8d4fc81..ef2f86b 100644
--- a/java/jshell.support/src/org/netbeans/modules/jshell/navigation/NavigationTask.java
+++ b/java/jshell.support/src/org/netbeans/modules/jshell/navigation/NavigationTask.java
@@ -71,7 +71,7 @@ public final class NavigationTask extends ParserResultTask<ConsoleContents>{
}
@MimeRegistration(service = TaskFactory.class, mimeType = "text/x-repl")
- public final static class Factory extends TaskFactory {
+ public static final class Factory extends TaskFactory {
@Override
public Collection<? extends SchedulerTask> create(Snapshot snapshot) {
diff --git a/java/jshell.support/src/org/netbeans/modules/jshell/support/PersistentSnippetsSupport.java b/java/jshell.support/src/org/netbeans/modules/jshell/support/PersistentSnippetsSupport.java
index 69be3ca..c6504ca 100644
--- a/java/jshell.support/src/org/netbeans/modules/jshell/support/PersistentSnippetsSupport.java
+++ b/java/jshell.support/src/org/netbeans/modules/jshell/support/PersistentSnippetsSupport.java
@@ -368,7 +368,7 @@ public class PersistentSnippetsSupport {
session.clearInputAndEvaluateExternal(execCommands, scriptFile.getName());
}
- final static class ProjectSnippetsFolder extends SnippetsFolder implements PropertyChangeListener {
+ static final class ProjectSnippetsFolder extends SnippetsFolder implements PropertyChangeListener {
final SnippetStorage projectStorage;
final Project project;
diff --git a/java/junit/src/org/netbeans/modules/junit/TestGeneratorSetup.java b/java/junit/src/org/netbeans/modules/junit/TestGeneratorSetup.java
index 30b0979..a8a544c 100644
--- a/java/junit/src/org/netbeans/modules/junit/TestGeneratorSetup.java
+++ b/java/junit/src/org/netbeans/modules/junit/TestGeneratorSetup.java
@@ -49,13 +49,13 @@ public final class TestGeneratorSetup implements TestabilityJudge {
/* the class is final only for performance reasons */
/* attributes - private */
- static private final String JUNIT_SUPER_CLASS_NAME = "TestCase";
- static private final String JUNIT_FRAMEWORK_PACKAGE_NAME = "junit.framework";
+ private static final String JUNIT_SUPER_CLASS_NAME = "TestCase";
+ private static final String JUNIT_FRAMEWORK_PACKAGE_NAME = "junit.framework";
- static private final String METHOD_NAME_SETUP = "setUp"; //NOI18N
- static private final String METHOD_NAME_TEARDOWN = "tearDown"; //NOI18N
- static private final String CLASS_COMMENT_LINE1 = "TestCreator.javaClass.addTestsHereComment.l1";
- static private final String CLASS_COMMENT_LINE2 = "TestCreator.javaClass.addTestsHereComment.l2";
+ private static final String METHOD_NAME_SETUP = "setUp"; //NOI18N
+ private static final String METHOD_NAME_TEARDOWN = "tearDown"; //NOI18N
+ private static final String CLASS_COMMENT_LINE1 = "TestCreator.javaClass.addTestsHereComment.l1";
+ private static final String CLASS_COMMENT_LINE2 = "TestCreator.javaClass.addTestsHereComment.l2";
/** should test classes be skipped during generation of tests? */
private boolean skipTestClasses = true;
diff --git a/java/junit/src/org/netbeans/modules/junit/api/JUnitTestUtil.java b/java/junit/src/org/netbeans/modules/junit/api/JUnitTestUtil.java
index 9f416db..f7aefa1 100644
--- a/java/junit/src/org/netbeans/modules/junit/api/JUnitTestUtil.java
+++ b/java/junit/src/org/netbeans/modules/junit/api/JUnitTestUtil.java
@@ -63,30 +63,30 @@ import org.openide.util.Utilities;
* @version 1.1
*/
public class JUnitTestUtil extends CommonTestUtil {
- static private final String JAVA_SOURCES_SUFFIX = "java";
+ private static final String JAVA_SOURCES_SUFFIX = "java";
private static final String JAVA_MIME_TYPE = "text/x-java"; //NOI18N
- static private String getTestClassSuffix() {
+ private static String getTestClassSuffix() {
return JUnitSettings.TEST_CLASSNAME_SUFFIX;
}
- static private String getIntegrationTestSuffix() {
+ private static String getIntegrationTestSuffix() {
return JUnitSettings.INTEGRATION_TEST_CLASSNAME_SUFFIX;
}
- static private String getTestClassPrefix() {
+ private static String getTestClassPrefix() {
return JUnitSettings.TEST_CLASSNAME_PREFIX;
}
- static private String getTestSuiteSuffix() {
+ private static String getTestSuiteSuffix() {
return JUnitSettings.SUITE_CLASSNAME_SUFFIX;
}
- static private String getTestSuitePrefix() {
+ private static String getTestSuitePrefix() {
return JUnitSettings.SUITE_CLASSNAME_PREFIX;
}
- static private String getRootSuiteName() {
+ private static String getRootSuiteName() {
return JUnitSettings.getDefault().getRootSuiteClassName();
}
@@ -441,7 +441,7 @@ public class JUnitTestUtil extends CommonTestUtil {
// return cls.getInnerClass(name, false);
// }
- static public String createNewName(int i, Set usedNames) {
+ public static String createNewName(int i, Set usedNames) {
String ret;
do {
ret = "p" + i++;
diff --git a/java/lib.jshell.agent/agentsrc/org/netbeans/lib/jshell/agent/AgentWorker.java b/java/lib.jshell.agent/agentsrc/org/netbeans/lib/jshell/agent/AgentWorker.java
index 269819f..d618be8 100644
--- a/java/lib.jshell.agent/agentsrc/org/netbeans/lib/jshell/agent/AgentWorker.java
+++ b/java/lib.jshell.agent/agentsrc/org/netbeans/lib/jshell/agent/AgentWorker.java
@@ -101,7 +101,7 @@ public class AgentWorker extends RemoteExecutionControl implements Executor, Run
* Threads which execute user code, keyed by agent's socket local port.
*/
// @GuardedBy(self)
- private final static Map<Integer, Thread> userCodeExecutingThreads = new HashMap<Integer, Thread>();
+ private static final Map<Integer, Thread> userCodeExecutingThreads = new HashMap<Integer, Thread>();
private AgentWorker() {
agent = null;
diff --git a/java/lib.jshell.agent/agentsrc/org/netbeans/lib/jshell/agent/NbJShellAgent.java b/java/lib.jshell.agent/agentsrc/org/netbeans/lib/jshell/agent/NbJShellAgent.java
index 2fccafd..6f01b45 100644
--- a/java/lib.jshell.agent/agentsrc/org/netbeans/lib/jshell/agent/NbJShellAgent.java
+++ b/java/lib.jshell.agent/agentsrc/org/netbeans/lib/jshell/agent/NbJShellAgent.java
@@ -69,7 +69,7 @@ public class NbJShellAgent implements Runnable, ClassFileTransformer {
* This field will be initialized at startup. The IDE will grab the value
* using JDI to associate a debugger Session with the appropriate incoming socket.
*/
- public volatile static String debuggerKey = ""; // NOI18N
+ public static volatile String debuggerKey = ""; // NOI18N
private static final Logger LOG = Logger.getLogger(NbJShellAgent.class.getName());
diff --git a/java/maven.grammar/src/org/netbeans/modules/maven/codegen/NewMirrorPanel.java b/java/maven.grammar/src/org/netbeans/modules/maven/codegen/NewMirrorPanel.java
index 965b252..b9e9d9e 100644
--- a/java/maven.grammar/src/org/netbeans/modules/maven/codegen/NewMirrorPanel.java
+++ b/java/maven.grammar/src/org/netbeans/modules/maven/codegen/NewMirrorPanel.java
@@ -56,10 +56,10 @@ public class NewMirrorPanel extends javax.swing.JPanel {
private SettingsModel model;
private NotificationLineSupport nls;
- private final static String ALL = "*"; //2.0.5+ //NOI18N
- private final static String ALL_NON_LOCAL = "external:*"; //2.0.9+ //NOI18N
- private final static String ALL_BUT_FOO = "*,!foo"; //2.0.9+ //NOI18N
- private final static String LIST = "foo,bar"; //2.0.9+ //NOI18N
+ private static final String ALL = "*"; //2.0.5+ //NOI18N
+ private static final String ALL_NON_LOCAL = "external:*"; //2.0.9+ //NOI18N
+ private static final String ALL_BUT_FOO = "*,!foo"; //2.0.9+ //NOI18N
+ private static final String LIST = "foo,bar"; //2.0.9+ //NOI18N
private final String[] MIRROROFS = new String[] {
RepositorySystem.DEFAULT_REMOTE_REPO_ID,
diff --git a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryPreferences.java b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryPreferences.java
index d1573c8..8ce3bbe 100644
--- a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryPreferences.java
+++ b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryPreferences.java
@@ -101,7 +101,7 @@ public final class RepositoryPreferences {
return NbPreferences.root().node("org/netbeans/modules/maven/repositories");
}
- public synchronized static RepositoryPreferences getInstance() {
+ public static synchronized RepositoryPreferences getInstance() {
if (instance == null) {
instance = new RepositoryPreferences();
}
diff --git a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryQueries.java b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryQueries.java
index 9c36af6..4a6d048 100644
--- a/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryQueries.java
+++ b/java/maven.indexer/src/org/netbeans/modules/maven/indexer/api/RepositoryQueries.java
@@ -66,7 +66,7 @@ public final class RepositoryQueries {
* @param <T>
* @since 2.9
*/
- public final static class Result<T> {
+ public static final class Result<T> {
private final ResultImplementation<T> impl;
/**
@@ -120,7 +120,7 @@ public final class RepositoryQueries {
}
}
- private final static class CompositeResult<T> implements ResultImplementation {
+ private static final class CompositeResult<T> implements ResultImplementation {
private final List<ResultImplementation<T>> results;
@@ -179,7 +179,7 @@ public final class RepositoryQueries {
/**
* One usage result.
*/
- public final static class ClassUsage {
+ public static final class ClassUsage {
private final NBVersionInfo artifact;
private final Set<String> classes;
public ClassUsage(NBVersionInfo artifact, Set<String> classes) {
diff --git a/java/maven.indexer/test/unit/src/org/netbeans/modules/maven/indexer/api/AbstractTestQueryProvider.java b/java/maven.indexer/test/unit/src/org/netbeans/modules/maven/indexer/api/AbstractTestQueryProvider.java
index df16118..d26dbd0 100644
--- a/java/maven.indexer/test/unit/src/org/netbeans/modules/maven/indexer/api/AbstractTestQueryProvider.java
+++ b/java/maven.indexer/test/unit/src/org/netbeans/modules/maven/indexer/api/AbstractTestQueryProvider.java
@@ -85,7 +85,7 @@ public abstract class AbstractTestQueryProvider implements RepositoryIndexQueryP
return false;
}
- abstract protected String getID();
+ protected abstract String getID();
@Override
public ArchetypeQueries getArchetypeQueries() {
diff --git a/java/maven/src/org/netbeans/modules/maven/ActionProviderImpl.java b/java/maven/src/org/netbeans/modules/maven/ActionProviderImpl.java
index 517744a..5091e42 100644
--- a/java/maven/src/org/netbeans/modules/maven/ActionProviderImpl.java
+++ b/java/maven/src/org/netbeans/modules/maven/ActionProviderImpl.java
@@ -521,7 +521,7 @@ public class ActionProviderImpl implements ActionProvider {
return new CustomAction(name, mapping, showUI, context, project);
}
- private final static class CustomAction extends AbstractAction {
+ private static final class CustomAction extends AbstractAction {
private final NetbeansActionMapping mapping;
private final boolean showUI;
@@ -625,7 +625,7 @@ public class ActionProviderImpl implements ActionProvider {
}
// XXX should this be an API somewhere?
- private static abstract class ConditionallyShownAction extends AbstractAction implements ContextAwareAction {
+ private abstract static class ConditionallyShownAction extends AbstractAction implements ContextAwareAction {
protected boolean triggeredOnFile = false;
protected boolean triggeredOnPom = false;
diff --git a/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java b/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java
index 2978382..4b9a23a 100644
--- a/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java
+++ b/java/maven/src/org/netbeans/modules/maven/NbMavenProjectImpl.java
@@ -204,7 +204,7 @@ public final class NbMavenProjectImpl implements Project {
}
- public static abstract class WatcherAccessor {
+ public abstract static class WatcherAccessor {
public abstract NbMavenProject createWatcher(NbMavenProjectImpl proj);
diff --git a/java/maven/src/org/netbeans/modules/maven/actions/CreateLibraryAction.java b/java/maven/src/org/netbeans/modules/maven/actions/CreateLibraryAction.java
index 19f5ae6..e704451 100644
--- a/java/maven/src/org/netbeans/modules/maven/actions/CreateLibraryAction.java
+++ b/java/maven/src/org/netbeans/modules/maven/actions/CreateLibraryAction.java
@@ -75,7 +75,7 @@ import org.openide.util.Utilities;
public class CreateLibraryAction extends AbstractAction implements LookupListener {
private final Lookup lookup;
private final Lookup.Result<DependencyNode> result;
- private final static @StaticResource String LIBRARIES_ICON = "org/netbeans/modules/maven/actions/libraries.gif";;
+ private static final @StaticResource String LIBRARIES_ICON = "org/netbeans/modules/maven/actions/libraries.gif";;
private boolean createRunning;
@Messages("ACT_Library=Create Library")
diff --git a/java/maven/src/org/netbeans/modules/maven/api/customizer/support/ReflectionTextComponentUpdater.java b/java/maven/src/org/netbeans/modules/maven/api/customizer/support/ReflectionTextComponentUpdater.java
index e448587..8c9a89d 100644
--- a/java/maven/src/org/netbeans/modules/maven/api/customizer/support/ReflectionTextComponentUpdater.java
+++ b/java/maven/src/org/netbeans/modules/maven/api/customizer/support/ReflectionTextComponentUpdater.java
@@ -141,7 +141,7 @@ public final class ReflectionTextComponentUpdater extends TextComponentUpdater {
}
- public static abstract class Operation implements ModelOperation<POMModel> {
+ public abstract static class Operation implements ModelOperation<POMModel> {
boolean isValueSet = false;
private String newValue;
diff --git a/java/maven/src/org/netbeans/modules/maven/api/output/OutputUtils.java b/java/maven/src/org/netbeans/modules/maven/api/output/OutputUtils.java
index 011d70f..88a8e09 100644
--- a/java/maven/src/org/netbeans/modules/maven/api/output/OutputUtils.java
+++ b/java/maven/src/org/netbeans/modules/maven/api/output/OutputUtils.java
@@ -146,7 +146,7 @@ public final class OutputUtils {
}
}
- private static abstract class StacktraceOutputListener implements OutputListener {
+ private abstract static class StacktraceOutputListener implements OutputListener {
protected abstract ClassPath getClassPath();
diff --git a/java/maven/src/org/netbeans/modules/maven/classpath/ClassPathProviderImpl.java b/java/maven/src/org/netbeans/modules/maven/classpath/ClassPathProviderImpl.java
index 0be2ffd..c6a7db4 100644
--- a/java/maven/src/org/netbeans/modules/maven/classpath/ClassPathProviderImpl.java
+++ b/java/maven/src/org/netbeans/modules/maven/classpath/ClassPathProviderImpl.java
@@ -76,25 +76,25 @@ public final class ClassPathProviderImpl implements ClassPathProvider, ActiveJ2S
private final @NonNull Project proj;
- private final static int SOURCE_PATH = 0; // TEST_SOURCE_PATH = 1
- private final static int COMPILE_TIME_PATH = 2; // TEST_COMPILE_TIME_PATH = 3
- private final static int RUNTIME_PATH = 4; // TEST_RUNTIME_PATH = 5
- private final static int BOOT_PATH = 6; // TEST_BOOT_PATH = 7
- private final static int ENDORSED_PATH = 8;
- private final static int MODULE_BOOT_PATH = 9;
- private final static int MODULE_COMPILE_PATH = 10; // TEST_MODULE_COMPILE_PATH = 11
- private final static int MODULE_LEGACY_PATH = 12; // TEST_MODULE_LEGACY_PATH = 13
-
- private final static int MODULE_EXECUTE_PATH = 14; // TEST_MODULE_EXECUTE_PATH = 15
- private final static int MODULE_EXECUTE_CLASS_PATH = 16; // TEST_MODULE_EXECUTE_CLASS_PATH = 17
-
- private final static int JAVA8_COMPILE_PATH = 18;
- private final static int JAVA8_TEST_COMPILE_PATH = 19;
- private final static int JAVA8_TEST_SCOPED_COMPILE_PATH = 20;
- private final static int JAVA8_RUNTIME_PATH = 21; // JAVA8_TEST_RUNTIME_PATH = 22
- private final static int JAVA8_TEST_SCOPED_RUNTIME_PATH = 23;
-
- private final static int ANNOTATION_PROC_PATH = 24; // TEST_ANNOTATION_PROC_PATH = 25
+ private static final int SOURCE_PATH = 0; // TEST_SOURCE_PATH = 1
+ private static final int COMPILE_TIME_PATH = 2; // TEST_COMPILE_TIME_PATH = 3
+ private static final int RUNTIME_PATH = 4; // TEST_RUNTIME_PATH = 5
+ private static final int BOOT_PATH = 6; // TEST_BOOT_PATH = 7
+ private static final int ENDORSED_PATH = 8;
+ private static final int MODULE_BOOT_PATH = 9;
+ private static final int MODULE_COMPILE_PATH = 10; // TEST_MODULE_COMPILE_PATH = 11
+ private static final int MODULE_LEGACY_PATH = 12; // TEST_MODULE_LEGACY_PATH = 13
+
+ private static final int MODULE_EXECUTE_PATH = 14; // TEST_MODULE_EXECUTE_PATH = 15
+ private static final int MODULE_EXECUTE_CLASS_PATH = 16; // TEST_MODULE_EXECUTE_CLASS_PATH = 17
+
+ private static final int JAVA8_COMPILE_PATH = 18;
+ private static final int JAVA8_TEST_COMPILE_PATH = 19;
+ private static final int JAVA8_TEST_SCOPED_COMPILE_PATH = 20;
+ private static final int JAVA8_RUNTIME_PATH = 21; // JAVA8_TEST_RUNTIME_PATH = 22
+ private static final int JAVA8_TEST_SCOPED_RUNTIME_PATH = 23;
+
+ private static final int ANNOTATION_PROC_PATH = 24; // TEST_ANNOTATION_PROC_PATH = 25
private final ClassPath[] cache = new ClassPath[26];
@@ -754,7 +754,7 @@ public final class ClassPathProviderImpl implements ClassPathProvider, ActiveJ2S
}
}
- private static abstract class ClassPathSelector implements org.netbeans.spi.java.classpath.support.ClassPathSupport.Selector {
+ private abstract static class ClassPathSelector implements org.netbeans.spi.java.classpath.support.ClassPathSupport.Selector {
protected final PropertyChangeSupport support = new PropertyChangeSupport(this);
protected final NbMavenProjectImpl proj;
diff --git a/java/maven/src/org/netbeans/modules/maven/customizer/CustomizerProviderImpl.java b/java/maven/src/org/netbeans/modules/maven/customizer/CustomizerProviderImpl.java
index 06b31b3..b11d801 100644
--- a/java/maven/src/org/netbeans/modules/maven/customizer/CustomizerProviderImpl.java
+++ b/java/maven/src/org/netbeans/modules/maven/customizer/CustomizerProviderImpl.java
@@ -281,7 +281,7 @@ public class CustomizerProviderImpl implements CustomizerProvider2 {
}
- public static abstract class ModelAccessor {
+ public abstract static class ModelAccessor {
public abstract void setConfigurationId(ModelHandle.Configuration cfg, String id);
public abstract ModelHandle createHandle(POMModel model, MavenProject proj, Map<String, ActionToGoalMapping> mapp,
@@ -289,7 +289,7 @@ public class CustomizerProviderImpl implements CustomizerProvider2 {
}
- public static abstract class ModelAccessor2 {
+ public abstract static class ModelAccessor2 {
public abstract ModelHandle2 createHandle(POMModel model, MavenProject proj, Map<String, ActionToGoalMapping> mapp,
List<ModelHandle2.Configuration> configs, ModelHandle2.Configuration active, MavenProjectPropsImpl auxProps);
diff --git a/java/maven/src/org/netbeans/modules/maven/dependencies/CheckNode.java b/java/maven/src/org/netbeans/modules/maven/dependencies/CheckNode.java
index fd75c1c..f9a07d0 100644
--- a/java/maven/src/org/netbeans/modules/maven/dependencies/CheckNode.java
+++ b/java/maven/src/org/netbeans/modules/maven/dependencies/CheckNode.java
@@ -31,8 +31,8 @@ import javax.swing.tree.*;
*/
public class CheckNode extends DefaultMutableTreeNode {
- public final static int SINGLE_SELECTION = 0;
- public final static int DIG_IN_SELECTION = 4;
+ public static final int SINGLE_SELECTION = 0;
+ public static final int DIG_IN_SELECTION = 4;
private int selectionMode;
private boolean isSelected;
diff --git a/java/maven/src/org/netbeans/modules/maven/execute/ActionToGoalUtils.java b/java/maven/src/org/netbeans/modules/maven/execute/ActionToGoalUtils.java
index d8aa361..d89f896 100644
--- a/java/maven/src/org/netbeans/modules/maven/execute/ActionToGoalUtils.java
+++ b/java/maven/src/org/netbeans/modules/maven/execute/ActionToGoalUtils.java
@@ -77,7 +77,7 @@ public final class ActionToGoalUtils {
}
- public static abstract class ContextAccessor {
+ public abstract static class ContextAccessor {
public abstract ExecutionContext createContext(InputOutput inputoutput, ProgressHandle handle);
}
diff --git a/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java b/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java
index 070a8ff..05dbf93 100644
--- a/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java
+++ b/java/maven/src/org/netbeans/modules/maven/execute/MavenCommandLineExecutor.java
@@ -143,7 +143,7 @@ public class MavenCommandLineExecutor extends AbstractMavenExecutor {
private static final RequestProcessor RP = new RequestProcessor(MavenCommandLineExecutor.class.getName(),1);
- private final static RequestProcessor UPDATE_INDEX_RP = new RequestProcessor(RunUtils.class.getName(), 5);
+ private static final RequestProcessor UPDATE_INDEX_RP = new RequestProcessor(RunUtils.class.getName(), 5);
/**
* Execute maven build in NetBeans execution engine.
* Most callers should rather use {@link #run} as this variant does no (non-late-bound) prerequisite checks.
diff --git a/java/maven/src/org/netbeans/modules/maven/execute/ModelRunConfig.java b/java/maven/src/org/netbeans/modules/maven/execute/ModelRunConfig.java
index f7c4893..0ed52f2 100644
--- a/java/maven/src/org/netbeans/modules/maven/execute/ModelRunConfig.java
+++ b/java/maven/src/org/netbeans/modules/maven/execute/ModelRunConfig.java
@@ -43,7 +43,7 @@ import org.openide.util.Lookup;
*/
public final class ModelRunConfig extends BeanRunConfig {
- private final static Logger LOG = Logger.getLogger(ModelRunConfig.class.getName());
+ private static final Logger LOG = Logger.getLogger(ModelRunConfig.class.getName());
private final NetbeansActionMapping model;
private final boolean fallback;
diff --git a/java/maven/src/org/netbeans/modules/maven/nodes/DependenciesNode.java b/java/maven/src/org/netbeans/modules/maven/nodes/DependenciesNode.java
index f30cce6..d6304a4 100644
--- a/java/maven/src/org/netbeans/modules/maven/nodes/DependenciesNode.java
+++ b/java/maven/src/org/netbeans/modules/maven/nodes/DependenciesNode.java
@@ -250,7 +250,7 @@ public class DependenciesNode extends AbstractNode {
}
}
- private final static class DependencyWrapper {
+ private static final class DependencyWrapper {
private final Artifact artifact;
private final FileObject fileObject;
diff --git a/java/maven/src/org/netbeans/modules/maven/options/SettingsPanel.java b/java/maven/src/org/netbeans/modules/maven/options/SettingsPanel.java
index c64ac0c..3df8aff 100644
--- a/java/maven/src/org/netbeans/modules/maven/options/SettingsPanel.java
+++ b/java/maven/src/org/netbeans/modules/maven/options/SettingsPanel.java
@@ -93,7 +93,7 @@ public class SettingsPanel extends javax.swing.JPanel {
private final DefaultComboBoxModel jdkHomeDataModel = new DefaultComboBoxModel();
private String mavenRuntimeHome = null;
private int lastSelected = -1;
- private final static RequestProcessor RP = new RequestProcessor(SettingsPanel.class);
+ private static final RequestProcessor RP = new RequestProcessor(SettingsPanel.class);
private static class ComboBoxRenderer extends DefaultListCellRenderer {
diff --git a/java/maven/src/org/netbeans/modules/maven/queries/RepositoryForBinaryQueryImpl.java b/java/maven/src/org/netbeans/modules/maven/queries/RepositoryForBinaryQueryImpl.java
index 8898f27..89604ed 100644
--- a/java/maven/src/org/netbeans/modules/maven/queries/RepositoryForBinaryQueryImpl.java
+++ b/java/maven/src/org/netbeans/modules/maven/queries/RepositoryForBinaryQueryImpl.java
@@ -296,7 +296,7 @@ public class RepositoryForBinaryQueryImpl extends AbstractMavenForBinaryQueryImp
private final PropertyChangeListener projectListener;
private final FileChangeListener sourceJarChangeListener;
private final RequestProcessor.Task checkChangesTask;
- private final static int CHECK_CHANGES_DELAY = 50;
+ private static final int CHECK_CHANGES_DELAY = 50;
private final String groupId;
private final String artifactId;
private final String version;
diff --git a/java/maven/src/org/netbeans/modules/maven/runjar/MavenExecuteUtils.java b/java/maven/src/org/netbeans/modules/maven/runjar/MavenExecuteUtils.java
index 6c747af..5876fe8 100644
--- a/java/maven/src/org/netbeans/modules/maven/runjar/MavenExecuteUtils.java
+++ b/java/maven/src/org/netbeans/modules/maven/runjar/MavenExecuteUtils.java
@@ -97,7 +97,7 @@ public final class MavenExecuteUtils {
* made on the helper instance. Use {@link #createExecutionEnvHelper}
* to make an instance.
*/
- public final static class ExecutionEnvHelper {
+ public static final class ExecutionEnvHelper {
private final ActionToGoalMapping goalMappings;
private final NbMavenProjectImpl project;
diff --git a/java/nashorn.execution/src/org/netbeans/modules/nashorn/execution/actions/ExecJSAction.java b/java/nashorn.execution/src/org/netbeans/modules/nashorn/execution/actions/ExecJSAction.java
index fcff4b2..ecf98e8 100644
--- a/java/nashorn.execution/src/org/netbeans/modules/nashorn/execution/actions/ExecJSAction.java
+++ b/java/nashorn.execution/src/org/netbeans/modules/nashorn/execution/actions/ExecJSAction.java
@@ -97,7 +97,7 @@ abstract class ExecJSAction extends AbstractAction implements ContextAwareAction
return Utilities.actionsGlobalContext().lookup(FileObject.class);
}
- abstract protected void exec(JavaPlatform javaPlatform, FileObject fo) throws IOException, UnsupportedOperationException;
+ protected abstract void exec(JavaPlatform javaPlatform, FileObject fo) throws IOException, UnsupportedOperationException;
@Override
public void stateChanged(ChangeEvent e) {
diff --git a/java/performance/actionsframework/src/org/netbeans/actions/spi/ContextProviderSupport.java b/java/performance/actionsframework/src/org/netbeans/actions/spi/ContextProviderSupport.java
index ea6bb07..39d94dc 100644
--- a/java/performance/actionsframework/src/org/netbeans/actions/spi/ContextProviderSupport.java
+++ b/java/performance/actionsframework/src/org/netbeans/actions/spi/ContextProviderSupport.java
@@ -97,7 +97,7 @@ public final class ContextProviderSupport implements ContextProvider {
/** Implementation of Contributor which takes fixed arrays of keys and
* values */
- public static abstract class FixedContributor implements Contributor {
+ public abstract static class FixedContributor implements Contributor {
public final Map getContribution() {
return new FixedMap(getKeys(), getValues());
}
@@ -114,7 +114,7 @@ public final class ContextProviderSupport implements ContextProvider {
* Note that the map that will actually be used is a snapshot of the map
* returned, taken at the time of updating.
*/
- public static abstract class ActiveContributor implements Contributor {
+ public abstract static class ActiveContributor implements Contributor {
public abstract Map getContribution();
Map toFixedMap() {
diff --git a/java/performance/mobility/test/qa-functional/src/org/netbeans/performance/mobility/actions/OpenMIDletEditorTest.java b/java/performance/mobility/test/qa-functional/src/org/netbeans/performance/mobility/actions/OpenMIDletEditorTest.java
index dcb92f3..7c48b95 100644
--- a/java/performance/mobility/test/qa-functional/src/org/netbeans/performance/mobility/actions/OpenMIDletEditorTest.java
+++ b/java/performance/mobility/test/qa-functional/src/org/netbeans/performance/mobility/actions/OpenMIDletEditorTest.java
@@ -45,7 +45,7 @@ public class OpenMIDletEditorTest extends PerformanceTestCase {
private String targetProject;
private String midletName;
private ProjectsTabOperator pto;
- public final static long EXPECTED_TIME = 10000;
+ public static final long EXPECTED_TIME = 10000;
protected static String OPEN = org.netbeans.jellytools.Bundle.getStringTrimmed("org.openide.actions.Bundle", "Open");
/**
diff --git a/java/performance/src/org/netbeans/modules/performance/guitracker/ActionTracker.java b/java/performance/src/org/netbeans/modules/performance/guitracker/ActionTracker.java
index ddf21d7..3dbbcf3 100644
--- a/java/performance/src/org/netbeans/modules/performance/guitracker/ActionTracker.java
+++ b/java/performance/src/org/netbeans/modules/performance/guitracker/ActionTracker.java
@@ -69,38 +69,38 @@ public class ActionTracker {
/**
* Start of a sequence of recorded events.
*/
- public final static int TRACK_START = 1;
+ public static final int TRACK_START = 1;
/**
* Painting happened. @see Painter
*/
- public final static int TRACK_PAINT = 2;
+ public static final int TRACK_PAINT = 2;
/**
* MOUSE_PRESSED event.
*/
- public final static int TRACK_MOUSE_PRESS = 10;
+ public static final int TRACK_MOUSE_PRESS = 10;
/**
* MOUSE_RELEASED event.
*/
- public final static int TRACK_MOUSE_RELEASE = 11;
+ public static final int TRACK_MOUSE_RELEASE = 11;
/**
* MOUSE_DRAGGED event.
*/
- public final static int TRACK_MOUSE_DRAGGED = 12;
+ public static final int TRACK_MOUSE_DRAGGED = 12;
/**
* MOUSE_MOVED event.
*/
- public final static int TRACK_MOUSE_MOVED = 13;
+ public static final int TRACK_MOUSE_MOVED = 13;
/**
* KEY_PRESSED event.
*/
- public final static int TRACK_KEY_PRESS = 20;
+ public static final int TRACK_KEY_PRESS = 20;
/**
* KEY_RELEASED event.
*/
- public final static int TRACK_KEY_RELEASE = 21;
+ public static final int TRACK_KEY_RELEASE = 21;
private static final int TRACK_FRAME = 1000;
private static final int TRACK_DIALOG = 2000;
@@ -122,110 +122,110 @@ public class ActionTracker {
/**
* COMPONENT_SHOWN event happened on a Dialog or JDialog.
*/
- public final static int TRACK_DIALOG_SHOW = TRACK_DIALOG + ComponentEvent.COMPONENT_SHOWN;
+ public static final int TRACK_DIALOG_SHOW = TRACK_DIALOG + ComponentEvent.COMPONENT_SHOWN;
/**
* COMPONENT_HIDDEN event happened on a Dialog or JDialog.
*/
- public final static int TRACK_DIALOG_HIDE = TRACK_DIALOG + ComponentEvent.COMPONENT_HIDDEN;
+ public static final int TRACK_DIALOG_HIDE = TRACK_DIALOG + ComponentEvent.COMPONENT_HIDDEN;
/**
* COMPONENT_RESIZED event happened on a Dialog or JDialog.
*/
- public final static int TRACK_DIALOG_RESIZE = TRACK_DIALOG + ComponentEvent.COMPONENT_RESIZED;
+ public static final int TRACK_DIALOG_RESIZE = TRACK_DIALOG + ComponentEvent.COMPONENT_RESIZED;
/**
* COMPONENT_SHOWN event happened on a Component.
*/
- public final static int TRACK_COMPONENT_SHOW = TRACK_COMPONENT + ComponentEvent.COMPONENT_SHOWN;
+ public static final int TRACK_COMPONENT_SHOW = TRACK_COMPONENT + ComponentEvent.COMPONENT_SHOWN;
/**
* COMPONENT_HIDDEN event happened on a Component.
*/
- public final static int TRACK_COMPONENT_HIDE = TRACK_COMPONENT + ComponentEvent.COMPONENT_HIDDEN;
+ public static final int TRACK_COMPONENT_HIDE = TRACK_COMPONENT + ComponentEvent.COMPONENT_HIDDEN;
/**
* COMPONENT_RESIZED event happened on a Component.
*/
- public final static int TRACK_COMPONENT_RESIZE = TRACK_COMPONENT + ComponentEvent.COMPONENT_RESIZED;
+ public static final int TRACK_COMPONENT_RESIZE = TRACK_COMPONENT + ComponentEvent.COMPONENT_RESIZED;
/**
* Any messages the application wants to send.
*/
- public final static int TRACK_APPLICATION_MESSAGE = 50;
+ public static final int TRACK_APPLICATION_MESSAGE = 50;
/**
* Any messages the application wants to send.
*/
- public final static int TRACK_CONFIG_APPLICATION_MESSAGE = 51;
+ public static final int TRACK_CONFIG_APPLICATION_MESSAGE = 51;
/**
* Before/After messages.
*/
- public final static int TRACK_TRACE_MESSAGE = 52;
+ public static final int TRACK_TRACE_MESSAGE = 52;
/**
* Should be used only for value of MY_START_EVENT or MY_END_EVENT
*/
- public final static int TRACK_OPEN_BEFORE_TRACE_MESSAGE = TRACK_TRACE_MESSAGE + 1;
+ public static final int TRACK_OPEN_BEFORE_TRACE_MESSAGE = TRACK_TRACE_MESSAGE + 1;
/**
* Should be used only for value of MY_START_EVENT or MY_END_EVENT
*/
- public final static int TRACK_OPEN_AFTER_TRACE_MESSAGE = TRACK_TRACE_MESSAGE + 2;
+ public static final int TRACK_OPEN_AFTER_TRACE_MESSAGE = TRACK_TRACE_MESSAGE + 2;
/**
* FOCUS_GAINED event
*/
- public final static int TRACK_FOCUS_GAINED = 80;
+ public static final int TRACK_FOCUS_GAINED = 80;
/**
* FOCUS_LOST event
*/
- public final static int TRACK_FOCUS_LOST = 81;
+ public static final int TRACK_FOCUS_LOST = 81;
/**
* unknown event
*/
- public final static int TRACK_INVOCATION = 82;
+ public static final int TRACK_INVOCATION = 82;
/**
* unknown event
*/
- public final static int TRACK_UNKNOWN = 83;
+ public static final int TRACK_UNKNOWN = 83;
/**
* The name of the root element in generated XML.
*/
- public final static String TN_ROOT_ELEMENT = "action-tracking";
+ public static final String TN_ROOT_ELEMENT = "action-tracking";
/**
* The name of the event-list element in generated XML.
*/
- public final static String TN_EVENT_LIST = "event-list";
+ public static final String TN_EVENT_LIST = "event-list";
/**
* The name of each event element in generated XML.
*/
- public final static String TN_EVENT = "event";
+ public static final String TN_EVENT = "event";
/**
* The attribute name for start time.
*/
- public final static String ATTR_START = "start";
+ public static final String ATTR_START = "start";
/**
* The attribute name for descriptive phrase.
*/
- public final static String ATTR_NAME = "name";
+ public static final String ATTR_NAME = "name";
/**
* The attribute name for the node-type.
*/
- public final static String ATTR_TYPE = "type";
+ public static final String ATTR_TYPE = "type";
/**
* The attribute name for the timestamp.
*/
- public final static String ATTR_TIME = "time";
+ public static final String ATTR_TIME = "time";
/**
* The attribute name for calculated time difference since the start.
*/
- public final static String ATTR_TIME_DIFF_START = "diff";
+ public static final String ATTR_TIME_DIFF_START = "diff";
/**
* The attribute name for calculated time difference since the last
* MOUSE_DRAGGED event.
*/
- public final static String ATTR_TIME_DIFF_DRAG = "diffdrag";
+ public static final String ATTR_TIME_DIFF_DRAG = "diffdrag";
/**
* The attribute measured for events we are measuring one start + one stop.
*/
- public final static String ATTR_MEASURED = "measured";
+ public static final String ATTR_MEASURED = "measured";
// Instance of the ActionTracker
private static ActionTracker instance = null;
diff --git a/java/performance/src/org/netbeans/modules/performance/utilities/MeasureStartupTimeTestCase.java b/java/performance/src/org/netbeans/modules/performance/utilities/MeasureStartupTimeTestCase.java
index 11d518a..6c9b319 100644
--- a/java/performance/src/org/netbeans/modules/performance/utilities/MeasureStartupTimeTestCase.java
+++ b/java/performance/src/org/netbeans/modules/performance/utilities/MeasureStartupTimeTestCase.java
@@ -79,7 +79,7 @@ public class MeasureStartupTimeTestCase extends org.netbeans.junit.NbPerformance
/**
* Number used for unknown time.
*/
- protected final static long UNKNOWN_TIME = -1;
+ protected static final long UNKNOWN_TIME = -1;
/**
* Table of the supported platforms.
diff --git a/java/performance/threaddemo/src/threaddemo/locking/EventLock.java b/java/performance/threaddemo/src/threaddemo/locking/EventLock.java
index 95bd0db..351c319 100644
--- a/java/performance/threaddemo/src/threaddemo/locking/EventLock.java
+++ b/java/performance/threaddemo/src/threaddemo/locking/EventLock.java
@@ -36,7 +36,7 @@ import org.openide.util.Utilities;
*/
final class EventLock implements RWLock {
- public final static RWLock DEFAULT = new EventLock();
+ public static final RWLock DEFAULT = new EventLock();
private EventLock() {}
diff --git a/java/performance/threaddemo/src/threaddemo/util/TwoWaySupport.java b/java/performance/threaddemo/src/threaddemo/util/TwoWaySupport.java
index 322c7b7..0e2ffed 100644
--- a/java/performance/threaddemo/src/threaddemo/util/TwoWaySupport.java
+++ b/java/performance/threaddemo/src/threaddemo/util/TwoWaySupport.java
@@ -271,7 +271,7 @@ public abstract class TwoWaySupport<DM, UMD, DMD> {
* to pass to {@link TwoWayEvent.Derived}, which may be useful for subclasses
* firing changes.
*/
- protected final static class DerivationResult<DM, DMD> {
+ protected static final class DerivationResult<DM, DMD> {
final DM newValue;
final DMD derivedDelta;
/**
diff --git a/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/EclipseProjectReference.java b/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/EclipseProjectReference.java
index 19142ad..48a6308 100644
--- a/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/EclipseProjectReference.java
+++ b/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/EclipseProjectReference.java
@@ -58,8 +58,8 @@ public class EclipseProjectReference {
private EclipseProject eclipseProject;
private ProjectImportModel importModel;
- private final static String PROJECT_PREFIX = "project-"; //NOI18N
- private final static String WORKSPACE_PREFIX = "workspace-"; //NOI18N
+ private static final String PROJECT_PREFIX = "project-"; //NOI18N
+ private static final String WORKSPACE_PREFIX = "workspace-"; //NOI18N
public EclipseProjectReference(Project project, String eclipseProjectLocation, String eclipseWorkspaceLocation, long timestamp, String key) {
this.eclipseProjectLocation = PropertyUtils.resolveFile(FileUtil.toFile(project.getProjectDirectory()), eclipseProjectLocation);
diff --git a/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/UpgradableProject.java b/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/UpgradableProject.java
index 77775db..cf2d552 100644
--- a/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/UpgradableProject.java
+++ b/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/UpgradableProject.java
@@ -33,7 +33,7 @@ import org.openide.util.MutexException;
/**
*
*/
-final public class UpgradableProject {
+public final class UpgradableProject {
private Project project;
private EclipseProjectReference reference;
diff --git a/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/spi/UpgradableProjectLookupProvider.java b/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/spi/UpgradableProjectLookupProvider.java
index 9b42069..e50bb3e 100644
--- a/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/spi/UpgradableProjectLookupProvider.java
+++ b/java/projectimport.eclipse.core/src/org/netbeans/modules/projectimport/eclipse/core/spi/UpgradableProjectLookupProvider.java
@@ -28,7 +28,7 @@ import org.openide.util.Lookup;
import org.openide.util.lookup.Lookups;
// registered separately in j2se and web modules, otherwise could use @LookupProvider.Registration
-final public class UpgradableProjectLookupProvider implements LookupProvider {
+public final class UpgradableProjectLookupProvider implements LookupProvider {
public Lookup createAdditionalLookup(Lookup baseContext) {
Project p = baseContext.lookup(Project.class);
diff --git a/java/projectimport.eclipse.core/test/qa-functional/src/org/netbeans/modules/projectimport/eclipse/gui/ProjectImporterTestCase.java b/java/projectimport.eclipse.core/test/qa-functional/src/org/netbeans/modules/projectimport/eclipse/gui/ProjectImporterTestCase.java
index dfc1aa4..55145d2 100644
--- a/java/projectimport.eclipse.core/test/qa-functional/src/org/netbeans/modules/projectimport/eclipse/gui/ProjectImporterTestCase.java
+++ b/java/projectimport.eclipse.core/test/qa-functional/src/org/netbeans/modules/projectimport/eclipse/gui/ProjectImporterTestCase.java
@@ -43,7 +43,7 @@ import org.openide.util.test.TestFileUtils;
*/
public abstract class ProjectImporterTestCase extends NbTestCase {
- private final static String caption = Bundle.getStringTrimmed("org.netbeans.modules.projectimport.eclipse.core.wizard.Bundle", "CTL_WizardTitle");
+ private static final String caption = Bundle.getStringTrimmed("org.netbeans.modules.projectimport.eclipse.core.wizard.Bundle", "CTL_WizardTitle");
protected ProjectsTabOperator pto = null;
public ProjectImporterTestCase(String testName) {
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/callhierarchy/CallHierarchyTasks.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/callhierarchy/CallHierarchyTasks.java
index 3c4027f..7e83260 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/callhierarchy/CallHierarchyTasks.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/callhierarchy/CallHierarchyTasks.java
@@ -238,7 +238,7 @@ final class CallHierarchyTasks {
}
- private static abstract class CallTaskBase implements Runnable, CancellableTask<CompilationController> {
+ private abstract static class CallTaskBase implements Runnable, CancellableTask<CompilationController> {
protected final Call elmDesc;
private final Runnable resultHandler;
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/callhierarchy/CallHierarchyTopComponent.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/callhierarchy/CallHierarchyTopComponent.java
index 40f4551..8a3f77d 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/callhierarchy/CallHierarchyTopComponent.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/callhierarchy/CallHierarchyTopComponent.java
@@ -393,7 +393,7 @@ private void jMenuItemScopeActionPerformed(java.awt.event.ActionEvent evt) {//GE
return beanTreeView.requestFocusInWindow();
}
- final static class ResolvableHelper implements Serializable {
+ static final class ResolvableHelper implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ChangeParamsTransformer.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ChangeParamsTransformer.java
index 19a5e84..cd8e624 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ChangeParamsTransformer.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ChangeParamsTransformer.java
@@ -917,9 +917,9 @@ public class ChangeParamsTransformer extends RefactoringVisitor {
*/
private static class TagComparator implements Comparator<DocTree> {
- private final static int HIGHER = -1;
- private final static int EQUAL = 0;
- private final static int LOWER = 1;
+ private static final int HIGHER = -1;
+ private static final int EQUAL = 0;
+ private static final int LOWER = 1;
@Override
public int compare(DocTree t, DocTree t1) {
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ExtractInterfaceRefactoringPlugin.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ExtractInterfaceRefactoringPlugin.java
index 3216e08..dc17fc1 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ExtractInterfaceRefactoringPlugin.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ExtractInterfaceRefactoringPlugin.java
@@ -271,7 +271,7 @@ public final class ExtractInterfaceRefactoringPlugin extends JavaRefactoringPlug
// --- REFACTORING ELEMENTS ------------------------------------------------
- private final static class UpdateClassTask implements CancellableTask<WorkingCopy> {
+ private static final class UpdateClassTask implements CancellableTask<WorkingCopy> {
private final ExtractInterfaceRefactoring refactoring;
private final ElementHandle<TypeElement> sourceType;
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ExtractSuperclassRefactoringPlugin.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ExtractSuperclassRefactoringPlugin.java
index f09cec1..b2e1417 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ExtractSuperclassRefactoringPlugin.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/plugins/ExtractSuperclassRefactoringPlugin.java
@@ -272,7 +272,7 @@ public final class ExtractSuperclassRefactoringPlugin extends JavaRefactoringPlu
return problem;
}
- private final static class ExtractSuperclassTransformer extends RefactoringVisitor {
+ private static final class ExtractSuperclassTransformer extends RefactoringVisitor {
private final ExtractSuperclassRefactoring refactoring;
private final ElementHandle<TypeElement> sourceType;
private List<Tree> members;
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ContextAnalyzer.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ContextAnalyzer.java
index 5e86a68..b0ecdf5 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ContextAnalyzer.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ContextAnalyzer.java
@@ -183,7 +183,7 @@ public final class ContextAnalyzer {
return !notOnlyFile;
}
- private static abstract class TreePathHandleTask implements Runnable, CancellableTask<CompilationController> {
+ private abstract static class TreePathHandleTask implements Runnable, CancellableTask<CompilationController> {
private Collection<TreePathHandle> handles = new ArrayList<TreePathHandle>();
private TreePathHandle current;
private FileObject file;
@@ -277,7 +277,7 @@ public final class ContextAnalyzer {
protected abstract RefactoringUI createRefactoringUI(Collection<TreePathHandle> handles);
}
- private static abstract class TextComponentTask implements Runnable, CancellableTask<CompilationController> {
+ private abstract static class TextComponentTask implements Runnable, CancellableTask<CompilationController> {
private JTextComponent textC;
private int caret;
private int start;
@@ -480,7 +480,7 @@ public final class ContextAnalyzer {
return false;
}
- private static abstract class NodeToElementTask implements Runnable, CancellableTask<CompilationController> {
+ private abstract static class NodeToElementTask implements Runnable, CancellableTask<CompilationController> {
private Node node;
private RefactoringUI ui;
@@ -526,7 +526,7 @@ public final class ContextAnalyzer {
protected abstract RefactoringUI createRefactoringUI(TreePathHandle selectedElement, CompilationInfo info);
}
- private static abstract class NodeToFileObjectTask implements Runnable, CancellableTask<CompilationController> {
+ private abstract static class NodeToFileObjectTask implements Runnable, CancellableTask<CompilationController> {
private Collection<? extends Node> nodes;
public ArrayList<NonRecursiveFolder> pkg;
Collection<TreePathHandle> handles = new ArrayList<TreePathHandle>();
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ReplaceConstructorWithBuilderPanel.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ReplaceConstructorWithBuilderPanel.java
index 3e30222..4ab1916 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ReplaceConstructorWithBuilderPanel.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ReplaceConstructorWithBuilderPanel.java
@@ -38,7 +38,7 @@ import org.openide.util.NbBundle;
*/
public class ReplaceConstructorWithBuilderPanel extends javax.swing.JPanel implements CustomRefactoringPanel {
- private final static String DEFAULT_PREFIX = "set";
+ private static final String DEFAULT_PREFIX = "set";
private static final String[] columnNames = {
getString("LBL_BuilderParameter"), // NOI18N
getString("LBL_BuilderSetterName"), // NOI18N
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/WhereUsedPanel.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/WhereUsedPanel.java
index 583ac8d..3332292 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/WhereUsedPanel.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/WhereUsedPanel.java
@@ -171,7 +171,7 @@ public class WhereUsedPanel extends JPanel implements CustomRefactoringPanel {
initialized = true;
}
- static abstract class WhereUsedInnerPanel extends JPanel {
+ abstract static class WhereUsedInnerPanel extends JPanel {
abstract boolean isSearchInComments();
abstract void initialize(Element element, CompilationController info);
}
diff --git a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/scope/CustomScopePanel.java b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/scope/CustomScopePanel.java
index 3031685..cf84e5f 100644
--- a/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/scope/CustomScopePanel.java
+++ b/java/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/scope/CustomScopePanel.java
@@ -376,7 +376,7 @@ public class CustomScopePanel extends javax.swing.JPanel implements ExplorerMana
}
}
- private static abstract class CustomNode extends AbstractNode implements PropertyChangeListener {
+ private abstract static class CustomNode extends AbstractNode implements PropertyChangeListener {
protected final CustomScopePanel panel;
private final Data data;
diff --git a/java/refactoring.java/test/qa-functional/src/org/netbeans/modules/test/refactoring/RefactoringTestCase.java b/java/refactoring.java/test/qa-functional/src/org/netbeans/modules/test/refactoring/RefactoringTestCase.java
index b86d97f..3f7aeb6 100644
--- a/java/refactoring.java/test/qa-functional/src/org/netbeans/modules/test/refactoring/RefactoringTestCase.java
+++ b/java/refactoring.java/test/qa-functional/src/org/netbeans/modules/test/refactoring/RefactoringTestCase.java
@@ -68,7 +68,7 @@ public abstract class RefactoringTestCase extends JellyTestCase {
* root then this values will be sorted before dumping to ref file
*/
public static int sortLevel = 2;
- protected final static String REFACTORING_TEST = "RefactoringTest";
+ protected static final String REFACTORING_TEST = "RefactoringTest";
public RefactoringTestCase(String name) {
super(name);
diff --git a/java/selenium2.maven/src/org/netbeans/modules/selenium2/maven/Selenium2MavenSupportImpl.java b/java/selenium2.maven/src/org/netbeans/modules/selenium2/maven/Selenium2MavenSupportImpl.java
index 19ad39e..e9b1b1d 100644
--- a/java/selenium2.maven/src/org/netbeans/modules/selenium2/maven/Selenium2MavenSupportImpl.java
+++ b/java/selenium2.maven/src/org/netbeans/modules/selenium2/maven/Selenium2MavenSupportImpl.java
@@ -68,13 +68,13 @@ import org.openide.util.lookup.ServiceProvider;
@ServiceProvider(service = Selenium2SupportImpl.class)
public class Selenium2MavenSupportImpl extends Selenium2SupportImpl {
- private final static String JUNIT_GROUP_ID = "junit"; //NOI18N
- private final static String JUNIT_ARTIFACT_ID = "junit"; //NOI18N
- private final static String SELENIUM_GROUP_ID = "org.seleniumhq.selenium"; //NOI18N
- private final static String SELENIUM_ARTIFACT_ID = "selenium-java"; //NOI18N
- private final static String SELENIUM_REMOTE_DRIVER_ARTIFACT_ID = "selenium-remote-driver"; //NOI18N
- private final static String OPERA_GROUP_ID = "com.opera"; //NOI18N
- private final static String OPERA_ARTIFACT_ID = "operadriver"; //NOI18N
+ private static final String JUNIT_GROUP_ID = "junit"; //NOI18N
+ private static final String JUNIT_ARTIFACT_ID = "junit"; //NOI18N
+ private static final String SELENIUM_GROUP_ID = "org.seleniumhq.selenium"; //NOI18N
+ private static final String SELENIUM_ARTIFACT_ID = "selenium-java"; //NOI18N
+ private static final String SELENIUM_REMOTE_DRIVER_ARTIFACT_ID = "selenium-remote-driver"; //NOI18N
+ private static final String OPERA_GROUP_ID = "com.opera"; //NOI18N
+ private static final String OPERA_ARTIFACT_ID = "operadriver"; //NOI18N
@Override
public boolean isSupportActive(Project p) {
diff --git a/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/JavaFixImpl.java b/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/JavaFixImpl.java
index 39e7fed..06a55fa 100644
--- a/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/JavaFixImpl.java
+++ b/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/JavaFixImpl.java
@@ -114,7 +114,7 @@ public class JavaFixImpl implements Fix {
}
- public static abstract class Accessor {
+ public abstract static class Accessor {
static {
try {
diff --git a/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearch.java b/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearch.java
index e85c528..f01480d 100644
--- a/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearch.java
+++ b/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearch.java
@@ -531,7 +531,7 @@ public class BatchSearch {
public IndexEnquirer findIndex(FileObject root, ProgressHandleWrapper progress, boolean recursive);
}
- public static abstract class IndexEnquirer {
+ public abstract static class IndexEnquirer {
final FileObject src;
public IndexEnquirer(FileObject src) {
this.src = src;
@@ -541,7 +541,7 @@ public class BatchSearch {
// public int[] getEstimatedSpan(Resource r);
}
- public static abstract class LocalIndexEnquirer extends IndexEnquirer {
+ public abstract static class LocalIndexEnquirer extends IndexEnquirer {
public LocalIndexEnquirer(FileObject src) {
super(src);
}
diff --git a/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/BulkSearch.java b/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/BulkSearch.java
index 205f47e..eb04522 100644
--- a/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/BulkSearch.java
+++ b/java/spi.java.hints/src/org/netbeans/modules/java/hints/spiimpl/pm/BulkSearch.java
@@ -95,7 +95,7 @@ public abstract class BulkSearch {
@CheckForNull
public abstract BulkPattern create(Collection<? extends String> code, Collection<? extends Tree> patterns, Collection<? extends AdditionalQueryConstraints> additionalConstraints, AtomicBoolean cancel);
- public static abstract class BulkPattern {
+ public abstract static class BulkPattern {
private final List<? extends String> patterns;
private final List<? extends Set<? extends String>> identifiers;
diff --git a/java/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearchTest.java b/java/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearchTest.java
index 274b225..a03e88e 100644
--- a/java/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearchTest.java
+++ b/java/spi.java.hints/test/unit/src/org/netbeans/modules/java/hints/spiimpl/batch/BatchSearchTest.java
@@ -371,11 +371,11 @@ public class BatchSearchTest extends NbTestCase {
private static Collection<FileObject> sourceRoots;
- public synchronized static void setSourceRoots(Collection<FileObject> sourceRoots) {
+ public static synchronized void setSourceRoots(Collection<FileObject> sourceRoots) {
ClassPathProviderImpl.sourceRoots = sourceRoots;
}
- public synchronized static Collection<FileObject> getSourceRoots() {
+ public static synchronized Collection<FileObject> getSourceRoots() {
return sourceRoots;
}
diff --git a/java/spring.beans/src/org/netbeans/modules/spring/beans/completion/completors/BeansRefCompletor.java b/java/spring.beans/src/org/netbeans/modules/spring/beans/completion/completors/BeansRefCompletor.java
index ef56878..bd79b6a 100644
--- a/java/spring.beans/src/org/netbeans/modules/spring/beans/completion/completors/BeansRefCompletor.java
+++ b/java/spring.beans/src/org/netbeans/modules/spring/beans/completion/completors/BeansRefCompletor.java
@@ -45,7 +45,7 @@ import org.openide.filesystems.FileObject;
*/
public class BeansRefCompletor extends Completor {
- final private boolean includeGlobal;
+ private final boolean includeGlobal;
public BeansRefCompletor(boolean includeGlobal, int invocationOffset) {
super(invocationOffset);
diff --git a/java/spring.beans/src/org/netbeans/modules/spring/beans/model/ExclusiveAccess.java b/java/spring.beans/src/org/netbeans/modules/spring/beans/model/ExclusiveAccess.java
index caf7f76..85d3a60 100644
--- a/java/spring.beans/src/org/netbeans/modules/spring/beans/model/ExclusiveAccess.java
+++ b/java/spring.beans/src/org/netbeans/modules/spring/beans/model/ExclusiveAccess.java
@@ -34,7 +34,7 @@ public final class ExclusiveAccess {
// TODO improve the priority of runSyncTask() tasks.
- private final static ExclusiveAccess INSTANCE = new ExclusiveAccess();
+ private static final ExclusiveAccess INSTANCE = new ExclusiveAccess();
private final RequestProcessor rp = new RequestProcessor("Spring config file access thread", 1, false); // NOI18N
private final ReentrantLock lock = new ReentrantLock();
diff --git a/java/spring.beans/src/org/netbeans/modules/spring/beans/model/impl/ObjectProviders.java b/java/spring.beans/src/org/netbeans/modules/spring/beans/model/impl/ObjectProviders.java
index 94b3e33..88dbc4d 100644
--- a/java/spring.beans/src/org/netbeans/modules/spring/beans/model/impl/ObjectProviders.java
+++ b/java/spring.beans/src/org/netbeans/modules/spring/beans/model/impl/ObjectProviders.java
@@ -49,7 +49,7 @@ class ObjectProviders {
}
}
- private static abstract class AbstractProvider<T extends Refreshable> implements ObjectProvider<T> {
+ private abstract static class AbstractProvider<T extends Refreshable> implements ObjectProvider<T> {
private Set<String> annotationTypeNames;
private AnnotationModelHelper helper;
diff --git a/java/testng/src/org/netbeans/modules/testng/TestUtil.java b/java/testng/src/org/netbeans/modules/testng/TestUtil.java
index 3f023fe..89fc670 100644
--- a/java/testng/src/org/netbeans/modules/testng/TestUtil.java
+++ b/java/testng/src/org/netbeans/modules/testng/TestUtil.java
@@ -56,26 +56,26 @@ import org.openide.util.Utilities;
* @version 1.1
*/
public class TestUtil extends CommonTestUtil {
- static private final String JAVA_SOURCES_SUFFIX = "java";
+ private static final String JAVA_SOURCES_SUFFIX = "java";
private static final String JAVA_MIME_TYPE = "text/x-java"; //NOI18N
- static private String getTestClassSuffix() {
+ private static String getTestClassSuffix() {
return TestNGSettings.TEST_CLASSNAME_SUFFIX;
}
- static private String getTestClassPrefix() {
+ private static String getTestClassPrefix() {
return TestNGSettings.TEST_CLASSNAME_PREFIX;
}
- static private String getTestSuiteSuffix() {
+ private static String getTestSuiteSuffix() {
return TestNGSettings.SUITE_CLASSNAME_SUFFIX;
}
- static private String getTestSuitePrefix() {
+ private static String getTestSuitePrefix() {
return TestNGSettings.SUITE_CLASSNAME_PREFIX;
}
- static private String getRootSuiteName() {
+ private static String getRootSuiteName() {
return TestNGSettings.getDefault().getRootSuiteClassName();
}
@@ -371,7 +371,7 @@ public class TestUtil extends CommonTestUtil {
// return cls.getInnerClass(name, false);
// }
- static public String createNewName(int i, Set usedNames) {
+ public static String createNewName(int i, Set usedNames) {
String ret;
do {
ret = "p" + i++;
diff --git a/java/whitelist/src/org/netbeans/modules/whitelist/project/WhiteListLookupProvider.java b/java/whitelist/src/org/netbeans/modules/whitelist/project/WhiteListLookupProvider.java
index 56e637b..35f3a9b 100644
--- a/java/whitelist/src/org/netbeans/modules/whitelist/project/WhiteListLookupProvider.java
+++ b/java/whitelist/src/org/netbeans/modules/whitelist/project/WhiteListLookupProvider.java
@@ -48,7 +48,7 @@ public class WhiteListLookupProvider implements LookupProvider {
private static final String PROP_WHITELIST = "whitelist-";
//@GuardedBy("lookupCache")
- private final static Map<Project,Reference<WhiteListLookup>> lookupCache =
+ private static final Map<Project,Reference<WhiteListLookup>> lookupCache =
Collections.synchronizedMap(new WeakHashMap<Project, Reference<WhiteListLookup>>());
---------------------------------------------------------------------
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
[netbeans] 14/17: Use the blessed modifier order in projects located in enterprise projects
Posted by mk...@apache.org.
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
[netbeans] 03/17: Use the blessed modifier order in projects located in webcommon projects
Posted by mk...@apache.org.
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 7df85fea5e10e4dcb058b954e85e3ff64d49d018
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Fri Feb 18 11:08:23 2022 +0100
Use the blessed modifier order in projects located in webcommon projects
---
.../modules/cordova/platforms/android/AndroidPlatform.java | 2 +-
.../netbeans/modules/cordova/platforms/EnhancedBrowserImpl.java | 2 +-
.../modules/cordova/platforms/RefreshOnSaveListenerImpl.java | 4 ++--
.../src/org/netbeans/modules/cordova/updatetask/XMLFile.java | 2 +-
.../cordova/src/org/netbeans/modules/cordova/CordovaPlatform.java | 2 +-
.../netbeans/modules/cordova/project/MobileConfigurationImpl.java | 2 +-
.../src/org/netbeans/modules/cordova/wizard/CordovaTemplate.java | 2 +-
.../modules/extbrowser/plugins/ExtensionManagerAccessor.java | 2 +-
.../modules/extbrowser/plugins/chrome/ChromeManagerAccessor.java | 2 +-
.../modules/html/angular/editor/AngularJsCompletionItem.java | 2 +-
.../modules/html/angular/model/AngularConfigInterceptor.java | 2 +-
.../modules/html/angular/model/AngularModuleInterceptor.java | 4 ++--
.../modules/html/angular/model/AngularWhenInterceptor.java | 8 ++++----
.../src/org/netbeans/modules/html/angular/TestProjectSupport.java | 2 +-
.../html/angular/editor/AngularJsDeclarationFinder2Test.java | 2 +-
.../modules/javascript/bower/ui/libraries/DependenciesPanel.java | 8 ++++----
.../src/org/netbeans/modules/javascript/cdnjs/Library.java | 2 +-
.../org/netbeans/modules/javascript/cdnjs/ui/SelectionPanel.java | 6 +++---
.../modules/javascript/nodejs/ui/libraries/DependenciesPanel.java | 8 ++++----
.../javascript/v8debug/ui/eval/EvaluationResultsModel.java | 2 +-
.../src/org/netbeans/modules/javascript2/editor/FileUtils.java | 2 +-
.../src/org/netbeans/modules/javascript2/editor/JsKeywords.java | 4 ++--
.../netbeans/modules/javascript2/editor/JsStructureScanner.java | 8 ++++----
.../modules/javascript2/editor/JsTypedTextInterceptor.java | 4 ++--
.../netbeans/modules/javascript2/editor/formatter/CodeStyle.java | 2 +-
.../modules/javascript2/editor/parser/JsErrorManager.java | 2 +-
.../modules/javascript2/editor/parser/SanitizingParser.java | 4 ++--
.../netbeans/modules/javascript2/extjs/ExtJsCodeCompletion.java | 2 +-
.../modules/javascript2/jade/editor/JadeCodeCompletion.java | 4 ++--
.../modules/javascript2/jade/editor/JadeCompletionItem.java | 6 +++---
.../modules/javascript2/jquery/editor/JQueryCodeCompletion.java | 2 +-
.../modules/javascript2/jquery/model/JQueryExtendInterceptor.java | 2 +-
.../modules/javascript2/jquery/model/JQueryWidgetInterceptor.java | 2 +-
.../modules/javascript2/jsdoc/model/JsDocElementType.java | 2 +-
.../org/netbeans/modules/javascript2/model/CatchBlockImpl.java | 2 +-
.../org/netbeans/modules/javascript2/model/JsFunctionImpl.java | 6 +++---
.../src/org/netbeans/modules/javascript2/model/JsObjectImpl.java | 8 ++++----
.../src/org/netbeans/modules/javascript2/model/ModelVisitor.java | 2 +-
.../netbeans/modules/javascript2/model/api/IndexedElement.java | 6 +++---
.../netbeans/modules/javascript2/nodejs/TestProjectSupport.java | 2 +-
.../javascript2/nodejs/editor/NodeJSCodeCompletionTest.java | 2 +-
.../nodejs/editor/NodeJsCodeCompletionWithJsRunTimeTest.java | 2 +-
.../modules/javascript2/prototypejs/model/CreateInterceptor.java | 6 +++---
.../modules/javascript2/requirejs/RequireJsDataProvider.java | 2 +-
.../modules/javascript2/requirejs/editor/FSCompletionUtils.java | 2 +-
.../modules/javascript2/requirejs/editor/SimpleHandle.java | 2 +-
.../javascript2/requirejs/editor/model/ConfigInterceptor.java | 2 +-
.../modules/javascript2/requirejs/TestProjectSupport.java | 2 +-
.../javascript2/requirejs/editor/RequireJSCodeCompletionTest.java | 2 +-
.../src/org/netbeans/lib/v8debug/client/cmdline/V8Debug.java | 2 +-
.../modules/web/clientproject/build/ui/VerticalGridLayout.java | 2 +-
.../modules/web/clientproject/browser/BrowserActionProvider.java | 2 +-
.../clientproject/browser/ClientProjectEnhancedBrowserImpl.java | 4 ++--
.../web/clientproject/browser/RefreshOnSaveListenerImpl.java | 4 ++--
.../modules/web/inspect/webkit/knockout/KnockoutNode.java | 2 +-
.../web/javascript/debugger/eval/ui/EvaluationResultsModel.java | 2 +-
56 files changed, 89 insertions(+), 89 deletions(-)
diff --git a/webcommon/cordova.platforms.android/src/org/netbeans/modules/cordova/platforms/android/AndroidPlatform.java b/webcommon/cordova.platforms.android/src/org/netbeans/modules/cordova/platforms/android/AndroidPlatform.java
index cb5345c..ad46a42 100644
--- a/webcommon/cordova.platforms.android/src/org/netbeans/modules/cordova/platforms/android/AndroidPlatform.java
+++ b/webcommon/cordova.platforms.android/src/org/netbeans/modules/cordova/platforms/android/AndroidPlatform.java
@@ -63,7 +63,7 @@ public class AndroidPlatform implements MobilePlatform {
public static int DEFAULT_TIMEOUT = 30000;
- private transient final java.beans.PropertyChangeSupport propertyChangeSupport = new java.beans.PropertyChangeSupport(this);
+ private final transient java.beans.PropertyChangeSupport propertyChangeSupport = new java.beans.PropertyChangeSupport(this);
public AndroidPlatform() {
}
diff --git a/webcommon/cordova.platforms/src/org/netbeans/modules/cordova/platforms/EnhancedBrowserImpl.java b/webcommon/cordova.platforms/src/org/netbeans/modules/cordova/platforms/EnhancedBrowserImpl.java
index 485546c..03044ca 100644
--- a/webcommon/cordova.platforms/src/org/netbeans/modules/cordova/platforms/EnhancedBrowserImpl.java
+++ b/webcommon/cordova.platforms/src/org/netbeans/modules/cordova/platforms/EnhancedBrowserImpl.java
@@ -35,7 +35,7 @@ import org.netbeans.spi.project.ActionProvider;
*/
public final class EnhancedBrowserImpl implements ClientProjectEnhancedBrowserImplementation {
- final private Project project;
+ private final Project project;
private final WebBrowser browser;
protected BrowserSupport browserSupport;
private static final Logger LOGGER = Logger.getLogger(EnhancedBrowserImpl.class.getName());
diff --git a/webcommon/cordova.platforms/src/org/netbeans/modules/cordova/platforms/RefreshOnSaveListenerImpl.java b/webcommon/cordova.platforms/src/org/netbeans/modules/cordova/platforms/RefreshOnSaveListenerImpl.java
index cb59345..ab724d2 100644
--- a/webcommon/cordova.platforms/src/org/netbeans/modules/cordova/platforms/RefreshOnSaveListenerImpl.java
+++ b/webcommon/cordova.platforms/src/org/netbeans/modules/cordova/platforms/RefreshOnSaveListenerImpl.java
@@ -28,8 +28,8 @@ import org.openide.filesystems.FileObject;
public class RefreshOnSaveListenerImpl implements RefreshOnSaveListener {
- final private BrowserSupport support;
- final private Project project;
+ private final BrowserSupport support;
+ private final Project project;
private ClientProjectEnhancedBrowserImplementation cfg;
public RefreshOnSaveListenerImpl(Project project, BrowserSupport support, ClientProjectEnhancedBrowserImplementation cfg) {
diff --git a/webcommon/cordova/cordovaprojectupdate/src/org/netbeans/modules/cordova/updatetask/XMLFile.java b/webcommon/cordova/cordovaprojectupdate/src/org/netbeans/modules/cordova/updatetask/XMLFile.java
index 5a9ccb9..83d0caa 100644
--- a/webcommon/cordova/cordovaprojectupdate/src/org/netbeans/modules/cordova/updatetask/XMLFile.java
+++ b/webcommon/cordova/cordovaprojectupdate/src/org/netbeans/modules/cordova/updatetask/XMLFile.java
@@ -51,7 +51,7 @@ import org.xml.sax.SAXException;
*/
public class XMLFile {
- final protected Document doc;
+ protected final Document doc;
private File file;
private final XPath xPath;
diff --git a/webcommon/cordova/src/org/netbeans/modules/cordova/CordovaPlatform.java b/webcommon/cordova/src/org/netbeans/modules/cordova/CordovaPlatform.java
index 4710381..d0b5771 100644
--- a/webcommon/cordova/src/org/netbeans/modules/cordova/CordovaPlatform.java
+++ b/webcommon/cordova/src/org/netbeans/modules/cordova/CordovaPlatform.java
@@ -43,7 +43,7 @@ public class CordovaPlatform {
private final Map<String, Version> versions = Collections.synchronizedMap(new HashMap<>());
private boolean isGitReady;
- private transient final java.beans.PropertyChangeSupport propertyChangeSupport = new java.beans.PropertyChangeSupport(this);
+ private final transient java.beans.PropertyChangeSupport propertyChangeSupport = new java.beans.PropertyChangeSupport(this);
private CordovaPlatform() {
}
diff --git a/webcommon/cordova/src/org/netbeans/modules/cordova/project/MobileConfigurationImpl.java b/webcommon/cordova/src/org/netbeans/modules/cordova/project/MobileConfigurationImpl.java
index 181cc5b..cd3451a 100644
--- a/webcommon/cordova/src/org/netbeans/modules/cordova/project/MobileConfigurationImpl.java
+++ b/webcommon/cordova/src/org/netbeans/modules/cordova/project/MobileConfigurationImpl.java
@@ -43,7 +43,7 @@ import org.openide.util.Exceptions;
*/
public class MobileConfigurationImpl implements ProjectConfiguration, PropertyProvider {
- final private Project project;
+ private final Project project;
//final private ClientProjectPlatformImpl platform;
private final String name;
private final String displayName;
diff --git a/webcommon/cordova/src/org/netbeans/modules/cordova/wizard/CordovaTemplate.java b/webcommon/cordova/src/org/netbeans/modules/cordova/wizard/CordovaTemplate.java
index 22ed1fe..b8c1fbb 100644
--- a/webcommon/cordova/src/org/netbeans/modules/cordova/wizard/CordovaTemplate.java
+++ b/webcommon/cordova/src/org/netbeans/modules/cordova/wizard/CordovaTemplate.java
@@ -193,7 +193,7 @@ public class CordovaTemplate implements SiteTemplateImplementation {
}
private CordovaPanel panel;
- private transient final ChangeSupport changeSupport = new ChangeSupport(this);
+ private final transient ChangeSupport changeSupport = new ChangeSupport(this);
@Override
public void addChangeListener(ChangeListener listener) {
diff --git a/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/ExtensionManagerAccessor.java b/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/ExtensionManagerAccessor.java
index 1372b79..813c281 100644
--- a/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/ExtensionManagerAccessor.java
+++ b/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/ExtensionManagerAccessor.java
@@ -30,7 +30,7 @@ public interface ExtensionManagerAccessor {
BrowserExtensionManager getManager();
- public static abstract class AbstractBrowserExtensionManager
+ public abstract static class AbstractBrowserExtensionManager
implements BrowserExtensionManager
{
protected static final String PLUGIN_MODULE_NAME =
diff --git a/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/chrome/ChromeManagerAccessor.java b/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/chrome/ChromeManagerAccessor.java
index 70ac34d..e361782 100644
--- a/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/chrome/ChromeManagerAccessor.java
+++ b/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/chrome/ChromeManagerAccessor.java
@@ -563,7 +563,7 @@ public class ChromeManagerAccessor implements ExtensionManagerAccessor {
return result[0];
}
- static private class FileFinder implements FileFilter {
+ private static class FileFinder implements FileFilter {
FileFinder(String name){
this( name, false );
}
diff --git a/webcommon/html.angular/src/org/netbeans/modules/html/angular/editor/AngularJsCompletionItem.java b/webcommon/html.angular/src/org/netbeans/modules/html/angular/editor/AngularJsCompletionItem.java
index 8823934..576315e 100644
--- a/webcommon/html.angular/src/org/netbeans/modules/html/angular/editor/AngularJsCompletionItem.java
+++ b/webcommon/html.angular/src/org/netbeans/modules/html/angular/editor/AngularJsCompletionItem.java
@@ -34,7 +34,7 @@ import org.openide.util.ImageUtilities;
*/
public class AngularJsCompletionItem implements CompletionProposal {
- private final static String ANGULAR_NAME = "Angular Js";
+ private static final String ANGULAR_NAME = "Angular Js";
private static ImageIcon angularIcon = null;
private final int anchorOffset;
diff --git a/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularConfigInterceptor.java b/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularConfigInterceptor.java
index 4ac7246..cb24334 100644
--- a/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularConfigInterceptor.java
+++ b/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularConfigInterceptor.java
@@ -47,7 +47,7 @@ import org.openide.filesystems.FileObject;
@FunctionInterceptor.Registration(priority = 17)
public class AngularConfigInterceptor implements FunctionInterceptor {
- private final static Pattern PATTERN = Pattern.compile("(.)*\\.config"); //NOI18N
+ private static final Pattern PATTERN = Pattern.compile("(.)*\\.config"); //NOI18N
public static final String COMPONENT_PROP = "component"; //NOI18N
public static final String COMPONENTS_PROP = "components"; //NOI18N
public static final String CONTROLLER_SUFFIX = "Controller"; //NOI18N
diff --git a/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularModuleInterceptor.java b/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularModuleInterceptor.java
index 3750380..02211b0 100644
--- a/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularModuleInterceptor.java
+++ b/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularModuleInterceptor.java
@@ -49,8 +49,8 @@ import org.openide.filesystems.FileObject;
public class AngularModuleInterceptor implements FunctionInterceptor{
//private static Pattern PATTERN = Pattern.compile("angular\\.module(\\..*)*\\.controller");
- private final static Pattern PATTERN = Pattern.compile("(.)*\\.controller");
- private final static List<String> KNOWN_TYPES = Arrays.asList(
+ private static final Pattern PATTERN = Pattern.compile("(.)*\\.controller");
+ private static final List<String> KNOWN_TYPES = Arrays.asList(
TypeUsage.ARRAY, TypeUsage.BOOLEAN, TypeUsage.FUNCTION, TypeUsage.NULL,
TypeUsage.NUMBER, TypeUsage.OBJECT, TypeUsage.REGEXP, TypeUsage.STRING,
TypeUsage.UNDEFINED, TypeUsage.UNRESOLVED);
diff --git a/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularWhenInterceptor.java b/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularWhenInterceptor.java
index 568f66d..13b0e45 100644
--- a/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularWhenInterceptor.java
+++ b/webcommon/html.angular/src/org/netbeans/modules/html/angular/model/AngularWhenInterceptor.java
@@ -42,10 +42,10 @@ import org.openide.filesystems.FileObject;
@FunctionInterceptor.Registration(priority = 16)
public class AngularWhenInterceptor implements FunctionInterceptor {
- private final static Pattern PATTERN = Pattern.compile("(.)*\\.(when|state)"); //NOI18N
- public final static String TEMPLATE_URL_PROP = "templateUrl"; //NOI18N
- public final static String CONTROLLER_PROP = "controller"; //NOI18N
- public final static String CONTROLLER_AS_PROP = "controllerAs"; //NOI18N
+ private static final Pattern PATTERN = Pattern.compile("(.)*\\.(when|state)"); //NOI18N
+ public static final String TEMPLATE_URL_PROP = "templateUrl"; //NOI18N
+ public static final String CONTROLLER_PROP = "controller"; //NOI18N
+ public static final String CONTROLLER_AS_PROP = "controllerAs"; //NOI18N
@Override
public Pattern getNamePattern() {
diff --git a/webcommon/html.angular/test/unit/src/org/netbeans/modules/html/angular/TestProjectSupport.java b/webcommon/html.angular/test/unit/src/org/netbeans/modules/html/angular/TestProjectSupport.java
index d48526d..7f1d449 100644
--- a/webcommon/html.angular/test/unit/src/org/netbeans/modules/html/angular/TestProjectSupport.java
+++ b/webcommon/html.angular/test/unit/src/org/netbeans/modules/html/angular/TestProjectSupport.java
@@ -70,7 +70,7 @@ public class TestProjectSupport {
}
- static public class FileOwnerQueryImpl implements FileOwnerQueryImplementation {
+ public static class FileOwnerQueryImpl implements FileOwnerQueryImplementation {
private Project testProject1;
diff --git a/webcommon/html.angular/test/unit/src/org/netbeans/modules/html/angular/editor/AngularJsDeclarationFinder2Test.java b/webcommon/html.angular/test/unit/src/org/netbeans/modules/html/angular/editor/AngularJsDeclarationFinder2Test.java
index 125a51c..05c2b19 100644
--- a/webcommon/html.angular/test/unit/src/org/netbeans/modules/html/angular/editor/AngularJsDeclarationFinder2Test.java
+++ b/webcommon/html.angular/test/unit/src/org/netbeans/modules/html/angular/editor/AngularJsDeclarationFinder2Test.java
@@ -55,7 +55,7 @@ public class AngularJsDeclarationFinder2Test extends JsCodeCompletionBase {
super(testName);
}
- static private boolean isSetup = false;
+ private static boolean isSetup = false;
@Override
protected void setUp() throws Exception {
diff --git a/webcommon/javascript.bower/src/org/netbeans/modules/javascript/bower/ui/libraries/DependenciesPanel.java b/webcommon/javascript.bower/src/org/netbeans/modules/javascript/bower/ui/libraries/DependenciesPanel.java
index f8cd154..902c589 100644
--- a/webcommon/javascript.bower/src/org/netbeans/modules/javascript/bower/ui/libraries/DependenciesPanel.java
+++ b/webcommon/javascript.bower/src/org/netbeans/modules/javascript/bower/ui/libraries/DependenciesPanel.java
@@ -684,10 +684,10 @@ public class DependenciesPanel extends javax.swing.JPanel {
* Renderer of the version columns.
*/
static class VersionColumnRenderer extends DefaultTableCellRenderer {
- final static Object UP_TO_DATE = new Object();
- final static Object CHECKING = new Object();
- final static Object UNKNOWN = new Object();
- final static Object NO_VERSION = new Object();
+ static final Object UP_TO_DATE = new Object();
+ static final Object CHECKING = new Object();
+ static final Object UNKNOWN = new Object();
+ static final Object NO_VERSION = new Object();
@Override
@NbBundle.Messages({
diff --git a/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/Library.java b/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/Library.java
index 668bd64..6f59f2e 100644
--- a/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/Library.java
+++ b/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/Library.java
@@ -119,7 +119,7 @@ public final class Library {
/**
* Library version.
*/
- public final static class Version {
+ public static final class Version {
/** Owning library. */
private final Library library;
/** Whether this version is already part of the project. */
diff --git a/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/ui/SelectionPanel.java b/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/ui/SelectionPanel.java
index ed56be3..85c2434 100644
--- a/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/ui/SelectionPanel.java
+++ b/webcommon/javascript.cdnjs/src/org/netbeans/modules/javascript/cdnjs/ui/SelectionPanel.java
@@ -558,9 +558,9 @@ public class SelectionPanel extends JPanel implements HelpCtx.Provider {
*/
static class VersionColumnRenderer extends DefaultTableCellRenderer {
- final static Object UP_TO_DATE = new Object();
- final static Object CHECKING = new Object();
- final static Object UNKNOWN = new Object();
+ static final Object UP_TO_DATE = new Object();
+ static final Object CHECKING = new Object();
+ static final Object UNKNOWN = new Object();
@StaticResource
private static final String UP_TO_DATE_ICON = "org/netbeans/modules/javascript/cdnjs/ui/resources/uptodate.gif"; // NOI18N
diff --git a/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/libraries/DependenciesPanel.java b/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/libraries/DependenciesPanel.java
index 2fe2c0b..338e3a2 100644
--- a/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/libraries/DependenciesPanel.java
+++ b/webcommon/javascript.nodejs/src/org/netbeans/modules/javascript/nodejs/ui/libraries/DependenciesPanel.java
@@ -704,10 +704,10 @@ public class DependenciesPanel extends javax.swing.JPanel {
* Renderer of the version columns.
*/
static class VersionColumnRenderer extends DefaultTableCellRenderer {
- final static Object UP_TO_DATE = new Object();
- final static Object CHECKING = new Object();
- final static Object UNKNOWN = new Object();
- final static Object NO_VERSION = new Object();
+ static final Object UP_TO_DATE = new Object();
+ static final Object CHECKING = new Object();
+ static final Object UNKNOWN = new Object();
+ static final Object NO_VERSION = new Object();
@Override
@NbBundle.Messages({
diff --git a/webcommon/javascript.v8debug.ui/src/org/netbeans/modules/javascript/v8debug/ui/eval/EvaluationResultsModel.java b/webcommon/javascript.v8debug.ui/src/org/netbeans/modules/javascript/v8debug/ui/eval/EvaluationResultsModel.java
index 3349b0d..bac7f7f 100644
--- a/webcommon/javascript.v8debug.ui/src/org/netbeans/modules/javascript/v8debug/ui/eval/EvaluationResultsModel.java
+++ b/webcommon/javascript.v8debug.ui/src/org/netbeans/modules/javascript/v8debug/ui/eval/EvaluationResultsModel.java
@@ -63,7 +63,7 @@ public class EvaluationResultsModel extends VariablesModel {
private static final String ICON_WRONG_PASS =
"org/netbeans/modules/debugger/resources/wrong_pass.png"; // NOI18N
- private final static RequestProcessor RP = new RequestProcessor(EvaluationResultsModel.class);
+ private static final RequestProcessor RP = new RequestProcessor(EvaluationResultsModel.class);
private final org.netbeans.spi.debugger.ui.CodeEvaluator.Result result;
private EvaluatorListener evalListener = new EvaluatorListener();
diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/FileUtils.java b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/FileUtils.java
index f834b98..eb20b2a 100644
--- a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/FileUtils.java
+++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/FileUtils.java
@@ -44,7 +44,7 @@ import org.openide.util.BaseUtilities;
*/
public class FileUtils {
- final static String GO_UP = "../"; //NOI18N
+ static final String GO_UP = "../"; //NOI18N
private static final String SLASH = "/"; //NOI18N
private static final String FILE = "file"; // URI scheme
diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsKeywords.java b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsKeywords.java
index 9a080b8..76411a8 100644
--- a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsKeywords.java
+++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsKeywords.java
@@ -40,8 +40,8 @@ public class JsKeywords {
ENDS_WITH_DOT
};
- protected final static Map<String, CompletionDescription> KEYWORDS = new HashMap<>();
- protected final static Map<String, CompletionDescription> SPECIAL_KEYWORDS_IMPORTEXPORT = new HashMap<>();
+ protected static final Map<String, CompletionDescription> KEYWORDS = new HashMap<>();
+ protected static final Map<String, CompletionDescription> SPECIAL_KEYWORDS_IMPORTEXPORT = new HashMap<>();
static {
KEYWORDS.put(JsTokenId.KEYWORD_BREAK.fixedText(), new CompletionDescription(CompletionType.ENDS_WITH_SEMICOLON));
diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsStructureScanner.java b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsStructureScanner.java
index cd3556f..074f133 100644
--- a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsStructureScanner.java
+++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsStructureScanner.java
@@ -403,10 +403,10 @@ public class JsStructureScanner implements StructureScanner {
private JsObject modelElement;
- final private List<? extends StructureItem> children;
- final private String sortPrefix;
- final protected ParserResult parserResult;
- final private String fqn;
+ private final List<? extends StructureItem> children;
+ private final String sortPrefix;
+ protected final ParserResult parserResult;
+ private final String fqn;
public JsStructureItem(JsObject elementHandle, List<? extends StructureItem> children, String sortPrefix, ParserResult parserResult) {
this.modelElement = elementHandle;
diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsTypedTextInterceptor.java b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsTypedTextInterceptor.java
index c41194b..ff13808 100644
--- a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsTypedTextInterceptor.java
+++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/JsTypedTextInterceptor.java
@@ -52,10 +52,10 @@ public class JsTypedTextInterceptor implements TypedTextInterceptor {
private static final TokenId[] REGEXP_TOKENS = { JsTokenId.REGEXP, JsTokenId.REGEXP_END };
/** Tokens which indicate that we're within a literal string */
- private final static TokenId[] STRING_TOKENS = { JsTokenId.STRING, JsTokenId.STRING_END };
+ private static final TokenId[] STRING_TOKENS = { JsTokenId.STRING, JsTokenId.STRING_END };
/** Tokens which indicate that we're within a template string */
- private final static TokenId[] TEMPLATE_TOKENS = { JsTokenId.TEMPLATE, JsTokenId.TEMPLATE_END };
+ private static final TokenId[] TEMPLATE_TOKENS = { JsTokenId.TEMPLATE, JsTokenId.TEMPLATE_END };
private final Language<JsTokenId> language;
diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/formatter/CodeStyle.java b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/formatter/CodeStyle.java
index 70bf3f3..dae9c67 100644
--- a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/formatter/CodeStyle.java
+++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/formatter/CodeStyle.java
@@ -691,7 +691,7 @@ public final class CodeStyle {
WRAP_NEVER
}
- final static class Holder {
+ static final class Holder {
final boolean expandTabsToSpaces;
diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/parser/JsErrorManager.java b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/parser/JsErrorManager.java
index ef93f59..68ede4d 100644
--- a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/parser/JsErrorManager.java
+++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/parser/JsErrorManager.java
@@ -101,7 +101,7 @@ public class JsErrorManager extends ErrorManager implements ANTLRErrorListener {
private List<JsParserError> convertedErrors;
- private final static Map<String, JsTokenId> JS_TEXT_TOKENS = new HashMap<String, JsTokenId>();
+ private static final Map<String, JsTokenId> JS_TEXT_TOKENS = new HashMap<String, JsTokenId>();
static {
for (JsTokenId jsTokenId : JsTokenId.values()) {
diff --git a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/parser/SanitizingParser.java b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/parser/SanitizingParser.java
index 26f7d6d..2803146 100644
--- a/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/parser/SanitizingParser.java
+++ b/webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/parser/SanitizingParser.java
@@ -546,7 +546,7 @@ public abstract class SanitizingParser<R extends BaseParserResult> extends Parse
/**
* Parsing context
*/
- protected final static class Context {
+ protected static final class Context {
private static final List<JsTokenId> IMPORT_EXPORT = new ArrayList<JsTokenId>(2);
@@ -776,7 +776,7 @@ public abstract class SanitizingParser<R extends BaseParserResult> extends Parse
public abstract Sanitize next();
}
- private static abstract class TokenCondition {
+ private abstract static class TokenCondition {
public abstract boolean found(JsTokenId id);
diff --git a/webcommon/javascript2.extjs/src/org/netbeans/modules/javascript2/extjs/ExtJsCodeCompletion.java b/webcommon/javascript2.extjs/src/org/netbeans/modules/javascript2/extjs/ExtJsCodeCompletion.java
index 39b813e..0a5ce00 100644
--- a/webcommon/javascript2.extjs/src/org/netbeans/modules/javascript2/extjs/ExtJsCodeCompletion.java
+++ b/webcommon/javascript2.extjs/src/org/netbeans/modules/javascript2/extjs/ExtJsCodeCompletion.java
@@ -59,7 +59,7 @@ public class ExtJsCodeCompletion implements CompletionProvider {
private static HashMap<String, Collection<ExtJsDataItem>> ccData = null;
- private synchronized static Map<String, Collection<ExtJsDataItem>> getData() {
+ private static synchronized Map<String, Collection<ExtJsDataItem>> getData() {
return DataLoader.getData(getDataFile());
}
diff --git a/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCodeCompletion.java b/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCodeCompletion.java
index 1c3fda9..1c08b2c 100644
--- a/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCodeCompletion.java
+++ b/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCodeCompletion.java
@@ -70,8 +70,8 @@ public class JadeCodeCompletion implements CodeCompletionHandler2 {
private boolean caseSensitive;
- protected final static String CSS_ID_PREFIX = "#";
- protected final static String CSS_CLASS_PREFIX = ".";
+ protected static final String CSS_ID_PREFIX = "#";
+ protected static final String CSS_CLASS_PREFIX = ".";
@Override
@SuppressWarnings("fallthrough")
diff --git a/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCompletionItem.java b/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCompletionItem.java
index c34da4a..0a40106 100644
--- a/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCompletionItem.java
+++ b/webcommon/javascript2.jade/src/org/netbeans/modules/javascript2/jade/editor/JadeCompletionItem.java
@@ -133,9 +133,9 @@ public class JadeCompletionItem implements CompletionProposal {
}
protected static class CompletionRequest {
- final public int anchor;
- final public String prefix;
- final public ParserResult parserResult;
+ public final int anchor;
+ public final String prefix;
+ public final ParserResult parserResult;
public CompletionRequest(ParserResult parserResult, int anchor, String prefix) {
this.anchor = anchor;
diff --git a/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/editor/JQueryCodeCompletion.java b/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/editor/JQueryCodeCompletion.java
index efd4e26..d8a56b0 100644
--- a/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/editor/JQueryCodeCompletion.java
+++ b/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/editor/JQueryCodeCompletion.java
@@ -251,7 +251,7 @@ public class JQueryCodeCompletion implements CompletionProvider {
}
}
- private synchronized static Map<String, Collection<PropertyNameDataItem>> getPropertyNameData() {
+ private static synchronized Map<String, Collection<PropertyNameDataItem>> getPropertyNameData() {
return PropertyNameDataLoader.getData(getPropertyNameDataFile());
}
diff --git a/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/model/JQueryExtendInterceptor.java b/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/model/JQueryExtendInterceptor.java
index 1cd7598..46e4797 100644
--- a/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/model/JQueryExtendInterceptor.java
+++ b/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/model/JQueryExtendInterceptor.java
@@ -36,7 +36,7 @@ import org.netbeans.modules.parsing.api.Snapshot;
@FunctionInterceptor.Registration(priority = 51)
public class JQueryExtendInterceptor implements FunctionInterceptor {
- private final static Pattern PATTERN = Pattern.compile("(\\$|jQuery)\\.extend"); //NOI18N
+ private static final Pattern PATTERN = Pattern.compile("(\\$|jQuery)\\.extend"); //NOI18N
@Override
public Pattern getNamePattern() {
diff --git a/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/model/JQueryWidgetInterceptor.java b/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/model/JQueryWidgetInterceptor.java
index e0b857a..20fc270 100644
--- a/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/model/JQueryWidgetInterceptor.java
+++ b/webcommon/javascript2.jquery/src/org/netbeans/modules/javascript2/jquery/model/JQueryWidgetInterceptor.java
@@ -37,7 +37,7 @@ import org.netbeans.modules.parsing.api.Snapshot;
@FunctionInterceptor.Registration(priority = 50)
public class JQueryWidgetInterceptor implements FunctionInterceptor {
- private final static Pattern PATTERN = Pattern.compile("(\\$|jQuery)\\.widget"); //NOI18N
+ private static final Pattern PATTERN = Pattern.compile("(\\$|jQuery)\\.widget"); //NOI18N
@Override
public Pattern getNamePattern() {
diff --git a/webcommon/javascript2.jsdoc/src/org/netbeans/modules/javascript2/jsdoc/model/JsDocElementType.java b/webcommon/javascript2.jsdoc/src/org/netbeans/modules/javascript2/jsdoc/model/JsDocElementType.java
index b56b21e..6793db6 100644
--- a/webcommon/javascript2.jsdoc/src/org/netbeans/modules/javascript2/jsdoc/model/JsDocElementType.java
+++ b/webcommon/javascript2.jsdoc/src/org/netbeans/modules/javascript2/jsdoc/model/JsDocElementType.java
@@ -99,7 +99,7 @@ public enum JsDocElementType {
* @param value {@code String} value of the {@code Type}
* @return {@code Type}
*/
- public synchronized static JsDocElementType fromString(String value) {
+ public static synchronized JsDocElementType fromString(String value) {
if (types == null) {
types = new HashMap<String, JsDocElementType>();
for (JsDocElementType type : JsDocElementType.values()) {
diff --git a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/CatchBlockImpl.java b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/CatchBlockImpl.java
index b5e9b3f..8ef7b94 100644
--- a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/CatchBlockImpl.java
+++ b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/CatchBlockImpl.java
@@ -35,7 +35,7 @@ import org.netbeans.modules.javascript2.types.api.TypeUsage;
*/
public class CatchBlockImpl extends DeclarationScopeImpl implements JsFunction {
- final private List<JsObject> parameters;
+ private final List<JsObject> parameters;
public CatchBlockImpl(DeclarationScope inFunction, Identifier exception, OffsetRange range, String mimeType) {
super(inFunction, (JsObject)inFunction, new Identifier(getBlockName((JsObject)inFunction), OffsetRange.NONE),
diff --git a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsFunctionImpl.java b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsFunctionImpl.java
index 57e0d0e..6930790 100644
--- a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsFunctionImpl.java
+++ b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsFunctionImpl.java
@@ -45,9 +45,9 @@ import org.openide.filesystems.FileObject;
*/
public class JsFunctionImpl extends DeclarationScopeImpl implements JsFunction {
- final private HashMap <String, JsObject> parametersByName;
- final private List<JsObject> parameters;
- final private Set<TypeUsage> returnTypes;
+ private final HashMap <String, JsObject> parametersByName;
+ private final List<JsObject> parameters;
+ private final Set<TypeUsage> returnTypes;
private boolean isStrict;
public JsFunctionImpl(DeclarationScope scope, JsObject parentObject, Identifier name,
diff --git a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsObjectImpl.java b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsObjectImpl.java
index b1a6259..08a4ca4 100644
--- a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsObjectImpl.java
+++ b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsObjectImpl.java
@@ -52,12 +52,12 @@ import org.netbeans.modules.javascript2.types.api.TypeUsage;
public class JsObjectImpl extends JsElementImpl implements JsObject {
// final protected HashMap<String, JsObject> properties = new HashMap<String, JsObject>();
- final protected LinkedHashMap<String, JsObject> properties = new LinkedHashMap<String, JsObject>();
+ protected final LinkedHashMap<String, JsObject> properties = new LinkedHashMap<String, JsObject>();
private Identifier declarationName;
private JsObject parent;
- final private List<Occurrence> occurrences = new ArrayList<Occurrence>();
- final private NavigableMap<Integer, Collection<TypeUsage>> assignments = new TreeMap<>();
- final private Map<String, Integer>assignmentsReverse = new HashMap<>();
+ private final List<Occurrence> occurrences = new ArrayList<Occurrence>();
+ private final NavigableMap<Integer, Collection<TypeUsage>> assignments = new TreeMap<>();
+ private final Map<String, Integer>assignmentsReverse = new HashMap<>();
private int countOfAssignments = 0;
private boolean hasName;
private Documentation documentation;
diff --git a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/ModelVisitor.java b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/ModelVisitor.java
index 669512b..50bfbaf 100644
--- a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/ModelVisitor.java
+++ b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/ModelVisitor.java
@@ -125,7 +125,7 @@ public class ModelVisitor extends PathNodeVisitor implements ModelResolver {
private final String scriptName;
private LexicalContext lc;
- private final static String BLOCK_OBJECT_NAME_PREFIX = "block-"; //NOI18N
+ private static final String BLOCK_OBJECT_NAME_PREFIX = "block-"; //NOI18N
public ModelVisitor(ParserResult parserResult, OccurrenceBuilder occurrenceBuilder) {
super();
diff --git a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/api/IndexedElement.java b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/api/IndexedElement.java
index 38583cb..0530afc 100644
--- a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/api/IndexedElement.java
+++ b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/api/IndexedElement.java
@@ -41,9 +41,9 @@ public class IndexedElement implements JsElement {
private final boolean isAnonymous;
private final boolean isPlatform;
private final Collection<TypeUsage> assignments;
- public final static char ANONYMOUS_POSFIX = 'A';
- public final static char OBJECT_POSFIX = 'O';
- public final static char PARAMETER_POSTFIX = 'P';
+ public static final char ANONYMOUS_POSFIX = 'A';
+ public static final char OBJECT_POSFIX = 'O';
+ public static final char PARAMETER_POSTFIX = 'P';
private final FileObject fileObject;
private final String name;
private final boolean isDeclared;
diff --git a/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/TestProjectSupport.java b/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/TestProjectSupport.java
index 8a46c08..4a9a356 100644
--- a/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/TestProjectSupport.java
+++ b/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/TestProjectSupport.java
@@ -70,7 +70,7 @@ public class TestProjectSupport {
}
- static public class FileOwnerQueryImpl implements FileOwnerQueryImplementation {
+ public static class FileOwnerQueryImpl implements FileOwnerQueryImplementation {
private Project testProject1;
diff --git a/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJSCodeCompletionTest.java b/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJSCodeCompletionTest.java
index d03d405..fd85b40 100644
--- a/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJSCodeCompletionTest.java
+++ b/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJSCodeCompletionTest.java
@@ -46,7 +46,7 @@ public class NodeJSCodeCompletionTest extends JsCodeCompletionBase {
super(testName);
}
- static private boolean isSetup = false;
+ private static boolean isSetup = false;
@Override
protected void setUp() throws Exception {
diff --git a/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJsCodeCompletionWithJsRunTimeTest.java b/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJsCodeCompletionWithJsRunTimeTest.java
index 38c99d7..6c18123 100644
--- a/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJsCodeCompletionWithJsRunTimeTest.java
+++ b/webcommon/javascript2.nodejs/test/unit/src/org/netbeans/modules/javascript2/nodejs/editor/NodeJsCodeCompletionWithJsRunTimeTest.java
@@ -46,7 +46,7 @@ public class NodeJsCodeCompletionWithJsRunTimeTest extends JsCodeCompletionBase
super(testName);
}
- static private boolean isSetup = false;
+ private static boolean isSetup = false;
@Override
protected void setUp() throws Exception {
diff --git a/webcommon/javascript2.prototypejs/src/org/netbeans/modules/javascript2/prototypejs/model/CreateInterceptor.java b/webcommon/javascript2.prototypejs/src/org/netbeans/modules/javascript2/prototypejs/model/CreateInterceptor.java
index 24ddf8d..708a6b1 100644
--- a/webcommon/javascript2.prototypejs/src/org/netbeans/modules/javascript2/prototypejs/model/CreateInterceptor.java
+++ b/webcommon/javascript2.prototypejs/src/org/netbeans/modules/javascript2/prototypejs/model/CreateInterceptor.java
@@ -49,9 +49,9 @@ import org.openide.filesystems.FileObject;
@FunctionInterceptor.Registration(priority = 360)
public class CreateInterceptor implements FunctionInterceptor {
- private final static Pattern PATTERN = Pattern.compile("Class\\.create"); //NOI18N
- private final static String CLASS = "Class"; //NOI18N
- private final static String INITIALIZE_METHOD_NAME = "initialize"; //NOI18N
+ private static final Pattern PATTERN = Pattern.compile("Class\\.create"); //NOI18N
+ private static final String CLASS = "Class"; //NOI18N
+ private static final String INITIALIZE_METHOD_NAME = "initialize"; //NOI18N
@Override
public Pattern getNamePattern() {
diff --git a/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/RequireJsDataProvider.java b/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/RequireJsDataProvider.java
index 2a64b22..dcf5ce9 100644
--- a/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/RequireJsDataProvider.java
+++ b/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/RequireJsDataProvider.java
@@ -76,7 +76,7 @@ public class RequireJsDataProvider {
/**
* Translating names from documentation to the real option names
*/
- private final static HashMap<String, String> TRANSLATE_NAME = new HashMap<>();
+ private static final HashMap<String, String> TRANSLATE_NAME = new HashMap<>();
static {
TRANSLATE_NAME.put("moduleconfig", "config");//NOI18N
diff --git a/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/FSCompletionUtils.java b/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/FSCompletionUtils.java
index 13041d1..8135acb 100644
--- a/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/FSCompletionUtils.java
+++ b/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/FSCompletionUtils.java
@@ -50,7 +50,7 @@ import org.openide.util.Utilities;
*/
public class FSCompletionUtils {
- final static String GO_UP = "../"; //NOI18N
+ static final String GO_UP = "../"; //NOI18N
private static final String SLASH = "/"; //NOI18N
private static final String FILE = "file"; // URI scheme
diff --git a/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/SimpleHandle.java b/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/SimpleHandle.java
index b0882b1..a664c0a 100644
--- a/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/SimpleHandle.java
+++ b/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/SimpleHandle.java
@@ -81,7 +81,7 @@ public class SimpleHandle implements ElementHandle {
return OffsetRange.NONE;
}
- public static abstract class DocumentationHandle extends SimpleHandle {
+ public abstract static class DocumentationHandle extends SimpleHandle {
public DocumentationHandle(String name, ElementKind kind) {
super(name, kind);
diff --git a/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/model/ConfigInterceptor.java b/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/model/ConfigInterceptor.java
index a2e619b..c53cf24 100644
--- a/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/model/ConfigInterceptor.java
+++ b/webcommon/javascript2.requirejs/src/org/netbeans/modules/javascript2/requirejs/editor/model/ConfigInterceptor.java
@@ -52,7 +52,7 @@ import org.openide.filesystems.FileUtil;
@FunctionInterceptor.Registration(priority = 351)
public class ConfigInterceptor implements FunctionInterceptor {
- private final static Pattern PATTERN = Pattern.compile("(require|requirejs)\\.config"); //NOI18N
+ private static final Pattern PATTERN = Pattern.compile("(require|requirejs)\\.config"); //NOI18N
private static final String PROPERTY_NAME = "name"; //NOI18N
private static final String PROPERTY_LOCATION = "location"; //NOI18N
diff --git a/webcommon/javascript2.requirejs/test/unit/src/org/netbeans/modules/javascript2/requirejs/TestProjectSupport.java b/webcommon/javascript2.requirejs/test/unit/src/org/netbeans/modules/javascript2/requirejs/TestProjectSupport.java
index e687336..a62bea5 100644
--- a/webcommon/javascript2.requirejs/test/unit/src/org/netbeans/modules/javascript2/requirejs/TestProjectSupport.java
+++ b/webcommon/javascript2.requirejs/test/unit/src/org/netbeans/modules/javascript2/requirejs/TestProjectSupport.java
@@ -70,7 +70,7 @@ public class TestProjectSupport {
}
- static public class FileOwnerQueryImpl implements FileOwnerQueryImplementation {
+ public static class FileOwnerQueryImpl implements FileOwnerQueryImplementation {
private Project testProject1;
diff --git a/webcommon/javascript2.requirejs/test/unit/src/org/netbeans/modules/javascript2/requirejs/editor/RequireJSCodeCompletionTest.java b/webcommon/javascript2.requirejs/test/unit/src/org/netbeans/modules/javascript2/requirejs/editor/RequireJSCodeCompletionTest.java
index c94a034..74d19cc 100644
--- a/webcommon/javascript2.requirejs/test/unit/src/org/netbeans/modules/javascript2/requirejs/editor/RequireJSCodeCompletionTest.java
+++ b/webcommon/javascript2.requirejs/test/unit/src/org/netbeans/modules/javascript2/requirejs/editor/RequireJSCodeCompletionTest.java
@@ -48,7 +48,7 @@ public class RequireJSCodeCompletionTest extends JsCodeCompletionBase {
super(testName);
}
- static private boolean isSetup = false;
+ private static boolean isSetup = false;
@Override
protected void setUp() throws Exception {
diff --git a/webcommon/lib.v8debug/src/org/netbeans/lib/v8debug/client/cmdline/V8Debug.java b/webcommon/lib.v8debug/src/org/netbeans/lib/v8debug/client/cmdline/V8Debug.java
index 631697e..76a0294 100644
--- a/webcommon/lib.v8debug/src/org/netbeans/lib/v8debug/client/cmdline/V8Debug.java
+++ b/webcommon/lib.v8debug/src/org/netbeans/lib/v8debug/client/cmdline/V8Debug.java
@@ -1051,7 +1051,7 @@ public class V8Debug {
}
}
- final static class TestAccess {
+ static final class TestAccess {
static V8Debug createV8Debug(String hostName, int port, Testeable testeable) throws IOException {
final V8Debug v8dbg = new V8Debug(hostName, port);
diff --git a/webcommon/web.clientproject.api/src/org/netbeans/modules/web/clientproject/build/ui/VerticalGridLayout.java b/webcommon/web.clientproject.api/src/org/netbeans/modules/web/clientproject/build/ui/VerticalGridLayout.java
index 9e51c52..e6abb65 100644
--- a/webcommon/web.clientproject.api/src/org/netbeans/modules/web/clientproject/build/ui/VerticalGridLayout.java
+++ b/webcommon/web.clientproject.api/src/org/netbeans/modules/web/clientproject/build/ui/VerticalGridLayout.java
@@ -50,7 +50,7 @@ public class VerticalGridLayout implements LayoutManager2 {
private final int screenHeight;
- final private Set<Component> components = new LinkedHashSet<Component>();
+ private final Set<Component> components = new LinkedHashSet<Component>();
@Override
public void addLayoutComponent(Component comp, Object constraints) {
diff --git a/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/BrowserActionProvider.java b/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/BrowserActionProvider.java
index ce94e2b..560c100 100644
--- a/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/BrowserActionProvider.java
+++ b/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/BrowserActionProvider.java
@@ -42,7 +42,7 @@ import org.openide.util.Pair;
public class BrowserActionProvider implements ActionProvider {
- final private ClientSideProject project;
+ private final ClientSideProject project;
private final BrowserSupport support;
private ClientProjectEnhancedBrowserImpl cfg;
diff --git a/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/ClientProjectEnhancedBrowserImpl.java b/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/ClientProjectEnhancedBrowserImpl.java
index 9644635..f3240c2 100644
--- a/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/ClientProjectEnhancedBrowserImpl.java
+++ b/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/ClientProjectEnhancedBrowserImpl.java
@@ -37,8 +37,8 @@ import org.openide.util.EditableProperties;
public class ClientProjectEnhancedBrowserImpl implements ClientProjectEnhancedBrowserImplementation {
- final private ClientSideProject project;
- final private WebBrowser browser;
+ private final ClientSideProject project;
+ private final WebBrowser browser;
private BrowserSupport browserSupport;
private ProjectConfigurationCustomizerImpl cust = null;
diff --git a/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/RefreshOnSaveListenerImpl.java b/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/RefreshOnSaveListenerImpl.java
index 51a5c0b..66a935f 100644
--- a/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/RefreshOnSaveListenerImpl.java
+++ b/webcommon/web.clientproject/src/org/netbeans/modules/web/clientproject/browser/RefreshOnSaveListenerImpl.java
@@ -27,8 +27,8 @@ import org.openide.filesystems.FileObject;
public class RefreshOnSaveListenerImpl implements RefreshOnSaveListener {
- final private BrowserSupport support;
- final private Project project;
+ private final BrowserSupport support;
+ private final Project project;
private ClientProjectEnhancedBrowserImpl cfg;
public RefreshOnSaveListenerImpl(Project project, BrowserSupport support, ClientProjectEnhancedBrowserImpl cfg) {
diff --git a/webcommon/web.inspect/src/org/netbeans/modules/web/inspect/webkit/knockout/KnockoutNode.java b/webcommon/web.inspect/src/org/netbeans/modules/web/inspect/webkit/knockout/KnockoutNode.java
index e0d121b..22fe227 100644
--- a/webcommon/web.inspect/src/org/netbeans/modules/web/inspect/webkit/knockout/KnockoutNode.java
+++ b/webcommon/web.inspect/src/org/netbeans/modules/web/inspect/webkit/knockout/KnockoutNode.java
@@ -78,7 +78,7 @@ public class KnockoutNode extends AbstractNode {
* @return {@code KnockoutChildFactory} (possibly {@code null})
* for the given {@code RemoteObject}
*/
- final static KnockoutChildFactory childFactoryFor(RemoteObject remoteObject) {
+ static final KnockoutChildFactory childFactoryFor(RemoteObject remoteObject) {
boolean isLeaf = true;
if (remoteObject != null) {
RemoteObject.Type type = remoteObject.getType();
diff --git a/webcommon/web.javascript.debugger/src/org/netbeans/modules/web/javascript/debugger/eval/ui/EvaluationResultsModel.java b/webcommon/web.javascript.debugger/src/org/netbeans/modules/web/javascript/debugger/eval/ui/EvaluationResultsModel.java
index 06cf67f..31e3aea 100644
--- a/webcommon/web.javascript.debugger/src/org/netbeans/modules/web/javascript/debugger/eval/ui/EvaluationResultsModel.java
+++ b/webcommon/web.javascript.debugger/src/org/netbeans/modules/web/javascript/debugger/eval/ui/EvaluationResultsModel.java
@@ -51,7 +51,7 @@ public class EvaluationResultsModel extends VariablesModel {
private static final String ICON_EVAL_RESULT =
"org/netbeans/modules/debugger/resources/evaluator/evaluator_result_16.png"; // NOI18N
- private final static RequestProcessor RP = new RequestProcessor(EvaluationResultsModel.class);
+ private static final RequestProcessor RP = new RequestProcessor(EvaluationResultsModel.class);
private final CodeEvaluator.Result result;
private EvaluatorListener evalListener = new EvaluatorListener();
---------------------------------------------------------------------
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
[netbeans] 13/17: Use the blessed modifier order in projects located in extide projects
Posted by mk...@apache.org.
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 89151fc47a659d7cde45ecc77f6a7af5b2794880
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Fri Feb 18 11:10:56 2022 +0100
Use the blessed modifier order in projects located in extide projects
---
.../src/org/netbeans/modules/gradle/ActionProviderImpl.java | 4 ++--
.../src/org/netbeans/modules/gradle/NbGradleProjectImpl.java | 2 +-
.../modules/gradle/api/GradleBaseProjectBuilder.java | 4 ++--
.../org/netbeans/modules/gradle/api/GradleDependency.java | 8 ++++----
.../modules/gradle/api/execute/GradleCommandLine.java | 2 +-
.../org/netbeans/modules/gradle/cache/AbstractDiskCache.java | 10 +++++-----
.../netbeans/modules/gradle/cache/ProjectInfoDiskCache.java | 2 +-
.../modules/gradle/customizer/BuildActionsCustomizer.java | 2 +-
.../modules/gradle/execute/GradleCliCompletionProvider.java | 2 +-
.../gradle/execute/GradleDistributionProviderImpl.java | 2 +-
.../org/netbeans/modules/gradle/nodes/BuildScriptsNode.java | 2 +-
.../org/netbeans/modules/gradle/options/SettingsPanel.java | 2 +-
.../modules/gradle/spi/newproject/TemplateOperation.java | 2 +-
.../src/org/apache/tools/ant/module/AntSettings.java | 2 +-
.../org/apache/tools/ant/module/api/AntTargetExecutor.java | 4 ++--
.../src/org/apache/tools/ant/module/bridge/AntBridge.java | 2 +-
.../apache/tools/ant/module/nodes/AntProjectChildren.java | 2 +-
.../src/org/apache/tools/ant/module/run/TargetExecutor.java | 2 +-
.../org/apache/tools/ant/module/run/VerticalGridLayout.java | 2 +-
.../src/org/apache/tools/ant/module/spi/AntOutputStream.java | 12 ++++++------
20 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java b/extide/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java
index 9e5fc21..6693238 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/ActionProviderImpl.java
@@ -372,7 +372,7 @@ public class ActionProviderImpl implements ActionProvider {
return createCustomGradleAction(project, name, command, Lookup.EMPTY, false);
}
- private final static class CustomAction extends AbstractAction {
+ private static final class CustomAction extends AbstractAction {
private final ActionMapping mapping;
private final boolean showUI;
@@ -397,7 +397,7 @@ public class ActionProviderImpl implements ActionProvider {
}
// Copied from the Maven Plugin with minimal changes applied.
- private static abstract class ConditionallyShownAction extends AbstractAction implements ContextAwareAction {
+ private abstract static class ConditionallyShownAction extends AbstractAction implements ContextAwareAction {
protected boolean triggeredOnFile = false;
protected boolean triggeredOnGradle = false;
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/NbGradleProjectImpl.java b/extide/gradle/src/org/netbeans/modules/gradle/NbGradleProjectImpl.java
index a09b799..4492de1 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/NbGradleProjectImpl.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/NbGradleProjectImpl.java
@@ -121,7 +121,7 @@ public final class NbGradleProjectImpl implements Project {
return project != null;
}
- public static abstract class WatcherAccessor {
+ public abstract static class WatcherAccessor {
public abstract NbGradleProject createWatcher(NbGradleProjectImpl proj);
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java b/extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java
index 2167860..e1da60d 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/api/GradleBaseProjectBuilder.java
@@ -50,8 +50,8 @@ import org.openide.util.lookup.ServiceProvider;
@SuppressWarnings("unchecked")
class GradleBaseProjectBuilder implements ProjectInfoExtractor.Result {
- final static Map<String, List<String>> DEPENDENCY_TO_PLUGIN = new LinkedHashMap<>();
- final static Logger LOG = Logger.getLogger(GradleBaseProjectBuilder.class.getName());
+ static final Map<String, List<String>> DEPENDENCY_TO_PLUGIN = new LinkedHashMap<>();
+ static final Logger LOG = Logger.getLogger(GradleBaseProjectBuilder.class.getName());
static {
addDependencyPlugin("javax:javaee-api:.*", "ejb", "jpa");
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/api/GradleDependency.java b/extide/gradle/src/org/netbeans/modules/gradle/api/GradleDependency.java
index 8bd32a2..4649e82 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/api/GradleDependency.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/api/GradleDependency.java
@@ -68,7 +68,7 @@ public abstract class GradleDependency implements Serializable, Comparable<Gradl
* Dependency for modules usually downloaded from a remote repository.
* @since 1.0
*/
- public final static class ModuleDependency extends GradleDependency {
+ public static final class ModuleDependency extends GradleDependency {
final Set<File> artifacts;
Set<File> sources;
@@ -163,7 +163,7 @@ public abstract class GradleDependency implements Serializable, Comparable<Gradl
* Dependency for sub-project in the current multi-project setup.
* @since 1.0
*/
- public final static class ProjectDependency extends GradleDependency {
+ public static final class ProjectDependency extends GradleDependency {
final File path;
String description;
@@ -220,7 +220,7 @@ public abstract class GradleDependency implements Serializable, Comparable<Gradl
* Dependency for files available on local filesystem.
* @since 1.0
*/
- public final static class FileCollectionDependency extends GradleDependency {
+ public static final class FileCollectionDependency extends GradleDependency {
final Set<File> files;
@@ -242,7 +242,7 @@ public abstract class GradleDependency implements Serializable, Comparable<Gradl
/**
* Dependency for modules which was not able to be resolved by Gradle.
*/
- public final static class UnresolvedDependency extends GradleDependency {
+ public static final class UnresolvedDependency extends GradleDependency {
String problem;
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleCommandLine.java b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleCommandLine.java
index a44b1d0..6a9ef80 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleCommandLine.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/api/execute/GradleCommandLine.java
@@ -884,7 +884,7 @@ public final class GradleCommandLine implements Serializable {
}
}
- final static void addGradleSettingJvmargs(File rootDir, List<String> jvmargs) {
+ static final void addGradleSettingJvmargs(File rootDir, List<String> jvmargs) {
List<File> propFiles = new ArrayList<>();
propFiles.add(new File(GradleSettings.getDefault().getGradleUserHome(), GradleFiles.GRADLE_PROPERTIES_NAME));
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/cache/AbstractDiskCache.java b/extide/gradle/src/org/netbeans/modules/gradle/cache/AbstractDiskCache.java
index a8c8f50..bad29db 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/cache/AbstractDiskCache.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/cache/AbstractDiskCache.java
@@ -49,7 +49,7 @@ public abstract class AbstractDiskCache<K, T extends Serializable> {
this.key = key;
}
- public synchronized final T loadData() {
+ public final synchronized T loadData() {
CacheEntry<T> e = loadEntry();
return e != null ? e.getData() : null;
}
@@ -64,14 +64,14 @@ public abstract class AbstractDiskCache<K, T extends Serializable> {
return e != null && e.isValid(this);
}
- public synchronized final void storeData(T data) {
+ public final synchronized void storeData(T data) {
CacheEntry<T> entry = new CacheEntry<>(this, data);
if (doStoreEntry(entry)) {
entryRef = new WeakReference(entry);
}
}
- public synchronized final void invalidate() {
+ public final synchronized void invalidate() {
entryRef = null;
File cacheFile = cacheFile();
if (cacheFile.canRead()) {
@@ -79,7 +79,7 @@ public abstract class AbstractDiskCache<K, T extends Serializable> {
}
}
- protected synchronized final CacheEntry<T> loadEntry() {
+ protected final synchronized CacheEntry<T> loadEntry() {
CacheEntry<T> ret = entryRef != null ? entryRef.get() : null;
if (ret == null && !GradleExperimentalSettings.getDefault().isCacheDisabled()) {
ret = doLoadEntry();
@@ -123,7 +123,7 @@ public abstract class AbstractDiskCache<K, T extends Serializable> {
protected abstract File cacheFile();
protected abstract Set<File> cacheInvalidators();
- public final static class CacheEntry <T extends Serializable> implements Serializable {
+ public static final class CacheEntry <T extends Serializable> implements Serializable {
static final long serialVersionUID = 1L;
int version;
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/cache/ProjectInfoDiskCache.java b/extide/gradle/src/org/netbeans/modules/gradle/cache/ProjectInfoDiskCache.java
index e87138f..248d9c5 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/cache/ProjectInfoDiskCache.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/cache/ProjectInfoDiskCache.java
@@ -94,7 +94,7 @@ public final class ProjectInfoDiskCache extends AbstractDiskCache<GradleFiles, Q
private final Quality quality;
private final Map<String, Object> info;
- private transient final Map<String, Object> ext;
+ private final transient Map<String, Object> ext;
private final Set<String> problems;
private final String gradleException;
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/customizer/BuildActionsCustomizer.java b/extide/gradle/src/org/netbeans/modules/gradle/customizer/BuildActionsCustomizer.java
index 2ee0ee7..7f0ef34 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/customizer/BuildActionsCustomizer.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/customizer/BuildActionsCustomizer.java
@@ -59,7 +59,7 @@ import org.openide.util.NbBundle.Messages;
@Messages("TXT_CUSTOM=Custom...")
public class BuildActionsCustomizer extends javax.swing.JPanel {
- private final static String CUSTOM_ACTION = Bundle.TXT_CUSTOM();
+ private static final String CUSTOM_ACTION = Bundle.TXT_CUSTOM();
private static final String CARD_NOSELECT = "empty"; //NOI18N
private static final String CARD_DETAILS = "details"; //NOI18N
private static final String CARD_DISABLED = "disabled"; //NOI18N
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleCliCompletionProvider.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleCliCompletionProvider.java
index 024bcf2..faaceac 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleCliCompletionProvider.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleCliCompletionProvider.java
@@ -193,7 +193,7 @@ public class GradleCliCompletionProvider implements CompletionProvider {
return -1;
}
- private static abstract class AbstractGradleCompletionItem implements CompletionItem {
+ private abstract static class AbstractGradleCompletionItem implements CompletionItem {
private final int startOffset;
private final int caretOffset;
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleDistributionProviderImpl.java b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleDistributionProviderImpl.java
index a46d93c..34d98f1 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleDistributionProviderImpl.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/execute/GradleDistributionProviderImpl.java
@@ -55,7 +55,7 @@ import org.openide.util.WeakListeners;
@ProjectServiceProvider(service = {GradleDistributionProvider.class, WatchedResourceProvider.class}, projectType = NbGradleProject.GRADLE_PROJECT_TYPE)
public class GradleDistributionProviderImpl implements GradleDistributionProvider, WatchedResourceProvider {
- private final static Logger LOGGER = Logger.getLogger(GradleDistributionProviderImpl.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(GradleDistributionProviderImpl.class.getName());
private static final List<String> AFFECTING_PROPS = Arrays.asList(
PROP_GRADLE_USER_HOME,
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/nodes/BuildScriptsNode.java b/extide/gradle/src/org/netbeans/modules/gradle/nodes/BuildScriptsNode.java
index 3513723..e940261 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/nodes/BuildScriptsNode.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/nodes/BuildScriptsNode.java
@@ -78,7 +78,7 @@ public final class BuildScriptsNode extends AnnotatedAbstractNode {
}
// The order in this array determines the order of the nodes under Build Scripts
- private final static Kind[] SCRIPTS = new Kind[] {
+ private static final Kind[] SCRIPTS = new Kind[] {
BUILD_SRC, USER_PROPERTIES, SETTINGS_SCRIPT, ROOT_SCRIPT, ROOT_PROPERTIES, BUILD_SCRIPT, PROJECT_PROPERTIES
};
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.java b/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.java
index da5ca8a..97f9234 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/options/SettingsPanel.java
@@ -59,7 +59,7 @@ public class SettingsPanel extends javax.swing.JPanel {
@StaticResource
private static final String RESTART_ICON = "org/netbeans/modules/gradle/resources/restart.png"; //NOI18
- private final static String[] CARDS = {"Execution", "Appearance", "Dependencies", "Experimental"}; //NOI18N
+ private static final String[] CARDS = {"Execution", "Appearance", "Dependencies", "Experimental"}; //NOI18N
private GradleDistributionManager gdm = GradleDistributionManager.get(GradleSettings.getDefault().getGradleUserHome());
diff --git a/extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/TemplateOperation.java b/extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/TemplateOperation.java
index c47db99..c7a8347 100644
--- a/extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/TemplateOperation.java
+++ b/extide/gradle/src/org/netbeans/modules/gradle/spi/newproject/TemplateOperation.java
@@ -322,7 +322,7 @@ public final class TemplateOperation implements Runnable {
steps.add(new PreloadProject(projectDir));
}
- private static abstract class BaseOperationStep implements OperationStep {
+ private abstract static class BaseOperationStep implements OperationStep {
@Override
public final String toString() {
return "Step: " + getMessage();
diff --git a/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/AntSettings.java b/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/AntSettings.java
index b83b60b..e7b2b5d 100644
--- a/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/AntSettings.java
+++ b/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/AntSettings.java
@@ -268,7 +268,7 @@ public class AntSettings {
pcs.firePropertyChange(prop, null, null);
}
- public static abstract class IntrospectedInfoSerializer {
+ public abstract static class IntrospectedInfoSerializer {
public static IntrospectedInfoSerializer instance;
public abstract IntrospectedInfo load(Preferences node);
public abstract void store(Preferences node, IntrospectedInfo info);
diff --git a/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/api/AntTargetExecutor.java b/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/api/AntTargetExecutor.java
index 6da9cb2..2e0d72f 100644
--- a/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/api/AntTargetExecutor.java
+++ b/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/api/AntTargetExecutor.java
@@ -38,7 +38,7 @@ import org.openide.util.Parameters;
* Executes an Ant target or list of targets asynchronously inside NetBeans.
* @since 2.15
*/
-final public class AntTargetExecutor {
+public final class AntTargetExecutor {
private final Env env;
@@ -105,7 +105,7 @@ final public class AntTargetExecutor {
* The class can be used for customization of properties avaialble during the
* execution, verbosity of Ant target execution and output stream definition.
*/
- final public static class Env {
+ public static final class Env {
private int verbosity;
private Properties properties;
diff --git a/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/bridge/AntBridge.java b/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/bridge/AntBridge.java
index 8ecbd76..204e8ff 100644
--- a/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/bridge/AntBridge.java
+++ b/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/bridge/AntBridge.java
@@ -251,7 +251,7 @@ public final class AntBridge {
return getAntInstance().bridge;
}
- private synchronized static AntInstance getAntInstance() {
+ private static synchronized AntInstance getAntInstance() {
AntInstance ai;
if (antInstance != null) {
ai = antInstance.get();
diff --git a/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/nodes/AntProjectChildren.java b/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/nodes/AntProjectChildren.java
index facd56f..fe3fe7d 100644
--- a/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/nodes/AntProjectChildren.java
+++ b/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/nodes/AntProjectChildren.java
@@ -40,7 +40,7 @@ import org.openide.util.RequestProcessor;
final class AntProjectChildren extends Children.Keys<TargetLister.Target> implements ChangeListener, Comparator<TargetLister.Target> {
- private final static RequestProcessor RP = new RequestProcessor(AntProjectChildren.class);
+ private static final RequestProcessor RP = new RequestProcessor(AntProjectChildren.class);
private static Collator SORTER = Collator.getInstance();
private final AntProjectCookie cookie;
diff --git a/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/run/TargetExecutor.java b/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/run/TargetExecutor.java
index c88d169..1dbe925 100644
--- a/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/run/TargetExecutor.java
+++ b/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/run/TargetExecutor.java
@@ -453,7 +453,7 @@ public final class TargetExecutor implements Runnable {
/** Call execute(), not this method directly!
*/
@SuppressWarnings("NestedSynchronizedStatement")
- synchronized public @Override void run () {
+ public synchronized @Override void run () {
final LastTargetExecuted[] thisExec = new LastTargetExecuted[1];
final StopAction sa = stopActions.get(io);
assert sa != null;
diff --git a/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/run/VerticalGridLayout.java b/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/run/VerticalGridLayout.java
index 1b1ea98..a38f66b 100644
--- a/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/run/VerticalGridLayout.java
+++ b/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/run/VerticalGridLayout.java
@@ -49,7 +49,7 @@ public class VerticalGridLayout implements LayoutManager2 {
private final int screenHeight;
- final private Set<Component> components = new LinkedHashSet<Component>();
+ private final Set<Component> components = new LinkedHashSet<Component>();
@Override
public void addLayoutComponent(Component comp, Object constraints) {
diff --git a/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/spi/AntOutputStream.java b/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/spi/AntOutputStream.java
index 2574bb0..f0ec064 100644
--- a/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/spi/AntOutputStream.java
+++ b/extide/o.apache.tools.ant.module/src/org/apache/tools/ant/module/spi/AntOutputStream.java
@@ -40,7 +40,7 @@ public abstract class AntOutputStream extends OutputStream {
private boolean hadFirst = false;
@Override
- final public void close() throws IOException {
+ public final void close() throws IOException {
flush ();
handleClose();
}
@@ -55,24 +55,24 @@ public abstract class AntOutputStream extends OutputStream {
}
@Override
- final public void flush() throws IOException {
+ public final void flush() throws IOException {
flushLines (true);
}
@Override
- final public void write(byte[] b) throws IOException {
+ public final void write(byte[] b) throws IOException {
write (b, 0, b.length);
}
@Override
- final public void write(byte[] b, int offset, int length) throws IOException {
+ public final void write(byte[] b, int offset, int length) throws IOException {
buffer.append (new String (b, offset, length));
// Will usually contain at least one newline:
flushLines (false);
}
@Override
- final public void write(int b) throws IOException {
+ public final void write(int b) throws IOException {
buffer.append ((char) b);
if ((char) b == '\n') {
flushLines (false);
@@ -157,7 +157,7 @@ public abstract class AntOutputStream extends OutputStream {
/** Write one line of text which was not parsed.
*/
- abstract protected void writeLine(String line) throws IOException;
+ protected abstract void writeLine(String line) throws IOException;
/** Create well formated message from the parsed information.
* @deprecated No longer used since org.apache.tools.ant.module/3 3.8.
---------------------------------------------------------------------
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