You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by mk...@apache.org on 2022/02/18 14:49:12 UTC
[netbeans] 16/17: Use the blessed modifier order in projects located in ide projects
This is an automated email from the ASF dual-hosted git repository.
mklaehn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 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