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:11 UTC
[netbeans] 15/17: Use the blessed modifier order in projects located in platform 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 255cfd2ec3e03276b8a6c25ee0c8e61620cc9b7f
Author: Martin Klähn <mk...@apache.org>
AuthorDate: Fri Feb 18 11:12:44 2022 +0100
Use the blessed modifier order in projects located in platform projects
---
.../netbeans/modules/htmlui/FallbackViewer.java | 2 +-
.../src/org/netbeans/modules/htmlui/ATech.java | 2 +-
.../api/progress/ProgressHandleFactoryTest.java | 2 +-
.../progress/module/ProgressApiAccessor.java | 2 +-
.../src/org/netbeans/api/search/SearchHistory.java | 8 ++--
.../netbeans/modules/search/BasicSearchForm.java | 2 +-
.../org/netbeans/modules/search/ResultView.java | 2 +-
.../netbeans/modules/search/ResultViewPanel.java | 2 +-
.../modules/search/ui/FormLayoutHelper.java | 2 +-
.../netbeans/spi/search/SearchScopeDefinition.java | 4 +-
.../provider/DefaultSearchResultsDisplayer.java | 2 +-
.../spi/search/provider/SearchProvider.java | 2 +-
.../search/provider/SearchResultsDisplayer.java | 2 +-
.../netbeans/api/visual/action/WidgetAction.java | 4 +-
.../netbeans/api/visual/graph/GraphPinScene.java | 2 +-
.../org/netbeans/api/visual/graph/GraphScene.java | 2 +-
.../libsrc/org/netbeans/updater/UpdaterFrame.java | 10 ++---
.../services/OperationContainerImpl.java | 2 +-
.../autoupdate/services/OperationValidator.java | 16 ++++----
.../autoupdate/services/UpdateManagerImpl.java | 2 +-
.../modules/autoupdate/services/Utilities.java | 2 +-
.../updateprovider/AutoupdateCatalogParser.java | 2 +-
.../autoupdate/updateprovider/DummyModuleInfo.java | 2 +-
.../services/FeatureDependsOnFeatureTest.java | 2 +-
.../services/FeatureNotUpToDateTest.java | 2 +-
.../autoupdate/ui/LocalDownloadSupport.java | 2 +-
.../modules/autoupdate/ui/SettingsTab.java | 2 +-
.../netbeans/core/execution/ExecutionEngine.java | 2 +-
.../multitabs/impl/FolderNameTabDecorator.java | 2 +-
.../multitabs/impl/ProjectColorTabDecorator.java | 2 +-
.../org/netbeans/core/multiview/SplitLayerUI.java | 2 +-
.../org/netbeans/core/multiview/TabsComponent.java | 2 +-
.../core/spi/multiview/MultiViewFactory.java | 4 +-
.../core/network/proxy/NetworkProxySettings.java | 8 ++--
.../proxy/fallback/FallbackNetworkProxy.java | 22 +++++-----
.../network/proxy/gnome/GconfNetworkProxy.java | 44 ++++++++++----------
.../network/proxy/gnome/GnomeNetworkProxy.java | 2 +-
.../network/proxy/gnome/GsettingsNetworkProxy.java | 48 +++++++++++-----------
.../core/network/proxy/kde/KdeNetworkProxy.java | 44 ++++++++++----------
.../core/network/proxy/mac/MacNetworkProxy.java | 36 ++++++++--------
.../core/network/proxy/pac/datetime/DateRange.java | 2 +-
.../proxy/pac/datetime/PacUtilsDateTime.java | 4 +-
.../core/network/proxy/pac/datetime/TimeRange.java | 2 +-
.../network/proxy/windows/WindowsNetworkProxy.java | 14 +++----
.../core/network/utils/SimpleObjCache.java | 2 +-
.../proxy/pac/impl/PacHelperMethodsImplTest.java | 4 +-
.../core/startup/AutomaticDependencies.java | 2 +-
.../core/startup/layers/BinaryCacheManager.java | 2 +-
.../startup/layers/ParsingLayerCacheManager.java | 10 ++---
.../options/filetypes/IgnoredFilesPreferences.java | 2 +-
.../core/windows/ModeStructureSnapshot.java | 2 +-
.../netbeans/core/windows/PersistenceHandler.java | 2 +-
.../netbeans/core/windows/TopComponentTracker.java | 2 +-
.../core/windows/documentgroup/PleaseWait.java | 2 +-
.../netbeans/core/windows/model/SplitSubModel.java | 2 +-
.../core/windows/services/ActionPasteType.java | 8 ++--
.../core/windows/services/NbPresenter.java | 2 +-
.../windows/view/ModeStructureAccessorImpl.java | 2 +-
.../netbeans/core/windows/view/ui/MainWindow.java | 2 +-
.../org/netbeans/core/windows/view/ui/NbSheet.java | 4 +-
.../ui/popupswitcher/KeyboardPopupSwitcher.java | 4 +-
.../view/ui/StatusLineElementProviderTest.java | 6 +--
.../src/org/netbeans/modules/favorites/Tab.java | 10 ++---
.../org/netbeans/modules/htmlui/impl/ATech.java | 2 +-
.../modules/javahelp/BrowserDisplayer.java | 2 +-
.../org/netbeans/lib/uihandler/DecorableTest.java | 2 +-
.../masterfs/watcher/windows/WindowsNotifier.java | 2 +-
.../masterfs/filebasedfs/FileBasedFileSystem.java | 10 ++---
.../filebasedfs/children/ChildrenSupport.java | 2 +-
.../filebasedfs/fileobjects/BaseFileObj.java | 2 +-
.../masterfs/filebasedfs/naming/NamingFactory.java | 2 +-
.../filebasedfs/MIMESupportLoggingTest.java | 2 +-
.../filebasedfs/fileobjects/FolderObjTest.java | 4 +-
.../utils/FileChangedManagerDeadlockTest.java | 2 +-
.../netbeans/modules/netbinox/NetbinoxHooks.java | 2 +-
.../netbeans/modules/netbinox/HookRaceTest.java | 4 +-
.../src/org/netbeans/JarClassLoader.java | 2 +-
.../o.n.bootstrap/src/org/netbeans/ModuleData.java | 4 +-
.../src/org/netbeans/ModuleManager.java | 4 +-
.../src/org/netbeans/ProxyClassPackages.java | 6 +--
.../unit/src/org/netbeans/CLIHandlerGrepTest.java | 4 +-
.../org/netbeans/CLIHandlerReadingOfInputTest.java | 4 +-
.../org/netbeans/CLIHandlerServerWaitsTest.java | 4 +-
.../test/unit/src/org/netbeans/CLIHandlerTest.java | 4 +-
.../org/netbeans/beaninfo/editors/FontEditor.java | 4 +-
.../o.n.core/src/org/netbeans/core/ExitDialog.java | 2 +-
.../src/org/netbeans/core/ModuleActions.java | 6 +--
.../netbeans/core/projects/XMLSettingsTest.java | 2 +-
.../netbeans/core/HtmlBrowserComponentTest.java | 2 +-
.../netbeans/swing/laf/dark/DarkMetalTheme.java | 2 +-
.../src/org/netbeans/swing/etable/ETable.java | 12 +++---
.../src/org/netbeans/swing/outline/Outline.java | 2 +-
.../netbeans/swing/plaf/aqua/AquaSeparatorUI.java | 4 +-
.../org/netbeans/swing/plaf/gtk/GtkLFCustoms.java | 2 +-
.../beanstubs/org/openide/util/Utilities.java | 2 +-
.../plaf/NonStretchingViewTabLayoutModel.java | 4 +-
.../swing/tabcontrol/plaf/WinFlatUtils.java | 2 +-
.../openide.awt/src/org/openide/awt/Actions.java | 2 +-
.../src/org/openide/awt/HtmlBrowser.java | 4 +-
.../src/org/openide/awt/MouseUtils.java | 4 +-
.../src/org/openide/awt/QuickSearch.java | 2 +-
.../src/org/openide/awt/SplittedPanel.java | 22 +++++-----
.../src/org/openide/awt/ContextActionTest.java | 2 +-
.../src/org/openide/explorer/ExplorerPanel.java | 2 +-
.../src/org/openide/explorer/view/TTVTest.java | 2 +-
.../src/org/openide/WizardValidationException.java | 2 +-
.../openide/explorer/ExplorerActionsImpl.java | 2 +-
.../org/openide/explorer/propertysheet/PSheet.java | 4 +-
.../openide/explorer/propertysheet/PropUtils.java | 4 +-
.../explorer/propertysheet/PropertySheetView.java | 6 +--
.../src/org/openide/explorer/view/ChoiceView.java | 6 +--
.../openide/explorer/view/CustomPopupFactory.java | 2 +-
.../openide/explorer/view/DragDropUtilities.java | 2 +-
.../org/openide/explorer/view/DropGlassPane.java | 16 ++++----
.../src/org/openide/explorer/view/ListView.java | 10 ++---
.../src/org/openide/explorer/view/MenuView.java | 4 +-
.../src/org/openide/explorer/view/OutlineView.java | 4 +-
.../explorer/view/OutlineViewDropSupport.java | 6 +--
.../src/org/openide/explorer/view/TableSheet.java | 6 +--
.../src/org/openide/explorer/view/TableView.java | 4 +-
.../src/org/openide/explorer/view/TreeView.java | 12 +++---
.../openide/explorer/view/TreeViewDropSupport.java | 12 +++---
.../org/openide/explorer/view/ViewTooltips.java | 4 +-
.../explorer/propertysheet/ProxyNodeTest.java | 2 +-
.../explorer/view/TreeTableView126560Test.java | 2 +-
.../org/openide/explorer/view/TreeViewTest.java | 2 +-
.../openide/filesystems/FileFilterSupport.java | 2 +-
.../openide/filesystems/AbstractFileSystem.java | 4 +-
.../org/openide/filesystems/AbstractFolder.java | 2 +-
.../org/openide/filesystems/DefaultAttributes.java | 16 ++++----
.../src/org/openide/filesystems/ExternalUtil.java | 2 +-
.../src/org/openide/filesystems/FCLSupport.java | 8 ++--
.../src/org/openide/filesystems/FileObject.java | 10 ++---
.../src/org/openide/filesystems/FileSystem.java | 6 +--
.../src/org/openide/filesystems/Repository.java | 4 +-
.../src/org/openide/filesystems/XMLMapAttr.java | 6 +--
.../org/openide/filesystems/FileObjectTestHid.java | 10 ++---
.../src/org/openide/filesystems/TestUtilHid.java | 14 +++----
.../src/org/openide/windows/IOColorLines.java | 2 +-
.../src/org/openide/windows/IOColorPrint.java | 2 +-
.../src/org/openide/windows/IOColors.java | 4 +-
.../src/org/openide/windows/IOFolding.java | 2 +-
.../src/org/openide/windows/IOPosition.java | 2 +-
.../src/org/openide/windows/IOSelect.java | 2 +-
.../openide.io/src/org/openide/windows/IOTab.java | 8 ++--
.../src/org/openide/actions/NewTemplateAction.java | 2 +-
.../src/org/openide/awt/Toolbar.java | 2 +-
.../src/org/openide/loaders/DataFolder.java | 8 ++--
.../src/org/openide/loaders/DataLoaderPool.java | 4 +-
.../src/org/openide/loaders/DataNode.java | 2 +-
.../src/org/openide/loaders/DataObjectPool.java | 4 +-
.../org/openide/loaders/DataTransferSupport.java | 2 +-
.../src/org/openide/loaders/FileEntry.java | 4 +-
.../src/org/openide/loaders/FolderList.java | 14 +++----
.../org/openide/loaders/InstanceDataObject.java | 6 +--
.../src/org/openide/loaders/InstanceNode.java | 2 +-
.../src/org/openide/loaders/MultiDataObject.java | 2 +-
.../src/org/openide/text/DataEditorSupport.java | 8 ++--
.../openide/loaders/AskEditorQuestionsTest.java | 2 +-
.../unit/src/org/openide/loaders/TestUtilHid.java | 2 +-
.../org/openide/text/DataEditorReadOnlyTest.java | 2 +-
.../org/openide/text/DataEditorSupportTest.java | 2 +-
.../FileEncodingQueryDataEditorSupportTest.java | 2 +-
.../src/org/openide/modules/Dependency.java | 20 ++++-----
.../openide/nodes/NodesRegistrationSupport.java | 2 +-
.../src/org/openide/nodes/ChildFactory.java | 2 +-
.../src/org/openide/nodes/Children.java | 6 +--
.../src/org/openide/nodes/CookieSetLkp.java | 4 +-
.../openide.nodes/src/org/openide/nodes/Index.java | 2 +-
.../openide.nodes/src/org/openide/nodes/Node.java | 6 +--
.../src/org/openide/nodes/PropertySupport.java | 6 +--
.../openide.nodes/src/org/openide/nodes/Sheet.java | 2 +-
.../src/org/openide/util/actions/CookieAction.java | 2 +-
.../src/org/openide/text/Annotatable.java | 12 +++---
.../src/org/openide/text/Annotation.java | 10 ++---
.../openide/text/CloneableEditorInitializer.java | 2 +-
.../src/org/openide/text/DocumentLine.java | 2 +-
.../src/org/openide/text/IndentEngine.java | 4 +-
.../openide.text/src/org/openide/text/Line.java | 20 ++++-----
.../src/org/openide/text/PositionRef.java | 8 ++--
.../src/org/openide/text/QuietEditorPane.java | 6 +--
.../openide/text/AskEditorQuestionsTest.java | 2 +-
.../src/org/openide/text/Deadlock207571Test.java | 2 +-
.../org/openide/text/EditToBeUndoneRedoneTest.java | 2 +-
.../src/org/openide/text/LoadMultipleDocsTest.java | 2 +-
.../org/openide/text/WrapEditorComponentTest.java | 2 +-
.../src/org/openide/util/Lookup.java | 4 +-
.../org/openide/util/lookup/AbstractLookup.java | 4 +-
.../org/openide/util/lookup/InstanceContent.java | 4 +-
.../src/org/openide/util/lookup/ProxyLookup.java | 4 +-
.../lookup/AbstractLookupArrayStorageTest.java | 2 +-
.../src/org/openide/ServiceType.java | 4 +-
.../src/org/openide/util/HelpCtx.java | 2 +-
.../src/org/openide/util/ImageUtilities.java | 2 +-
.../src/org/openide/util/NetworkSettings.java | 2 +-
.../org/openide/util/actions/ActionInvoker.java | 2 +-
.../openide/util/actions/CallbackSystemAction.java | 2 +-
.../openide/util/datatransfer/ExTransferable.java | 6 +--
.../org/openide/util/UtilitiesTranslateTest.java | 4 +-
.../org/openide/util/actions/SystemActionTest.java | 2 +-
.../src/org/openide/util/CharSequences.java | 4 +-
.../src/org/openide/util/NbBundle.java | 2 +-
.../src/org/openide/util/NbCollections.java | 2 +-
.../src/org/openide/util/RequestProcessor.java | 6 +--
.../org/openide/util/io/NbMarshalledObject.java | 2 +-
.../unit/src/org/openide/util/WeakSetTest.java | 4 +-
.../org/openide/windows/CloneableTopComponent.java | 4 +-
.../src/org/openide/windows/ModeUtilities.java | 2 +-
.../openide/windows/TopComponentGetLookupTest.java | 2 +-
.../src/org/netbeans/modules/options/Utils.java | 2 +-
.../modules/options/keymap/KeymapModel.java | 2 +-
.../modules/sampler/SamplesOutputStream.java | 6 +--
.../org/netbeans/modules/sendopts/OptionImpl.java | 2 +-
.../org/netbeans/api/sendopts/StreamingTest.java | 4 +-
.../settings/examples/JavaCompilerSetting.java | 8 ++--
.../modules/settings/examples/ProxySettings.java | 4 +-
.../src/org/netbeans/modules/settings/Env.java | 12 +++---
.../org/netbeans/modules/settings/SaveSupport.java | 4 +-
.../modules/settings/ScheduledRequest.java | 4 +-
.../settings/convertors/ModuleInfoManager.java | 4 +-
.../settings/convertors/SerialDataConvertor.java | 2 +-
.../settings/convertors/SerialDataNode.java | 2 +-
.../convertors/XMLPropertiesConvertor.java | 6 +--
.../settings/convertors/XMLSettingsSupport.java | 6 +--
.../netbeans/spi/settings/ConvertorResolver.java | 2 +-
.../org/netbeans/spi/settings/DOMConvertor.java | 16 ++++----
.../modules/settings/convertors/FooSetting.java | 4 +-
.../netbeans/spi/settings/DOMConvertorTest.java | 6 +--
.../modules/quicksearch/CommandEvaluator.java | 2 +-
.../modules/quicksearch/SlowProviderTest.java | 4 +-
.../modules/templates/actions/TemplatesAction.java | 2 +-
.../modules/templates/ui/TemplatesPanel.java | 8 ++--
.../modules/templatesui/AbstractWizard.java | 2 +-
.../exceptions/ReporterResultTopComponent.java | 2 +-
.../org/netbeans/modules/uihandler/Installer.java | 6 +--
.../org/netbeans/modules/uihandler/UINodeTest.java | 2 +-
236 files changed, 581 insertions(+), 581 deletions(-)
diff --git a/platform/api.htmlui/src/org/netbeans/modules/htmlui/FallbackViewer.java b/platform/api.htmlui/src/org/netbeans/modules/htmlui/FallbackViewer.java
index 11fe0d6..7420c3a 100644
--- a/platform/api.htmlui/src/org/netbeans/modules/htmlui/FallbackViewer.java
+++ b/platform/api.htmlui/src/org/netbeans/modules/htmlui/FallbackViewer.java
@@ -92,7 +92,7 @@ final class FallbackViewer implements HTMLViewerSpi<FallbackViewer.UI, JButton>
EventQueue.invokeLater(r);
}
- final static class UI {
+ static final class UI {
final Context context;
UI(Context context) {
diff --git a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ATech.java b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ATech.java
index 958ac77..1adcf68 100644
--- a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ATech.java
+++ b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ATech.java
@@ -30,7 +30,7 @@ public interface ATech {
}
@ServiceProvider(service = Contexts.Provider.class)
- public final static class Register implements Contexts.Provider {
+ public static final class Register implements Contexts.Provider {
@Override
public void fillContext(Contexts.Builder bldr, Class<?> type) {
bldr.register(ATech.class, new First(), 30);
diff --git a/platform/api.progress.nb/test/unit/src/org/netbeans/api/progress/ProgressHandleFactoryTest.java b/platform/api.progress.nb/test/unit/src/org/netbeans/api/progress/ProgressHandleFactoryTest.java
index 7a22845..539b076 100644
--- a/platform/api.progress.nb/test/unit/src/org/netbeans/api/progress/ProgressHandleFactoryTest.java
+++ b/platform/api.progress.nb/test/unit/src/org/netbeans/api/progress/ProgressHandleFactoryTest.java
@@ -116,7 +116,7 @@ public class ProgressHandleFactoryTest extends NbTestCase {
synchronized void wakeup() {
notify();
}
- volatile public boolean blocking = false;
+ public volatile boolean blocking = false;
private int blockingTime;
}
diff --git a/platform/api.progress/src/org/netbeans/progress/module/ProgressApiAccessor.java b/platform/api.progress/src/org/netbeans/progress/module/ProgressApiAccessor.java
index 0490b37..94b195c 100644
--- a/platform/api.progress/src/org/netbeans/progress/module/ProgressApiAccessor.java
+++ b/platform/api.progress/src/org/netbeans/progress/module/ProgressApiAccessor.java
@@ -34,7 +34,7 @@ public abstract class ProgressApiAccessor {
INSTANCE = inst;
}
- public synchronized static ProgressApiAccessor getInstance() {
+ public static synchronized ProgressApiAccessor getInstance() {
if (INSTANCE == null) {
try {
Class.forName(ProgressHandle.class.getName(), true, ProgressApiAccessor.class.getClassLoader());
diff --git a/platform/api.search/src/org/netbeans/api/search/SearchHistory.java b/platform/api.search/src/org/netbeans/api/search/SearchHistory.java
index d929a34..d0ff1f0 100644
--- a/platform/api.search/src/org/netbeans/api/search/SearchHistory.java
+++ b/platform/api.search/src/org/netbeans/api/search/SearchHistory.java
@@ -72,14 +72,14 @@ public final class SearchHistory {
* @deprecated just changes in history
*/
@Deprecated
- public final static String LAST_SELECTED = "last-selected"; //NOI18N
+ public static final String LAST_SELECTED = "last-selected"; //NOI18N
/** Property name for adding pattern that was not in history
* Firing:
* oldValue - null
* newValue - added pattern
*/
- public final static String ADD_TO_HISTORY = "add-to-history"; //NOI18N
+ public static final String ADD_TO_HISTORY = "add-to-history"; //NOI18N
/** Property name for adding replace pattern that was not in history
* Firing:
@@ -87,7 +87,7 @@ public final class SearchHistory {
* newValue - added pattern
* @since 1.8
*/
- public final static String ADD_TO_REPLACE = "add-to-replace"; //NOI18N
+ public static final String ADD_TO_REPLACE = "add-to-replace"; //NOI18N
/** Preferences node for storing history info */
private static Preferences prefs;
@@ -103,7 +103,7 @@ public final class SearchHistory {
}
/** @return singleton instance of SearchHistory */
- public synchronized static SearchHistory getDefault(){
+ public static synchronized SearchHistory getDefault(){
if (INSTANCE == null) {
INSTANCE = new SearchHistory();
}
diff --git a/platform/api.search/src/org/netbeans/modules/search/BasicSearchForm.java b/platform/api.search/src/org/netbeans/modules/search/BasicSearchForm.java
index 6071120..035c9f5 100644
--- a/platform/api.search/src/org/netbeans/modules/search/BasicSearchForm.java
+++ b/platform/api.search/src/org/netbeans/modules/search/BasicSearchForm.java
@@ -1113,7 +1113,7 @@ final class BasicSearchForm extends JPanel implements ChangeListener,
}
}
- final static class MultiLineComboBoxEditor implements ComboBoxEditor {
+ static final class MultiLineComboBoxEditor implements ComboBoxEditor {
private final JTextArea area = new JTextArea();
diff --git a/platform/api.search/src/org/netbeans/modules/search/ResultView.java b/platform/api.search/src/org/netbeans/modules/search/ResultView.java
index 18225c9..e04c281 100644
--- a/platform/api.search/src/org/netbeans/modules/search/ResultView.java
+++ b/platform/api.search/src/org/netbeans/modules/search/ResultView.java
@@ -156,7 +156,7 @@ public final class ResultView extends TopComponent {
}
@Deprecated
- final public static class ResolvableHelper implements java.io.Serializable {
+ public static final class ResolvableHelper implements java.io.Serializable {
static final long serialVersionUID = 7398708142639457544L;
public Object readResolve() {
return null;
diff --git a/platform/api.search/src/org/netbeans/modules/search/ResultViewPanel.java b/platform/api.search/src/org/netbeans/modules/search/ResultViewPanel.java
index cb8293c..e311345 100644
--- a/platform/api.search/src/org/netbeans/modules/search/ResultViewPanel.java
+++ b/platform/api.search/src/org/netbeans/modules/search/ResultViewPanel.java
@@ -138,7 +138,7 @@ class ResultViewPanel extends JPanel implements Lookup.Provider {
resultViewCards.show(this, CARD_NAME_RESULTS);
}
- public synchronized final GraphicalSearchListener createListener() {
+ public final synchronized GraphicalSearchListener createListener() {
if (searchListener == null) {
searchListener = new GraphicalSearchListener(
searchComposition, this);
diff --git a/platform/api.search/src/org/netbeans/modules/search/ui/FormLayoutHelper.java b/platform/api.search/src/org/netbeans/modules/search/ui/FormLayoutHelper.java
index e866ee0..dad8b59 100644
--- a/platform/api.search/src/org/netbeans/modules/search/ui/FormLayoutHelper.java
+++ b/platform/api.search/src/org/netbeans/modules/search/ui/FormLayoutHelper.java
@@ -98,7 +98,7 @@ public class FormLayoutHelper {
GroupLayout.DEFAULT_SIZE, component);
}
- public static abstract class Column {
+ public abstract static class Column {
protected abstract void addComponent(
JComponent component, Group parallelColumnGroup);
diff --git a/platform/api.search/src/org/netbeans/spi/search/SearchScopeDefinition.java b/platform/api.search/src/org/netbeans/spi/search/SearchScopeDefinition.java
index 6a54f54..649b1ff 100644
--- a/platform/api.search/src/org/netbeans/spi/search/SearchScopeDefinition.java
+++ b/platform/api.search/src/org/netbeans/spi/search/SearchScopeDefinition.java
@@ -83,7 +83,7 @@ public abstract class SearchScopeDefinition {
* @param l listener to be registered
* @see #isApplicable
*/
- public synchronized final void addChangeListener(
+ public final synchronized void addChangeListener(
@NonNull ChangeListener l) {
if (!changeListeners.contains(l)) {
changeListeners.add(l);
@@ -99,7 +99,7 @@ public abstract class SearchScopeDefinition {
* @see #addChangeListener
* @see #isApplicable
*/
- public synchronized final void removeChangeListener(
+ public final synchronized void removeChangeListener(
@NonNull ChangeListener l) {
changeListeners.remove(l);
}
diff --git a/platform/api.search/src/org/netbeans/spi/search/provider/DefaultSearchResultsDisplayer.java b/platform/api.search/src/org/netbeans/spi/search/provider/DefaultSearchResultsDisplayer.java
index b993ec0..cf4346c 100644
--- a/platform/api.search/src/org/netbeans/spi/search/provider/DefaultSearchResultsDisplayer.java
+++ b/platform/api.search/src/org/netbeans/spi/search/provider/DefaultSearchResultsDisplayer.java
@@ -160,7 +160,7 @@ public final class DefaultSearchResultsDisplayer<U>
* Class definining which nodes should be selected when Previous or Next
* button is pressed and what action should be performed.
*/
- public static abstract class ResultNodeShiftSupport {
+ public abstract static class ResultNodeShiftSupport {
/**
* Method that checks whether a node should be selected when Next or
diff --git a/platform/api.search/src/org/netbeans/spi/search/provider/SearchProvider.java b/platform/api.search/src/org/netbeans/spi/search/provider/SearchProvider.java
index 4983c73..2774d0a 100644
--- a/platform/api.search/src/org/netbeans/spi/search/provider/SearchProvider.java
+++ b/platform/api.search/src/org/netbeans/spi/search/provider/SearchProvider.java
@@ -139,7 +139,7 @@ public abstract class SearchProvider {
* }}</pre>
* </div>
*/
- public static abstract class Presenter {
+ public abstract static class Presenter {
private SearchProvider searchProvider;
private boolean replacing;
diff --git a/platform/api.search/src/org/netbeans/spi/search/provider/SearchResultsDisplayer.java b/platform/api.search/src/org/netbeans/spi/search/provider/SearchResultsDisplayer.java
index 0ce126c3..e88b6df 100644
--- a/platform/api.search/src/org/netbeans/spi/search/provider/SearchResultsDisplayer.java
+++ b/platform/api.search/src/org/netbeans/spi/search/provider/SearchResultsDisplayer.java
@@ -85,7 +85,7 @@ public abstract class SearchResultsDisplayer<T> {
/**
* Helper class for transforming matching objects to nodes.
*/
- public static abstract class NodeDisplayer<T> {
+ public abstract static class NodeDisplayer<T> {
/** Constructor for subclasses. */
protected NodeDisplayer() {}
diff --git a/platform/api.visual/src/org/netbeans/api/visual/action/WidgetAction.java b/platform/api.visual/src/org/netbeans/api/visual/action/WidgetAction.java
index 0e52d80..f43c4c6 100644
--- a/platform/api.visual/src/org/netbeans/api/visual/action/WidgetAction.java
+++ b/platform/api.visual/src/org/netbeans/api/visual/action/WidgetAction.java
@@ -54,7 +54,7 @@ public interface WidgetAction {
/**
* Represents a state of event processing.
*/
- public static abstract class State {
+ public abstract static class State {
/**
* The state that means: The event is not processed by the action and has to be processed by other actions too.
@@ -468,7 +468,7 @@ public interface WidgetAction {
* An adapter of the widget action. All methods return locked or rejected event state based on a result of isLocked method.
* This is often used for long-term actions like MoveAction.
*/
- public static abstract class LockedAdapter implements WidgetAction {
+ public abstract static class LockedAdapter implements WidgetAction {
/**
* Called by event handlers to resolve whether they should return locked or rejected event state.
diff --git a/platform/api.visual/src/org/netbeans/api/visual/graph/GraphPinScene.java b/platform/api.visual/src/org/netbeans/api/visual/graph/GraphPinScene.java
index 6b5acea..4a19685 100644
--- a/platform/api.visual/src/org/netbeans/api/visual/graph/GraphPinScene.java
+++ b/platform/api.visual/src/org/netbeans/api/visual/graph/GraphPinScene.java
@@ -484,7 +484,7 @@ public abstract class GraphPinScene<N, E, P> extends ObjectScene {
/**
* This class is a particular GraphPinScene where nodes, edges and pins are represented with String class.
*/
- public static abstract class StringGraph extends GraphPinScene<String, String, String> {
+ public abstract static class StringGraph extends GraphPinScene<String, String, String> {
}
diff --git a/platform/api.visual/src/org/netbeans/api/visual/graph/GraphScene.java b/platform/api.visual/src/org/netbeans/api/visual/graph/GraphScene.java
index b4aae62..216c421 100644
--- a/platform/api.visual/src/org/netbeans/api/visual/graph/GraphScene.java
+++ b/platform/api.visual/src/org/netbeans/api/visual/graph/GraphScene.java
@@ -360,7 +360,7 @@ public abstract class GraphScene<N, E> extends ObjectScene {
/**
* This class is a particular GraphScene where nodes and edges are represented with String class.
*/
- public static abstract class StringGraph extends GraphScene<String, String> {
+ public abstract static class StringGraph extends GraphScene<String, String> {
}
diff --git a/platform/autoupdate.services/libsrc/org/netbeans/updater/UpdaterFrame.java b/platform/autoupdate.services/libsrc/org/netbeans/updater/UpdaterFrame.java
index e202a9b..791e69f 100644
--- a/platform/autoupdate.services/libsrc/org/netbeans/updater/UpdaterFrame.java
+++ b/platform/autoupdate.services/libsrc/org/netbeans/updater/UpdaterFrame.java
@@ -304,7 +304,7 @@ implements UpdatingContext {
return false;
}
- static private Color stringToColor( String key, Color defcolor ) {
+ private static Color stringToColor( String key, Color defcolor ) {
try {
String str = Localization.getBrandedString( key + "_R" ); // NOI18N
int re = Integer.parseInt( str );
@@ -321,7 +321,7 @@ implements UpdatingContext {
}
}
- static private Dimension stringToDimension (String key, Dimension defaultSize) {
+ private static Dimension stringToDimension (String key, Dimension defaultSize) {
try {
String str = Localization.getBrandedString( key + "_X" ); // NOI18N
int x = Integer.parseInt( str );
@@ -335,15 +335,15 @@ implements UpdatingContext {
}
}
- static private boolean addBorder() {
+ private static boolean addBorder() {
return "true".equals( Localization.getBrandedString( "UpdaterFrame.hasBorder" ) ); // NOI18N
}
- static private boolean isGradient () {
+ private static boolean isGradient () {
return "true".equals (Localization.getBrandedString ("UpdaterFrame.isGradient")); // NOI18N
}
- static private boolean isGradientVertical () {
+ private static boolean isGradientVertical () {
return "true".equals (Localization.getBrandedString ("UpdaterFrame.isGradientVertical")); // NOI18N
}
diff --git a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/OperationContainerImpl.java b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/OperationContainerImpl.java
index 44edef6..5ce364c 100644
--- a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/OperationContainerImpl.java
+++ b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/OperationContainerImpl.java
@@ -184,7 +184,7 @@ public final class OperationContainerImpl<Support> {
return Collections.unmodifiableList(operations);
}
- synchronized public List<OperationInfo<Support>> listAllWithPossibleEager () {
+ public synchronized List<OperationInfo<Support>> listAllWithPossibleEager () {
if (upToDate) {
return listAll();
}
diff --git a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/OperationValidator.java b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/OperationValidator.java
index a5ffd73..4908c41 100644
--- a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/OperationValidator.java
+++ b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/OperationValidator.java
@@ -36,14 +36,14 @@ import org.openide.modules.ModuleInfo;
* @author Radek Matous, Jiri Rechtacek
*/
abstract class OperationValidator {
- private final static OperationValidator FOR_INSTALL = new InstallValidator();
- private final static OperationValidator FOR_INTERNAL_UPDATE = new InternalUpdateValidator();
- private final static OperationValidator FOR_UNINSTALL = new UninstallValidator();
- private final static OperationValidator FOR_UPDATE = new UpdateValidator();
- private final static OperationValidator FOR_ENABLE = new EnableValidator();
- private final static OperationValidator FOR_DISABLE = new DisableValidator();
- private final static OperationValidator FOR_CUSTOM_INSTALL = new CustomInstallValidator();
- private final static OperationValidator FOR_CUSTOM_UNINSTALL = new CustomUninstallValidator();
+ private static final OperationValidator FOR_INSTALL = new InstallValidator();
+ private static final OperationValidator FOR_INTERNAL_UPDATE = new InternalUpdateValidator();
+ private static final OperationValidator FOR_UNINSTALL = new UninstallValidator();
+ private static final OperationValidator FOR_UPDATE = new UpdateValidator();
+ private static final OperationValidator FOR_ENABLE = new EnableValidator();
+ private static final OperationValidator FOR_DISABLE = new DisableValidator();
+ private static final OperationValidator FOR_CUSTOM_INSTALL = new CustomInstallValidator();
+ private static final OperationValidator FOR_CUSTOM_UNINSTALL = new CustomUninstallValidator();
private static final Logger LOGGER = Logger.getLogger (OperationValidator.class.getName ());
/** Creates a new instance of OperationValidator */
diff --git a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/UpdateManagerImpl.java b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/UpdateManagerImpl.java
index 4ae351f..0193a3b 100644
--- a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/UpdateManagerImpl.java
+++ b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/UpdateManagerImpl.java
@@ -317,7 +317,7 @@ public class UpdateManagerImpl extends Object {
return units.get(moduleCodeName);
}
- synchronized private void createMaps () {
+ private synchronized void createMaps () {
availableEagers = new HashSet<UpdateElement> (getUnits ().size ());
installedEagers = new HashSet<UpdateElement> (getUnits ().size ());
token2installedProviders = new HashMap<String, Collection<ModuleInfo>> (11);
diff --git a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/Utilities.java b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/Utilities.java
index aa64fb7..886aa30 100644
--- a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/Utilities.java
+++ b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/services/Utilities.java
@@ -380,7 +380,7 @@ public class Utilities {
}
}
- static private class KeyStoreProviderListener implements LookupListener {
+ private static class KeyStoreProviderListener implements LookupListener {
private KeyStoreProviderListener () {
}
diff --git a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/AutoupdateCatalogParser.java b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/AutoupdateCatalogParser.java
index a6d737f..40dfe39 100644
--- a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/AutoupdateCatalogParser.java
+++ b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/AutoupdateCatalogParser.java
@@ -157,7 +157,7 @@ public class AutoupdateCatalogParser extends DefaultHandler {
private static String XML_EXTENSION = ".xml"; // NOI18N
private static String GZIP_MIME_TYPE = "application/x-gzip"; // NOI18N
- public synchronized static Map<String, UpdateItem> getUpdateItems (URL url, AutoupdateCatalogProvider provider) throws IOException {
+ public static synchronized Map<String, UpdateItem> getUpdateItems (URL url, AutoupdateCatalogProvider provider) throws IOException {
Map<String, UpdateItem> items = new HashMap<String, UpdateItem> ();
URI base;
try {
diff --git a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/DummyModuleInfo.java b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/DummyModuleInfo.java
index 54580a3..d86ccc2 100644
--- a/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/DummyModuleInfo.java
+++ b/platform/autoupdate.services/src/org/netbeans/modules/autoupdate/updateprovider/DummyModuleInfo.java
@@ -171,7 +171,7 @@ public final class DummyModuleInfo extends ModuleInfo {
return deps;
}
- private final static Set<Dependency> parseDeps(Attributes attr, String cnb) throws IllegalArgumentException {
+ private static final Set<Dependency> parseDeps(Attributes attr, String cnb) throws IllegalArgumentException {
Set<Dependency> s = new HashSet<Dependency> ();
s.addAll(Dependency.create(Dependency.TYPE_MODULE, attr.getValue("OpenIDE-Module-Module-Dependencies"))); // NOI18N
s.addAll(Dependency.create(Dependency.TYPE_PACKAGE, attr.getValue("OpenIDE-Module-Package-Dependencies"))); // NOI18N
diff --git a/platform/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/FeatureDependsOnFeatureTest.java b/platform/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/FeatureDependsOnFeatureTest.java
index a881731..7d452ea 100644
--- a/platform/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/FeatureDependsOnFeatureTest.java
+++ b/platform/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/FeatureDependsOnFeatureTest.java
@@ -183,7 +183,7 @@ public class FeatureDependsOnFeatureTest extends NbTestCase {
assertFalse(testDependsOnFeature + " has some available updates.", testDependsOnFeature.getAvailableUpdates().isEmpty());
}
- final static class HackedModuleInfo extends ModuleInfo {
+ static final class HackedModuleInfo extends ModuleInfo {
private ModuleInfo info;
private SpecificationVersion hackedVersion;
diff --git a/platform/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/FeatureNotUpToDateTest.java b/platform/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/FeatureNotUpToDateTest.java
index 1eae523..34ccfb7 100644
--- a/platform/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/FeatureNotUpToDateTest.java
+++ b/platform/autoupdate.services/test/unit/src/org/netbeans/modules/autoupdate/services/FeatureNotUpToDateTest.java
@@ -159,7 +159,7 @@ public class FeatureNotUpToDateTest extends NbTestCase
assertFalse (feature + " has some available updates.", feature.getAvailableUpdates ().isEmpty ());
}
- final static class HackedModuleInfo extends ModuleInfo {
+ static final class HackedModuleInfo extends ModuleInfo {
private ModuleInfo info;
private SpecificationVersion hackedVersion;
diff --git a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/LocalDownloadSupport.java b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/LocalDownloadSupport.java
index 667c908..526d7f3 100644
--- a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/LocalDownloadSupport.java
+++ b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/LocalDownloadSupport.java
@@ -192,7 +192,7 @@ public class LocalDownloadSupport {
}
}
- synchronized private void initCodeName2Unit () {
+ private synchronized void initCodeName2Unit () {
assert nbm2unitCodeName == null : "Cannot initialize nbm2unit twice!";
nbm2unitCodeName = new HashMap<File, String> ();
codeName2unit = new HashMap<String, UpdateUnit> ();
diff --git a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/SettingsTab.java b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/SettingsTab.java
index 3507ae2..6d72231 100644
--- a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/SettingsTab.java
+++ b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/SettingsTab.java
@@ -420,7 +420,7 @@ private void bProxyActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:
private boolean sbEnabled;
private String detailsTitle;
- synchronized private void prepareContent() {
+ private synchronized void prepareContent() {
assert ! SwingUtilities.isEventDispatchThread() : "Invoke SettingsTab.prepareContent out of AWT only";
int rowIndex = table.getSelectedRow();
if (rowIndex != -1 && table.getRowCount() > 0 && getSettingsTableModel().getUpdateUnitProvider(rowIndex) != null) {
diff --git a/platform/core.execution/src/org/netbeans/core/execution/ExecutionEngine.java b/platform/core.execution/src/org/netbeans/core/execution/ExecutionEngine.java
index ce33ca9..268e939 100644
--- a/platform/core.execution/src/org/netbeans/core/execution/ExecutionEngine.java
+++ b/platform/core.execution/src/org/netbeans/core/execution/ExecutionEngine.java
@@ -70,7 +70,7 @@ public final class
private static final IOTable taskIOs = new IOTable(base, systemIO);
/* table of window:threadgrp */
- static private WindowTable wtable = new WindowTable();
+ private static WindowTable wtable = new WindowTable();
/** list of ExecutionListeners */
private HashSet<ExecutionListener> executionListeners = new HashSet<ExecutionListener>();
diff --git a/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/FolderNameTabDecorator.java b/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/FolderNameTabDecorator.java
index 3be9c24..c9fab2d 100644
--- a/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/FolderNameTabDecorator.java
+++ b/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/FolderNameTabDecorator.java
@@ -40,7 +40,7 @@ import org.openide.windows.TopComponent;
public class FolderNameTabDecorator extends TabDecorator {
private final SettingsImpl settings = new SettingsImpl();
- private final static String pathSeparator = System.getProperty( "file.separator", "/" ); //NOI18N
+ private static final String pathSeparator = System.getProperty( "file.separator", "/" ); //NOI18N
@Override
public String getText( TabData tab ) {
diff --git a/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/ProjectColorTabDecorator.java b/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/ProjectColorTabDecorator.java
index 1235779..41eeb4c 100644
--- a/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/ProjectColorTabDecorator.java
+++ b/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/ProjectColorTabDecorator.java
@@ -53,7 +53,7 @@ public class ProjectColorTabDecorator extends TabDecorator {
private static final Map<TabData, Color> tab2color = new WeakHashMap<>(10);
private static final List<Color> backGroundColors;
private static Color foregroundColor;
- private final static ChangeListener projectsListener = (ChangeEvent e) -> updateColorMapping();
+ private static final ChangeListener projectsListener = (ChangeEvent e) -> updateColorMapping();
static {
backGroundColors = new ArrayList<>( 10 );
diff --git a/platform/core.multiview/src/org/netbeans/core/multiview/SplitLayerUI.java b/platform/core.multiview/src/org/netbeans/core/multiview/SplitLayerUI.java
index 0c46806..dd99b55 100644
--- a/platform/core.multiview/src/org/netbeans/core/multiview/SplitLayerUI.java
+++ b/platform/core.multiview/src/org/netbeans/core/multiview/SplitLayerUI.java
@@ -53,7 +53,7 @@ class SplitLayerUI extends LayerUI<JPanel> {
private boolean isDragging = false;
private final AWTEventListener awtListener;
- private final static Color FILL_COLOR = new Color( 0, 0, 0, 128);
+ private static final Color FILL_COLOR = new Color( 0, 0, 0, 128);
public SplitLayerUI( final JComponent content ) {
this.content = content;
diff --git a/platform/core.multiview/src/org/netbeans/core/multiview/TabsComponent.java b/platform/core.multiview/src/org/netbeans/core/multiview/TabsComponent.java
index c227a12..d72fdb0 100644
--- a/platform/core.multiview/src/org/netbeans/core/multiview/TabsComponent.java
+++ b/platform/core.multiview/src/org/netbeans/core/multiview/TabsComponent.java
@@ -46,7 +46,7 @@ import org.openide.windows.TopComponent;
class TabsComponent extends JPanel {
private JComponent EMPTY;
- private final static String TOOLBAR_MARKER = "MultiViewPanel"; //NOI18N
+ private static final String TOOLBAR_MARKER = "MultiViewPanel"; //NOI18N
MultiViewModel model;
private MouseListener buttonMouseListener = null;
diff --git a/platform/core.multiview/src/org/netbeans/core/spi/multiview/MultiViewFactory.java b/platform/core.multiview/src/org/netbeans/core/spi/multiview/MultiViewFactory.java
index ef43d83..bcbb00e 100644
--- a/platform/core.multiview/src/org/netbeans/core/spi/multiview/MultiViewFactory.java
+++ b/platform/core.multiview/src/org/netbeans/core/spi/multiview/MultiViewFactory.java
@@ -55,12 +55,12 @@ public final class MultiViewFactory {
* A utility singleton instance of MultiViewElement that does nothing.
*/
- public final static MultiViewElement BLANK_ELEMENT = new Blank();
+ public static final MultiViewElement BLANK_ELEMENT = new Blank();
/**
* a utility noop action instance to be used when no special handling is
* required in createUnsafeCloseState() method.
*/
- public final static Action NOOP_CLOSE_ACTION = new NoopAction();
+ public static final Action NOOP_CLOSE_ACTION = new NoopAction();
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/NetworkProxySettings.java b/platform/core.network/src/org/netbeans/core/network/proxy/NetworkProxySettings.java
index 23722dd..420978f 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/NetworkProxySettings.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/NetworkProxySettings.java
@@ -37,10 +37,10 @@ public final class NetworkProxySettings {
MANUAL
}
- private final static Logger LOGGER = Logger.getLogger(NetworkProxySettings.class.getName());
- private final static String COLON = ":"; //NOI18N
- private final static String SLASH = "/"; //NOI18N
- private final static String EMPTY_STRING = ""; //NOI18N
+ private static final Logger LOGGER = Logger.getLogger(NetworkProxySettings.class.getName());
+ private static final String COLON = ":"; //NOI18N
+ private static final String SLASH = "/"; //NOI18N
+ private static final String EMPTY_STRING = ""; //NOI18N
private final boolean resolved;
private final ProxyMode proxyMode;
private final String httpProxyHost;
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/fallback/FallbackNetworkProxy.java b/platform/core.network/src/org/netbeans/core/network/proxy/fallback/FallbackNetworkProxy.java
index d08e881..feb4665 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/fallback/FallbackNetworkProxy.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/fallback/FallbackNetworkProxy.java
@@ -35,20 +35,20 @@ import org.openide.util.NbBundle;
*/
public class FallbackNetworkProxy implements NetworkProxyResolver {
- private final static Logger LOGGER = Logger.getLogger(FallbackNetworkProxy.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(FallbackNetworkProxy.class.getName());
- private final static String AT = "@"; //NOI18N
- private final static String COMMA = ","; //NOI18N
- private final static String SLASH = "/"; //NOI18N
- private final static String PROTOCOL_PREXIF_SEPARATOR = "://"; //NOI18N
- private final static String EMPTY_STRING = ""; //NOI18N
+ private static final String AT = "@"; //NOI18N
+ private static final String COMMA = ","; //NOI18N
+ private static final String SLASH = "/"; //NOI18N
+ private static final String PROTOCOL_PREXIF_SEPARATOR = "://"; //NOI18N
+ private static final String EMPTY_STRING = ""; //NOI18N
- private final static String HTTP_PROXY_SYS_PROPERTY = "http_proxy"; //NOI18N
- private final static String HTTPS_PROXY_SYS_PROPERTY = "https_proxy"; //NOI18N
- private final static String SOCKS_PROXY_SYS_PROPERTY = "socks_proxy"; //NOI18N
- private final static String NO_PROXY_SYS_PROPERTY = "no_proxy"; //NOI18N
+ private static final String HTTP_PROXY_SYS_PROPERTY = "http_proxy"; //NOI18N
+ private static final String HTTPS_PROXY_SYS_PROPERTY = "https_proxy"; //NOI18N
+ private static final String SOCKS_PROXY_SYS_PROPERTY = "socks_proxy"; //NOI18N
+ private static final String NO_PROXY_SYS_PROPERTY = "no_proxy"; //NOI18N
- private final static String DEFAULT_NO_PROXY_HOSTS = NbBundle.getMessage(FallbackNetworkProxy.class, "DefaulNoProxyHosts");
+ private static final String DEFAULT_NO_PROXY_HOSTS = NbBundle.getMessage(FallbackNetworkProxy.class, "DefaulNoProxyHosts");
@Override
public NetworkProxySettings getNetworkProxySettings() {
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GconfNetworkProxy.java b/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GconfNetworkProxy.java
index 724d635..22a4db1 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GconfNetworkProxy.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GconfNetworkProxy.java
@@ -33,30 +33,30 @@ import static org.netbeans.core.network.proxy.gnome.GnomeNetworkProxy.executeCom
*/
public class GconfNetworkProxy {
- private final static Logger LOGGER = Logger.getLogger(GconfNetworkProxy.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(GconfNetworkProxy.class.getName());
- private final static String EQUALS = "="; //NOI18N
- private final static String COLON = ","; //NOI18N
- private final static String SQ_BRACKET_LEFT = "["; //NOI18N
- private final static String SQ_BRACKET_RIGHT = "]"; //NOI18N
+ private static final String EQUALS = "="; //NOI18N
+ private static final String COLON = ","; //NOI18N
+ private static final String SQ_BRACKET_LEFT = "["; //NOI18N
+ private static final String SQ_BRACKET_RIGHT = "]"; //NOI18N
- protected final static String GCONF_PATH = "/usr/bin/gconftool-2"; //NOI18N
- private final static String GCONF_ARGUMENT_LIST_RECURSIVELY = " -R "; //NOI18N
- private final static String GCONF_NODE_PROXY = "/system/proxy"; //NOI18N
- private final static String GCONF_NODE_HTTP_PROXY = "/system/http_proxy"; //NOI18N
- private final static String GCONF_KEY_MODE = "mode"; //NOI18N
- private final static String GCONF_KEY_PAC_URL = "autoconfig_url"; //NOI18N
- private final static String GCONF_KEY_HTTP_ALL = "use_http_proxy"; //NOI18N
- private final static String GCONF_KEY_HTTP_HOST = "host"; //NOI18N
- private final static String GCONF_KEY_HTTP_PORT = "port"; //NOI18N
- private final static String GCONF_KEY_HTTPS_HOST = "secure_host"; //NOI18N
- private final static String GCONF_KEY_HTTPS_PORT = "secure_port"; //NOI18N
- private final static String GCONF_KEY_SOCKS_HOST = "socks_host"; //NOI18N
- private final static String GCONF_KEY_SOCKS_PORT = "socks_port"; //NOI18N
- private final static String GCONF_KEY_IGNORE_HOSTS = "ignore_hosts"; //NOI18N
- private final static String GCONF_VALUE_NONE = "none"; //NOI18N
- private final static String GCONF_VALUE_AUTO = "auto"; //NOI18N
- private final static String GCONF_VALUE_MANUAL = "manual"; //NOI18N
+ protected static final String GCONF_PATH = "/usr/bin/gconftool-2"; //NOI18N
+ private static final String GCONF_ARGUMENT_LIST_RECURSIVELY = " -R "; //NOI18N
+ private static final String GCONF_NODE_PROXY = "/system/proxy"; //NOI18N
+ private static final String GCONF_NODE_HTTP_PROXY = "/system/http_proxy"; //NOI18N
+ private static final String GCONF_KEY_MODE = "mode"; //NOI18N
+ private static final String GCONF_KEY_PAC_URL = "autoconfig_url"; //NOI18N
+ private static final String GCONF_KEY_HTTP_ALL = "use_http_proxy"; //NOI18N
+ private static final String GCONF_KEY_HTTP_HOST = "host"; //NOI18N
+ private static final String GCONF_KEY_HTTP_PORT = "port"; //NOI18N
+ private static final String GCONF_KEY_HTTPS_HOST = "secure_host"; //NOI18N
+ private static final String GCONF_KEY_HTTPS_PORT = "secure_port"; //NOI18N
+ private static final String GCONF_KEY_SOCKS_HOST = "socks_host"; //NOI18N
+ private static final String GCONF_KEY_SOCKS_PORT = "socks_port"; //NOI18N
+ private static final String GCONF_KEY_IGNORE_HOSTS = "ignore_hosts"; //NOI18N
+ private static final String GCONF_VALUE_NONE = "none"; //NOI18N
+ private static final String GCONF_VALUE_AUTO = "auto"; //NOI18N
+ private static final String GCONF_VALUE_MANUAL = "manual"; //NOI18N
/**
* Returns network proxy settings - retrieved via gconftool.
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GnomeNetworkProxy.java b/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GnomeNetworkProxy.java
index 3ffdb5d..44dfb6f 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GnomeNetworkProxy.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GnomeNetworkProxy.java
@@ -33,7 +33,7 @@ import org.netbeans.core.network.proxy.NetworkProxySettings;
*/
public class GnomeNetworkProxy implements NetworkProxyResolver{
- private final static Logger LOGGER = Logger.getLogger(GnomeNetworkProxy.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(GnomeNetworkProxy.class.getName());
@Override
public NetworkProxySettings getNetworkProxySettings() {
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GsettingsNetworkProxy.java b/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GsettingsNetworkProxy.java
index 125fe39..e358d6b 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GsettingsNetworkProxy.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/gnome/GsettingsNetworkProxy.java
@@ -33,33 +33,33 @@ import static org.netbeans.core.network.proxy.gnome.GnomeNetworkProxy.executeCom
*/
public class GsettingsNetworkProxy {
- private final static Logger LOGGER = Logger.getLogger(GsettingsNetworkProxy.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(GsettingsNetworkProxy.class.getName());
- private final static String EMPTY_STRING = ""; //NOI18N
- private final static String SPACE = " "; //NOI18N
- private final static String DOT = "."; //NOI18N
- private final static String COLON = ","; //NOI18N
- private final static String SINGLE_QUOTE = "'"; //NOI18N
- private final static String SQ_BRACKET_LEFT = "["; //NOI18N
- private final static String SQ_BRACKET_RIGHT = "]"; //NOI18N
+ private static final String EMPTY_STRING = ""; //NOI18N
+ private static final String SPACE = " "; //NOI18N
+ private static final String DOT = "."; //NOI18N
+ private static final String COLON = ","; //NOI18N
+ private static final String SINGLE_QUOTE = "'"; //NOI18N
+ private static final String SQ_BRACKET_LEFT = "["; //NOI18N
+ private static final String SQ_BRACKET_RIGHT = "]"; //NOI18N
- protected final static String GSETTINGS_PATH = "/usr/bin/gsettings"; //NOI18N
- private final static String GSETTINGS_ARGUMENT_LIST_RECURSIVELY = " list-recursively "; //NOI18N
- private final static String GSETTINGS_PROXY_SCHEMA = "org.gnome.system.proxy"; //NOI18N
+ protected static final String GSETTINGS_PATH = "/usr/bin/gsettings"; //NOI18N
+ private static final String GSETTINGS_ARGUMENT_LIST_RECURSIVELY = " list-recursively "; //NOI18N
+ private static final String GSETTINGS_PROXY_SCHEMA = "org.gnome.system.proxy"; //NOI18N
- private final static String GSETTINGS_KEY_MODE = "org.gnome.system.proxy.mode"; //NOI18N
- private final static String GSETTINGS_KEY_PAC_URL = "org.gnome.system.proxy.autoconfig-url"; //NOI18N
- private final static String GSETTINGS_KEY_HTTP_ALL = "org.gnome.system.proxy.http.use-same-proxy"; //NOI18N
- private final static String GSETTINGS_KEY_HTTP_HOST = "org.gnome.system.proxy.http.host"; //NOI18N
- private final static String GSETTINGS_KEY_HTTP_PORT = "org.gnome.system.proxy.http.port"; //NOI18N
- private final static String GSETTINGS_KEY_HTTPS_HOST = "org.gnome.system.proxy.https.host"; //NOI18N
- private final static String GSETTINGS_KEY_HTTPS_PORT = "org.gnome.system.proxy.https.port"; //NOI18N
- private final static String GSETTINGS_KEY_SOCKS_HOST = "org.gnome.system.proxy.socks.host"; //NOI18N
- private final static String GSETTINGS_KEY_SOCKS_PORT = "org.gnome.system.proxy.socks.port"; //NOI18N
- private final static String GSETTINGS_KEY_IGNORE_HOSTS = "org.gnome.system.proxy.ignore-hosts"; //NOI18N
- private final static String GSETTINGS_VALUE_NONE = "none"; //NOI18N
- private final static String GSETTINGS_VALUE_AUTO = "auto"; //NOI18N
- private final static String GSETTINGS_VALUE_MANUAL = "manual"; //NOI18N
+ private static final String GSETTINGS_KEY_MODE = "org.gnome.system.proxy.mode"; //NOI18N
+ private static final String GSETTINGS_KEY_PAC_URL = "org.gnome.system.proxy.autoconfig-url"; //NOI18N
+ private static final String GSETTINGS_KEY_HTTP_ALL = "org.gnome.system.proxy.http.use-same-proxy"; //NOI18N
+ private static final String GSETTINGS_KEY_HTTP_HOST = "org.gnome.system.proxy.http.host"; //NOI18N
+ private static final String GSETTINGS_KEY_HTTP_PORT = "org.gnome.system.proxy.http.port"; //NOI18N
+ private static final String GSETTINGS_KEY_HTTPS_HOST = "org.gnome.system.proxy.https.host"; //NOI18N
+ private static final String GSETTINGS_KEY_HTTPS_PORT = "org.gnome.system.proxy.https.port"; //NOI18N
+ private static final String GSETTINGS_KEY_SOCKS_HOST = "org.gnome.system.proxy.socks.host"; //NOI18N
+ private static final String GSETTINGS_KEY_SOCKS_PORT = "org.gnome.system.proxy.socks.port"; //NOI18N
+ private static final String GSETTINGS_KEY_IGNORE_HOSTS = "org.gnome.system.proxy.ignore-hosts"; //NOI18N
+ private static final String GSETTINGS_VALUE_NONE = "none"; //NOI18N
+ private static final String GSETTINGS_VALUE_AUTO = "auto"; //NOI18N
+ private static final String GSETTINGS_VALUE_MANUAL = "manual"; //NOI18N
/**
* Returns network proxy settings - retrieved via GSettings (preferred).
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/kde/KdeNetworkProxy.java b/platform/core.network/src/org/netbeans/core/network/proxy/kde/KdeNetworkProxy.java
index dc165ac..bb8e8af 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/kde/KdeNetworkProxy.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/kde/KdeNetworkProxy.java
@@ -44,29 +44,29 @@ import org.netbeans.core.network.proxy.NetworkProxySettings;
*/
public class KdeNetworkProxy implements NetworkProxyResolver {
- private final static Logger LOGGER = Logger.getLogger(KdeNetworkProxy.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(KdeNetworkProxy.class.getName());
- private final static String EMPTY_STRING = ""; //NOI18N
- private final static String SPACE = " "; //NOI18N
- private final static String EQUALS = "="; //NOI18N
- private final static String COLON = ":"; //NOI18N
- private final static String COMMA = ","; //NOI18N
- private final static String SQ_BRACKET_LEFT = "["; //NOI18N
- private final static String HOME = "HOME"; //NOI18N
- private final static String KIOSLAVERC_PROXY_SETTINGS_GROUP = "[Proxy Settings]"; //NOI18N
- private final static String KIOSLAVERC_PROXY_TYPE = "ProxyType"; //NOI18N
- private final static String KIOSLAVERC_PROXY_CONFIG_SCRIPT = "Proxy Config Script"; //NOI18N
- private final static String KIOSLAVERC_HTTP_PROXY = "httpProxy"; //NOI18N
- private final static String KIOSLAVERC_HTTPS_PROXY = "httpsProxy"; //NOI18N
- private final static String KIOSLAVERC_SOCKS_PROXY = "socksProxy"; //NOI18N
- private final static String KIOSLAVERC_NO_PROXY_FOR = "NoProxyFor"; //NOI18N
- private final static String KIOSLAVERC_PROXY_TYPE_NONE = "0"; //NOI18N
- private final static String KIOSLAVERC_PROXY_TYPE_MANUAL = "1"; //NOI18N
- private final static String KIOSLAVERC_PROXY_TYPE_PAC = "2"; //NOI18N
- private final static String KIOSLAVERC_PROXY_TYPE_AUTO = "3"; //NOI18N
- private final static String KIOSLAVERC_PROXY_TYPE_SYSTEM = "4"; //NOI18N
- private final static String KIOSLAVERC_PATH_IN_HOME = ".config/kioslaverc"; //NOI18N
- private final static String KIOSLAVERC_PATH_IN_HOME_KDE4 = ".kde/share/config/kioslaverc"; //NOI18N
+ private static final String EMPTY_STRING = ""; //NOI18N
+ private static final String SPACE = " "; //NOI18N
+ private static final String EQUALS = "="; //NOI18N
+ private static final String COLON = ":"; //NOI18N
+ private static final String COMMA = ","; //NOI18N
+ private static final String SQ_BRACKET_LEFT = "["; //NOI18N
+ private static final String HOME = "HOME"; //NOI18N
+ private static final String KIOSLAVERC_PROXY_SETTINGS_GROUP = "[Proxy Settings]"; //NOI18N
+ private static final String KIOSLAVERC_PROXY_TYPE = "ProxyType"; //NOI18N
+ private static final String KIOSLAVERC_PROXY_CONFIG_SCRIPT = "Proxy Config Script"; //NOI18N
+ private static final String KIOSLAVERC_HTTP_PROXY = "httpProxy"; //NOI18N
+ private static final String KIOSLAVERC_HTTPS_PROXY = "httpsProxy"; //NOI18N
+ private static final String KIOSLAVERC_SOCKS_PROXY = "socksProxy"; //NOI18N
+ private static final String KIOSLAVERC_NO_PROXY_FOR = "NoProxyFor"; //NOI18N
+ private static final String KIOSLAVERC_PROXY_TYPE_NONE = "0"; //NOI18N
+ private static final String KIOSLAVERC_PROXY_TYPE_MANUAL = "1"; //NOI18N
+ private static final String KIOSLAVERC_PROXY_TYPE_PAC = "2"; //NOI18N
+ private static final String KIOSLAVERC_PROXY_TYPE_AUTO = "3"; //NOI18N
+ private static final String KIOSLAVERC_PROXY_TYPE_SYSTEM = "4"; //NOI18N
+ private static final String KIOSLAVERC_PATH_IN_HOME = ".config/kioslaverc"; //NOI18N
+ private static final String KIOSLAVERC_PATH_IN_HOME_KDE4 = ".kde/share/config/kioslaverc"; //NOI18N
private final List<Path> KIOSLAVERC_PATHS;
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/mac/MacNetworkProxy.java b/platform/core.network/src/org/netbeans/core/network/proxy/mac/MacNetworkProxy.java
index d3face2..bb0af2c 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/mac/MacNetworkProxy.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/mac/MacNetworkProxy.java
@@ -32,27 +32,27 @@ import org.netbeans.core.network.proxy.NetworkProxySettings;
*/
public class MacNetworkProxy implements NetworkProxyResolver {
- private final static Logger LOGGER = Logger.getLogger(MacNetworkProxy.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(MacNetworkProxy.class.getName());
- private final static MacNetworkProxyLibrary cfNetworkLibrary = MacNetworkProxyLibrary.LIBRARY;
- private final static MacCoreFoundationLibrary cfLibrary = MacCoreFoundationLibrary.LIBRARY;
+ private static final MacNetworkProxyLibrary cfNetworkLibrary = MacNetworkProxyLibrary.LIBRARY;
+ private static final MacCoreFoundationLibrary cfLibrary = MacCoreFoundationLibrary.LIBRARY;
- private final static String COMMA = ","; //NOI18N
+ private static final String COMMA = ","; //NOI18N
- private final static NativeLibrary NETWORK_LIBRARY = NativeLibrary.getInstance("CoreServices"); //NOI18N
- private final static String KEY_AUTO_DISCOVERY_ENABLE = "kCFNetworkProxiesProxyAutoDiscoveryEnable"; //NOI18N
- private final static String KEY_PAC_ENABLE = "kCFNetworkProxiesProxyAutoConfigEnable"; //NOI18N
- private final static String KEY_PAC_URL = "kCFNetworkProxiesProxyAutoConfigURLString"; //NOI18N
- private final static String KEY_HTTP_ENABLE = "kCFNetworkProxiesHTTPEnable"; //NOI18N
- private final static String KEY_HTTP_HOST = "kCFNetworkProxiesHTTPProxy"; //NOI18N
- private final static String KEY_HTTP_PORT = "kCFNetworkProxiesHTTPPort"; //NOI18N
- private final static String KEY_HTTPS_ENABLE = "kCFNetworkProxiesHTTPSEnable"; //NOI18N
- private final static String KEY_HTTPS_HOST = "kCFNetworkProxiesHTTPSProxy"; //NOI18N
- private final static String KEY_HTTPS_PORT = "kCFNetworkProxiesHTTPSPort"; //NOI18N
- private final static String KEY_SOCKS_ENABLE = "kCFNetworkProxiesSOCKSEnable"; //NOI18N
- private final static String KEY_SOCKS_HOST = "kCFNetworkProxiesSOCKSProxy"; //NOI18N
- private final static String KEY_SOCKS_PORT = "kCFNetworkProxiesSOCKSPort"; //NOI18N
- private final static String KEY_EXCEPTIONS_LIST = "kCFNetworkProxiesExceptionsList"; //NOI18N
+ private static final NativeLibrary NETWORK_LIBRARY = NativeLibrary.getInstance("CoreServices"); //NOI18N
+ private static final String KEY_AUTO_DISCOVERY_ENABLE = "kCFNetworkProxiesProxyAutoDiscoveryEnable"; //NOI18N
+ private static final String KEY_PAC_ENABLE = "kCFNetworkProxiesProxyAutoConfigEnable"; //NOI18N
+ private static final String KEY_PAC_URL = "kCFNetworkProxiesProxyAutoConfigURLString"; //NOI18N
+ private static final String KEY_HTTP_ENABLE = "kCFNetworkProxiesHTTPEnable"; //NOI18N
+ private static final String KEY_HTTP_HOST = "kCFNetworkProxiesHTTPProxy"; //NOI18N
+ private static final String KEY_HTTP_PORT = "kCFNetworkProxiesHTTPPort"; //NOI18N
+ private static final String KEY_HTTPS_ENABLE = "kCFNetworkProxiesHTTPSEnable"; //NOI18N
+ private static final String KEY_HTTPS_HOST = "kCFNetworkProxiesHTTPSProxy"; //NOI18N
+ private static final String KEY_HTTPS_PORT = "kCFNetworkProxiesHTTPSPort"; //NOI18N
+ private static final String KEY_SOCKS_ENABLE = "kCFNetworkProxiesSOCKSEnable"; //NOI18N
+ private static final String KEY_SOCKS_HOST = "kCFNetworkProxiesSOCKSProxy"; //NOI18N
+ private static final String KEY_SOCKS_PORT = "kCFNetworkProxiesSOCKSPort"; //NOI18N
+ private static final String KEY_EXCEPTIONS_LIST = "kCFNetworkProxiesExceptionsList"; //NOI18N
@Override
public NetworkProxySettings getNetworkProxySettings() {
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/DateRange.java b/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/DateRange.java
index 782e1aa..25b566a 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/DateRange.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/DateRange.java
@@ -36,7 +36,7 @@ import java.util.Calendar;
*/
class DateRange {
- private final static int UNDEFINED = -1;
+ private static final int UNDEFINED = -1;
private final int yearMin;
private final int yearMax;
private final int monthMin;
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/PacUtilsDateTime.java b/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/PacUtilsDateTime.java
index c527661..a51085e 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/PacUtilsDateTime.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/PacUtilsDateTime.java
@@ -35,7 +35,7 @@ public class PacUtilsDateTime {
* Content: {@code SUN MON TUE WED THU FRI SAT}
*
*/
- public final static List<String> WEEKDAY_NAMES = Collections.unmodifiableList(
+ public static final List<String> WEEKDAY_NAMES = Collections.unmodifiableList(
Arrays.asList("SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"));
/**
@@ -44,7 +44,7 @@ public class PacUtilsDateTime {
* Content: {@code JAN FEB MAR APR MAY JUN JUL AUG SEP OCT NOV DEC}
*
*/
- public final static List<String> MONTH_NAMES = Collections.unmodifiableList(
+ public static final List<String> MONTH_NAMES = Collections.unmodifiableList(
Arrays.asList("JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"));
private static final TimeZone UTC_TIME = TimeZone.getTimeZone("UTC");
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/TimeRange.java b/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/TimeRange.java
index c603ad0..7c39ddb 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/TimeRange.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/pac/datetime/TimeRange.java
@@ -38,7 +38,7 @@ import java.util.Calendar;
*/
class TimeRange {
- private final static int UNDEFINED = -1;
+ private static final int UNDEFINED = -1;
private final int hourMin;
private final int hourMax;
private final int minuteMin;
diff --git a/platform/core.network/src/org/netbeans/core/network/proxy/windows/WindowsNetworkProxy.java b/platform/core.network/src/org/netbeans/core/network/proxy/windows/WindowsNetworkProxy.java
index c580e95..24eb437 100644
--- a/platform/core.network/src/org/netbeans/core/network/proxy/windows/WindowsNetworkProxy.java
+++ b/platform/core.network/src/org/netbeans/core/network/proxy/windows/WindowsNetworkProxy.java
@@ -30,15 +30,15 @@ import org.netbeans.core.network.proxy.NetworkProxySettings;
*/
public class WindowsNetworkProxy implements NetworkProxyResolver {
- private final static Logger LOGGER = Logger.getLogger(WindowsNetworkProxy.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(WindowsNetworkProxy.class.getName());
- private final static String HTTP_PROPERTY_NAME = "http="; //NOI18N
- private final static String HTTPS_PROPERTY_NAME = "https="; //NOI18N
- private final static String SOCKS_PROPERTY_NAME = "socks="; //NOI18N
+ private static final String HTTP_PROPERTY_NAME = "http="; //NOI18N
+ private static final String HTTPS_PROPERTY_NAME = "https="; //NOI18N
+ private static final String SOCKS_PROPERTY_NAME = "socks="; //NOI18N
- private final static String SPACE = " "; //NOI18N
- private final static String COLON = ":"; //NOI18N
- private final static String SEMI_COLON = ";"; //NOI18N
+ private static final String SPACE = " "; //NOI18N
+ private static final String COLON = ":"; //NOI18N
+ private static final String SEMI_COLON = ";"; //NOI18N
@Override
diff --git a/platform/core.network/src/org/netbeans/core/network/utils/SimpleObjCache.java b/platform/core.network/src/org/netbeans/core/network/utils/SimpleObjCache.java
index da037c0..cc4699b 100644
--- a/platform/core.network/src/org/netbeans/core/network/utils/SimpleObjCache.java
+++ b/platform/core.network/src/org/netbeans/core/network/utils/SimpleObjCache.java
@@ -118,7 +118,7 @@ public class SimpleObjCache<K,V> {
map.clear();
}
- synchronized private void evictIfFull() {
+ private synchronized void evictIfFull() {
if (map.size() >= maxSize) {
K toBeEvicted = findEvictionCandidate();
if (toBeEvicted != null) {
diff --git a/platform/core.network/test/unit/src/org/netbeans/core/network/proxy/pac/impl/PacHelperMethodsImplTest.java b/platform/core.network/test/unit/src/org/netbeans/core/network/proxy/pac/impl/PacHelperMethodsImplTest.java
index 6337ce4..5d7b6a1 100644
--- a/platform/core.network/test/unit/src/org/netbeans/core/network/proxy/pac/impl/PacHelperMethodsImplTest.java
+++ b/platform/core.network/test/unit/src/org/netbeans/core/network/proxy/pac/impl/PacHelperMethodsImplTest.java
@@ -46,10 +46,10 @@ public class PacHelperMethodsImplTest {
private InetAddress ipv4Addr;
private InetAddress ipv6Addr;
private final NbPacHelperMethods helpers = new NbPacHelperMethods();
- private final static List<String> WEEKDAY_NAMES = Collections.unmodifiableList(
+ private static final List<String> WEEKDAY_NAMES = Collections.unmodifiableList(
Arrays.asList("SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"));
- private final static List<String> MONTH_NAMES = Collections.unmodifiableList(
+ private static final List<String> MONTH_NAMES = Collections.unmodifiableList(
Arrays.asList("JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"));
public PacHelperMethodsImplTest() {
diff --git a/platform/core.startup/src/org/netbeans/core/startup/AutomaticDependencies.java b/platform/core.startup/src/org/netbeans/core/startup/AutomaticDependencies.java
index 66400b6..6038c03 100644
--- a/platform/core.startup/src/org/netbeans/core/startup/AutomaticDependencies.java
+++ b/platform/core.startup/src/org/netbeans/core/startup/AutomaticDependencies.java
@@ -415,7 +415,7 @@ public final class AutomaticDependencies {
}
- private static abstract class Dep {
+ private abstract static class Dep {
public Dep() {}
public final String toString() {
return manifestKey() + ": " + toManifestForm();
diff --git a/platform/core.startup/src/org/netbeans/core/startup/layers/BinaryCacheManager.java b/platform/core.startup/src/org/netbeans/core/startup/layers/BinaryCacheManager.java
index 07f87ca..5446229 100644
--- a/platform/core.startup/src/org/netbeans/core/startup/layers/BinaryCacheManager.java
+++ b/platform/core.startup/src/org/netbeans/core/startup/layers/BinaryCacheManager.java
@@ -187,7 +187,7 @@ final class BinaryCacheManager extends ParsingLayerCacheManager {
}
}
- private final static String[] ATTR_TYPES = {
+ private static final String[] ATTR_TYPES = {
"bytevalue", // NOI18N
"shortvalue", // NOI18N
"intvalue", // NOI18N
diff --git a/platform/core.startup/src/org/netbeans/core/startup/layers/ParsingLayerCacheManager.java b/platform/core.startup/src/org/netbeans/core/startup/layers/ParsingLayerCacheManager.java
index 7b41a7a..d7128eb 100644
--- a/platform/core.startup/src/org/netbeans/core/startup/layers/ParsingLayerCacheManager.java
+++ b/platform/core.startup/src/org/netbeans/core/startup/layers/ParsingLayerCacheManager.java
@@ -57,7 +57,7 @@ import org.xml.sax.XMLReader;
*/
abstract class ParsingLayerCacheManager extends LayerCacheManager implements ContentHandler, ErrorHandler, EntityResolver {
- private final static String[] ATTR_TYPES = {
+ private static final String[] ATTR_TYPES = {
"boolvalue",
"bundlevalue",
"bytevalue",
@@ -74,9 +74,9 @@ abstract class ParsingLayerCacheManager extends LayerCacheManager implements Con
"urlvalue",
};
- private final static String DTD_1_0 = "-//NetBeans//DTD Filesystem 1.0//EN";
- private final static String DTD_1_1 = "-//NetBeans//DTD Filesystem 1.1//EN";
- private final static String DTD_1_2 = "-//NetBeans//DTD Filesystem 1.2//EN";
+ private static final String DTD_1_0 = "-//NetBeans//DTD Filesystem 1.0//EN";
+ private static final String DTD_1_1 = "-//NetBeans//DTD Filesystem 1.1//EN";
+ private static final String DTD_1_2 = "-//NetBeans//DTD Filesystem 1.2//EN";
private Locator locator;
private MemFolder root;
@@ -427,7 +427,7 @@ abstract class ParsingLayerCacheManager extends LayerCacheManager implements Con
/** Struct for <file> or <folder>.
*/
- protected static abstract class MemFileOrFolder {
+ protected abstract static class MemFileOrFolder {
public String name;
public List<MemAttr> attrs = null; // {null | List<MemAttr>}
private Object base;
diff --git a/platform/core.ui/src/org/netbeans/core/ui/options/filetypes/IgnoredFilesPreferences.java b/platform/core.ui/src/org/netbeans/core/ui/options/filetypes/IgnoredFilesPreferences.java
index d04dec7..5c58c48 100644
--- a/platform/core.ui/src/org/netbeans/core/ui/options/filetypes/IgnoredFilesPreferences.java
+++ b/platform/core.ui/src/org/netbeans/core/ui/options/filetypes/IgnoredFilesPreferences.java
@@ -43,7 +43,7 @@ final class IgnoredFilesPreferences {
= "IgnoreHiddenFilesInUserHome"; // NOI18N
/** Default ignored files pattern. Pattern \.(cvsignore|svn|DS_Store) is covered by ^\..*$ **/
static final String DEFAULT_IGNORED_FILES = "^(CVS|SCCS|vssver.?\\.scc|#.*#|%.*%|_svn)$|~$|^\\.(git|hg|svn|cache|DS_Store)$|^Thumbs.db$"; //NOI18N
- static private String syntaxError;
+ private static String syntaxError;
private IgnoredFilesPreferences() {
}
diff --git a/platform/core.windows/src/org/netbeans/core/windows/ModeStructureSnapshot.java b/platform/core.windows/src/org/netbeans/core/windows/ModeStructureSnapshot.java
index d31cf36..9a3a962 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/ModeStructureSnapshot.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/ModeStructureSnapshot.java
@@ -115,7 +115,7 @@ public class ModeStructureSnapshot {
/** Superclass for snapshot of model element.
* There are three types, split, mode, and editor (represents editor area) type. */
- public static abstract class ElementSnapshot {
+ public abstract static class ElementSnapshot {
// PENDING revise
/** Corresponding object in model (SplitNode or ModeNode or ModeImpl for separate mode). */
private final ModelElement originator;
diff --git a/platform/core.windows/src/org/netbeans/core/windows/PersistenceHandler.java b/platform/core.windows/src/org/netbeans/core/windows/PersistenceHandler.java
index 4e5bd7d..cbce993 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/PersistenceHandler.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/PersistenceHandler.java
@@ -45,7 +45,7 @@ import org.openide.windows.*;
*
* @author Peter Zavadsky, Marek Slama
*/
-final public class PersistenceHandler implements PersistenceObserver {
+public final class PersistenceHandler implements PersistenceObserver {
// Persistence data
/** Maps mode config name to mode instance. */
diff --git a/platform/core.windows/src/org/netbeans/core/windows/TopComponentTracker.java b/platform/core.windows/src/org/netbeans/core/windows/TopComponentTracker.java
index 7097020..8f07395 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/TopComponentTracker.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/TopComponentTracker.java
@@ -50,7 +50,7 @@ public final class TopComponentTracker {
/**
* @return The one and only instance.
*/
- public synchronized static TopComponentTracker getDefault() {
+ public static synchronized TopComponentTracker getDefault() {
if( null == theInstance ) {
theInstance = new TopComponentTracker();
}
diff --git a/platform/core.windows/src/org/netbeans/core/windows/documentgroup/PleaseWait.java b/platform/core.windows/src/org/netbeans/core/windows/documentgroup/PleaseWait.java
index 72a9684..96ae4fa 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/documentgroup/PleaseWait.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/documentgroup/PleaseWait.java
@@ -33,7 +33,7 @@ import org.netbeans.core.windows.WindowManagerImpl;
*/
class PleaseWait extends JPanel {
- private final static Color FILL_COLOR = new Color(0,0,0,128);
+ private static final Color FILL_COLOR = new Color(0,0,0,128);
private Component oldGlass;
public PleaseWait() {
diff --git a/platform/core.windows/src/org/netbeans/core/windows/model/SplitSubModel.java b/platform/core.windows/src/org/netbeans/core/windows/model/SplitSubModel.java
index 63714f1..a87c356 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/model/SplitSubModel.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/model/SplitSubModel.java
@@ -786,7 +786,7 @@ class SplitSubModel {
/// Nodes of this tree model
////////////////////////////////////////
/** Class representing one node in SplitSubModel. */
- protected static abstract class Node implements ModelElement {
+ protected abstract static class Node implements ModelElement {
/** Reference to parent node. */
private SplitNode parent;
diff --git a/platform/core.windows/src/org/netbeans/core/windows/services/ActionPasteType.java b/platform/core.windows/src/org/netbeans/core/windows/services/ActionPasteType.java
index c9aabd3..ada1b97 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/services/ActionPasteType.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/services/ActionPasteType.java
@@ -109,10 +109,10 @@ final class ActionPasteType {
return retVal;
}
- private final static class PasteTypeImpl extends PasteType {
- final private DataFolder targetFolder;
- final private Collection<DataObject> sourceDataObjects;
- final private int pasteOperation;
+ private static final class PasteTypeImpl extends PasteType {
+ private final DataFolder targetFolder;
+ private final Collection<DataObject> sourceDataObjects;
+ private final int pasteOperation;
private PasteTypeImpl(final Collection<DataObject> sourceDataObjects, final DataFolder targetFolder, final int pasteOperation) {
diff --git a/platform/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java b/platform/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java
index 0e48820..1e1ea8a 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/services/NbPresenter.java
@@ -139,7 +139,7 @@ implements PropertyChangeListener, WindowListener, Mutex.Action<Void>, Comparato
/** Initilizes accessible contexts */
initAccessibility();
}
- private final static String ESCAPE_COMMAND = "Escape"; // NOI18N
+ private static final String ESCAPE_COMMAND = "Escape"; // NOI18N
private Component currentMessage;
private JScrollPane currentScrollPane;
diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/ModeStructureAccessorImpl.java b/platform/core.windows/src/org/netbeans/core/windows/view/ModeStructureAccessorImpl.java
index 3e5a74f..1fce58b 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/view/ModeStructureAccessorImpl.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/view/ModeStructureAccessorImpl.java
@@ -124,7 +124,7 @@ final class ModeStructureAccessorImpl implements ModeStructureAccessor {
/** Superclass for accessor of model element.
* There are three types, split, mode, and editor (represents editor area) type. */
- static abstract class ElementAccessorImpl implements ElementAccessor {
+ abstract static class ElementAccessorImpl implements ElementAccessor {
// PENDING revise
/** Corresponding object in model (SplitNode or ModeNode for separate mode). */
private final ModelElement originator;
diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/ui/MainWindow.java b/platform/core.windows/src/org/netbeans/core/windows/view/ui/MainWindow.java
index 40b42e2..32e877e 100755
--- a/platform/core.windows/src/org/netbeans/core/windows/view/ui/MainWindow.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/view/ui/MainWindow.java
@@ -476,7 +476,7 @@ public final class MainWindow {
}
}
- static private class StatusLineElementsListener implements LookupListener {
+ private static class StatusLineElementsListener implements LookupListener {
private JPanel decoratingPanel;
StatusLineElementsListener (JPanel decoratingPanel) {
this.decoratingPanel = decoratingPanel;
diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/ui/NbSheet.java b/platform/core.windows/src/org/netbeans/core/windows/view/ui/NbSheet.java
index 1c20a9c..b7b948b 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/view/ui/NbSheet.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/view/ui/NbSheet.java
@@ -75,9 +75,9 @@ public final class NbSheet extends TopComponent {
/** shared sheet */
private static NbSheet sharedSheet;
/** listener to the property changes */
- transient private final Listener listener;
+ private final transient Listener listener;
/** listener to the node changes, especially their destruction */
- transient private final SheetNodesListener snListener;
+ private final transient SheetNodesListener snListener;
/** Should property sheet listen to the global changes ? */
boolean global;
/** the property sheet that is used to display nodes */
diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/ui/popupswitcher/KeyboardPopupSwitcher.java b/platform/core.windows/src/org/netbeans/core/windows/view/ui/popupswitcher/KeyboardPopupSwitcher.java
index de4db23..2d78707 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/view/ui/popupswitcher/KeyboardPopupSwitcher.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/view/ui/popupswitcher/KeyboardPopupSwitcher.java
@@ -94,8 +94,8 @@ public final class KeyboardPopupSwitcher implements WindowFocusListener {
/** Indicates whether an item to be selected is previous or next one. */
private boolean fwd = true;
- private final static AWTKeyStroke CTRL_TAB = AWTKeyStroke.getAWTKeyStroke( KeyEvent.VK_TAB, KeyEvent.CTRL_DOWN_MASK );
- private final static AWTKeyStroke CTRL_SHIFT_TAB = AWTKeyStroke.getAWTKeyStroke( KeyEvent.VK_TAB, KeyEvent.CTRL_DOWN_MASK+KeyEvent.SHIFT_DOWN_MASK );
+ private static final AWTKeyStroke CTRL_TAB = AWTKeyStroke.getAWTKeyStroke( KeyEvent.VK_TAB, KeyEvent.CTRL_DOWN_MASK );
+ private static final AWTKeyStroke CTRL_SHIFT_TAB = AWTKeyStroke.getAWTKeyStroke( KeyEvent.VK_TAB, KeyEvent.CTRL_DOWN_MASK+KeyEvent.SHIFT_DOWN_MASK );
/**
* Tries to process given <code>KeyEvent</code> and returns true is event
diff --git a/platform/core.windows/test/unit/src/org/netbeans/core/windows/view/ui/StatusLineElementProviderTest.java b/platform/core.windows/test/unit/src/org/netbeans/core/windows/view/ui/StatusLineElementProviderTest.java
index cb20fe7..f529801 100644
--- a/platform/core.windows/test/unit/src/org/netbeans/core/windows/view/ui/StatusLineElementProviderTest.java
+++ b/platform/core.windows/test/unit/src/org/netbeans/core/windows/view/ui/StatusLineElementProviderTest.java
@@ -46,9 +46,9 @@ public class StatusLineElementProviderTest extends NbTestCase {
System.setProperty ("org.openide.util.Lookup", "org.netbeans.core.windows.view.ui.StatusLineElementProviderTest$Lkp");
}
- static private InstanceContent ic = null;
- static private Impl impl1, impl2;
- static private JPanel statusLine;
+ private static InstanceContent ic = null;
+ private static Impl impl1, impl2;
+ private static JPanel statusLine;
public StatusLineElementProviderTest(String name) {
super(name);
diff --git a/platform/favorites/src/org/netbeans/modules/favorites/Tab.java b/platform/favorites/src/org/netbeans/modules/favorites/Tab.java
index c69351a..0e5e9cc 100644
--- a/platform/favorites/src/org/netbeans/modules/favorites/Tab.java
+++ b/platform/favorites/src/org/netbeans/modules/favorites/Tab.java
@@ -82,14 +82,14 @@ implements Runnable, ExplorerManager.Provider {
/* private */ static transient Tab DEFAULT; // package-private for unit tests
/** composited view */
- transient protected TreeView view;
+ protected transient TreeView view;
/** listeners to the root context and IDE settings */
- transient private PropertyChangeListener weakRcL;
- transient private NodeListener weakNRcL;
+ private transient PropertyChangeListener weakRcL;
+ private transient NodeListener weakNRcL;
- transient private NodeListener rcListener;
+ private transient NodeListener rcListener;
/** validity flag */
- transient private boolean valid = true;
+ private transient boolean valid = true;
private ExplorerManager manager;
diff --git a/platform/htmlui/test/unit/src/org/netbeans/modules/htmlui/impl/ATech.java b/platform/htmlui/test/unit/src/org/netbeans/modules/htmlui/impl/ATech.java
index 58efe55..b1bf557 100644
--- a/platform/htmlui/test/unit/src/org/netbeans/modules/htmlui/impl/ATech.java
+++ b/platform/htmlui/test/unit/src/org/netbeans/modules/htmlui/impl/ATech.java
@@ -30,7 +30,7 @@ public interface ATech {
}
@ServiceProvider(service = Contexts.Provider.class)
- public final static class Register implements Contexts.Provider {
+ public static final class Register implements Contexts.Provider {
@Override
public void fillContext(Contexts.Builder bldr, Class<?> type) {
bldr.register(ATech.class, new First(), 30);
diff --git a/platform/javahelp/src/org/netbeans/modules/javahelp/BrowserDisplayer.java b/platform/javahelp/src/org/netbeans/modules/javahelp/BrowserDisplayer.java
index 1cbf000..4fe4afe 100644
--- a/platform/javahelp/src/org/netbeans/modules/javahelp/BrowserDisplayer.java
+++ b/platform/javahelp/src/org/netbeans/modules/javahelp/BrowserDisplayer.java
@@ -96,7 +96,7 @@ public class BrowserDisplayer extends JButton
private HTMLDocument doc;
private URL base;
- private final static Cursor handCursor =
+ private static final Cursor handCursor =
Cursor.getPredefinedCursor(Cursor.HAND_CURSOR);
private Cursor origCursor;
diff --git a/platform/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/DecorableTest.java b/platform/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/DecorableTest.java
index 2f57c59..636a883 100644
--- a/platform/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/DecorableTest.java
+++ b/platform/lib.uihandler/test/unit/src/org/netbeans/lib/uihandler/DecorableTest.java
@@ -246,7 +246,7 @@ public class DecorableTest extends TestCase {
return buffImage;
}
- static private ColorModel colorModel(int transparency) {
+ private static ColorModel colorModel(int transparency) {
ColorModel model;
try {
model = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment()
diff --git a/platform/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java b/platform/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java
index a0722b1..84f5c08 100644
--- a/platform/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java
+++ b/platform/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java
@@ -217,7 +217,7 @@ public final class WindowsNotifier extends Notifier<Void> {
}
- final static Kernel32 KERNEL32 = Native.load("kernel32", Kernel32.class, W32APIOptions.UNICODE_OPTIONS);
+ static final Kernel32 KERNEL32 = Native.load("kernel32", Kernel32.class, W32APIOptions.UNICODE_OPTIONS);
public WindowsNotifier() { // prepare port, start thread?
}
diff --git a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/FileBasedFileSystem.java b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/FileBasedFileSystem.java
index f81f819..18ba602 100644
--- a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/FileBasedFileSystem.java
+++ b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/FileBasedFileSystem.java
@@ -55,9 +55,9 @@ import org.openide.util.lookup.ServiceProvider;
public class FileBasedFileSystem extends FileSystem {
private static final Logger LOG = Logger.getLogger(FileBasedFileSystem.class.getName());
private static volatile FileBasedFileSystem INSTANCE;
- transient private RootObj<? extends FileObject> root;
- transient private final StatusImpl status = new StatusImpl();
- transient private static int modificationInProgress;
+ private transient RootObj<? extends FileObject> root;
+ private final transient StatusImpl status = new StatusImpl();
+ private static transient int modificationInProgress;
public FileBasedFileSystem() {
if (BaseUtilities.isWindows()) {
@@ -69,11 +69,11 @@ public class FileBasedFileSystem extends FileSystem {
}
}
- public synchronized static boolean isModificationInProgress() {
+ public static synchronized boolean isModificationInProgress() {
return modificationInProgress == 0 ? false : true;
}
- private synchronized static void setModificationInProgress(boolean started) {
+ private static synchronized void setModificationInProgress(boolean started) {
if (started) {
modificationInProgress++;
} else {
diff --git a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/children/ChildrenSupport.java b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/children/ChildrenSupport.java
index c804d51..546905c 100644
--- a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/children/ChildrenSupport.java
+++ b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/children/ChildrenSupport.java
@@ -391,7 +391,7 @@ public class ChildrenSupport {
return notExistingChildren != null ? notExistingChildren : Collections.<FileNaming>emptySet();
}
- protected synchronized final void copyTo(ChildrenSupport newCache, FileNaming name) {
+ protected final synchronized void copyTo(ChildrenSupport newCache, FileNaming name) {
assert newCache != this && newCache.existingChildren == null && newCache.notExistingChildren == null;
for (FileNaming fn : getExisting(false)) {
newCache.getChild(fn.getName(), name, true);
diff --git a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java
index 68c1671..616967f 100644
--- a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java
+++ b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/BaseFileObj.java
@@ -858,7 +858,7 @@ public abstract class BaseFileObj extends FileObject {
return new ReplaceForSerialization(getFileName().getFile());
}
- abstract protected void setValid(boolean valid);
+ protected abstract void setValid(boolean valid);
abstract void refreshImpl(final boolean expected, boolean fire);
@Override
diff --git a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/naming/NamingFactory.java b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/naming/NamingFactory.java
index 749c2c0..ec73d81 100644
--- a/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/naming/NamingFactory.java
+++ b/platform/masterfs/src/org/netbeans/modules/masterfs/filebasedfs/naming/NamingFactory.java
@@ -387,7 +387,7 @@ public final class NamingFactory {
}
- synchronized static String dump(Integer id, File file) {
+ static synchronized String dump(Integer id, File file) {
StringBuilder sb = new StringBuilder();
final String hex = Integer.toHexString(id);
diff --git a/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/MIMESupportLoggingTest.java b/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/MIMESupportLoggingTest.java
index 837887d..0621f9e 100644
--- a/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/MIMESupportLoggingTest.java
+++ b/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/MIMESupportLoggingTest.java
@@ -158,7 +158,7 @@ public class MIMESupportLoggingTest extends NbTestCase {
}
- public final static File copyStringToFile (File f, String content) throws Exception {
+ public static final File copyStringToFile (File f, String content) throws Exception {
FileOutputStream os = new FileOutputStream(f);
InputStream is = new ByteArrayInputStream(content.getBytes("UTF-8"));
FileUtil.copy(is, os);
diff --git a/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FolderObjTest.java b/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FolderObjTest.java
index 29685e3..951f364 100644
--- a/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FolderObjTest.java
+++ b/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/fileobjects/FolderObjTest.java
@@ -84,7 +84,7 @@ public class FolderObjTest extends NbTestCase {
Level.FINEST : Level.OFF;
}
- static abstract class IntrusiveLogHandler extends Handler {
+ abstract static class IntrusiveLogHandler extends Handler {
private String message;
IntrusiveLogHandler(final String message) {
this.message = message;
@@ -96,7 +96,7 @@ public class FolderObjTest extends NbTestCase {
}
}
- abstract protected void processLogRecord(final LogRecord record);
+ protected abstract void processLogRecord(final LogRecord record);
public void flush() {}
public void close() { flush(); }
}
diff --git a/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/utils/FileChangedManagerDeadlockTest.java b/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/utils/FileChangedManagerDeadlockTest.java
index 7492b2f..3a0dc67 100644
--- a/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/utils/FileChangedManagerDeadlockTest.java
+++ b/platform/masterfs/test/unit/src/org/netbeans/modules/masterfs/filebasedfs/utils/FileChangedManagerDeadlockTest.java
@@ -74,7 +74,7 @@ public class FileChangedManagerDeadlockTest {
assertTrue("Priority IO should be finished", priorityIO.finished.get());
}
- private static abstract class IORunnable implements Runnable {
+ private abstract static class IORunnable implements Runnable {
protected Semaphore semaphore;
final AtomicBoolean finished = new AtomicBoolean(false);
diff --git a/platform/netbinox/src/org/netbeans/modules/netbinox/NetbinoxHooks.java b/platform/netbinox/src/org/netbeans/modules/netbinox/NetbinoxHooks.java
index 2953c0f..27b753c 100644
--- a/platform/netbinox/src/org/netbeans/modules/netbinox/NetbinoxHooks.java
+++ b/platform/netbinox/src/org/netbeans/modules/netbinox/NetbinoxHooks.java
@@ -278,7 +278,7 @@ BundleFileFactoryHook, FrameworkLog, FrameworkListener, AdaptorHook, LookupListe
archive = netigsoArchive;
}
- private synchronized static void initRegistry(HookRegistry hr, NetbinoxHooks hooks) {
+ private static synchronized void initRegistry(HookRegistry hr, NetbinoxHooks hooks) {
hookRegistry = hr;
hr.addClassLoadingHook(hooks);
hr.addBundleFileFactoryHook(hooks);
diff --git a/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/HookRaceTest.java b/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/HookRaceTest.java
index 620660e..dad69b5 100644
--- a/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/HookRaceTest.java
+++ b/platform/netbinox/test/unit/src/org/netbeans/modules/netbinox/HookRaceTest.java
@@ -88,9 +88,9 @@ public class HookRaceTest extends NbTestCase {
}
public static final class SlowH implements HookConfigurator {
- private final static Object LOCK = new Object();
+ private static final Object LOCK = new Object();
private static boolean proceed;
- volatile static int cnt;
+ static volatile int cnt;
@Override
public void addHooks(HookRegistry hr) {
diff --git a/platform/o.n.bootstrap/src/org/netbeans/JarClassLoader.java b/platform/o.n.bootstrap/src/org/netbeans/JarClassLoader.java
index 99ab774..33a1399 100644
--- a/platform/o.n.bootstrap/src/org/netbeans/JarClassLoader.java
+++ b/platform/o.n.bootstrap/src/org/netbeans/JarClassLoader.java
@@ -331,7 +331,7 @@ public class JarClassLoader extends ProxyClassLoader {
}
}
- static abstract class Source {
+ abstract static class Source {
private URL url;
private ProtectionDomain pd;
protected JarClassLoader jcl;
diff --git a/platform/o.n.bootstrap/src/org/netbeans/ModuleData.java b/platform/o.n.bootstrap/src/org/netbeans/ModuleData.java
index f6323b6..7da76fd 100644
--- a/platform/o.n.bootstrap/src/org/netbeans/ModuleData.java
+++ b/platform/o.n.bootstrap/src/org/netbeans/ModuleData.java
@@ -48,8 +48,8 @@ import org.openide.util.NbBundle;
* @author Jaroslav Tulach <jt...@netbeans.org>
*/
class ModuleData {
- private final static PackageExport[] ZERO_PACKAGE_ARRAY = new PackageExport[0];
- private final static String[] ZERO_STRING_ARRAY = new String[0];
+ private static final PackageExport[] ZERO_PACKAGE_ARRAY = new PackageExport[0];
+ private static final String[] ZERO_STRING_ARRAY = new String[0];
private final String codeName;
private final String codeNameBase;
diff --git a/platform/o.n.bootstrap/src/org/netbeans/ModuleManager.java b/platform/o.n.bootstrap/src/org/netbeans/ModuleManager.java
index f39b139..8e8836a 100644
--- a/platform/o.n.bootstrap/src/org/netbeans/ModuleManager.java
+++ b/platform/o.n.bootstrap/src/org/netbeans/ModuleManager.java
@@ -2460,7 +2460,7 @@ public final class ModuleManager extends Modules {
willEnable = null;
}
- synchronized final void registerEnable(Set<Module> modules, List<Module> l) {
+ final synchronized void registerEnable(Set<Module> modules, List<Module> l) {
toEnable = new HashSet<String>();
for (Module m : modules) {
toEnable.add(m.getCodeNameBase());
@@ -2473,7 +2473,7 @@ public final class ModuleManager extends Modules {
Stamps.getModulesJARs().scheduleSave(this, CACHE, false);
}
- synchronized final List<String> simulateEnable(Set<Module> modules) {
+ final synchronized List<String> simulateEnable(Set<Module> modules) {
if (
toEnable != null &&
modules.size() == toEnable.size() &&
diff --git a/platform/o.n.bootstrap/src/org/netbeans/ProxyClassPackages.java b/platform/o.n.bootstrap/src/org/netbeans/ProxyClassPackages.java
index c5b9f56..ffce7a4 100644
--- a/platform/o.n.bootstrap/src/org/netbeans/ProxyClassPackages.java
+++ b/platform/o.n.bootstrap/src/org/netbeans/ProxyClassPackages.java
@@ -39,7 +39,7 @@ final class ProxyClassPackages {
*/
private static final Map<String, Set<ProxyClassLoader>> packageCoverage = new HashMap<String, Set<ProxyClassLoader>>();
- synchronized static void addCoveredPackages(
+ static synchronized void addCoveredPackages(
ProxyClassLoader loader, Iterable<String> coveredPackages
) {
for (String pkg : coveredPackages) {
@@ -57,7 +57,7 @@ final class ProxyClassPackages {
}
}
- synchronized static void removeCoveredPakcages(
+ static synchronized void removeCoveredPakcages(
ProxyClassLoader loader
) {
for (Iterator<String> it = ProxyClassPackages.packageCoverage.keySet().iterator(); it.hasNext();) {
@@ -71,7 +71,7 @@ final class ProxyClassPackages {
}
}
- synchronized static Set<ProxyClassLoader> findCoveredPkg(String pkg) {
+ static synchronized Set<ProxyClassLoader> findCoveredPkg(String pkg) {
return packageCoverage.get(pkg);
}
diff --git a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerGrepTest.java b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerGrepTest.java
index 5cfe743..340ddd0 100644
--- a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerGrepTest.java
+++ b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerGrepTest.java
@@ -36,8 +36,8 @@ import org.openide.util.RequestProcessor;
*/
public class CLIHandlerGrepTest extends NbTestCase {
- final static ByteArrayInputStream nullInput = new ByteArrayInputStream(new byte[0]);
- final static ByteArrayOutputStream nullOutput = new ByteArrayOutputStream();
+ static final ByteArrayInputStream nullInput = new ByteArrayInputStream(new byte[0]);
+ static final ByteArrayOutputStream nullOutput = new ByteArrayOutputStream();
static Logger LOG;
diff --git a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerReadingOfInputTest.java b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerReadingOfInputTest.java
index 2822199..6eb533e 100644
--- a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerReadingOfInputTest.java
+++ b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerReadingOfInputTest.java
@@ -33,8 +33,8 @@ import static org.netbeans.CLIHandlerTest.*;
*/
public class CLIHandlerReadingOfInputTest extends NbTestCase {
- final static ByteArrayInputStream nullInput = new ByteArrayInputStream(new byte[0]);
- final static ByteArrayOutputStream nullOutput = new ByteArrayOutputStream();
+ static final ByteArrayInputStream nullInput = new ByteArrayInputStream(new byte[0]);
+ static final ByteArrayOutputStream nullOutput = new ByteArrayOutputStream();
private Logger LOG;
diff --git a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerServerWaitsTest.java b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerServerWaitsTest.java
index ad65a56..6ad3c21 100644
--- a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerServerWaitsTest.java
+++ b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerServerWaitsTest.java
@@ -34,8 +34,8 @@ import static org.netbeans.CLIHandlerTest.*;
@RandomlyFails
public class CLIHandlerServerWaitsTest extends NbTestCase {
- final static ByteArrayInputStream nullInput = new ByteArrayInputStream(new byte[0]);
- final static ByteArrayOutputStream nullOutput = new ByteArrayOutputStream();
+ static final ByteArrayInputStream nullInput = new ByteArrayInputStream(new byte[0]);
+ static final ByteArrayOutputStream nullOutput = new ByteArrayOutputStream();
private Logger LOG;
diff --git a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerTest.java b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerTest.java
index c81f6b5..91df241 100644
--- a/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerTest.java
+++ b/platform/o.n.bootstrap/test/unit/src/org/netbeans/CLIHandlerTest.java
@@ -37,8 +37,8 @@ import org.openide.util.RequestProcessor;
*/
public class CLIHandlerTest extends NbTestCase {
- final static ByteArrayInputStream nullInput = new ByteArrayInputStream(new byte[0]);
- final static ByteArrayOutputStream nullOutput = new ByteArrayOutputStream();
+ static final ByteArrayInputStream nullInput = new ByteArrayInputStream(new byte[0]);
+ static final ByteArrayOutputStream nullOutput = new ByteArrayOutputStream();
private Logger LOG;
diff --git a/platform/o.n.core/src/org/netbeans/beaninfo/editors/FontEditor.java b/platform/o.n.core/src/org/netbeans/beaninfo/editors/FontEditor.java
index d96ee3f..3e01fdc 100644
--- a/platform/o.n.core/src/org/netbeans/beaninfo/editors/FontEditor.java
+++ b/platform/o.n.core/src/org/netbeans/beaninfo/editors/FontEditor.java
@@ -190,8 +190,8 @@ public class FontEditor implements PropertyEditor, XMLPropertyEditor {
else return NbBundle.getMessage(FontEditor.class, "CTL_Plain");
}
- static private String[] fonts;
- static private String [] getFonts () {
+ private static String[] fonts;
+ private static String [] getFonts () {
if (fonts == null) {
try {
fonts = GraphicsEnvironment.getLocalGraphicsEnvironment ().getAvailableFontFamilyNames();
diff --git a/platform/o.n.core/src/org/netbeans/core/ExitDialog.java b/platform/o.n.core/src/org/netbeans/core/ExitDialog.java
index 63fd562..3c09c2f 100644
--- a/platform/o.n.core/src/org/netbeans/core/ExitDialog.java
+++ b/platform/o.n.core/src/org/netbeans/core/ExitDialog.java
@@ -53,7 +53,7 @@ import org.openide.util.NbBundle;
*/
public class ExitDialog extends JPanel implements java.awt.event.ActionListener {
- private final static boolean isAqua = "Aqua".equals(UIManager.getLookAndFeel().getID());
+ private static final boolean isAqua = "Aqua".equals(UIManager.getLookAndFeel().getID());
private static Object[] exitOptions;
diff --git a/platform/o.n.core/src/org/netbeans/core/ModuleActions.java b/platform/o.n.core/src/org/netbeans/core/ModuleActions.java
index 7c2a72e..9165e12 100644
--- a/platform/o.n.core/src/org/netbeans/core/ModuleActions.java
+++ b/platform/o.n.core/src/org/netbeans/core/ModuleActions.java
@@ -145,7 +145,7 @@ public class ModuleActions extends ActionManager
/** Adds new action to the list.
*/
- public synchronized static void add (ManifestSection.ActionSection a) {
+ public static synchronized void add (ManifestSection.ActionSection a) {
List<ManifestSection.ActionSection> list = map.get (module);
if (list == null) {
list = new ArrayList<ManifestSection.ActionSection> ();
@@ -160,7 +160,7 @@ public class ModuleActions extends ActionManager
/** Removes new action from the list.
*/
- public synchronized static void remove (ManifestSection.ActionSection a) {
+ public static synchronized void remove (ManifestSection.ActionSection a) {
List<ManifestSection.ActionSection> list = map.get (module);
if (list == null) {
return;
@@ -178,7 +178,7 @@ public class ModuleActions extends ActionManager
/** Creates the actions.
*/
- private synchronized static SystemAction[] createActions () {
+ private static synchronized SystemAction[] createActions () {
Iterator<List<ManifestSection.ActionSection>> it = map.values ().iterator ();
ArrayList<Object> arr = new ArrayList<Object> (map.size () * 5);
diff --git a/platform/o.n.core/test/perf/src/org/netbeans/core/projects/XMLSettingsTest.java b/platform/o.n.core/test/perf/src/org/netbeans/core/projects/XMLSettingsTest.java
index c721936..f1ec866 100644
--- a/platform/o.n.core/test/perf/src/org/netbeans/core/projects/XMLSettingsTest.java
+++ b/platform/o.n.core/test/perf/src/org/netbeans/core/projects/XMLSettingsTest.java
@@ -211,7 +211,7 @@ public class XMLSettingsTest extends Benchmark {
}
}
- public static abstract class SuperClazz implements Serializable {
+ public abstract static class SuperClazz implements Serializable {
public abstract int x();
}
public static final class Clazz extends SuperClazz {
diff --git a/platform/o.n.core/test/unit/src/org/netbeans/core/HtmlBrowserComponentTest.java b/platform/o.n.core/test/unit/src/org/netbeans/core/HtmlBrowserComponentTest.java
index 0856164..27e696e 100644
--- a/platform/o.n.core/test/unit/src/org/netbeans/core/HtmlBrowserComponentTest.java
+++ b/platform/o.n.core/test/unit/src/org/netbeans/core/HtmlBrowserComponentTest.java
@@ -87,7 +87,7 @@ public class HtmlBrowserComponentTest {
private static class TestBrowserImpl extends HtmlBrowser.Impl {
private final JComponent theComponent = new JPanel();
- private final static TestLookupContent lookupContent = new TestLookupContent();
+ private static final TestLookupContent lookupContent = new TestLookupContent();
private final Lookup lookup = Lookups.singleton( lookupContent );
@Override
diff --git a/platform/o.n.swing.laf.dark/src/org/netbeans/swing/laf/dark/DarkMetalTheme.java b/platform/o.n.swing.laf.dark/src/org/netbeans/swing/laf/dark/DarkMetalTheme.java
index fb0033b..820011d 100644
--- a/platform/o.n.swing.laf.dark/src/org/netbeans/swing/laf/dark/DarkMetalTheme.java
+++ b/platform/o.n.swing.laf.dark/src/org/netbeans/swing/laf/dark/DarkMetalTheme.java
@@ -242,5 +242,5 @@ public class DarkMetalTheme extends MetalTheme {
return DEFAULT_FONT;
}
- private final static FontUIResource DEFAULT_FONT = new FontUIResource("Dialog", Font.PLAIN, 11); //NOI18N
+ private static final FontUIResource DEFAULT_FONT = new FontUIResource("Dialog", Font.PLAIN, 11); //NOI18N
}
diff --git a/platform/o.n.swing.outline/src/org/netbeans/swing/etable/ETable.java b/platform/o.n.swing.outline/src/org/netbeans/swing/etable/ETable.java
index b10b7f8..cde1c6c 100644
--- a/platform/o.n.swing.outline/src/org/netbeans/swing/etable/ETable.java
+++ b/platform/o.n.swing.outline/src/org/netbeans/swing/etable/ETable.java
@@ -124,11 +124,11 @@ public class ETable extends JTable {
private static final String ACTION_FOCUS_NEXT = "focusNext"; //NOI18N
/** Possible value for editing property */
- private final static int FULLY_EDITABLE = 1;
+ private static final int FULLY_EDITABLE = 1;
/** Possible value for editing property */
- private final static int FULLY_NONEDITABLE = 2;
+ private static final int FULLY_NONEDITABLE = 2;
/** Possible value for editing property */
- private final static int DEFAULT = 3;
+ private static final int DEFAULT = 3;
/** Key for storing the currently searched column's index. */
private static final String SEARCH_COLUMN = "SearchColumn";
@@ -177,9 +177,9 @@ public class ETable extends JTable {
/** */
int SEARCH_FIELD_SPACE = 3;
/** */
- final private JTextField searchTextField = new SearchTextField();
+ private final JTextField searchTextField = new SearchTextField();
/** */
- final private int heightOfTextField = searchTextField.getPreferredSize().height;
+ private final int heightOfTextField = searchTextField.getPreferredSize().height;
/** */
private JPanel searchPanel = null;
@@ -2436,7 +2436,7 @@ public class ETable extends JTable {
/**
* Item to the collection when doing the sorting of table rows.
*/
- public final static class RowMapping {
+ public static final class RowMapping {
// index (of the row) in the TableModel
private final int originalIndex;
// table model of my table
diff --git a/platform/o.n.swing.outline/src/org/netbeans/swing/outline/Outline.java b/platform/o.n.swing.outline/src/org/netbeans/swing/outline/Outline.java
index 1fcc947..fd439cb 100644
--- a/platform/o.n.swing.outline/src/org/netbeans/swing/outline/Outline.java
+++ b/platform/o.n.swing.outline/src/org/netbeans/swing/outline/Outline.java
@@ -459,7 +459,7 @@ public class Outline extends ETable {
}
private transient Map<TreePath, RowMapping> tempSortMap = null;
- private transient final Object tempSortMapLock = new Object();
+ private final transient Object tempSortMapLock = new Object();
/**
* Sorts the rows of the tree table.
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/aqua/AquaSeparatorUI.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/aqua/AquaSeparatorUI.java
index 9ec2626..f0c5318 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/aqua/AquaSeparatorUI.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/aqua/AquaSeparatorUI.java
@@ -41,8 +41,8 @@ import javax.swing.plaf.SeparatorUI;
* @author Christopher Atlan
*/
public class AquaSeparatorUI extends SeparatorUI {
- private final static Color lineColorHorizontal = new Color(215, 215, 215);
- private final static Color lineColorVertical = new Color(128, 128, 128);
+ private static final Color lineColorHorizontal = new Color(215, 215, 215);
+ private static final Color lineColorVertical = new Color(128, 128, 128);
private static ComponentUI separatorui = new AquaSeparatorUI();
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkLFCustoms.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkLFCustoms.java
index d0d8d34..9fc66ae 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkLFCustoms.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkLFCustoms.java
@@ -220,7 +220,7 @@ public class GtkLFCustoms extends LFCustoms {
}
/** Temporary workaround for GTK L&F */
- private static abstract class GTKIcon implements Icon {
+ private abstract static class GTKIcon implements Icon {
private static final int SIZE = 11;
@Override
public int getIconWidth() {
diff --git a/platform/o.n.swing.tabcontrol/beanstubs/org/openide/util/Utilities.java b/platform/o.n.swing.tabcontrol/beanstubs/org/openide/util/Utilities.java
index 4edb13d..312cc10 100644
--- a/platform/o.n.swing.tabcontrol/beanstubs/org/openide/util/Utilities.java
+++ b/platform/o.n.swing.tabcontrol/beanstubs/org/openide/util/Utilities.java
@@ -176,7 +176,7 @@ public final class Utilities {
private static int operatingSystem = -1;
// only for UtilitiesTest purposes
- final static void resetOperatingSystem () {
+ static final void resetOperatingSystem () {
operatingSystem = -1;
}
diff --git a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/NonStretchingViewTabLayoutModel.java b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/NonStretchingViewTabLayoutModel.java
index fe23ed0..35f135d 100644
--- a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/NonStretchingViewTabLayoutModel.java
+++ b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/NonStretchingViewTabLayoutModel.java
@@ -39,9 +39,9 @@ final class NonStretchingViewTabLayoutModel implements TabLayoutModel {
private TabDisplayer tabDisplayer;
- private final static int PADDING_RIGHT = 5+15+15;
+ private static final int PADDING_RIGHT = 5+15+15;
- private final static int ICON_X_PAD = 4;
+ private static final int ICON_X_PAD = 4;
private Dimension padding = new Dimension( 5+5, 0 );
diff --git a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/WinFlatUtils.java b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/WinFlatUtils.java
index 4720341..47975b2 100644
--- a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/WinFlatUtils.java
+++ b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/WinFlatUtils.java
@@ -89,7 +89,7 @@ class WinFlatUtils {
* Corresponds to {@code org.netbeans.swing.laf.flatlaf.ui.FlatTabControlIcon}. Just delegate
* to the HiDPI-enabled Windows icons.
*/
- final static class FlatTabControlIcon {
+ static final class FlatTabControlIcon {
public static Icon get(int buttonId, int buttonState) {
return Windows8VectorTabControlIcon.get(buttonId, buttonState);
}
diff --git a/platform/openide.awt/src/org/openide/awt/Actions.java b/platform/openide.awt/src/org/openide/awt/Actions.java
index ea3cf13..18ba3d4 100644
--- a/platform/openide.awt/src/org/openide/awt/Actions.java
+++ b/platform/openide.awt/src/org/openide/awt/Actions.java
@@ -914,7 +914,7 @@ public class Actions {
* if such change occures, updateState method is called to
* reflect it.
*/
- private static abstract class Bridge extends Object implements PropertyChangeListener {
+ private abstract static class Bridge extends Object implements PropertyChangeListener {
/** component to work with */
protected JComponent comp;
diff --git a/platform/openide.awt/src/org/openide/awt/HtmlBrowser.java b/platform/openide.awt/src/org/openide/awt/HtmlBrowser.java
index d9c18db..6d88ea9 100644
--- a/platform/openide.awt/src/org/openide/awt/HtmlBrowser.java
+++ b/platform/openide.awt/src/org/openide/awt/HtmlBrowser.java
@@ -740,7 +740,7 @@ public class HtmlBrowser extends JPanel {
* This interface represents an implementation of html browser used in HtmlBrowser. Each BrowserImpl
* implementation corresponds with some BrowserFactory implementation.
*/
- public static abstract class Impl {
+ public abstract static class Impl {
/** generated Serialized Version UID */
static final long serialVersionUID = 2912844785502962114L;
@@ -919,7 +919,7 @@ public class HtmlBrowser extends JPanel {
* browsers, etc.
* @since 3.14
*/
- public static abstract class URLDisplayer {
+ public abstract static class URLDisplayer {
/** Subclass constructor. */
protected URLDisplayer() {
}
diff --git a/platform/openide.awt/src/org/openide/awt/MouseUtils.java b/platform/openide.awt/src/org/openide/awt/MouseUtils.java
index 0d61232..1e6fd92 100644
--- a/platform/openide.awt/src/org/openide/awt/MouseUtils.java
+++ b/platform/openide.awt/src/org/openide/awt/MouseUtils.java
@@ -132,7 +132,7 @@ public class MouseUtils extends Object {
* Please note that older implementation which used treshold is now
* deprecated, please use default constructor.
*/
- public static abstract class PopupMouseAdapter extends MouseAdapter {
+ public abstract static class PopupMouseAdapter extends MouseAdapter {
/** @deprecated Obsoleted as of 3.4, PopupMouseAdapter now uses isPopupTrigger properly.
Threshold does nothing, please use default constructor without treshold.
*/
@@ -175,6 +175,6 @@ public class MouseUtils extends Object {
* param evt The mouse release event - should be used to obtain the
* position of the popup menu
*/
- abstract protected void showPopup(MouseEvent evt);
+ protected abstract void showPopup(MouseEvent evt);
}
}
diff --git a/platform/openide.awt/src/org/openide/awt/QuickSearch.java b/platform/openide.awt/src/org/openide/awt/QuickSearch.java
index 49639bb..57edfc1 100644
--- a/platform/openide.awt/src/org/openide/awt/QuickSearch.java
+++ b/platform/openide.awt/src/org/openide/awt/QuickSearch.java
@@ -499,7 +499,7 @@ public class QuickSearch {
return str1.substring(0, i);
}
- private final static class AnimationTimer {
+ private static final class AnimationTimer {
private final JLabel jLabel;
private final Icon findIcon;
diff --git a/platform/openide.awt/src/org/openide/awt/SplittedPanel.java b/platform/openide.awt/src/org/openide/awt/SplittedPanel.java
index d99cf63..58608a32 100644
--- a/platform/openide.awt/src/org/openide/awt/SplittedPanel.java
+++ b/platform/openide.awt/src/org/openide/awt/SplittedPanel.java
@@ -84,13 +84,13 @@ public class SplittedPanel extends JComponent implements Accessible {
static final long serialVersionUID = 5058424218525927233L;
/** constant for no split - only the first (left/top) component will be shown */
- public final static int NONE = 0;
+ public static final int NONE = 0;
/** constant for vertical split */
- public final static int VERTICAL = 1;
+ public static final int VERTICAL = 1;
/** constant for horizontal split */
- public final static int HORIZONTAL = 2;
+ public static final int HORIZONTAL = 2;
/** constraints constant for adding a splitter */
public static final Object ADD_SPLITTER = new Integer(0);
@@ -131,7 +131,7 @@ public class SplittedPanel extends JComponent implements Accessible {
private static MessageFormat descriptionFormat = null;
/** The default split type */
- private final static int DEFAULT_SPLIT_TYPE = HORIZONTAL;
+ private static final int DEFAULT_SPLIT_TYPE = HORIZONTAL;
/** Save the last preferred setting (first or second). Double click reset the splitPosition to this value */
private int resetPosition = FIRST_PREFERRED;
@@ -179,29 +179,29 @@ public class SplittedPanel extends JComponent implements Accessible {
/** current keepFirstSame state */
private boolean keepFirstSame = false;
- transient private boolean splitIsChanging = false;
+ private transient boolean splitIsChanging = false;
private int dragPos = -1;
/** true if the panes were swapped, false otherwise */
private boolean panesSwapped = false;
/** popup menu for setting vertical/horizontal splitting */
- transient private JPopupMenu popupMenu;
+ private transient JPopupMenu popupMenu;
/** The popup menu item */
- transient private JRadioButtonMenuItem verticalCMI;
+ private transient JRadioButtonMenuItem verticalCMI;
/** The popup menu item */
- transient private JRadioButtonMenuItem horizontalCMI;
+ private transient JRadioButtonMenuItem horizontalCMI;
/** The popup menu item */
- transient private JMenuItem swapCMI;
+ private transient JMenuItem swapCMI;
/** The popup menu item */
- transient private JMenuItem splitterCMI;
+ private transient JMenuItem splitterCMI;
/** A Vector of SplitChangeListeners */
- transient private Vector<SplitChangeListener> listeners;
+ private transient Vector<SplitChangeListener> listeners;
/** Accessible context */
private AccessibleContext accessibleContext;
diff --git a/platform/openide.awt/test/unit/src/org/openide/awt/ContextActionTest.java b/platform/openide.awt/test/unit/src/org/openide/awt/ContextActionTest.java
index 96938bf..19aa466 100644
--- a/platform/openide.awt/test/unit/src/org/openide/awt/ContextActionTest.java
+++ b/platform/openide.awt/test/unit/src/org/openide/awt/ContextActionTest.java
@@ -755,7 +755,7 @@ implements Lookup.Provider, ContextActionEnabler<ContextActionTest.Openable> {
propertyChangeSupport.firePropertyChange(PROP_STATEVALUE, oldStateValue, stateValue);
}
- private transient final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
+ private final transient PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
public void addPropertyChangeListener(PropertyChangeListener listener) {
propertyChangeSupport.addPropertyChangeListener(listener);
diff --git a/platform/openide.compat/src/org/openide/explorer/ExplorerPanel.java b/platform/openide.compat/src/org/openide/explorer/ExplorerPanel.java
index 3140b23..f9353ce 100644
--- a/platform/openide.compat/src/org/openide/explorer/ExplorerPanel.java
+++ b/platform/openide.compat/src/org/openide/explorer/ExplorerPanel.java
@@ -78,7 +78,7 @@ public class ExplorerPanel extends TopComponent implements ExplorerManager.Provi
private ExplorerManager manager;
/** listens on the selected nodes in the ExporerManager */
- transient private final PropertyChangeListener managerListener = new PropL();
+ private final transient PropertyChangeListener managerListener = new PropL();
/** action handler for cut/copy/paste/delete for this panel */
private ExplorerActions actions;
diff --git a/platform/openide.compat/test/unit/src/org/openide/explorer/view/TTVTest.java b/platform/openide.compat/test/unit/src/org/openide/explorer/view/TTVTest.java
index 237a0d2..44a28c3 100644
--- a/platform/openide.compat/test/unit/src/org/openide/explorer/view/TTVTest.java
+++ b/platform/openide.compat/test/unit/src/org/openide/explorer/view/TTVTest.java
@@ -193,7 +193,7 @@ public class TTVTest extends NbTestCase {
/** Specialized property that will hold reference to any node method
* holdNode was called on.
*/
- private static abstract class NodeHolderProperty extends PropertySupport.ReadOnly<Object> {
+ private abstract static class NodeHolderProperty extends PropertySupport.ReadOnly<Object> {
private Node heldNode;
NodeHolderProperty (String propName, Class propClass, String name, String hint) {
diff --git a/platform/openide.dialogs/src/org/openide/WizardValidationException.java b/platform/openide.dialogs/src/org/openide/WizardValidationException.java
index c0386ce..88fb14c 100644
--- a/platform/openide.dialogs/src/org/openide/WizardValidationException.java
+++ b/platform/openide.dialogs/src/org/openide/WizardValidationException.java
@@ -28,7 +28,7 @@ import javax.swing.JComponent;
* @author Jiri Rechtacek
* @since 4.28
*/
-final public class WizardValidationException extends Exception {
+public final class WizardValidationException extends Exception {
private String localizedMessage;
private JComponent source;
diff --git a/platform/openide.explorer/src/org/netbeans/modules/openide/explorer/ExplorerActionsImpl.java b/platform/openide.explorer/src/org/netbeans/modules/openide/explorer/ExplorerActionsImpl.java
index e48821c..478230c 100644
--- a/platform/openide.explorer/src/org/netbeans/modules/openide/explorer/ExplorerActionsImpl.java
+++ b/platform/openide.explorer/src/org/netbeans/modules/openide/explorer/ExplorerActionsImpl.java
@@ -594,7 +594,7 @@ public final class ExplorerActionsImpl {
}
}
- private static abstract class BaseAction extends AbstractAction {
+ private abstract static class BaseAction extends AbstractAction {
private static final int NO_CHANGE = 0;
private static final int ENABLED = 1;
private static final int DISABLED = 2;
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/PSheet.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/PSheet.java
index a68face..7efa584 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/PSheet.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/PSheet.java
@@ -81,8 +81,8 @@ import org.netbeans.modules.openide.explorer.TabbedContainerBridge;
* @author Tim Boudreau
*/
class PSheet extends JPanel implements MouseListener {
- public final static int STATE_HAS_DESCRIPTION = 1;
- public final static int STATE_HAS_TABS = 2;
+ public static final int STATE_HAS_DESCRIPTION = 1;
+ public static final int STATE_HAS_TABS = 2;
private int addCount = 0;
private String description = ""; //NOI18N
private String title = ""; //NOI18N
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropUtils.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropUtils.java
index cdd3269..d3173ee 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropUtils.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropUtils.java
@@ -213,7 +213,7 @@ final class PropUtils {
//Comparators copied from original propertysheet implementation
/** Comparator which compares types */
- private final static Comparator<Node.Property> SORTER_TYPE = new Comparator<Node.Property>() {
+ private static final Comparator<Node.Property> SORTER_TYPE = new Comparator<Node.Property>() {
@Override
public int compare(Node.Property l, Node.Property r) {
@@ -241,7 +241,7 @@ final class PropUtils {
};
/** Comparator which compares PropertyDetils names */
- private final static Comparator<Node.Property> SORTER_NAME = new Comparator<Node.Property>() {
+ private static final Comparator<Node.Property> SORTER_NAME = new Comparator<Node.Property>() {
@Override
public int compare(Node.Property l, Node.Property r) {
String s1 = l.getDisplayName();
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropertySheetView.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropertySheetView.java
index 42a9ae2..57eb896 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropertySheetView.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropertySheetView.java
@@ -70,13 +70,13 @@ public class PropertySheetView extends PropertySheet {
static final long serialVersionUID = -7568245745904766160L;
/** helper flag for avoiding multiple initialization of the GUI */
- transient private boolean guiInitialized = false;
+ private transient boolean guiInitialized = false;
/** The Listener that tracks changes in explorerManager */
- transient private PropertyIL managerListener;
+ private transient PropertyIL managerListener;
/** manager to use */
- transient private ExplorerManager explorerManager;
+ private transient ExplorerManager explorerManager;
public PropertySheetView() {
setPreferredSize(new Dimension (200, 300));
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/ChoiceView.java b/platform/openide.explorer/src/org/openide/explorer/view/ChoiceView.java
index 99a37be..e7deac4 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/ChoiceView.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/ChoiceView.java
@@ -69,13 +69,13 @@ public class ChoiceView extends JComboBox implements Externalizable {
/** The local reference to the explorerManager. It is transient
* because it will be reset in initializeManager() after deserialization.*/
- transient private ExplorerManager manager;
+ private transient ExplorerManager manager;
/** Listens on ExplorerManager. */
- transient private PropertyIL iListener;
+ private transient PropertyIL iListener;
/** model to use */
- transient private NodeListModel model;
+ private transient NodeListModel model;
/** Value of property showExploredContext. */
private boolean showExploredContext = true;
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/CustomPopupFactory.java b/platform/openide.explorer/src/org/openide/explorer/view/CustomPopupFactory.java
index aa15e49..9daec24 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/CustomPopupFactory.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/CustomPopupFactory.java
@@ -75,7 +75,7 @@ class CustomPopupFactory extends PopupFactory {
}
}
- private static abstract class OurPopup extends Popup {
+ private abstract static class OurPopup extends Popup {
protected Component owner = null;
protected Component contents = null;
protected int x = -1;
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/DragDropUtilities.java b/platform/openide.explorer/src/org/openide/explorer/view/DragDropUtilities.java
index 38b173f..33e0001 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/DragDropUtilities.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/DragDropUtilities.java
@@ -147,7 +147,7 @@ final class DragDropUtilities extends Object {
/* Invokes the stored runnable if it is there and than set to null.
*/
- static private void invokePostDropRun() {
+ private static void invokePostDropRun() {
if (postDropRun != null) {
SwingUtilities.invokeLater(postDropRun);
postDropRun = null;
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/DropGlassPane.java b/platform/openide.explorer/src/org/openide/explorer/view/DropGlassPane.java
index 7f6d324..e41fb5d 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/DropGlassPane.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/DropGlassPane.java
@@ -44,13 +44,13 @@ import org.openide.util.Parameters;
*/
final class DropGlassPane extends JPanel {
private static HashMap<Integer, DropGlassPane> map = new HashMap<Integer, DropGlassPane>();
- final static private int MIN_X = 5;
- final static private int MIN_Y = 3;
- final static private int MIN_WIDTH = 10;
- final static private int MIN_HEIGTH = 3;
- transient static private Component oldPane;
- transient static private JComponent originalSource;
- transient static private boolean wasVisible;
+ private static final int MIN_X = 5;
+ private static final int MIN_Y = 3;
+ private static final int MIN_WIDTH = 10;
+ private static final int MIN_HEIGTH = 3;
+ private static transient Component oldPane;
+ private static transient JComponent originalSource;
+ private static transient boolean wasVisible;
Line2D line = null;
private DropGlassPane() {
@@ -60,7 +60,7 @@ final class DropGlassPane extends JPanel {
* calculate the new bounds in current pane's boundary.
* @param comp
* @return */
- synchronized static public DropGlassPane getDefault(JComponent comp) {
+ public static synchronized DropGlassPane getDefault(JComponent comp) {
Integer id = new Integer(System.identityHashCode(comp));
if ((map.get(id)) == null) {
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/ListView.java b/platform/openide.explorer/src/org/openide/explorer/view/ListView.java
index 5c1819d..7680720 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/ListView.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/ListView.java
@@ -121,10 +121,10 @@ public class ListView extends JScrollPane implements Externalizable {
private transient ExplorerManager manager;
/** The actual JList list */
- transient protected JList list;
+ protected transient JList list;
/** model to use */
- transient protected NodeListModel model;
+ protected transient NodeListModel model;
//
// listeners
@@ -175,8 +175,8 @@ public class ListView extends JScrollPane implements Externalizable {
transient ListViewDropSupport dropSupport;
// default DnD actions
- transient private int allowedDragActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
- transient private int allowedDropActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
+ private transient int allowedDragActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
+ private transient int allowedDropActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
/** True, if the selection listener is attached. */
transient boolean listenerActive;
@@ -815,7 +815,7 @@ public class ListView extends JScrollPane implements Externalizable {
}
};
- final private int heightOfTextField = searchTextField.getPreferredSize().height;
+ private final int heightOfTextField = searchTextField.getPreferredSize().height;
private int originalScrollMode;
private JPanel searchpanel = null;
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/MenuView.java b/platform/openide.explorer/src/org/openide/explorer/view/MenuView.java
index cfd9750..b9ba2af 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/MenuView.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/MenuView.java
@@ -107,7 +107,7 @@ public class MenuView extends JPanel {
};
/** The explorerManager that manages this view */
- transient private ExplorerManager explorerManager;
+ private transient ExplorerManager explorerManager;
/** button to open root view */
private JButton root;
@@ -116,7 +116,7 @@ public class MenuView extends JPanel {
private JButton current;
/** property change listener */
- transient private Listener listener;
+ private transient Listener listener;
/* This is the constructor implementation
* recommended by ExplorerView class that only calls the inherited
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/OutlineView.java b/platform/openide.explorer/src/org/openide/explorer/view/OutlineView.java
index eb71102..2ea9c14 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/OutlineView.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/OutlineView.java
@@ -184,8 +184,8 @@ public class OutlineView extends JScrollPane {
transient boolean dropTargetPopupAllowed = true;
// default DnD actions
- transient private int allowedDragActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
- transient private int allowedDropActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
+ private transient int allowedDragActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
+ private transient int allowedDropActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
/** Listener on keystroke to invoke default action */
private ActionListener defaultTreeActionListener;
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/OutlineViewDropSupport.java b/platform/openide.explorer/src/org/openide/explorer/view/OutlineViewDropSupport.java
index f35e129..0d0732d 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/OutlineViewDropSupport.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/OutlineViewDropSupport.java
@@ -51,8 +51,8 @@ import javax.swing.tree.TreePath;
* @author Dafe Simonek, Jiri Rechtacek, David Strupl
*/
final class OutlineViewDropSupport implements DropTargetListener, Runnable {
- final static protected int FUSSY_POINTING = 3;
- final static private int DELAY_TIME_FOR_EXPAND = 1000;
+ protected static final int FUSSY_POINTING = 3;
+ private static final int DELAY_TIME_FOR_EXPAND = 1000;
/** true if support is active, false otherwise */
boolean active = false;
@@ -270,7 +270,7 @@ final class OutlineViewDropSupport implements DropTargetListener, Runnable {
timer = new Timer(
DELAY_TIME_FOR_EXPAND,
new ActionListener() {
- final public void actionPerformed(ActionEvent e) {
+ public final void actionPerformed(ActionEvent e) {
if (LOGABLE) {
log("should expand " + path); // NOI18N
}
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/TableSheet.java b/platform/openide.explorer/src/org/openide/explorer/view/TableSheet.java
index 129db06..b25c38d 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/TableSheet.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/TableSheet.java
@@ -41,12 +41,12 @@ import org.openide.util.NbBundle;
*/
class TableSheet extends JScrollPane {
/** table */
- transient protected JTable table;
+ protected transient JTable table;
/** model */
- transient private NodeTableModel tableModel;
+ private transient NodeTableModel tableModel;
- transient private TableSheetCell tableCell;
+ private transient TableSheetCell tableCell;
/** Create table view with default table model.
*/
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/TableView.java b/platform/openide.explorer/src/org/openide/explorer/view/TableView.java
index 3e7f47e..d9c838b 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/TableView.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/TableView.java
@@ -88,8 +88,8 @@ public class TableView extends JScrollPane {
// transient private List storeSelectedPaths;
// default DnD actions
- transient private int allowedDragActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
- transient private int allowedDropActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
+ private transient int allowedDragActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
+ private transient int allowedDropActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
/** Creates a new instance of TableView */
public TableView() {
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/TreeView.java b/platform/openide.explorer/src/org/openide/explorer/view/TreeView.java
index 2901b1b..ce67bc2 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/TreeView.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/TreeView.java
@@ -139,7 +139,7 @@ public abstract class TreeView extends JScrollPane {
//
/** Main <code>JTree</code> component. */
- transient protected JTree tree;
+ protected transient JTree tree;
/** model */
transient NodeTreeModel treeModel;
@@ -181,21 +181,21 @@ public abstract class TreeView extends JScrollPane {
transient boolean dropTargetPopupAllowed = true;
// default DnD actions
- transient private int allowedDragActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
- transient private int allowedDropActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
+ private transient int allowedDragActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
+ private transient int allowedDropActions = DnDConstants.ACTION_COPY_OR_MOVE | DnDConstants.ACTION_REFERENCE;
/** Quick Search support */
- transient private QuickSearch qs;
+ private transient QuickSearch qs;
/** wait cursor is shown automatically during expanding */
- transient private boolean autoWaitCursor = true;
+ private transient boolean autoWaitCursor = true;
/** Holds VisualizerChildren for all visible nodes */
private final VisualizerHolder visHolder = new VisualizerHolder();
/** reference to the last visible search field */
private static Reference<TreeView> lastSearchField = new WeakReference<TreeView>(null);
- transient private boolean removedNodeWasSelected = false;
+ private transient boolean removedNodeWasSelected = false;
/** Constructor.
*/
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/TreeViewDropSupport.java b/platform/openide.explorer/src/org/openide/explorer/view/TreeViewDropSupport.java
index c442ddf..d4a0e30 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/TreeViewDropSupport.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/TreeViewDropSupport.java
@@ -53,11 +53,11 @@ import javax.swing.tree.TreePath;
* @author Dafe Simonek, Jiri Rechtacek
*/
final class TreeViewDropSupport implements DropTargetListener, Runnable {
- final static protected int FUSSY_POINTING = 3;
- final static private int DELAY_TIME_FOR_EXPAND = 1000;
- final static private int SHIFT_DOWN = -1;
- final static private int SHIFT_RIGHT = 10;
- final static private int SHIFT_LEFT = 15;
+ protected static final int FUSSY_POINTING = 3;
+ private static final int DELAY_TIME_FOR_EXPAND = 1000;
+ private static final int SHIFT_DOWN = -1;
+ private static final int SHIFT_RIGHT = 10;
+ private static final int SHIFT_LEFT = 15;
// Attributes
@@ -267,7 +267,7 @@ final class TreeViewDropSupport implements DropTargetListener, Runnable {
timer = new Timer(
DELAY_TIME_FOR_EXPAND,
new ActionListener() {
- final public void actionPerformed(ActionEvent e) {
+ public final void actionPerformed(ActionEvent e) {
view.expandNode(cn);
}
}
diff --git a/platform/openide.explorer/src/org/openide/explorer/view/ViewTooltips.java b/platform/openide.explorer/src/org/openide/explorer/view/ViewTooltips.java
index b2beccf..1781bde 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/ViewTooltips.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/ViewTooltips.java
@@ -93,7 +93,7 @@ final class ViewTooltips extends MouseAdapter implements MouseMotionListener {
* for now) which should show helper tooltips. Should be called
* from the component's addNotify() method.
*/
- synchronized static void register (JComponent comp) {
+ static synchronized void register (JComponent comp) {
ViewTooltips vtt = (ViewTooltips) comp.getClientProperty(KEY);
assert vtt == null : "There already is " + vtt + " for " + comp;
comp.putClientProperty(KEY, vtt = new ViewTooltips());
@@ -105,7 +105,7 @@ final class ViewTooltips extends MouseAdapter implements MouseMotionListener {
* for now) which should show helper tooltips. Should be called
* from the component's removeNotify() method.
*/
- synchronized static void unregister (JComponent comp) {
+ static synchronized void unregister (JComponent comp) {
ViewTooltips inst = (ViewTooltips) comp.getClientProperty(KEY);
if (inst == null) {
return;
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/ProxyNodeTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/ProxyNodeTest.java
index aa2446f..c08eb52 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/ProxyNodeTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/ProxyNodeTest.java
@@ -240,7 +240,7 @@ public class ProxyNodeTest extends NbTestCase {
this.name = name;
propertyChangeSupport.firePropertyChange(PROP_NAME, oldName, name);
}
- private transient final PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
+ private final transient PropertyChangeSupport propertyChangeSupport = new PropertyChangeSupport(this);
public void addPropertyChangeListener(PropertyChangeListener listener) {
propertyChangeSupport.addPropertyChangeListener(listener);
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/view/TreeTableView126560Test.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/view/TreeTableView126560Test.java
index 61aa3aa..0e68e39 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/view/TreeTableView126560Test.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/view/TreeTableView126560Test.java
@@ -97,7 +97,7 @@ public class TreeTableView126560Test extends NbTestCase {
class AwtBlock implements Runnable {
- synchronized public void run() {
+ public synchronized void run() {
notifyAll();
doWait();
}
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewTest.java
index 15f2e4e..6e1f9c0 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/view/TreeViewTest.java
@@ -268,7 +268,7 @@ public final class TreeViewTest extends NbTestCase {
tree.collapseRow(4);
}
- final static class TreeChildren extends Children.Array {
+ static final class TreeChildren extends Children.Array {
private static final char[] letters
= new char[] {'A', 'B', 'C', 'D', 'E'};
diff --git a/platform/openide.filesystems.nb/src/org/netbeans/modules/openide/filesystems/FileFilterSupport.java b/platform/openide.filesystems.nb/src/org/netbeans/modules/openide/filesystems/FileFilterSupport.java
index bf498a6..48a407e 100644
--- a/platform/openide.filesystems.nb/src/org/netbeans/modules/openide/filesystems/FileFilterSupport.java
+++ b/platform/openide.filesystems.nb/src/org/netbeans/modules/openide/filesystems/FileFilterSupport.java
@@ -279,7 +279,7 @@ public final class FileFilterSupport {
/**
* Element of File Filter. One accepted extension or file name pattern.
*/
- private static abstract class FilterElement {
+ private abstract static class FilterElement {
public abstract String getName();
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/AbstractFileSystem.java b/platform/openide.filesystems/src/org/openide/filesystems/AbstractFileSystem.java
index b20f35b..91bacdf 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/AbstractFileSystem.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/AbstractFileSystem.java
@@ -98,7 +98,7 @@ public abstract class AbstractFileSystem extends FileSystem {
private static final long serialVersionUID = -3345098214331282438L;
/** cached last value of Enumeration which holds resource name (enumeration like StringTokenizer)*/
- static transient private PathElements lastEnum;
+ private static transient PathElements lastEnum;
/** root object for the filesystem */
private transient AbstractFileObject root;
@@ -208,7 +208,7 @@ public abstract class AbstractFileSystem extends FileSystem {
*
* @param ms number of milliseconds between two refreshes; if <code><= 0</code> then refreshing is disabled
*/
- protected synchronized final void setRefreshTime(int ms) {
+ protected final synchronized void setRefreshTime(int ms) {
if (refresher != null) {
refresher.stop();
}
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/AbstractFolder.java b/platform/openide.filesystems/src/org/openide/filesystems/AbstractFolder.java
index 2da49d0..34aa19e 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/AbstractFolder.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/AbstractFolder.java
@@ -953,7 +953,7 @@ abstract class AbstractFolder extends FileObject {
* @param lock the lock obtained by a call to {@link #lock}
* @exception IOException if the file could not be deleted
*/
- final public void delete(FileLock lock) throws IOException {
+ public final void delete(FileLock lock) throws IOException {
if (isFolder()) {
FileObject[] fos = this.getChildren();
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java b/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java
index 9a519c9..e75bc7d 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java
@@ -95,20 +95,20 @@ public class DefaultAttributes extends Object implements AbstractFileSystem.Attr
* @deprecated does not handle XML attributes
*/
@Deprecated
- public final static String ATTR_NAME = "filesystem"; // NOI18N
+ public static final String ATTR_NAME = "filesystem"; // NOI18N
/** Extension of special file in each folder where attributes are saved.
* @deprecated does not handle XML attributes
*/
@Deprecated
- public final static String ATTR_EXT = "attributes"; // NOI18N
+ public static final String ATTR_EXT = "attributes"; // NOI18N
/** Name with extension of special file in each folder where attributes are saved.
* @deprecated does not handle XML attributes
*/
@Deprecated
- public final static String ATTR_NAME_EXT = ATTR_NAME + '.' + ATTR_EXT;
- private final static String ATTR_NAME_EXT_XML = System.getProperty(
+ public static final String ATTR_NAME_EXT = ATTR_NAME + '.' + ATTR_EXT;
+ private static final String ATTR_NAME_EXT_XML = System.getProperty(
"org.openide.filesystems.DefaultAttributes.ATTR_NAME_EXT_XML", ".nbattrs"
); // NOI18N
@@ -119,7 +119,7 @@ public class DefaultAttributes extends Object implements AbstractFileSystem.Attr
* - org.openide.loaders.CompilerSupport
* - org.netbeans.core.ExJarFileSystem
*/
- private final static String READONLY_ATTRIBUTES = "readOnlyAttrs"; //NOI18N
+ private static final String READONLY_ATTRIBUTES = "readOnlyAttrs"; //NOI18N
// <?xml version="1.0"?>
// <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD DefaultAttributes 1.0//EN" "http://www.netbeans.org/dtds/attributes-1_0.dtd">
@@ -710,7 +710,7 @@ public class DefaultAttributes extends Object implements AbstractFileSystem.Attr
* @param pbStream is pushback input stream; tests 4 bytes and then returns them back
* @return true if the file has serialized form
*/
- static private final boolean isSerialized(PushbackInputStream pbStream)
+ private static final boolean isSerialized(PushbackInputStream pbStream)
throws IOException {
int[] serialPattern = { '\u00AC', '\u00ED', '\u0000', '\u0005' }; //NOI18N patern for serialized objects
byte[] checkedArray = new byte[serialPattern.length];
@@ -775,7 +775,7 @@ public class DefaultAttributes extends Object implements AbstractFileSystem.Attr
/** Table that hold mapping between files and attributes.
* Hold mapping of type (String, Map (String, Object))
*/
- final static class Table extends HashMap implements Externalizable {
+ static final class Table extends HashMap implements Externalizable {
static final long serialVersionUID = 2353458763249746934L;
/** name of folder we belong to */
@@ -1156,7 +1156,7 @@ public class DefaultAttributes extends Object implements AbstractFileSystem.Attr
* - protected void characters(char[] ch, int start, int length) throws SAXException {}
* - protected void internalStartElement(String elemName, HashMap mapMandatory,HashMap mapAllowed) throws SAXException {}
*/
- static abstract class ElementHandler {
+ abstract static class ElementHandler {
private static final String[] EMPTY = { };
private int mandatAttrCount;
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/ExternalUtil.java b/platform/openide.filesystems/src/org/openide/filesystems/ExternalUtil.java
index 3c139aa..fe9575a 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/ExternalUtil.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/ExternalUtil.java
@@ -68,7 +68,7 @@ final class ExternalUtil {
return orig;
}
- final static Logger LOG = Logger.getLogger("org.openide.filesystems"); // NOI18N
+ static final Logger LOG = Logger.getLogger("org.openide.filesystems"); // NOI18N
/** Logs a text.
*/
public static void log(String msg) {
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/FCLSupport.java b/platform/openide.filesystems/src/org/openide/filesystems/FCLSupport.java
index 8e759ae..99c4cbb 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/FCLSupport.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/FCLSupport.java
@@ -41,7 +41,7 @@ class FCLSupport {
/* Add new listener to this object.
* @param l the listener
*/
- synchronized final void addFileChangeListener(FileChangeListener fcl) {
+ final synchronized void addFileChangeListener(FileChangeListener fcl) {
if (listeners == null) {
listeners = new ListenerList<FileChangeListener>();
}
@@ -52,7 +52,7 @@ class FCLSupport {
/* Remove listener from this object.
* @param l the listener
*/
- synchronized final void removeFileChangeListener(FileChangeListener fcl) {
+ final synchronized void removeFileChangeListener(FileChangeListener fcl) {
if (listeners != null) {
listeners.remove(fcl);
}
@@ -89,14 +89,14 @@ class FCLSupport {
/** @return true if there is a listener
*/
- synchronized final boolean hasListeners() {
+ final synchronized boolean hasListeners() {
return listeners != null && listeners.hasListeners();
}
/**
* Wrapper for a file change event and a listener (or a list of listeners).
*/
- private static abstract class DispatchEventWrapper {
+ private abstract static class DispatchEventWrapper {
final FileEvent fe;
final Op operation;
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/FileObject.java b/platform/openide.filesystems/src/org/openide/filesystems/FileObject.java
index 16e5e0f..66bc740 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/FileObject.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/FileObject.java
@@ -444,7 +444,7 @@ public abstract class FileObject extends Object implements Serializable, Lookup.
* @param attrName name of the attribute
* @return appropriate (serializable) value or <CODE>null</CODE> if the attribute is unset (or could not be properly restored for some reason)
*/
- abstract public Object getAttribute(String attrName);
+ public abstract Object getAttribute(String attrName);
/** Set the file attribute with the specified name. The actual meaning of
* this method is implementation dependent. It is generally expected that
@@ -467,13 +467,13 @@ public abstract class FileObject extends Object implements Serializable, Lookup.
* @param value new value or <code>null</code> to clear the attribute. Must be serializable, although particular filesystems may or may not use serialization to store attribute values.
* @exception IOException if the attribute cannot be set. If serialization is used to store it, this may in fact be a subclass such as {@link java.io.NotSerializableException}.
*/
- abstract public void setAttribute(String attrName, Object value)
+ public abstract void setAttribute(String attrName, Object value)
throws IOException;
/** Get all file attribute names for this file.
* @return enumeration of keys (as strings)
*/
- abstract public Enumeration<String> getAttributes();
+ public abstract Enumeration<String> getAttributes();
/** Test whether this file has the specified extension.
* @param ext the extension the file should have
@@ -1368,8 +1368,8 @@ public abstract class FileObject extends Object implements Serializable, Lookup.
private static class ED extends FileSystem.EventDispatcher {
private FCLSupport.Op op;
private Enumeration<FileChangeListener> en;
- final private List<FileChangeListener> fsList;
- final private List<FileChangeListener> repList;
+ private final List<FileChangeListener> fsList;
+ private final List<FileChangeListener> repList;
private FileEvent fe;
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/FileSystem.java b/platform/openide.filesystems/src/org/openide/filesystems/FileSystem.java
index 22a37ee..5f76d83 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/FileSystem.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/FileSystem.java
@@ -134,7 +134,7 @@ public abstract class FileSystem implements Serializable {
/** Used for synchronization purpose*/
private static final Object internLock = new Object();
- private transient static ThreadLocal<EventControl> thrLocal = new ThreadLocal<EventControl>();
+ private static transient ThreadLocal<EventControl> thrLocal = new ThreadLocal<EventControl>();
/** Empty status */
private static final StatusDecorator STATUS_NONE = new StatusDecorator() {
@@ -152,7 +152,7 @@ public abstract class FileSystem implements Serializable {
* It can be invalid if there is another filesystem with the
* same name in the filesystem pool.
*/
- transient private boolean valid = false;
+ private transient boolean valid = false;
/** True if the filesystem is assigned to pool.
* Is modified from Repository methods.
@@ -765,7 +765,7 @@ public abstract class FileSystem implements Serializable {
/** Class used to notify events for the filesystem.
*/
- static abstract class EventDispatcher extends Object implements Runnable {
+ abstract static class EventDispatcher extends Object implements Runnable {
public final void run() {
dispatch(false, null);
}
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/Repository.java b/platform/openide.filesystems/src/org/openide/filesystems/Repository.java
index 86b6741..a6e4c97 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/Repository.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/Repository.java
@@ -108,7 +108,7 @@ public class Repository implements Serializable {
*
* @since 7.59
*/
- public static abstract class LayerProvider {
+ public abstract static class LayerProvider {
/** Allows providers to add their additions to the structure
* beneath {@link FileUtil#getConfigRoot()}. The method is
* supposed to collect all additional layers and {@link Collection#add(java.lang.Object) add}
@@ -1033,7 +1033,7 @@ public class Repository implements Serializable {
* <p/>
* @since 9.5
*/
- public static abstract class LocalProvider {
+ public abstract static class LocalProvider {
/**
* Returns the local repository instance. The method can return {@code null} to indicate
* the main Repository should be used. The method <b>must</b> return the very same instance
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java b/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java
index 42a50c0..f783026 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java
@@ -442,7 +442,7 @@ final class XMLMapAttr implements Map {
* attribute a returns it as Object. Each Attr contains pair key and value. Key is type. Value is real value (in textual form) of this type.
* Detailed describtion is in <A HREF="XMLMapAttr.html">XMLMapAttr<A>
*/
- final static class Attr extends java.lang.Object {
+ static final class Attr extends java.lang.Object {
// static final long serialVersionUID = -62733358015297232L;
private static final String[] ALLOWED_ATTR_KEYS = {
"bytevalue", "shortvalue", "intvalue", "longvalue", "floatvalue", "doublevalue", "boolvalue", "charvalue",
@@ -1060,7 +1060,7 @@ final class XMLMapAttr implements Map {
* Checks if key is valid
* @return Index to array of allowed keys or -1 which means error.
*/
- final static int isValid(String key) {
+ static final int isValid(String key) {
int index = -1;
int i;
String[] strArray = getAttrTypes();
@@ -1108,7 +1108,7 @@ final class XMLMapAttr implements Map {
static class ModifiedAttribute implements java.io.Serializable {
/** generated Serialized Version UID */
static final long serialVersionUID = 84214031923497718L;
- private final static String[] fragments = new String[] { "transient:" }; //NOI18N
+ private static final String[] fragments = new String[] { "transient:" }; //NOI18N
private int modifier = 0;
private Object origAttrValue = null;
diff --git a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/FileObjectTestHid.java b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/FileObjectTestHid.java
index 61ed1fa..a9a7598 100644
--- a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/FileObjectTestHid.java
+++ b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/FileObjectTestHid.java
@@ -37,12 +37,12 @@ import org.openide.util.Lookup.Result;
*/
public class FileObjectTestHid extends TestBaseHid {
- private final static String FOLDER_CHILD_NAME= "testFolder";
- private final static String FOLDER_CHILD= "/"+FOLDER_CHILD_NAME;
+ private static final String FOLDER_CHILD_NAME= "testFolder";
+ private static final String FOLDER_CHILD= "/"+FOLDER_CHILD_NAME;
- private final static String FILE_CHILD_NAME= "test";
- private final static String FILE_CHILD_EXT= "txt";
- private final static String FILE_CHILD= "/"+FILE_CHILD_NAME+"." +FILE_CHILD_EXT;
+ private static final String FILE_CHILD_NAME= "test";
+ private static final String FILE_CHILD_EXT= "txt";
+ private static final String FILE_CHILD= "/"+FILE_CHILD_NAME+"." +FILE_CHILD_EXT;
/**Should be deleted and testedFS renamed to fs*/
private FileSystem fs;
diff --git a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/TestUtilHid.java b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/TestUtilHid.java
index bc2e24a..6826daa 100644
--- a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/TestUtilHid.java
+++ b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/TestUtilHid.java
@@ -57,13 +57,13 @@ public class TestUtilHid {
}
/** @return URL to folder where should be placed tested data */
- public final static URL getResourceContext () {
+ public static final URL getResourceContext () {
//System.out.println("getResourceContext: " + FileSystemFactoryHid.class.getResource("../data"));
return FileSystemFactoryHid.class.getResource("../data/");
}
/** It may be helpful to delete resursively Files */
- public final static boolean deleteFolder (File file) throws IOException{
+ public static final boolean deleteFolder (File file) throws IOException{
boolean ret = file.delete();
if (ret) {
@@ -94,7 +94,7 @@ public class TestUtilHid {
* {@link #createLocalFileSystem(File,String[])}
* or use FileUtil.toFileObject with masterfs in CP
*/
- public final static FileSystem createLocalFileSystem(String testName, String[] resources) throws IOException {
+ public static final FileSystem createLocalFileSystem(String testName, String[] resources) throws IOException {
File mountPoint = locationOfLFSTempFolder(testName);
return createLocalFileSystem(mountPoint, resources);
@@ -131,7 +131,7 @@ public class TestUtilHid {
return mountPoint;
}
- public final static void destroyLocalFileSystem (String testName) throws IOException {
+ public static final void destroyLocalFileSystem (String testName) throws IOException {
File mountPoint = TestUtilHid.locationOfTempFolder("lfstest");
if (mountPoint.exists()) {
@@ -141,7 +141,7 @@ public class TestUtilHid {
}
- public final static void destroyXMLFileSystem(String testName) throws IOException {
+ public static final void destroyXMLFileSystem(String testName) throws IOException {
File tempFile = TestUtilHid.locationOfTempFolder("xfstest");
File xmlFile = new File (tempFile,"xfstest.xml");
if (xmlFile.exists())
@@ -149,7 +149,7 @@ public class TestUtilHid {
}
- public final static FileSystem createXMLFileSystem(String testName, String[] resources) throws IOException{
+ public static final FileSystem createXMLFileSystem(String testName, String[] resources) throws IOException{
File xmlFile = createXMLLayer(testName, resources);
XMLFileSystem xfs = new XMLFileSystem ();
@@ -160,7 +160,7 @@ public class TestUtilHid {
return xfs;
}
- public final static FileSystem createXMLFileSystem(String testName, Resource rootResource) throws IOException {
+ public static final FileSystem createXMLFileSystem(String testName, Resource rootResource) throws IOException {
File xmlFile = createXMLLayer(testName, rootResource);
XMLFileSystem xfs = new XMLFileSystem ();
diff --git a/platform/openide.io/src/org/openide/windows/IOColorLines.java b/platform/openide.io/src/org/openide/windows/IOColorLines.java
index e879a59..38adb73 100644
--- a/platform/openide.io/src/org/openide/windows/IOColorLines.java
+++ b/platform/openide.io/src/org/openide/windows/IOColorLines.java
@@ -102,5 +102,5 @@ public abstract class IOColorLines {
* or highlight the hyperlink.
* @param color a color for the line of text (null allowed). If null is passed default color (see {@link IOColors}) is used.
*/
- abstract protected void println(CharSequence text, OutputListener listener, boolean important, Color color) throws IOException;
+ protected abstract void println(CharSequence text, OutputListener listener, boolean important, Color color) throws IOException;
}
diff --git a/platform/openide.io/src/org/openide/windows/IOColorPrint.java b/platform/openide.io/src/org/openide/windows/IOColorPrint.java
index 73ecd8a..68cbce5 100644
--- a/platform/openide.io/src/org/openide/windows/IOColorPrint.java
+++ b/platform/openide.io/src/org/openide/windows/IOColorPrint.java
@@ -105,5 +105,5 @@ public abstract class IOColorPrint {
* or highlight the hyperlink.
* @param color a color for the text (null allowed). If null is passed default color (see {@link IOColors}) is used.
*/
- abstract protected void print(CharSequence text, OutputListener listener, boolean important, Color color) throws IOException;
+ protected abstract void print(CharSequence text, OutputListener listener, boolean important, Color color) throws IOException;
}
diff --git a/platform/openide.io/src/org/openide/windows/IOColors.java b/platform/openide.io/src/org/openide/windows/IOColors.java
index 8a4fb1d..cb4d5ea 100644
--- a/platform/openide.io/src/org/openide/windows/IOColors.java
+++ b/platform/openide.io/src/org/openide/windows/IOColors.java
@@ -124,12 +124,12 @@ public abstract class IOColors {
* @param type output type to get color for
* @return current color for specified output
*/
- abstract protected Color getColor(OutputType type);
+ protected abstract Color getColor(OutputType type);
/**
* Sets specified color for output
* @param type output type to set color for
* @param color new color for specified output type
*/
- abstract protected void setColor(OutputType type, Color color);
+ protected abstract void setColor(OutputType type, Color color);
}
diff --git a/platform/openide.io/src/org/openide/windows/IOFolding.java b/platform/openide.io/src/org/openide/windows/IOFolding.java
index 4404e70..4b872bd 100644
--- a/platform/openide.io/src/org/openide/windows/IOFolding.java
+++ b/platform/openide.io/src/org/openide/windows/IOFolding.java
@@ -127,7 +127,7 @@ public abstract class IOFolding {
/**
* An SPI for creating custom FoldHandle implementations.
*/
- protected static abstract class FoldHandleDefinition {
+ protected abstract static class FoldHandleDefinition {
/**
* Finish the fold at the current last line. Ensure that nested folds
diff --git a/platform/openide.io/src/org/openide/windows/IOPosition.java b/platform/openide.io/src/org/openide/windows/IOPosition.java
index ab8bc0b..99547dc 100644
--- a/platform/openide.io/src/org/openide/windows/IOPosition.java
+++ b/platform/openide.io/src/org/openide/windows/IOPosition.java
@@ -79,5 +79,5 @@ public abstract class IOPosition {
* Gets current position in IO
* @return current position
*/
- abstract protected Position currentPosition();
+ protected abstract Position currentPosition();
}
diff --git a/platform/openide.io/src/org/openide/windows/IOSelect.java b/platform/openide.io/src/org/openide/windows/IOSelect.java
index c9fc6c4..1f002e8 100644
--- a/platform/openide.io/src/org/openide/windows/IOSelect.java
+++ b/platform/openide.io/src/org/openide/windows/IOSelect.java
@@ -102,5 +102,5 @@ public abstract class IOSelect {
* @param extraOps Additional operations to apply to the containing
* TopComponent.
*/
- abstract protected void select(Set<AdditionalOperation> extraOps);
+ protected abstract void select(Set<AdditionalOperation> extraOps);
}
diff --git a/platform/openide.io/src/org/openide/windows/IOTab.java b/platform/openide.io/src/org/openide/windows/IOTab.java
index 139cdcf..f9bd6ae 100644
--- a/platform/openide.io/src/org/openide/windows/IOTab.java
+++ b/platform/openide.io/src/org/openide/windows/IOTab.java
@@ -108,24 +108,24 @@ public abstract class IOTab {
* Gets current tab icon
* @return current tab icon
*/
- abstract protected Icon getIcon();
+ protected abstract Icon getIcon();
/**
* Sets icon to tab
* @param icon tab icon
*/
- abstract protected void setIcon(Icon icon);
+ protected abstract void setIcon(Icon icon);
/**
* Gets current tool tip text
* @return current tool tip text
*/
- abstract protected String getToolTipText();
+ protected abstract String getToolTipText();
/**
* Sets tool tip text to tab
* @param text new tool tip text
*/
- abstract protected void setToolTipText(String text);
+ protected abstract void setToolTipText(String text);
}
diff --git a/platform/openide.loaders/src/org/openide/actions/NewTemplateAction.java b/platform/openide.loaders/src/org/openide/actions/NewTemplateAction.java
index 3ad371a..1db1b5c 100644
--- a/platform/openide.loaders/src/org/openide/actions/NewTemplateAction.java
+++ b/platform/openide.loaders/src/org/openide/actions/NewTemplateAction.java
@@ -877,7 +877,7 @@ public class NewTemplateAction extends NodeAction {
private void updateAction () {}
- static private final synchronized Node[] getNodesFromLookup (Lookup lookup) {
+ private static final synchronized Node[] getNodesFromLookup (Lookup lookup) {
if (lookup != null) {
return lookup.lookupAll(Node.class).toArray(EMPTY_NODE_ARRAY);
}
diff --git a/platform/openide.loaders/src/org/openide/awt/Toolbar.java b/platform/openide.loaders/src/org/openide/awt/Toolbar.java
index 9e68946..f19a5fd 100644
--- a/platform/openide.loaders/src/org/openide/awt/Toolbar.java
+++ b/platform/openide.loaders/src/org/openide/awt/Toolbar.java
@@ -253,7 +253,7 @@ public class Toolbar extends ToolbarWithOverflow /*implemented by patchsuperclas
* @deprecated Always returns 1
*/
@Deprecated
- static public int rowCount (int height) {
+ public static int rowCount (int height) {
return 1;
}
diff --git a/platform/openide.loaders/src/org/openide/loaders/DataFolder.java b/platform/openide.loaders/src/org/openide/loaders/DataFolder.java
index b06a224..af74f32 100644
--- a/platform/openide.loaders/src/org/openide/loaders/DataFolder.java
+++ b/platform/openide.loaders/src/org/openide/loaders/DataFolder.java
@@ -193,7 +193,7 @@ public class DataFolder extends MultiDataObject implements DataObject.Container
* @param mode an constant from {@link DataFolder.SortMode}
* @exception IOException if the mode cannot be set
*/
- public synchronized final void setSortMode (SortMode mode) throws IOException {
+ public final synchronized void setSortMode (SortMode mode) throws IOException {
SortMode old = getOrder ().getSortMode ();
getOrder ().setSortMode (mode);
firePropertyChange (PROP_SORT_MODE, old, getOrder ().getSortMode ());
@@ -220,7 +220,7 @@ public class DataFolder extends MultiDataObject implements DataObject.Container
* @exception IOException if the order cannot be set
*
*/
- public synchronized final void setOrder (DataObject[] arr) throws IOException {
+ public final synchronized void setOrder (DataObject[] arr) throws IOException {
getOrder ().setOrder (arr);
firePropertyChange (PROP_ORDER, null, null);
}
@@ -380,8 +380,8 @@ public class DataFolder extends MultiDataObject implements DataObject.Container
}
}
- private final static class ClonedFilterHandle implements Node.Handle {
- private final static long serialVersionUID = 24234097765186L;
+ private static final class ClonedFilterHandle implements Node.Handle {
+ private static final long serialVersionUID = 24234097765186L;
private DataObject folder;
private DataFilter filter;
public ClonedFilterHandle (DataFolder folder, DataFilter filter) {
diff --git a/platform/openide.loaders/src/org/openide/loaders/DataLoaderPool.java b/platform/openide.loaders/src/org/openide/loaders/DataLoaderPool.java
index b57c252..beade10 100644
--- a/platform/openide.loaders/src/org/openide/loaders/DataLoaderPool.java
+++ b/platform/openide.loaders/src/org/openide/loaders/DataLoaderPool.java
@@ -165,7 +165,7 @@ implements java.io.Serializable {
/** Add a listener for operations on data objects.
* @param l the listener
*/
- public synchronized final void addOperationListener (OperationListener l) {
+ public final synchronized void addOperationListener (OperationListener l) {
if (listeners == null) listeners = new EventListenerList();
listeners.add( OperationListener.class, l);
}
@@ -173,7 +173,7 @@ implements java.io.Serializable {
/** Remove a listener for operations on data objects.
* @param l the listener
*/
- public synchronized final void removeOperationListener (OperationListener l) {
+ public final synchronized void removeOperationListener (OperationListener l) {
if (listeners != null) {
listeners.remove( OperationListener.class, l);
}
diff --git a/platform/openide.loaders/src/org/openide/loaders/DataNode.java b/platform/openide.loaders/src/org/openide/loaders/DataNode.java
index 6401b45..174704e 100644
--- a/platform/openide.loaders/src/org/openide/loaders/DataNode.java
+++ b/platform/openide.loaders/src/org/openide/loaders/DataNode.java
@@ -1185,7 +1185,7 @@ public class DataNode extends AbstractNode {
private Set<FileObject> obj_files;
- synchronized private void lazyInitialization () {
+ private synchronized void lazyInitialization () {
obj_files = obj.files();
}
diff --git a/platform/openide.loaders/src/org/openide/loaders/DataObjectPool.java b/platform/openide.loaders/src/org/openide/loaders/DataObjectPool.java
index f094237..54cb159 100644
--- a/platform/openide.loaders/src/org/openide/loaders/DataObjectPool.java
+++ b/platform/openide.loaders/src/org/openide/loaders/DataObjectPool.java
@@ -117,7 +117,7 @@ implements ChangeListener {
/** Method to check whether the constructor is allowed.
*/
- final static boolean isConstructorAllowed() {
+ static final boolean isConstructorAllowed() {
return FIND.get() != null;
}
@@ -657,7 +657,7 @@ implements ChangeListener {
}
}
- static private Collection<Item> getTargets(FileEvent fe, boolean checkSiblings) {
+ private static Collection<Item> getTargets(FileEvent fe, boolean checkSiblings) {
FileObject fo = fe.getFile();
// The FileSystem notifying us about the changes should
// not hold any lock so we're safe here
diff --git a/platform/openide.loaders/src/org/openide/loaders/DataTransferSupport.java b/platform/openide.loaders/src/org/openide/loaders/DataTransferSupport.java
index ad1982b..903aff8 100644
--- a/platform/openide.loaders/src/org/openide/loaders/DataTransferSupport.java
+++ b/platform/openide.loaders/src/org/openide/loaders/DataTransferSupport.java
@@ -87,7 +87,7 @@ abstract class DataTransferSupport {
/** Supports paste of multiple DataObject at once.
*/
- static abstract class PasteTypeExt extends PasteType {
+ abstract static class PasteTypeExt extends PasteType {
private static final RequestProcessor RP = new RequestProcessor("Paste Support"); // NOI18N
/** All DataObjects being pasted. */
diff --git a/platform/openide.loaders/src/org/openide/loaders/FileEntry.java b/platform/openide.loaders/src/org/openide/loaders/FileEntry.java
index 65af66a..3ac38c6 100644
--- a/platform/openide.loaders/src/org/openide/loaders/FileEntry.java
+++ b/platform/openide.loaders/src/org/openide/loaders/FileEntry.java
@@ -199,7 +199,7 @@ public class FileEntry extends MultiDataObject.Entry {
* <P>
* Useful for representing useless files.
*/
- public final static class Numb extends MultiDataObject.Entry {
+ public static final class Numb extends MultiDataObject.Entry {
/** generated Serialized Version UID */
static final long serialVersionUID = -6572157492885890612L;
@@ -290,7 +290,7 @@ public class FileEntry extends MultiDataObject.Entry {
* using this entry.
* @since 1.13
*/
- public final static class Folder extends MultiDataObject.Entry {
+ public static final class Folder extends MultiDataObject.Entry {
/** Creates new FolderEntry */
public Folder (MultiDataObject obj, FileObject fo) {
diff --git a/platform/openide.loaders/src/org/openide/loaders/FolderList.java b/platform/openide.loaders/src/org/openide/loaders/FolderList.java
index 2b583de..0a2b814 100644
--- a/platform/openide.loaders/src/org/openide/loaders/FolderList.java
+++ b/platform/openide.loaders/src/org/openide/loaders/FolderList.java
@@ -86,31 +86,31 @@ implements FileChangeListener, DataObject.Container {
* Whenever a new change notification arrives (thru file listener)
* the previous task is canceled (if not running) and new is created.
*/
- transient private volatile RequestProcessor.Task refreshTask;
+ private transient volatile RequestProcessor.Task refreshTask;
/** task that is non-null if a setOrder has been called
*/
- transient private volatile ComparatorTask comparatorTask;
+ private transient volatile ComparatorTask comparatorTask;
/** Primary files in this folder. Maps (FileObject, Reference (DataObject))
*/
- transient private Map<FileObject, Reference<DataObject>> primaryFiles = null;
+ private transient Map<FileObject, Reference<DataObject>> primaryFiles = null;
/** order of primary files (FileObject) */
- transient private List<FileObject> order;
+ private transient List<FileObject> order;
private static final Logger err = Logger.getLogger("org.openide.loaders.FolderList"); // NOI18N
/** property change support */
- transient private PropertyChangeSupport pcs;
+ private transient PropertyChangeSupport pcs;
/**
* If true, this folder has been fully created (though it might
* still be refreshing etc.). Used to avoid e.g. MDO.PROP_FILES
* firing before the folder is ready.
*/
- transient private boolean folderCreated = false;
+ private transient boolean folderCreated = false;
- transient private FileChangeListener weakFCL = FileUtil.weakFileChangeListener(this, null);
+ private transient FileChangeListener weakFCL = FileUtil.weakFileChangeListener(this, null);
static {
// Ensure it is loaded so that WeakListenerImpl does not have to load it later:
diff --git a/platform/openide.loaders/src/org/openide/loaders/InstanceDataObject.java b/platform/openide.loaders/src/org/openide/loaders/InstanceDataObject.java
index 5ee036c..8115c50 100644
--- a/platform/openide.loaders/src/org/openide/loaders/InstanceDataObject.java
+++ b/platform/openide.loaders/src/org/openide/loaders/InstanceDataObject.java
@@ -945,7 +945,7 @@ public class InstanceDataObject extends MultiDataObject implements InstanceCooki
// XXX #27494 Please changes to this field apply also into
// core/naming/src/org/netbeans/core/naming/Utils class.
- private final static int MAX_FILENAME_LENGTH = 50;
+ private static final int MAX_FILENAME_LENGTH = 50;
// XXX #27494 Please changes to this method apply also into
// core/naming/src/org/netbeans/core/naming/Utils class.
@@ -1543,7 +1543,7 @@ public class InstanceDataObject extends MultiDataObject implements InstanceCooki
private InstanceDataObject result = null;
private boolean create;
- private final static Creator me = new Creator ();
+ private static final Creator me = new Creator ();
private Creator() {
@@ -1638,7 +1638,7 @@ public class InstanceDataObject extends MultiDataObject implements InstanceCooki
}
/** path where to find convertor/provider definition */
- private final static String EA_PROVIDER_PATH = "settings.providerPath"; // NOI18N
+ private static final String EA_PROVIDER_PATH = "settings.providerPath"; // NOI18N
private static final String EA_SUBCLASSES = "settings.subclasses"; // NOI18N
/** look up appropriate convertor according to obj */
diff --git a/platform/openide.loaders/src/org/openide/loaders/InstanceNode.java b/platform/openide.loaders/src/org/openide/loaders/InstanceNode.java
index def5137..6fae892 100644
--- a/platform/openide.loaders/src/org/openide/loaders/InstanceNode.java
+++ b/platform/openide.loaders/src/org/openide/loaders/InstanceNode.java
@@ -955,7 +955,7 @@ final class InstanceNode extends DataNode implements Runnable {
} // end of I
/** Derived from BeanChildren and allow replace beancontext. */
- private final static class InstanceChildren extends Children.Keys implements PropertyChangeListener {
+ private static final class InstanceChildren extends Children.Keys implements PropertyChangeListener {
java.lang.ref.WeakReference<PropertyChangeListener> dobjListener;
InstanceDataObject dobj;
Object bean;
diff --git a/platform/openide.loaders/src/org/openide/loaders/MultiDataObject.java b/platform/openide.loaders/src/org/openide/loaders/MultiDataObject.java
index 6059055..d499e39 100644
--- a/platform/openide.loaders/src/org/openide/loaders/MultiDataObject.java
+++ b/platform/openide.loaders/src/org/openide/loaders/MultiDataObject.java
@@ -1229,7 +1229,7 @@ public class MultiDataObject extends DataObject {
}
}
- final static class Pair {
+ static final class Pair {
MultiDataObject.Entry entry;
FileObject file;
diff --git a/platform/openide.loaders/src/org/openide/text/DataEditorSupport.java b/platform/openide.loaders/src/org/openide/text/DataEditorSupport.java
index 5631cce..adbd1b6 100644
--- a/platform/openide.loaders/src/org/openide/text/DataEditorSupport.java
+++ b/platform/openide.loaders/src/org/openide/text/DataEditorSupport.java
@@ -731,7 +731,7 @@ public class DataEditorSupport extends CloneableEditorSupport {
/** Environment that connects the data object and the CloneableEditorSupport.
*/
- public static abstract class Env extends OpenSupport.Env implements CloneableEditorSupport.Env {
+ public abstract static class Env extends OpenSupport.Env implements CloneableEditorSupport.Env {
/** generated Serialized Version UID */
private static final long serialVersionUID = -2945098431098324441L;
@@ -748,9 +748,9 @@ public class DataEditorSupport extends CloneableEditorSupport {
/** did we warned about the size of the file?
*/
- private transient static Set<FileObject> warnedFiles = new HashSet<FileObject>();
+ private static transient Set<FileObject> warnedFiles = new HashSet<FileObject>();
- private transient static boolean sentBigFileInfo;
+ private static transient boolean sentBigFileInfo;
/** Atomic action used to ignore fileChange event from FileObject.refresh */
private transient FileSystem.AtomicAction action = null;
@@ -839,7 +839,7 @@ public class DataEditorSupport extends CloneableEditorSupport {
/**
* default threshold for big file to warn user (default is 1MB)
*/
- private transient final long BIG_FILE_THRESHOLD_MB = Integer.getInteger("org.openide.text.big.file.size", 1) * 1024 * 1024;
+ private final transient long BIG_FILE_THRESHOLD_MB = Integer.getInteger("org.openide.text.big.file.size", 1) * 1024 * 1024;
/** Obtains the input stream.
* @exception IOException if an I/O error occurs
diff --git a/platform/openide.loaders/test/unit/src/org/netbeans/modules/openide/loaders/AskEditorQuestionsTest.java b/platform/openide.loaders/test/unit/src/org/netbeans/modules/openide/loaders/AskEditorQuestionsTest.java
index 9a87b51..30e664f 100644
--- a/platform/openide.loaders/test/unit/src/org/netbeans/modules/openide/loaders/AskEditorQuestionsTest.java
+++ b/platform/openide.loaders/test/unit/src/org/netbeans/modules/openide/loaders/AskEditorQuestionsTest.java
@@ -104,7 +104,7 @@ public class AskEditorQuestionsTest {
}
}
- public final static class MockDialogDisplayer extends DialogDisplayer {
+ public static final class MockDialogDisplayer extends DialogDisplayer {
public MockDialogDisplayer() {
}
diff --git a/platform/openide.loaders/test/unit/src/org/openide/loaders/TestUtilHid.java b/platform/openide.loaders/test/unit/src/org/openide/loaders/TestUtilHid.java
index aa28b29..27a01cd 100644
--- a/platform/openide.loaders/test/unit/src/org/openide/loaders/TestUtilHid.java
+++ b/platform/openide.loaders/test/unit/src/org/openide/loaders/TestUtilHid.java
@@ -57,7 +57,7 @@ public class TestUtilHid {
return lfs;
}
- public final static void destroyLocalFileSystem (String testName) throws IOException {
+ public static final void destroyLocalFileSystem (String testName) throws IOException {
}
static class StatusFileSystem extends LocalFileSystem {
diff --git a/platform/openide.loaders/test/unit/src/org/openide/text/DataEditorReadOnlyTest.java b/platform/openide.loaders/test/unit/src/org/openide/text/DataEditorReadOnlyTest.java
index 3384196..40a3420 100644
--- a/platform/openide.loaders/test/unit/src/org/openide/text/DataEditorReadOnlyTest.java
+++ b/platform/openide.loaders/test/unit/src/org/openide/text/DataEditorReadOnlyTest.java
@@ -216,7 +216,7 @@ public class DataEditorReadOnlyTest extends NbTestCase {
return this.file;
}
- public synchronized static FileEncodingQueryImpl getDefault () {
+ public static synchronized FileEncodingQueryImpl getDefault () {
if (instance == null) {
instance = new FileEncodingQueryImpl ();
}
diff --git a/platform/openide.loaders/test/unit/src/org/openide/text/DataEditorSupportTest.java b/platform/openide.loaders/test/unit/src/org/openide/text/DataEditorSupportTest.java
index 8445f07..1cdae57 100644
--- a/platform/openide.loaders/test/unit/src/org/openide/text/DataEditorSupportTest.java
+++ b/platform/openide.loaders/test/unit/src/org/openide/text/DataEditorSupportTest.java
@@ -664,7 +664,7 @@ public class DataEditorSupportTest extends NbTestCase {
return this.file;
}
- public synchronized static FileEncodingQueryImpl getDefault () {
+ public static synchronized FileEncodingQueryImpl getDefault () {
if (instance == null) {
instance = new FileEncodingQueryImpl ();
}
diff --git a/platform/openide.loaders/test/unit/src/org/openide/text/FileEncodingQueryDataEditorSupportTest.java b/platform/openide.loaders/test/unit/src/org/openide/text/FileEncodingQueryDataEditorSupportTest.java
index 4b0cf64..9122434 100644
--- a/platform/openide.loaders/test/unit/src/org/openide/text/FileEncodingQueryDataEditorSupportTest.java
+++ b/platform/openide.loaders/test/unit/src/org/openide/text/FileEncodingQueryDataEditorSupportTest.java
@@ -379,7 +379,7 @@ public class FileEncodingQueryDataEditorSupportTest extends NbTestCase {
return this.file;
}
- public synchronized static FileEncodingQueryImpl getDefault () {
+ public static synchronized FileEncodingQueryImpl getDefault () {
if (instance == null) {
instance = new FileEncodingQueryImpl ();
}
diff --git a/platform/openide.modules/src/org/openide/modules/Dependency.java b/platform/openide.modules/src/org/openide/modules/Dependency.java
index d10da62..f30b589 100644
--- a/platform/openide.modules/src/org/openide/modules/Dependency.java
+++ b/platform/openide.modules/src/org/openide/modules/Dependency.java
@@ -39,32 +39,32 @@ public final class Dependency implements Serializable {
static final long serialVersionUID = 9548259318L;
/** Dependency on another module. */
- public final static int TYPE_MODULE = 1;
+ public static final int TYPE_MODULE = 1;
/** Dependency on a package. */
- public final static int TYPE_PACKAGE = 2;
+ public static final int TYPE_PACKAGE = 2;
/** Dependency on Java. */
- public final static int TYPE_JAVA = 3;
+ public static final int TYPE_JAVA = 3;
/**
* Dependency on the IDE.
* @deprecated This type of dependency should no longer be used.
*/
@Deprecated
- public final static int TYPE_IDE = 4;
+ public static final int TYPE_IDE = 4;
/** Dependency on a token.
* @see ModuleInfo#getProvides
* @since 2.3
*/
- public final static int TYPE_REQUIRES = 5;
+ public static final int TYPE_REQUIRES = 5;
/** Dependency on a token, but without need to have token provider be initialised sooner.
* @see ModuleInfo#getProvides
* @since 7.1
*/
- public final static int TYPE_NEEDS = 6;
+ public static final int TYPE_NEEDS = 6;
/** An advisory dependency on a token. If at least one provider of such token is
* available, it is enabled. If there is no such provider, then nothing is done
@@ -73,16 +73,16 @@ public final class Dependency implements Serializable {
* @see ModuleInfo#getProvides
* @since 7.1
*/
- public final static int TYPE_RECOMMENDS = 7;
+ public static final int TYPE_RECOMMENDS = 7;
/** Comparison by specification version. */
- public final static int COMPARE_SPEC = 1;
+ public static final int COMPARE_SPEC = 1;
/** Comparison by implementation version. */
- public final static int COMPARE_IMPL = 2;
+ public static final int COMPARE_IMPL = 2;
/** No comparison, just require the dependency to be present. */
- public final static int COMPARE_ANY = 3;
+ public static final int COMPARE_ANY = 3;
/** @deprecated request dependencies on direct modules */
@Deprecated
diff --git a/platform/openide.nodes/src/org/netbeans/modules/openide/nodes/NodesRegistrationSupport.java b/platform/openide.nodes/src/org/netbeans/modules/openide/nodes/NodesRegistrationSupport.java
index a612197..4864d10 100644
--- a/platform/openide.nodes/src/org/netbeans/modules/openide/nodes/NodesRegistrationSupport.java
+++ b/platform/openide.nodes/src/org/netbeans/modules/openide/nodes/NodesRegistrationSupport.java
@@ -237,7 +237,7 @@ public final class NodesRegistrationSupport {
}
}
- private static abstract class AbstractRegistrator implements LookupListener {
+ private abstract static class AbstractRegistrator implements LookupListener {
Result lookupResult;
private final Class cls;
diff --git a/platform/openide.nodes/src/org/openide/nodes/ChildFactory.java b/platform/openide.nodes/src/org/openide/nodes/ChildFactory.java
index 360a3cd..6d81910 100644
--- a/platform/openide.nodes/src/org/openide/nodes/ChildFactory.java
+++ b/platform/openide.nodes/src/org/openide/nodes/ChildFactory.java
@@ -225,7 +225,7 @@ public abstract class ChildFactory <T> {
* @param <T> The key type for this child factory
* @since org.openide.nodes 7.7
*/
- public static abstract class Detachable<T> extends ChildFactory<T>{
+ public abstract static class Detachable<T> extends ChildFactory<T>{
/**
* Called immediately before the first call to createKeys(). Override
* to set up listening for changes, allocating expensive-to-create
diff --git a/platform/openide.nodes/src/org/openide/nodes/Children.java b/platform/openide.nodes/src/org/openide/nodes/Children.java
index 69de0fc..a59cbe7 100644
--- a/platform/openide.nodes/src/org/openide/nodes/Children.java
+++ b/platform/openide.nodes/src/org/openide/nodes/Children.java
@@ -1070,7 +1070,7 @@ public abstract class Children extends Object {
/** Entry mapping one key to the node.
*/
- final static class ME extends Object implements Entry {
+ static final class ME extends Object implements Entry {
/** key */
public Object key;
@@ -1312,7 +1312,7 @@ public abstract class Children extends Object {
*
* @param T the type of the key
*/
- public static abstract class Keys<T> extends Children.Array {
+ public abstract static class Keys<T> extends Children.Array {
/** the last runnable (created in method setKeys) for each children object.
*/
private static java.util.Map<Keys<?>,Runnable> lastRuns = new HashMap<Keys<?>,Runnable>(11);
@@ -1679,7 +1679,7 @@ public abstract class Children extends Object {
* added to the collection and if the same object is added
* more than once it is indexed by a number.
*/
- private static abstract class Dupl<T> implements Cloneable, Entry {
+ private abstract static class Dupl<T> implements Cloneable, Entry {
/** the key either real value or Dupl (Dupl (Dupl (... value ...)))*/
protected Object key;
diff --git a/platform/openide.nodes/src/org/openide/nodes/CookieSetLkp.java b/platform/openide.nodes/src/org/openide/nodes/CookieSetLkp.java
index c589b17..970ae18 100644
--- a/platform/openide.nodes/src/org/openide/nodes/CookieSetLkp.java
+++ b/platform/openide.nodes/src/org/openide/nodes/CookieSetLkp.java
@@ -124,7 +124,7 @@ final class CookieSetLkp extends AbstractLookup {
/** Instance of one item representing an object.
*/
- final static class SimpleItem<T> extends Pair<T> {
+ static final class SimpleItem<T> extends Pair<T> {
private T obj;
/** Create an item.
@@ -203,7 +203,7 @@ final class CookieSetLkp extends AbstractLookup {
/** Instance of one item registered in the map.
*/
- final static class ConvertingItem<T,R> extends Pair<R> {
+ static final class ConvertingItem<T,R> extends Pair<R> {
/** registered object */
private T obj;
diff --git a/platform/openide.nodes/src/org/openide/nodes/Index.java b/platform/openide.nodes/src/org/openide/nodes/Index.java
index 7a4757d..956949d 100644
--- a/platform/openide.nodes/src/org/openide/nodes/Index.java
+++ b/platform/openide.nodes/src/org/openide/nodes/Index.java
@@ -104,7 +104,7 @@ public interface Index extends Node.Cookie {
/** A support class implementing some methods of the <code>Index</code>
* cookie.
*/
- public static abstract class Support implements Index {
+ public abstract static class Support implements Index {
/** Registered listeners */
private HashSet<ChangeListener> listeners;
diff --git a/platform/openide.nodes/src/org/openide/nodes/Node.java b/platform/openide.nodes/src/org/openide/nodes/Node.java
index c78889e..0fbfd6e 100644
--- a/platform/openide.nodes/src/org/openide/nodes/Node.java
+++ b/platform/openide.nodes/src/org/openide/nodes/Node.java
@@ -1412,7 +1412,7 @@ public abstract class Node extends FeatureDescriptor implements Lookup.Provider,
* and value of type <code>String</code> giving a help ID.
* Normally this is unnecessary as help for the whole {@link Node} will be used by default.
*/
- public static abstract class PropertySet extends FeatureDescriptor {
+ public abstract static class PropertySet extends FeatureDescriptor {
/** Default constructor. */
public PropertySet() {
}
@@ -1491,7 +1491,7 @@ public abstract class Node extends FeatureDescriptor implements Lookup.Provider,
* {@link Node#firePropertyChange firing property changes}.
* @param T the type of bean
*/
- public static abstract class Property<T> extends FeatureDescriptor {
+ public abstract static class Property<T> extends FeatureDescriptor {
/**
* Contains classNames of incorrectly implemented properties which have
* been already logged by an ErrorManager.<br>
@@ -1690,7 +1690,7 @@ public abstract class Node extends FeatureDescriptor implements Lookup.Provider,
* @param T type of the whole property
* @param E type of one element
*/
- public static abstract class IndexedProperty<T,E> extends Node.Property<T> {
+ public abstract static class IndexedProperty<T,E> extends Node.Property<T> {
/** type of element that this property works with */
private Class<E> elementType;
diff --git a/platform/openide.nodes/src/org/openide/nodes/PropertySupport.java b/platform/openide.nodes/src/org/openide/nodes/PropertySupport.java
index 8890dad..3b5d42b 100644
--- a/platform/openide.nodes/src/org/openide/nodes/PropertySupport.java
+++ b/platform/openide.nodes/src/org/openide/nodes/PropertySupport.java
@@ -348,7 +348,7 @@ public abstract class PropertySupport<T> extends Node.Property<T> {
* Subclasses should implement
* {@link #getValue} and {@link #setValue}.
*/
- public static abstract class ReadWrite<T> extends PropertySupport<T> {
+ public abstract static class ReadWrite<T> extends PropertySupport<T> {
/** Construct a new support.
* @param name the name of the property
* @param type the class type of the property
@@ -363,7 +363,7 @@ public abstract class PropertySupport<T> extends Node.Property<T> {
/** A simple read-only property.
* Subclasses should implement {@link #getValue}.
*/
- public static abstract class ReadOnly<T> extends PropertySupport<T> {
+ public abstract static class ReadOnly<T> extends PropertySupport<T> {
/** Construct a new support.
* @param name the name of the property
* @param type the class type of the property
@@ -390,7 +390,7 @@ public abstract class PropertySupport<T> extends Node.Property<T> {
/** A simple write-only property.
* Subclasses should implement {@link #setValue}.
*/
- public static abstract class WriteOnly<T> extends PropertySupport<T> {
+ public abstract static class WriteOnly<T> extends PropertySupport<T> {
/** Construct a new support.
* @param name the name of the property
* @param type the class type of the property
diff --git a/platform/openide.nodes/src/org/openide/nodes/Sheet.java b/platform/openide.nodes/src/org/openide/nodes/Sheet.java
index 15a7635..730dd6f 100644
--- a/platform/openide.nodes/src/org/openide/nodes/Sheet.java
+++ b/platform/openide.nodes/src/org/openide/nodes/Sheet.java
@@ -278,7 +278,7 @@ public final class Sheet extends Object {
/** Get all properties in this set.
* @return the properties
*/
- synchronized public Node.Property<?>[] getProperties() {
+ public synchronized Node.Property<?>[] getProperties() {
if (array == null) {
array = new Node.Property<?>[props.size()];
props.toArray(array);
diff --git a/platform/openide.nodes/src/org/openide/util/actions/CookieAction.java b/platform/openide.nodes/src/org/openide/util/actions/CookieAction.java
index 45f81fd..d617745 100644
--- a/platform/openide.nodes/src/org/openide/util/actions/CookieAction.java
+++ b/platform/openide.nodes/src/org/openide/util/actions/CookieAction.java
@@ -302,7 +302,7 @@ public abstract class CookieAction extends NodeAction {
* extract the nodes it operates on from it. Otherwise it delegates to the
* regular NodeAction.
*/
- final static class CookieDelegateAction extends org.openide.util.actions.NodeAction.DelegateAction
+ static final class CookieDelegateAction extends org.openide.util.actions.NodeAction.DelegateAction
implements org.openide.nodes.NodeListener, Runnable {
/** our weak listener */
private org.openide.nodes.NodeListener listener;
diff --git a/platform/openide.text/src/org/openide/text/Annotatable.java b/platform/openide.text/src/org/openide/text/Annotatable.java
index 8541edb..78f2792 100644
--- a/platform/openide.text/src/org/openide/text/Annotatable.java
+++ b/platform/openide.text/src/org/openide/text/Annotatable.java
@@ -93,25 +93,25 @@ public abstract class Annotatable extends Object {
/** Add listeners on changes of annotatable properties
* @param l change listener*/
- final public void addPropertyChangeListener(java.beans.PropertyChangeListener l) {
+ public final void addPropertyChangeListener(java.beans.PropertyChangeListener l) {
propertyChangeSupport.addPropertyChangeListener(l);
}
/** Remove listeners on changes of annotatable properties
* @param l change listener*/
- final public void removePropertyChangeListener(java.beans.PropertyChangeListener l) {
+ public final void removePropertyChangeListener(java.beans.PropertyChangeListener l) {
propertyChangeSupport.removePropertyChangeListener(l);
}
/** Fire property change to registered listeners. */
- final protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
+ protected final void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
propertyChangeSupport.firePropertyChange(propertyName, oldValue, newValue);
}
/** Whether this Annotatable object was removed or not.
* @return whether the Annotatable object was removed or not
*/
- final public boolean isDeleted() {
+ public final boolean isDeleted() {
return deleted;
}
@@ -122,7 +122,7 @@ public abstract class Annotatable extends Object {
* what means that document is closed.
* @since 1.35
*/
- abstract public String getText();
+ public abstract String getText();
/** Setter for property deleted.
* @param deleted New value of property deleted.
@@ -139,7 +139,7 @@ public abstract class Annotatable extends Object {
* already attached some annotations or not.
* @return count of attached annotations
*/
- final public int getAnnotationCount() {
+ public final int getAnnotationCount() {
return attachedAnnotations.size();
}
}
diff --git a/platform/openide.text/src/org/openide/text/Annotation.java b/platform/openide.text/src/org/openide/text/Annotation.java
index 15496e5..58d91ce 100644
--- a/platform/openide.text/src/org/openide/text/Annotation.java
+++ b/platform/openide.text/src/org/openide/text/Annotation.java
@@ -128,24 +128,24 @@ public abstract class Annotation extends Object {
/** Gets annotatable object to which this annotation is attached.
* @return null if annotation is not attached or reference to annotatable object.
* @since 1.27 */
- final public Annotatable getAttachedAnnotatable() {
+ public final Annotatable getAttachedAnnotatable() {
return attached;
}
/** Add listeners on changes of annotation properties
* @param l change listener*/
- final public void addPropertyChangeListener(java.beans.PropertyChangeListener l) {
+ public final void addPropertyChangeListener(java.beans.PropertyChangeListener l) {
support.addPropertyChangeListener(l);
}
/** Remove listeners on changes of annotation properties
* @param l change listener*/
- final public void removePropertyChangeListener(java.beans.PropertyChangeListener l) {
+ public final void removePropertyChangeListener(java.beans.PropertyChangeListener l) {
support.removePropertyChangeListener(l);
}
/** Fire property change to registered listeners. */
- final protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
+ protected final void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
support.firePropertyChange(propertyName, oldValue, newValue);
}
@@ -154,7 +154,7 @@ public abstract class Annotation extends Object {
* property on which editors must listen and do the fronting of the annotation. Whether the annotation
* is visible in editor or not is not guaranteed by this method - use Line.show instead.
* @since 1.27 */
- final public void moveToFront() {
+ public final void moveToFront() {
support.firePropertyChange(PROP_MOVE_TO_FRONT, null, null);
}
diff --git a/platform/openide.text/src/org/openide/text/CloneableEditorInitializer.java b/platform/openide.text/src/org/openide/text/CloneableEditorInitializer.java
index 558ec36..df6c362 100644
--- a/platform/openide.text/src/org/openide/text/CloneableEditorInitializer.java
+++ b/platform/openide.text/src/org/openide/text/CloneableEditorInitializer.java
@@ -67,7 +67,7 @@ final class CloneableEditorInitializer implements Runnable {
private static final RequestProcessor RP = new RequestProcessor("org.openide.text Editor Initialization");
- final static Logger TIMER = Logger.getLogger("TIMER"); // NOI18N
+ static final Logger TIMER = Logger.getLogger("TIMER"); // NOI18N
/**
* Flag indicating if modal dialog for handling UQE is displayed. If it is
diff --git a/platform/openide.text/src/org/openide/text/DocumentLine.java b/platform/openide.text/src/org/openide/text/DocumentLine.java
index a85cf4a..3a083f1 100644
--- a/platform/openide.text/src/org/openide/text/DocumentLine.java
+++ b/platform/openide.text/src/org/openide/text/DocumentLine.java
@@ -918,7 +918,7 @@ public abstract class DocumentLine extends Line {
* ways to obtain a line set for documents following
* NetBeans conventions.
*/
- public static abstract class Set extends Line.Set {
+ public abstract static class Set extends Line.Set {
/** listener on document changes, accessed from LazyLines */
final LineListener listener;
diff --git a/platform/openide.text/src/org/openide/text/IndentEngine.java b/platform/openide.text/src/org/openide/text/IndentEngine.java
index 466d562..1e9a4bd 100644
--- a/platform/openide.text/src/org/openide/text/IndentEngine.java
+++ b/platform/openide.text/src/org/openide/text/IndentEngine.java
@@ -100,7 +100,7 @@ public abstract class IndentEngine extends org.openide.ServiceType {
* @deprecated IndentEngine now is a ServiceType
*/
@Deprecated
- public synchronized static void register(String mime, IndentEngine eng) {
+ public static synchronized void register(String mime, IndentEngine eng) {
map.put(mime, eng);
}
@@ -114,7 +114,7 @@ public abstract class IndentEngine extends org.openide.ServiceType {
/** Finds engine associated with given mime type.
* If no engine is associated returns default one.
*/
- public synchronized static IndentEngine find(String mime) {
+ public static synchronized IndentEngine find(String mime) {
Enumeration<? extends IndentEngine> en = indentEngines();
while (en.hasMoreElements()) {
diff --git a/platform/openide.text/src/org/openide/text/Line.java b/platform/openide.text/src/org/openide/text/Line.java
index 9810775..b2dba23 100644
--- a/platform/openide.text/src/org/openide/text/Line.java
+++ b/platform/openide.text/src/org/openide/text/Line.java
@@ -56,7 +56,7 @@ public abstract class Line extends Annotatable implements Serializable {
* and {@link ShowVisibilityType#NONE} instead.
*/
@Deprecated
- public final static int SHOW_TRY_SHOW = 0;
+ public static final int SHOW_TRY_SHOW = 0;
/** Opens the editor if necessary and shows the line.
* @see #show(int) <code>show</code>
@@ -64,7 +64,7 @@ public abstract class Line extends Annotatable implements Serializable {
* and {@link ShowVisibilityType#NONE} instead.
*/
@Deprecated
- public final static int SHOW_SHOW = 1;
+ public static final int SHOW_SHOW = 1;
/** Opens the editor if necessary, shows the line, and takes the focus.
* @see #show(int) <code>show</code>
@@ -72,7 +72,7 @@ public abstract class Line extends Annotatable implements Serializable {
* and {@link ShowVisibilityType#FOCUS} instead.
*/
@Deprecated
- public final static int SHOW_GOTO = 2;
+ public static final int SHOW_GOTO = 2;
/** Same as SHOW_GOTO except that the Window Manager attempts to front the
* editor window (i.e. make it the top most window).
@@ -83,7 +83,7 @@ public abstract class Line extends Annotatable implements Serializable {
* and {@link ShowVisibilityType#FRONT} instead.
*/
@Deprecated
- public final static int SHOW_TOFRONT = 3;
+ public static final int SHOW_TOFRONT = 3;
/** Takes the focus in case the editor is already opened and shows the line.
* Replaces (closes) the last editor opened using SHOW_REUSE in case
@@ -96,7 +96,7 @@ public abstract class Line extends Annotatable implements Serializable {
* and {@link ShowVisibilityType#FOCUS} instead.
*/
@Deprecated
- public final static int SHOW_REUSE = 4;
+ public static final int SHOW_REUSE = 4;
/** Focuses or opens given editor, marking it as reusable editor if it
* was not opened before. Similar to {@link #SHOW_REUSE} but ignores
@@ -107,7 +107,7 @@ public abstract class Line extends Annotatable implements Serializable {
* and {@link ShowVisibilityType#FOCUS} instead.
*/
@Deprecated
- public final static int SHOW_REUSE_NEW = 5;
+ public static final int SHOW_REUSE_NEW = 5;
/** ShowOpenType and ShowVisibilityType is replacement for constants SHOW_TRY_SHOW, SHOW_SHOW,
* SHOW_GOTO, SHOW_TOFRONT, SHOW_REUSE, SHOW_REUSE_NEW. It is to provide full control
@@ -155,7 +155,7 @@ public abstract class Line extends Annotatable implements Serializable {
};
/** Instance of null implementation of Line.Part */
- static final private Line.Part nullPart = new Line.NullPart();
+ private static final Line.Part nullPart = new Line.NullPart();
/** context of this line */
private org.openide.util.Lookup dataObject;
@@ -383,7 +383,7 @@ public abstract class Line extends Annotatable implements Serializable {
* part never cross the end of the line.
* @since 1.20
*/
- public static abstract class Part extends Annotatable {
+ public abstract static class Part extends Annotatable {
/** Property name for the line attribute */
public static final String PROP_LINE = "line"; // NOI18N
@@ -412,7 +412,7 @@ public abstract class Line extends Annotatable implements Serializable {
}
/** Implementation of Line.Part which is presenting empty part */
- static final private class NullPart extends Part {
+ private static final class NullPart extends Part {
NullPart() {
}
@@ -445,7 +445,7 @@ public abstract class Line extends Annotatable implements Serializable {
* and the compiler module asks for the 25th line (because the compiler reports an error at line 25 in the saved file) via the line set, the 26th line
* of the current document will be marked as being in error.
*/
- public static abstract class Set extends Object {
+ public abstract static class Set extends Object {
/** date when the object has been created */
private Date date;
diff --git a/platform/openide.text/src/org/openide/text/PositionRef.java b/platform/openide.text/src/org/openide/text/PositionRef.java
index e9e8afc..0208c65 100644
--- a/platform/openide.text/src/org/openide/text/PositionRef.java
+++ b/platform/openide.text/src/org/openide/text/PositionRef.java
@@ -50,7 +50,7 @@ public final class PositionRef extends Object implements Serializable, Position
private static final Logger LOG = Logger.getLogger(PositionRef.class.getName());
/** Which type of position is currently holded - int X Position */
- transient private Manager.Kind kind;
+ private transient Manager.Kind kind;
/** Manager for this position */
private Manager manager;
@@ -219,10 +219,10 @@ public final class PositionRef extends Object implements Serializable, Position
private static final RequestProcessor RP = new RequestProcessor(PositionRef.class);
/** support for the editor */
- transient private CloneableEditorSupport support;
+ private transient CloneableEditorSupport support;
/** the document for this manager or null if the manager is not in memory */
- transient private Reference<StyledDocument> doc;
+ private transient Reference<StyledDocument> doc;
/**
* Whether positions were turned into in-memory representation.
@@ -437,7 +437,7 @@ public final class PositionRef extends Object implements Serializable, Position
// End of class ChainItem.
/** Base kind with all methods */
- private static abstract class Kind extends Object {
+ private abstract static class Kind extends Object {
protected final PositionRef.Manager mgr;
Kind(PositionRef.Manager mgr) {
diff --git a/platform/openide.text/src/org/openide/text/QuietEditorPane.java b/platform/openide.text/src/org/openide/text/QuietEditorPane.java
index fc6ee08..103d2cb 100644
--- a/platform/openide.text/src/org/openide/text/QuietEditorPane.java
+++ b/platform/openide.text/src/org/openide/text/QuietEditorPane.java
@@ -80,9 +80,9 @@ final class QuietEditorPane extends JEditorPane {
}
}
- final static int FIRE = 0x1;
- final static int PAINT = 0x2;
- final static int ALL = FIRE | PAINT;
+ static final int FIRE = 0x1;
+ static final int PAINT = 0x2;
+ static final int ALL = FIRE | PAINT;
// #21120. Caret was null while serializing CloneableEditor.
diff --git a/platform/openide.text/test/unit/src/org/netbeans/modules/openide/text/AskEditorQuestionsTest.java b/platform/openide.text/test/unit/src/org/netbeans/modules/openide/text/AskEditorQuestionsTest.java
index bd6d72b..4bf2030 100644
--- a/platform/openide.text/test/unit/src/org/netbeans/modules/openide/text/AskEditorQuestionsTest.java
+++ b/platform/openide.text/test/unit/src/org/netbeans/modules/openide/text/AskEditorQuestionsTest.java
@@ -72,7 +72,7 @@ public class AskEditorQuestionsTest {
}
}
- public final static class MockDialogDisplayer extends DialogDisplayer {
+ public static final class MockDialogDisplayer extends DialogDisplayer {
public MockDialogDisplayer() {
}
diff --git a/platform/openide.text/test/unit/src/org/openide/text/Deadlock207571Test.java b/platform/openide.text/test/unit/src/org/openide/text/Deadlock207571Test.java
index a2197d4..112503c 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/Deadlock207571Test.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/Deadlock207571Test.java
@@ -69,7 +69,7 @@ implements CloneableEditorSupport.Env {
/** if not null contains message why this document cannot be modified */
private transient String cannotBeModified;
private transient Date date = new Date ();
- private transient final PropertyChangeSupport pcl;
+ private final transient PropertyChangeSupport pcl;
private transient VetoableChangeListener vetoL;
private transient volatile boolean inReloadBeforeSupportLock;
diff --git a/platform/openide.text/test/unit/src/org/openide/text/EditToBeUndoneRedoneTest.java b/platform/openide.text/test/unit/src/org/openide/text/EditToBeUndoneRedoneTest.java
index 3d263ac..507d0b3 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/EditToBeUndoneRedoneTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/EditToBeUndoneRedoneTest.java
@@ -72,7 +72,7 @@ implements CloneableEditorSupport.Env {
/** if not null contains message why this document cannot be modified */
private transient String cannotBeModified;
private transient Date date = new Date ();
- private transient final PropertyChangeSupport pcl;
+ private final transient PropertyChangeSupport pcl;
private transient VetoableChangeListener vetoL;
private transient volatile boolean inReloadBeforeSupportLock;
diff --git a/platform/openide.text/test/unit/src/org/openide/text/LoadMultipleDocsTest.java b/platform/openide.text/test/unit/src/org/openide/text/LoadMultipleDocsTest.java
index 39dd021..c6a6e59 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/LoadMultipleDocsTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/LoadMultipleDocsTest.java
@@ -193,7 +193,7 @@ public class LoadMultipleDocsTest extends NbTestCase {
}
/** Implementation of the CES */
- private final static class CES extends CloneableEditorSupport {
+ private static final class CES extends CloneableEditorSupport {
public CES (Env env, org.openide.util.Lookup l) {
super (env, l);
}
diff --git a/platform/openide.text/test/unit/src/org/openide/text/WrapEditorComponentTest.java b/platform/openide.text/test/unit/src/org/openide/text/WrapEditorComponentTest.java
index d867a01..c58efaf 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/WrapEditorComponentTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/WrapEditorComponentTest.java
@@ -231,7 +231,7 @@ implements CloneableEditorSupport.Env {
}
}
- private final static class NbLikeEditorKitWithCustomEditor extends NbLikeEditorKit {
+ private static final class NbLikeEditorKitWithCustomEditor extends NbLikeEditorKit {
public Document createDefaultDocument() {
return new CustomDoc();
diff --git a/platform/openide.util.lookup/src/org/openide/util/Lookup.java b/platform/openide.util.lookup/src/org/openide/util/Lookup.java
index 17be0d9..018bc84 100644
--- a/platform/openide.util.lookup/src/org/openide/util/Lookup.java
+++ b/platform/openide.util.lookup/src/org/openide/util/Lookup.java
@@ -444,7 +444,7 @@ public abstract class Lookup {
* Also permits listening to changes in the result.
* Result can contain duplicate items.
*/
- public static abstract class Result<T> extends Object {
+ public abstract static class Result<T> extends Object {
/** Registers a listener that is invoked when there is a possible
* change in this result.
* <p>
@@ -528,7 +528,7 @@ public abstract class Lookup {
*
* @since 1.25
*/
- public static abstract class Item<T> extends Object {
+ public abstract static class Item<T> extends Object {
/** Get the instance itself.
* @return the instance or null if the instance cannot be created
*/
diff --git a/platform/openide.util.lookup/src/org/openide/util/lookup/AbstractLookup.java b/platform/openide.util.lookup/src/org/openide/util/lookup/AbstractLookup.java
index 6ea8ead..10a7847 100644
--- a/platform/openide.util.lookup/src/org/openide/util/lookup/AbstractLookup.java
+++ b/platform/openide.util.lookup/src/org/openide/util/lookup/AbstractLookup.java
@@ -808,7 +808,7 @@ public class AbstractLookup extends Lookup implements Serializable {
/** Extension to the default lookup item that offers additional information
* for the data structures use in AbstractLookup
*/
- public static abstract class Pair<T> extends Lookup.Item<T> implements Serializable {
+ public abstract static class Pair<T> extends Lookup.Item<T> implements Serializable {
private static final long serialVersionUID = 1L;
/** possition of this item in the lookup, manipulated in addPair, removePair, setPairs methods */
@@ -1305,7 +1305,7 @@ public class AbstractLookup extends Lookup implements Serializable {
/** Just a holder for index & modified values.
*/
- final static class Info extends Object {
+ static final class Info extends Object {
public int index;
public Object transaction;
diff --git a/platform/openide.util.lookup/src/org/openide/util/lookup/InstanceContent.java b/platform/openide.util.lookup/src/org/openide/util/lookup/InstanceContent.java
index 638d481..28fbfd5 100644
--- a/platform/openide.util.lookup/src/org/openide/util/lookup/InstanceContent.java
+++ b/platform/openide.util.lookup/src/org/openide/util/lookup/InstanceContent.java
@@ -168,7 +168,7 @@ public final class InstanceContent extends AbstractLookup.Content {
/** Instance of one item representing an object.
*/
- final static class SimpleItem<T> extends Pair<T> {
+ static final class SimpleItem<T> extends Pair<T> {
private T obj;
/** Create an item.
@@ -249,7 +249,7 @@ public final class InstanceContent extends AbstractLookup.Content {
/** Instance of one item registered in the map.
*/
- final static class ConvertingItem<T,R> extends Pair<R> {
+ static final class ConvertingItem<T,R> extends Pair<R> {
/** registered object */
private T obj;
diff --git a/platform/openide.util.lookup/src/org/openide/util/lookup/ProxyLookup.java b/platform/openide.util.lookup/src/org/openide/util/lookup/ProxyLookup.java
index 3d1f394..2779fdb 100644
--- a/platform/openide.util.lookup/src/org/openide/util/lookup/ProxyLookup.java
+++ b/platform/openide.util.lookup/src/org/openide/util/lookup/ProxyLookup.java
@@ -907,7 +907,7 @@ public class ProxyLookup extends Lookup {
}
} // end of WeakResult
- static abstract class ImmutableInternalData extends Object {
+ abstract static class ImmutableInternalData extends Object {
static final ImmutableInternalData EMPTY = new EmptyInternalData();
static final Lookup[] EMPTY_ARR = new Lookup[0];
@@ -1371,7 +1371,7 @@ public class ProxyLookup extends Lookup {
}
} // end of LazyCollection
- private final static class LazyList extends LazyCollection implements List {
+ private static final class LazyList extends LazyCollection implements List {
public LazyList(R data, Object[] cc, int indexToCache, boolean callBeforeLookup, Lookup.Result[] arr) {
super(data, cc, indexToCache, callBeforeLookup, arr);
diff --git a/platform/openide.util.lookup/test/unit/src/org/openide/util/lookup/AbstractLookupArrayStorageTest.java b/platform/openide.util.lookup/test/unit/src/org/openide/util/lookup/AbstractLookupArrayStorageTest.java
index 124af3c..894b322 100644
--- a/platform/openide.util.lookup/test/unit/src/org/openide/util/lookup/AbstractLookupArrayStorageTest.java
+++ b/platform/openide.util.lookup/test/unit/src/org/openide/util/lookup/AbstractLookupArrayStorageTest.java
@@ -69,7 +69,7 @@ public class AbstractLookupArrayStorageTest extends AbstractLookupBaseHid {
}
- private static abstract class ArrayTestSuite extends NbTestSuite
+ private abstract static class ArrayTestSuite extends NbTestSuite
implements AbstractLookupBaseHid.Impl {
private int trash;
diff --git a/platform/openide.util.ui/src/org/openide/ServiceType.java b/platform/openide.util.ui/src/org/openide/ServiceType.java
index 7feb54d..4f9a430 100644
--- a/platform/openide.util.ui/src/org/openide/ServiceType.java
+++ b/platform/openide.util.ui/src/org/openide/ServiceType.java
@@ -206,9 +206,9 @@ public abstract class ServiceType extends Object implements Serializable, HelpCt
* @deprecated Use lookup instead.
*/
@Deprecated
- public static abstract class Registry implements Serializable {
+ public abstract static class Registry implements Serializable {
/** suid */
- final static long serialVersionUID = 8721000770371416481L;
+ static final long serialVersionUID = 8721000770371416481L;
/** Get all available services managed by the engine.
* @return an enumeration of {@link ServiceType}s
diff --git a/platform/openide.util.ui/src/org/openide/util/HelpCtx.java b/platform/openide.util.ui/src/org/openide/util/HelpCtx.java
index a325bfa..27e6347 100644
--- a/platform/openide.util.ui/src/org/openide/util/HelpCtx.java
+++ b/platform/openide.util.ui/src/org/openide/util/HelpCtx.java
@@ -41,7 +41,7 @@ public final class HelpCtx extends Object {
* This (hopefully) points to a note explaining to the user that no help is available.
* Precisely, the Help ID is set to <code>org.openide.util.HelpCtx.DEFAULT_HELP</code>.
*/
- public final static HelpCtx DEFAULT_HELP = new HelpCtx(HelpCtx.class.getName() + ".DEFAULT_HELP"); // NOI18N
+ public static final HelpCtx DEFAULT_HELP = new HelpCtx(HelpCtx.class.getName() + ".DEFAULT_HELP"); // NOI18N
/** URL of the help page */
private final URL helpCtx;
diff --git a/platform/openide.util.ui/src/org/openide/util/ImageUtilities.java b/platform/openide.util.ui/src/org/openide/util/ImageUtilities.java
index 083919e..121738b 100644
--- a/platform/openide.util.ui/src/org/openide/util/ImageUtilities.java
+++ b/platform/openide.util.ui/src/org/openide/util/ImageUtilities.java
@@ -931,7 +931,7 @@ public final class ImageUtilities {
return buffImage;
}
- static private ColorModel colorModel(int transparency) {
+ private static ColorModel colorModel(int transparency) {
ColorModel model;
try {
model = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment()
diff --git a/platform/openide.util.ui/src/org/openide/util/NetworkSettings.java b/platform/openide.util.ui/src/org/openide/util/NetworkSettings.java
index 6a7a076..c35f538 100644
--- a/platform/openide.util.ui/src/org/openide/util/NetworkSettings.java
+++ b/platform/openide.util.ui/src/org/openide/util/NetworkSettings.java
@@ -160,7 +160,7 @@ public final class NetworkSettings {
* @author Jiri Rechtacek, Ondrej Vrabec
* @since 8.17
*/
- public static abstract class ProxyCredentialsProvider {
+ public abstract static class ProxyCredentialsProvider {
/** Returns the <code>username</code> for Proxy Authentication.
* Returns <code>null</code> if no authentication required.
diff --git a/platform/openide.util.ui/src/org/openide/util/actions/ActionInvoker.java b/platform/openide.util.ui/src/org/openide/util/actions/ActionInvoker.java
index 6dcfb38..e7fbdb8 100644
--- a/platform/openide.util.ui/src/org/openide/util/actions/ActionInvoker.java
+++ b/platform/openide.util.ui/src/org/openide/util/actions/ActionInvoker.java
@@ -95,7 +95,7 @@ public abstract class ActionInvoker extends Object {
/** Special class that can be passed to invokeAction and delegates
* to correct values
*/
- private static abstract class ActionRunnable implements Action {
+ private abstract static class ActionRunnable implements Action {
final ActionEvent ev;
final Action action;
final boolean async;
diff --git a/platform/openide.util.ui/src/org/openide/util/actions/CallbackSystemAction.java b/platform/openide.util.ui/src/org/openide/util/actions/CallbackSystemAction.java
index b9a9147..a798f87 100644
--- a/platform/openide.util.ui/src/org/openide/util/actions/CallbackSystemAction.java
+++ b/platform/openide.util.ui/src/org/openide/util/actions/CallbackSystemAction.java
@@ -337,7 +337,7 @@ public abstract class CallbackSystemAction extends CallableSystemAction implemen
resultChanged(null);
}
- public synchronized static GlobalManager getDefault() {
+ public static synchronized GlobalManager getDefault() {
if (instance != null) {
return instance;
}
diff --git a/platform/openide.util.ui/src/org/openide/util/datatransfer/ExTransferable.java b/platform/openide.util.ui/src/org/openide/util/datatransfer/ExTransferable.java
index c25733d..4851941 100644
--- a/platform/openide.util.ui/src/org/openide/util/datatransfer/ExTransferable.java
+++ b/platform/openide.util.ui/src/org/openide/util/datatransfer/ExTransferable.java
@@ -152,7 +152,7 @@ public class ExTransferable extends Object implements Transferable {
*
* @param l the listener
*/
- public synchronized final void addTransferListener(TransferListener l) {
+ public final synchronized void addTransferListener(TransferListener l) {
if (listeners == null) {
listeners = new EventListenerList();
}
@@ -162,7 +162,7 @@ public class ExTransferable extends Object implements Transferable {
/** Removes a listener.
*/
- public synchronized final void removeTransferListener(TransferListener l) {
+ public final synchronized void removeTransferListener(TransferListener l) {
if (listeners != null) {
listeners.remove(TransferListener.class, l);
}
@@ -217,7 +217,7 @@ public class ExTransferable extends Object implements Transferable {
/** Support for transferable owner with only one data flavor.
* Subclasses need only implement {@link #getData}.
*/
- public static abstract class Single extends Object implements Transferable {
+ public abstract static class Single extends Object implements Transferable {
/** the supported data flavor */
private DataFlavor flavor;
diff --git a/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateTest.java b/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateTest.java
index 9f42262..a0628bb 100644
--- a/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateTest.java
+++ b/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTranslateTest.java
@@ -223,12 +223,12 @@ public class UtilitiesTranslateTest extends NbTestCase {
/** A test to serialize and deserialize different class with same fields.
*/
private static final class A implements Serializable {
- final static long serialVersionUID = 1;
+ static final long serialVersionUID = 1;
public String value;
}
private static final class Ahoj implements Serializable {
- final static long serialVersionUID = 1;
+ static final long serialVersionUID = 1;
public String value;
}
diff --git a/platform/openide.util.ui/test/unit/src/org/openide/util/actions/SystemActionTest.java b/platform/openide.util.ui/test/unit/src/org/openide/util/actions/SystemActionTest.java
index a4edfb8..9902d93 100644
--- a/platform/openide.util.ui/test/unit/src/org/openide/util/actions/SystemActionTest.java
+++ b/platform/openide.util.ui/test/unit/src/org/openide/util/actions/SystemActionTest.java
@@ -67,7 +67,7 @@ public class SystemActionTest extends NbTestCase {
assertTrue(log.toString(), log.toString().contains("No such icon"));
}
- private static abstract class TestSystemAction extends SystemAction {
+ private abstract static class TestSystemAction extends SystemAction {
public void actionPerformed(ActionEvent e) {}
public HelpCtx getHelpCtx() {
return HelpCtx.DEFAULT_HELP;
diff --git a/platform/openide.util/src/org/openide/util/CharSequences.java b/platform/openide.util/src/org/openide/util/CharSequences.java
index b9fa71c..94e2bdb 100644
--- a/platform/openide.util/src/org/openide/util/CharSequences.java
+++ b/platform/openide.util/src/org/openide/util/CharSequences.java
@@ -1388,7 +1388,7 @@ public final class CharSequences {
* it is still more efficient than String, because string stores length in field
* and it costs 20 bytes aligned into 24
*/
- private final static class CharBasedSequence implements CompactCharSequence, Comparable<CharSequence> {
+ private static final class CharBasedSequence implements CompactCharSequence, Comparable<CharSequence> {
private final char[] value;
private int hash;
@@ -1457,7 +1457,7 @@ public final class CharSequences {
* compact char sequence implementation based on byte[]
* size: 8 + 4 + 4 (= 16 bytes) + sizeof ('value')
*/
- private final static class ByteBasedSequence implements CompactCharSequence, Comparable<CharSequence> {
+ private static final class ByteBasedSequence implements CompactCharSequence, Comparable<CharSequence> {
private final byte[] value;
private int hash;
diff --git a/platform/openide.util/src/org/openide/util/NbBundle.java b/platform/openide.util/src/org/openide/util/NbBundle.java
index e072141..982c4fe 100644
--- a/platform/openide.util/src/org/openide/util/NbBundle.java
+++ b/platform/openide.util/src/org/openide/util/NbBundle.java
@@ -1484,7 +1484,7 @@ public class NbBundle extends Object {
* Local charset to decode using UTF-8 by default, but automatically switching to ISO-8859-1 if UTF-8 decoding fails.
*
*/
- static private class UtfThenIsoCharset extends Charset {
+ private static class UtfThenIsoCharset extends Charset {
private final boolean onlyUTF8;
diff --git a/platform/openide.util/src/org/openide/util/NbCollections.java b/platform/openide.util/src/org/openide/util/NbCollections.java
index 4fa385a..35ad347 100644
--- a/platform/openide.util/src/org/openide/util/NbCollections.java
+++ b/platform/openide.util/src/org/openide/util/NbCollections.java
@@ -138,7 +138,7 @@ public class NbCollections {
return m2;
}
- private static abstract class CheckedIterator<E> implements Iterator<E> {
+ private abstract static class CheckedIterator<E> implements Iterator<E> {
private static final Object WAITING = new Object();
diff --git a/platform/openide.util/src/org/openide/util/RequestProcessor.java b/platform/openide.util/src/org/openide/util/RequestProcessor.java
index 8de90c6..7e79619 100644
--- a/platform/openide.util/src/org/openide/util/RequestProcessor.java
+++ b/platform/openide.util/src/org/openide/util/RequestProcessor.java
@@ -1083,7 +1083,7 @@ outer: do {
}
}
- private static abstract class TaskFutureWrapper implements ScheduledFuture<Void>, Runnable, RunnableWrapper {
+ private abstract static class TaskFutureWrapper implements ScheduledFuture<Void>, Runnable, RunnableWrapper {
volatile Task t;
protected final Runnable toRun;
protected final long initialDelay;
@@ -2196,7 +2196,7 @@ outer: do {
return 0;
}
- synchronized static final void schedule(Item localItem, long delay) {
+ static final synchronized void schedule(Item localItem, long delay) {
if (TICK == null) {
TICK = new TickTac();
TICK.scheduleImpl(localItem, delay);
@@ -2214,7 +2214,7 @@ outer: do {
queue.add(localItem);
}
- synchronized static final void cancel(Item localItem) {
+ static final synchronized void cancel(Item localItem) {
if (TICK != null) {
TICK.cancelImpl(localItem);
TickTac.class.notifyAll();
diff --git a/platform/openide.util/src/org/openide/util/io/NbMarshalledObject.java b/platform/openide.util/src/org/openide/util/io/NbMarshalledObject.java
index 4395d5d..758afea 100644
--- a/platform/openide.util/src/org/openide/util/io/NbMarshalledObject.java
+++ b/platform/openide.util/src/org/openide/util/io/NbMarshalledObject.java
@@ -38,7 +38,7 @@ import java.util.Arrays;
public final class NbMarshalledObject implements Serializable {
/** serial version UID */
private static final long serialVersionUID = 7842398740921434354L;
- private final static char[] HEX = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; // NOI18N
+ private static final char[] HEX = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; // NOI18N
/**
* @serial Bytes of serialized representation. If <code>objBytes</code> is
diff --git a/platform/openide.util/test/unit/src/org/openide/util/WeakSetTest.java b/platform/openide.util/test/unit/src/org/openide/util/WeakSetTest.java
index 0699ff8..55f6b80 100644
--- a/platform/openide.util/test/unit/src/org/openide/util/WeakSetTest.java
+++ b/platform/openide.util/test/unit/src/org/openide/util/WeakSetTest.java
@@ -145,7 +145,7 @@ public class WeakSetTest extends NbTestCase {
}
}
- private final static class TestObj {
+ private static final class TestObj {
static final Set<TestObj> testObjs = new WeakSet<TestObj>();
private final String name;
TestObj(String name) {
@@ -162,7 +162,7 @@ public class WeakSetTest extends NbTestCase {
}
- private final static class GC implements Runnable {
+ private static final class GC implements Runnable {
public void run() {
try {
diff --git a/platform/openide.windows/src/org/openide/windows/CloneableTopComponent.java b/platform/openide.windows/src/org/openide/windows/CloneableTopComponent.java
index c3b7dfe..999190b 100644
--- a/platform/openide.windows/src/org/openide/windows/CloneableTopComponent.java
+++ b/platform/openide.windows/src/org/openide/windows/CloneableTopComponent.java
@@ -132,7 +132,7 @@ public abstract class CloneableTopComponent extends TopComponent implements Exte
*
* @return the clone registry for this component's group
*/
- public synchronized final Ref getReference() {
+ public final synchronized Ref getReference() {
if (ref == null) {
ref = new Ref(this);
}
@@ -143,7 +143,7 @@ public abstract class CloneableTopComponent extends TopComponent implements Exte
/** Changes the reference to which this components belongs.
* @param another the new reference this component should belong
*/
- public synchronized final void setReference(Ref another) {
+ public final synchronized void setReference(Ref another) {
if (another == EMPTY) {
throw new IllegalArgumentException(
NbBundle.getBundle(CloneableTopComponent.class).getString("EXC_CannotAssign")
diff --git a/platform/openide.windows/src/org/openide/windows/ModeUtilities.java b/platform/openide.windows/src/org/openide/windows/ModeUtilities.java
index 796e5fc..2de0b7b 100644
--- a/platform/openide.windows/src/org/openide/windows/ModeUtilities.java
+++ b/platform/openide.windows/src/org/openide/windows/ModeUtilities.java
@@ -55,7 +55,7 @@ public final class ModeUtilities {
* @param mode the {@link Mode} whose XML configuration is required.
* @return the XML of the Mode's configuration or {@code null} if not supported.
*/
- public final static String toXml(Mode mode) {
+ public static final String toXml(Mode mode) {
return mode instanceof Mode.Xml
? ((Mode.Xml) mode).toXml()
: null;
diff --git a/platform/openide.windows/test/unit/src/org/openide/windows/TopComponentGetLookupTest.java b/platform/openide.windows/test/unit/src/org/openide/windows/TopComponentGetLookupTest.java
index 8383852..bb4911e 100644
--- a/platform/openide.windows/test/unit/src/org/openide/windows/TopComponentGetLookupTest.java
+++ b/platform/openide.windows/test/unit/src/org/openide/windows/TopComponentGetLookupTest.java
@@ -877,7 +877,7 @@ public class TopComponentGetLookupTest extends NbTestCase {
}
}
- private final static Def defaultFocusManager = new Def();
+ private static final Def defaultFocusManager = new Def();
static {
try {
Utilities.actionsGlobalContext();
diff --git a/platform/options.api/src/org/netbeans/modules/options/Utils.java b/platform/options.api/src/org/netbeans/modules/options/Utils.java
index 85c4979..c23c0e5 100644
--- a/platform/options.api/src/org/netbeans/modules/options/Utils.java
+++ b/platform/options.api/src/org/netbeans/modules/options/Utils.java
@@ -31,7 +31,7 @@ public class Utils {
private static Map<String, FileObject> filesCache = new HashMap<String, FileObject> ();
- public final static int ScrollBarUnitIncrement = 16;
+ public static final int ScrollBarUnitIncrement = 16;
public static FileObject getFileObject (String name, String ext, boolean create)
throws IOException {
diff --git a/platform/options.keymap/src/org/netbeans/modules/options/keymap/KeymapModel.java b/platform/options.keymap/src/org/netbeans/modules/options/keymap/KeymapModel.java
index e9d3a17..cdd408f 100644
--- a/platform/options.keymap/src/org/netbeans/modules/options/keymap/KeymapModel.java
+++ b/platform/options.keymap/src/org/netbeans/modules/options/keymap/KeymapModel.java
@@ -76,7 +76,7 @@ public class KeymapModel {
private static volatile List<KeymapManager> managers = null;
- private volatile static KeymapModel INSTANCE;
+ private static volatile KeymapModel INSTANCE;
static KeymapModel create() {
if (INSTANCE != null) {
diff --git a/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java b/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java
index 7f2063b..8776946 100644
--- a/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java
+++ b/platform/sampler/src/org/netbeans/modules/sampler/SamplesOutputStream.java
@@ -220,9 +220,9 @@ class SamplesOutputStream {
private static class Sample {
- final private long time;
- final private List<Long> sameThread;
- final private List<ThreadInfo> newThreads;
+ private final long time;
+ private final List<Long> sameThread;
+ private final List<ThreadInfo> newThreads;
Sample(long t, List<Long> sameT, List<ThreadInfo> newT) {
time = t;
diff --git a/platform/sendopts/src/org/netbeans/modules/sendopts/OptionImpl.java b/platform/sendopts/src/org/netbeans/modules/sendopts/OptionImpl.java
index 8f42a16..e6a5579 100644
--- a/platform/sendopts/src/org/netbeans/modules/sendopts/OptionImpl.java
+++ b/platform/sendopts/src/org/netbeans/modules/sendopts/OptionImpl.java
@@ -580,7 +580,7 @@ public abstract class OptionImpl implements Cloneable {
return new AlternativeOptionsImpl(option, null, list);
}
- public static abstract class Trampoline {
+ public abstract static class Trampoline {
public static Trampoline DEFAULT;
static {
try {
diff --git a/platform/sendopts/test/unit/src/org/netbeans/api/sendopts/StreamingTest.java b/platform/sendopts/test/unit/src/org/netbeans/api/sendopts/StreamingTest.java
index e8d9fbd..2f9affa 100644
--- a/platform/sendopts/test/unit/src/org/netbeans/api/sendopts/StreamingTest.java
+++ b/platform/sendopts/test/unit/src/org/netbeans/api/sendopts/StreamingTest.java
@@ -109,7 +109,7 @@ public class StreamingTest extends NbTestCase {
}
- public static abstract class SinkProvider {
+ public abstract static class SinkProvider {
/** associated option */
final Option option;
@@ -136,7 +136,7 @@ public class StreamingTest extends NbTestCase {
throws CommandException;
}
- public static abstract class Sink {
+ public abstract static class Sink {
public static Sink create(String n, WritableByteChannel b, boolean x) {
return null;
}
diff --git a/platform/settings/examples/src/org/netbeans/modules/settings/examples/JavaCompilerSetting.java b/platform/settings/examples/src/org/netbeans/modules/settings/examples/JavaCompilerSetting.java
index e01c5bb..340975a 100644
--- a/platform/settings/examples/src/org/netbeans/modules/settings/examples/JavaCompilerSetting.java
+++ b/platform/settings/examples/src/org/netbeans/modules/settings/examples/JavaCompilerSetting.java
@@ -26,10 +26,10 @@ import java.util.Properties;
* @author Jan Pokorsky
*/
public final class JavaCompilerSetting {
- private final static String PROP_DEBUG = "debug"; //NOI18N
- private final static String PROP_DEPRECATION = "deprecation"; //NOI18N
- private final static String PROP_CLASS_PATH = "classPath"; //NOI18N
- private final static String PROP_EXEC_PATH = "path"; //NOI18N
+ private static final String PROP_DEBUG = "debug"; //NOI18N
+ private static final String PROP_DEPRECATION = "deprecation"; //NOI18N
+ private static final String PROP_CLASS_PATH = "classPath"; //NOI18N
+ private static final String PROP_EXEC_PATH = "path"; //NOI18N
private java.beans.PropertyChangeSupport propertyChangeSupport = new java.beans.PropertyChangeSupport(this);
diff --git a/platform/settings/examples/src/org/netbeans/modules/settings/examples/ProxySettings.java b/platform/settings/examples/src/org/netbeans/modules/settings/examples/ProxySettings.java
index c7c5809..a479a75 100644
--- a/platform/settings/examples/src/org/netbeans/modules/settings/examples/ProxySettings.java
+++ b/platform/settings/examples/src/org/netbeans/modules/settings/examples/ProxySettings.java
@@ -26,8 +26,8 @@ import java.util.Properties;
* @author Jan Pokorsky
*/
public final class ProxySettings {
- private final static String PROP_PROXYHOST = "proxyHost"; //NOI18N
- private final static String PROP_PROXYPORT = "proxyPort"; //NOI18N
+ private static final String PROP_PROXYHOST = "proxyHost"; //NOI18N
+ private static final String PROP_PROXYPORT = "proxyPort"; //NOI18N
/** Holds value of property proxyHost. */
private String proxyHost;
diff --git a/platform/settings/src/org/netbeans/modules/settings/Env.java b/platform/settings/src/org/netbeans/modules/settings/Env.java
index c4481e2..bc2a478 100644
--- a/platform/settings/src/org/netbeans/modules/settings/Env.java
+++ b/platform/settings/src/org/netbeans/modules/settings/Env.java
@@ -39,36 +39,36 @@ public final class Env implements Environment.Provider {
* <code><attr name="settings.convertor" methodvalue="org.netbeans.modules.settings.XMLPropertiesConvertor.create"/>
* </code>
*/
- public final static String EA_CONVERTOR = "settings.convertor"; //NOI18N
+ public static final String EA_CONVERTOR = "settings.convertor"; //NOI18N
/** file attribute containing path to the provider. Used by
* InstanceDataObject.create or upgrade algorithm. Usage
* <code><attr name="settings.providerPath" stringvalue="xml/lookups/NetBeans/DTD_XML_Properties_1_0.instance"/>
* </code>
*/
- public final static String EA_PROVIDER_PATH = "settings.providerPath"; // NOI18N
+ public static final String EA_PROVIDER_PATH = "settings.providerPath"; // NOI18N
/** file attribute containing PUBLIC attribute of xml header. Usage
* <code><attr name="hint.originalPublicID" stringvalue="-//NetBeans//DTD XML Properties 1.0//EN"/>
* </code>
*/
- public final static String EA_PUBLICID = "hint.originalPublicID"; // NOI18N
+ public static final String EA_PUBLICID = "hint.originalPublicID"; // NOI18N
/** file attribute containnig class name of the setting object. Usage
* <code><attr name="settings.instanceClass" stringvalue="org.netbeans.modules.foo.Foo"/>
* </code>
*/
- public final static String EA_INSTANCE_CLASS_NAME = "settings.instanceClass"; //NOI18N
+ public static final String EA_INSTANCE_CLASS_NAME = "settings.instanceClass"; //NOI18N
/** file attribute containnig class name and subclass names of the setting object. Use the
* attribute for performance reasons. Usage
* <code><attr name="settings.instanceOf" stringvalue="org.netbeans.modules.foo.Foo[, ...]"/>
* </code>
*/
- public final static String EA_INSTANCE_OF = "settings.instanceOf"; //NOI18N
+ public static final String EA_INSTANCE_OF = "settings.instanceOf"; //NOI18N
/** file attribute containnig the setting object. Usage
* <code><attr name="settings.instanceCreate" newvalue="org.netbeans.modules.foo.Foo"/>
* </code> or
* <code><attr name="settings.instanceCreate" methodvalue="org.netbeans.modules.foo.Foo.create"/>
* </code>
*/
- public final static String EA_INSTANCE_CREATE = "settings.instanceCreate"; //NOI18N
+ public static final String EA_INSTANCE_CREATE = "settings.instanceCreate"; //NOI18N
/** file attribute determining whether the registration works also for subclasses of the registering
* class. Use of this attribute is optional. The default is false, the value must be boolean, example:
* <code><attr name="settings.subclasses" boolvalue="true"/></code>
diff --git a/platform/settings/src/org/netbeans/modules/settings/SaveSupport.java b/platform/settings/src/org/netbeans/modules/settings/SaveSupport.java
index 2a66281..a877325 100644
--- a/platform/settings/src/org/netbeans/modules/settings/SaveSupport.java
+++ b/platform/settings/src/org/netbeans/modules/settings/SaveSupport.java
@@ -38,9 +38,9 @@ import org.openide.util.Exceptions;
*/
final class SaveSupport {
/** property means setting is changed and should be changed */
- public final static String PROP_SAVE = "savecookie"; //NOI18N
+ public static final String PROP_SAVE = "savecookie"; //NOI18N
/** property means setting file content is changed */
- public final static String PROP_FILE_CHANGED = "fileChanged"; //NOI18N
+ public static final String PROP_FILE_CHANGED = "fileChanged"; //NOI18N
/** data object name cached in the attribute to prevent instance creation when
* its node is displayed.
* @see org.openide.loaders.InstanceDataObject#EA_NAME
diff --git a/platform/settings/src/org/netbeans/modules/settings/ScheduledRequest.java b/platform/settings/src/org/netbeans/modules/settings/ScheduledRequest.java
index cf2b1c4..200a84a 100644
--- a/platform/settings/src/org/netbeans/modules/settings/ScheduledRequest.java
+++ b/platform/settings/src/org/netbeans/modules/settings/ScheduledRequest.java
@@ -33,9 +33,9 @@ import org.openide.util.RequestProcessor.*;
* @author Jan Pokorsky
*/
public final class ScheduledRequest implements Runnable {
- private final static RequestProcessor PROCESSOR =
+ private static final RequestProcessor PROCESSOR =
new RequestProcessor("Settings Processor"); //NOI18N
- private final static int DELAY = 2000;
+ private static final int DELAY = 2000;
private Object inst;
private Task task;
diff --git a/platform/settings/src/org/netbeans/modules/settings/convertors/ModuleInfoManager.java b/platform/settings/src/org/netbeans/modules/settings/convertors/ModuleInfoManager.java
index e979366..e8d557e 100644
--- a/platform/settings/src/org/netbeans/modules/settings/convertors/ModuleInfoManager.java
+++ b/platform/settings/src/org/netbeans/modules/settings/convertors/ModuleInfoManager.java
@@ -32,7 +32,7 @@ import org.openide.util.LookupEvent;
* @author Jan Pokorsky
*/
final class ModuleInfoManager {
- private final static ModuleInfoManager mim = new ModuleInfoManager();;
+ private static final ModuleInfoManager mim = new ModuleInfoManager();;
/** all modules <code bas name, ModuleInfo> */
private HashMap<String, ModuleInfo> modules = null;
@@ -44,7 +44,7 @@ final class ModuleInfoManager {
private ModuleInfoManager() {
}
- public final static ModuleInfoManager getDefault() {
+ public static final ModuleInfoManager getDefault() {
return mim;
}
diff --git a/platform/settings/src/org/netbeans/modules/settings/convertors/SerialDataConvertor.java b/platform/settings/src/org/netbeans/modules/settings/convertors/SerialDataConvertor.java
index 9652bce..07cbec9 100644
--- a/platform/settings/src/org/netbeans/modules/settings/convertors/SerialDataConvertor.java
+++ b/platform/settings/src/org/netbeans/modules/settings/convertors/SerialDataConvertor.java
@@ -836,7 +836,7 @@ implements PropertyChangeListener, FileSystem.AtomicAction {
/** A provider for .settings files containing serial data format
* (hexa stream)
*/
- public final static class Provider implements Environment.Provider {
+ public static final class Provider implements Environment.Provider {
private final FileObject providerFO;
public static Environment.Provider create(FileObject fo) {
diff --git a/platform/settings/src/org/netbeans/modules/settings/convertors/SerialDataNode.java b/platform/settings/src/org/netbeans/modules/settings/convertors/SerialDataNode.java
index 71d2570..b62481d 100644
--- a/platform/settings/src/org/netbeans/modules/settings/convertors/SerialDataNode.java
+++ b/platform/settings/src/org/netbeans/modules/settings/convertors/SerialDataNode.java
@@ -845,7 +845,7 @@ public final class SerialDataNode extends DataNode {
} // end of I
/** Derived from BeanChildren and allow replace beancontext. */
- private final static class InstanceChildren extends Children.Keys {
+ private static final class InstanceChildren extends Children.Keys {
SerialDataNode task;
DataObject dobj;
Object bean;
diff --git a/platform/settings/src/org/netbeans/modules/settings/convertors/XMLPropertiesConvertor.java b/platform/settings/src/org/netbeans/modules/settings/convertors/XMLPropertiesConvertor.java
index bac0f1d..2351453 100644
--- a/platform/settings/src/org/netbeans/modules/settings/convertors/XMLPropertiesConvertor.java
+++ b/platform/settings/src/org/netbeans/modules/settings/convertors/XMLPropertiesConvertor.java
@@ -49,12 +49,12 @@ public final class XMLPropertiesConvertor extends Convertor implements PropertyC
* <code><attr name="xmlproperties.preventStoring" boolvalue="[true|false]"/>
* </code>
*/
- public final static String EA_PREVENT_STORING = "xmlproperties.preventStoring"; //NOI18N
+ public static final String EA_PREVENT_STORING = "xmlproperties.preventStoring"; //NOI18N
/** file attribute containnig list of property names their changes will be ignored. Usage
* <code><attr name="xmlproperties.ignoreChanges" stringvalue="name[, ...]"/>
* </code>
*/
- public final static String EA_IGNORE_CHANGES = "xmlproperties.ignoreChanges"; //NOI18N
+ public static final String EA_IGNORE_CHANGES = "xmlproperties.ignoreChanges"; //NOI18N
private FileObject providerFO;
/** cached property names to be filtered */
private java.util.Set ignoreProperites;
@@ -190,7 +190,7 @@ public final class XMLPropertiesConvertor extends Convertor implements PropertyC
return true;
}
- private final static String INDENT = " "; // NOI18N
+ private static final String INDENT = " "; // NOI18N
private String instanceClass = null;
diff --git a/platform/settings/src/org/netbeans/modules/settings/convertors/XMLSettingsSupport.java b/platform/settings/src/org/netbeans/modules/settings/convertors/XMLSettingsSupport.java
index f632309..3d218e0 100644
--- a/platform/settings/src/org/netbeans/modules/settings/convertors/XMLSettingsSupport.java
+++ b/platform/settings/src/org/netbeans/modules/settings/convertors/XMLSettingsSupport.java
@@ -256,7 +256,7 @@ final class XMLSettingsSupport {
// enlarged to not need do the test for negative byte values
- private final static char[] HEXDIGITS = {'0', '1', '2', '3', '4', '5', '6', '7',
+ private static final char[] HEXDIGITS = {'0', '1', '2', '3', '4', '5', '6', '7',
'8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
'0', '1', '2', '3', '4', '5', '6', '7'};
@@ -333,7 +333,7 @@ final class XMLSettingsSupport {
}
/** Settings parser. */
- final static class SettingsRecognizer extends org.xml.sax.helpers.DefaultHandler {
+ static final class SettingsRecognizer extends org.xml.sax.helpers.DefaultHandler {
private static final String ELM_SETTING = "settings"; // NOI18N
private static final String ATR_SETTING_VERSION = "version"; // NOI18N
@@ -1143,7 +1143,7 @@ final class XMLSettingsSupport {
}
- final static class StopSAXException extends SAXException {
+ static final class StopSAXException extends SAXException {
public StopSAXException() {
super("Parser stopped"); // NOI18N
}
diff --git a/platform/settings/src/org/netbeans/spi/settings/ConvertorResolver.java b/platform/settings/src/org/netbeans/spi/settings/ConvertorResolver.java
index 5780182..d526afb 100644
--- a/platform/settings/src/org/netbeans/spi/settings/ConvertorResolver.java
+++ b/platform/settings/src/org/netbeans/spi/settings/ConvertorResolver.java
@@ -31,7 +31,7 @@ import org.openide.filesystems.FileUtil;
*/
final class ConvertorResolver {
private static final String LOOKUP_PREFIX = "/xml/lookups"; // NOI18N
- private final static ConvertorResolver DEFAULT = new ConvertorResolver();
+ private static final ConvertorResolver DEFAULT = new ConvertorResolver();
/** Creates a new instance of ConvertorResolver */
private ConvertorResolver() {
diff --git a/platform/settings/src/org/netbeans/spi/settings/DOMConvertor.java b/platform/settings/src/org/netbeans/spi/settings/DOMConvertor.java
index 1b21179..3d91a23 100644
--- a/platform/settings/src/org/netbeans/spi/settings/DOMConvertor.java
+++ b/platform/settings/src/org/netbeans/spi/settings/DOMConvertor.java
@@ -37,10 +37,10 @@ import org.xml.sax.SAXException;
*/
public abstract class DOMConvertor extends Convertor {
/** an attribute containing public ID of DTD describing nested elements */
- private final static String ATTR_PUBLIC_ID = "dtd_public_id"; // NOI18N
+ private static final String ATTR_PUBLIC_ID = "dtd_public_id"; // NOI18N
- private final static String ATTR_ID = "id"; // NOI18N
- private final static String ATTR_IDREF = "idref"; // NOI18N
+ private static final String ATTR_ID = "id"; // NOI18N
+ private static final String ATTR_IDREF = "idref"; // NOI18N
/** element used to wrap output from non-DOMConvertor or to reference
* already written object.
* @see #ATTR_ID
@@ -54,12 +54,12 @@ public abstract class DOMConvertor extends Convertor {
// ...
// <domconvertor idref='1'/>
- private final static String ELM_DELEGATE = "domconvertor"; // NOI18N
+ private static final String ELM_DELEGATE = "domconvertor"; // NOI18N
- private final static java.util.Map<Document, Map<Object,CacheRec>> refsCache =
+ private static final java.util.Map<Document, Map<Object,CacheRec>> refsCache =
new java.util.HashMap<Document, Map<Object,CacheRec>>();
/** cache of contexts <Document, Lookup>*/
- private final static java.util.Map<Document, Lookup> ctxCache = new java.util.HashMap<Document, Lookup>();
+ private static final java.util.Map<Document, Lookup> ctxCache = new java.util.HashMap<Document, Lookup>();
private String publicID;
private String systemID;
@@ -161,7 +161,7 @@ public abstract class DOMConvertor extends Convertor {
* @see #readElement
* @since 1.1
*/
- protected final static Object delegateRead(org.w3c.dom.Element element) throws java.io.IOException, ClassNotFoundException {
+ protected static final Object delegateRead(org.w3c.dom.Element element) throws java.io.IOException, ClassNotFoundException {
Object obj;
// in case of a reference a cache of already read objects should
@@ -232,7 +232,7 @@ public abstract class DOMConvertor extends Convertor {
* @see #writeElement
* @since 1.1
*/
- protected final static org.w3c.dom.Element delegateWrite(org.w3c.dom.Document doc, Object obj) throws java.io.IOException, org.w3c.dom.DOMException {
+ protected static final org.w3c.dom.Element delegateWrite(org.w3c.dom.Document doc, Object obj) throws java.io.IOException, org.w3c.dom.DOMException {
// first lookup a cache of already written objects to prevent
// storing of the same instance multiple times.
CacheRec cache = setCache(doc, obj);
diff --git a/platform/settings/test/unit/src/org/netbeans/modules/settings/convertors/FooSetting.java b/platform/settings/test/unit/src/org/netbeans/modules/settings/convertors/FooSetting.java
index 680a491..4da3173 100644
--- a/platform/settings/test/unit/src/org/netbeans/modules/settings/convertors/FooSetting.java
+++ b/platform/settings/test/unit/src/org/netbeans/modules/settings/convertors/FooSetting.java
@@ -26,8 +26,8 @@ import java.util.Properties;
* @author Jan Pokorsky
*/
public class FooSetting {
- private final static String PROP_PROPERTY1 = "property1";
- private final static String PROP_NAME = "name";
+ private static final String PROP_PROPERTY1 = "property1";
+ private static final String PROP_NAME = "name";
/** Holds value of property property1. */
private String property1;
diff --git a/platform/settings/test/unit/src/org/netbeans/spi/settings/DOMConvertorTest.java b/platform/settings/test/unit/src/org/netbeans/spi/settings/DOMConvertorTest.java
index 35d6800..4fa4ba6 100644
--- a/platform/settings/test/unit/src/org/netbeans/spi/settings/DOMConvertorTest.java
+++ b/platform/settings/test/unit/src/org/netbeans/spi/settings/DOMConvertorTest.java
@@ -135,9 +135,9 @@ public class DOMConvertorTest extends NbTestCase {
}
public static class ComposedSettingConvertor extends DOMConvertor {
- private final static String PUBLIC_ID = "-//NetBeans org.netbeans.modules.settings.xtest//DTD ComposedSetting 1.0//EN"; // NOI18N
- private final static String SYSTEM_ID = "nbres:/org/netbeans/modules/settings/convertors/data/composedsetting-1_0.dtd"; // NOI18N
- private final static String ELM_COMPOSED_SETTING = "composedsetting"; // NOI18N
+ private static final String PUBLIC_ID = "-//NetBeans org.netbeans.modules.settings.xtest//DTD ComposedSetting 1.0//EN"; // NOI18N
+ private static final String SYSTEM_ID = "nbres:/org/netbeans/modules/settings/convertors/data/composedsetting-1_0.dtd"; // NOI18N
+ private static final String ELM_COMPOSED_SETTING = "composedsetting"; // NOI18N
public ComposedSettingConvertor() {
super(PUBLIC_ID, SYSTEM_ID, ELM_COMPOSED_SETTING);
diff --git a/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/CommandEvaluator.java b/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/CommandEvaluator.java
index e642f3c..f47c44b 100644
--- a/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/CommandEvaluator.java
+++ b/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/CommandEvaluator.java
@@ -42,7 +42,7 @@ import org.openide.util.RequestProcessor.Task;
*/
public class CommandEvaluator {
- final static String RECENT = "Recent"; //NOI18N
+ static final String RECENT = "Recent"; //NOI18N
private static final String PROP_ENABLED_CATEGORIES
= "enabledCategories"; //NOI18N
diff --git a/platform/spi.quicksearch/test/unit/src/org/netbeans/modules/quicksearch/SlowProviderTest.java b/platform/spi.quicksearch/test/unit/src/org/netbeans/modules/quicksearch/SlowProviderTest.java
index c80dfe7..94cbdda 100644
--- a/platform/spi.quicksearch/test/unit/src/org/netbeans/modules/quicksearch/SlowProviderTest.java
+++ b/platform/spi.quicksearch/test/unit/src/org/netbeans/modules/quicksearch/SlowProviderTest.java
@@ -104,8 +104,8 @@ public class SlowProviderTest extends NbTestCase {
}
private static final Semaphore sync = new Semaphore(0);
- private volatile static boolean obsoleteAtStart;
- private volatile static boolean obsoleteAtEnd;
+ private static volatile boolean obsoleteAtStart;
+ private static volatile boolean obsoleteAtEnd;
public static class SlowProvider implements SearchProvider {
diff --git a/platform/templates/src/org/netbeans/modules/templates/actions/TemplatesAction.java b/platform/templates/src/org/netbeans/modules/templates/actions/TemplatesAction.java
index b9a8fc0..41ec62a 100644
--- a/platform/templates/src/org/netbeans/modules/templates/actions/TemplatesAction.java
+++ b/platform/templates/src/org/netbeans/modules/templates/actions/TemplatesAction.java
@@ -172,7 +172,7 @@ public class TemplatesAction extends AbstractAction { // XXX could be ActionList
}
}
- static private Set<Node> getNodes2Open (Node [] nodes) {
+ private static Set<Node> getNodes2Open (Node [] nodes) {
Set<Node> nodes2open = new HashSet<> (nodes.length);
for (int i = 0; i < nodes.length; i++) {
if (nodes [i].isLeaf ()) {
diff --git a/platform/templates/src/org/netbeans/modules/templates/ui/TemplatesPanel.java b/platform/templates/src/org/netbeans/modules/templates/ui/TemplatesPanel.java
index c3a3f33..8e5ebf8 100644
--- a/platform/templates/src/org/netbeans/modules/templates/ui/TemplatesPanel.java
+++ b/platform/templates/src/org/netbeans/modules/templates/ui/TemplatesPanel.java
@@ -109,7 +109,7 @@ public class TemplatesPanel extends TopComponent implements ExplorerManager.Prov
private static TemplateTreeView view;
private static final RequestProcessor rp = new RequestProcessor("Templates", 1);
- static private FileObject templatesRoot;
+ private static FileObject templatesRoot;
private static Node templatesRootNode = null;
private static final String TEMPLATE_DISPLAY_NAME_ATTRIBUTE = "displayName"; // NOI18N
@@ -1168,7 +1168,7 @@ public class TemplatesPanel extends TopComponent implements ExplorerManager.Prov
}
}
- static private DataObject getDOFromNode (Node n) {
+ private static DataObject getDOFromNode (Node n) {
DataObject dobj = n.getLookup ().lookup (DataObject.class);
if (dobj == null) {
throw new NullPointerException("DataObject can not be found for node " + n);
@@ -1176,7 +1176,7 @@ public class TemplatesPanel extends TopComponent implements ExplorerManager.Prov
return dobj;
}
- static private DataFolder getTargetFolder (Node [] nodes) {
+ private static DataFolder getTargetFolder (Node [] nodes) {
DataFolder folder;
if (nodes == null || nodes.length == 0) {
folder = DataFolder.findFolder (getTemplatesRoot ());
@@ -1648,7 +1648,7 @@ public class TemplatesPanel extends TopComponent implements ExplorerManager.Prov
}
/** Copy from AbstractLookup.SimpleItem */
- private final static class SimpleItem<T> extends Pair<T> {
+ private static final class SimpleItem<T> extends Pair<T> {
private T obj;
/** Create an item.
diff --git a/platform/templatesui/src/org/netbeans/modules/templatesui/AbstractWizard.java b/platform/templatesui/src/org/netbeans/modules/templatesui/AbstractWizard.java
index 886652b..0753a1d 100644
--- a/platform/templatesui/src/org/netbeans/modules/templatesui/AbstractWizard.java
+++ b/platform/templatesui/src/org/netbeans/modules/templatesui/AbstractWizard.java
@@ -476,7 +476,7 @@ implements WizardDescriptor.InstantiatingIterator<WizardDescriptor> {
}
@JavaScriptBody(args = "code", body = "return 0 || eval(code);")
- native static Object eval(String code);
+ static native Object eval(String code);
@JavaScriptBody(args = { "arr" }, body =
"for (var i = 0; i < arr.length; i++) {\n" +
diff --git a/platform/uihandler/src/org/netbeans/modules/exceptions/ReporterResultTopComponent.java b/platform/uihandler/src/org/netbeans/modules/exceptions/ReporterResultTopComponent.java
index dbb8eff..f8d928d 100644
--- a/platform/uihandler/src/org/netbeans/modules/exceptions/ReporterResultTopComponent.java
+++ b/platform/uihandler/src/org/netbeans/modules/exceptions/ReporterResultTopComponent.java
@@ -383,7 +383,7 @@ public final class ReporterResultTopComponent extends TopComponent implements Hy
});
}
- final static class ResolvableHelper implements Serializable {
+ static final class ResolvableHelper implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/platform/uihandler/src/org/netbeans/modules/uihandler/Installer.java b/platform/uihandler/src/org/netbeans/modules/uihandler/Installer.java
index 8070e29..ead1fbd 100644
--- a/platform/uihandler/src/org/netbeans/modules/uihandler/Installer.java
+++ b/platform/uihandler/src/org/netbeans/modules/uihandler/Installer.java
@@ -1661,7 +1661,7 @@ public class Installer extends ModuleInstall implements Runnable {
return enc;
}
- private static abstract class Submit implements ActionListener, Runnable {
+ private abstract static class Submit implements ActionListener, Runnable {
private enum DialogState {
@@ -1682,7 +1682,7 @@ public class Installer extends ModuleInstall implements Runnable {
protected String errorURL = null;
protected String errorMessage = null;
protected DataType dataType = DataType.DATA_UIGESTURE;
- final protected List<LogRecord> recs;
+ protected final List<LogRecord> recs;
protected boolean isOOM = false;
protected boolean isAfterRestart = false;
protected ExceptionsSettings settings;
@@ -1899,7 +1899,7 @@ public class Installer extends ModuleInstall implements Runnable {
LOG.log(Level.FINE, "doShow, dialogCreated, exiting");
}
- protected synchronized final void doCloseDialog() {
+ protected final synchronized void doCloseDialog() {
dialogState = DialogState.NON_CREATED;
closeDialog();
notifyAll();
diff --git a/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/UINodeTest.java b/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/UINodeTest.java
index af9d6ac..1ddf69c 100644
--- a/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/UINodeTest.java
+++ b/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/UINodeTest.java
@@ -201,7 +201,7 @@ public class UINodeTest extends TestCase {
return buffImage;
}
- static private ColorModel colorModel(int transparency) {
+ private static ColorModel colorModel(int transparency) {
ColorModel model;
try {
model = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists