You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by mb...@apache.org on 2023/02/03 23:23:10 UTC

[netbeans] branch master updated: platform dir: added missing @Override annotations

This is an automated email from the ASF dual-hosted git repository.

mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git


The following commit(s) were added to refs/heads/master by this push:
     new 08cd27e007 platform dir: added missing @Override annotations
     new 3cf3c91e4f Merge pull request #5189 from tbw777/code/override/platform
08cd27e007 is described below

commit 08cd27e00715e3a3332d1af7f95571c604523f9b
Author: Andrei Briukhov <an...@gmail.com>
AuthorDate: Tue Jan 3 19:48:22 2023 -0300

    platform dir: added missing @Override annotations
    
    @Override annotations are used to detect changing of interfaces at compile time
    For example. If parent method signature is changes then javac will stop compiling becouse of difference with method signature that marked by annotation and so on.
---
 .../netbeans/api/visual/widget/SceneComponent.java |  2 +
 .../action/TextFieldInplaceEditorProvider.java     |  2 +
 .../visual/graph/layout/HierarchicalLayout.java    | 11 ++++
 .../layout/hierarchicalsupport/DirectedGraph.java  |  1 +
 .../router/OrthogonalSearchRouterRegion.java       |  1 +
 .../modules/visual/widget/BirdViewWindow.java      |  1 +
 .../modules/visual/widget/SatelliteComponent.java  |  3 +
 .../libsrc/org/netbeans/updater/Localization.java  |  1 +
 .../modules/autoupdate/ui/HTMLEditorKitEx.java     |  1 +
 .../core/execution/IOPermissionCollection.java     |  1 +
 .../core/execution/OutputStreamWriter.java         |  2 +
 .../src/org/netbeans/core/execution/SysIn.java     |  6 ++
 .../org/netbeans/core/execution/WindowTable.java   |  3 +-
 .../netbeans/core/execution/WriterPrintStream.java | 21 +++++++
 .../beaninfo/editors/NbClassPathCustomEditor.java  |  1 +
 .../editors/NbProcessDescriptorCustomEditor.java   |  1 +
 .../core/multiview/MultiViewActionMap.java         | 13 ++++-
 .../src/org/netbeans/core/output2/TestFrame.java   |  1 +
 .../startup/layers/NbinstURLStreamHandler.java     |  3 +
 .../org/netbeans/core/startup/layers/BinaryFS.java |  1 +
 .../core/startup/CLILookupHelpNoDirTest.java       |  5 +-
 .../netbeans/core/startup/CLILookupHelpTest.java   |  5 +-
 .../startup/NbURLStreamHandlerFactoryTest.java     |  9 ++-
 .../org/netbeans/core/startup/TopLoggingTest.java  |  4 ++
 .../ui/options/general/AdvancedProxyPanel.java     |  1 +
 .../ui/options/general/GeneralOptionsPanel.java    |  6 ++
 .../windows/actions/CloseAllDocumentsAction.java   |  6 +-
 .../core/windows/actions/CloseWindowAction.java    |  6 +-
 .../netbeans/core/windows/model/SplitSubModel.java |  4 ++
 .../core/windows/persistence/GroupParser.java      |  7 ++-
 .../core/windows/persistence/ModeParser.java       |  6 +-
 .../core/windows/persistence/TCGroupParser.java    |  6 +-
 .../core/windows/persistence/TCRefParser.java      |  6 +-
 .../windows/persistence/WindowManagerParser.java   |  4 +-
 .../core/windows/services/FileSelector.java        |  1 +
 .../core/windows/view/dnd/ZOrderManager.java       |  4 ++
 .../core/windows/view/ui/DecorationUtils.java      |  7 +++
 .../core/windows/view/ui/DocumentsDlg.java         |  6 +-
 .../core/windows/view/ui/EditorAreaFrame.java      |  8 ++-
 .../core/windows/view/ui/MultiSplitDivider.java    |  1 +
 .../core/windows/view/ui/slides/ScaleFx.java       |  1 +
 .../view/ui/slides/SlideBarActionEvent.java        |  1 +
 .../core/windows/services/NotifyLaterTest.java     |  3 +-
 .../modules/javahelp/BrowserDisplayerBeanInfo.java |  3 +-
 .../modules/javahelp/NbDocsStreamHandler.java      | 10 ++++
 .../netbeans/lib/uihandler/MultiPartHandler.java   |  5 ++
 .../org/netbeans/libs/junit4/NbJUnitProcessor.java |  1 +
 .../src/org/netbeans/JarClassLoader.java           |  3 +-
 .../unit/src/org/netbeans/JarClassLoaderTest.java  |  1 +
 .../beaninfo/editors/ArrayOfIntSupport.java        |  3 +
 .../org/netbeans/beaninfo/editors/CharEditor.java  |  4 ++
 .../org/netbeans/beaninfo/editors/ClassEditor.java |  3 +
 .../org/netbeans/beaninfo/editors/ColorEditor.java |  4 ++
 .../org/netbeans/beaninfo/editors/DateEditor.java  |  5 +-
 .../netbeans/beaninfo/editors/FileArrayEditor.java |  5 ++
 .../org/netbeans/beaninfo/editors/FileEditor.java  |  5 ++
 .../org/netbeans/beaninfo/editors/HtmlBrowser.java |  9 ++-
 .../netbeans/beaninfo/editors/ListImageEditor.java | 16 ++++--
 .../beaninfo/editors/PropertiesEditor.java         |  5 ++
 .../beaninfo/editors/StringArrayCustomEditor.java  |  4 +-
 .../beaninfo/editors/StringCustomEditor.java       |  3 +-
 .../org/netbeans/beaninfo/editors/URLEditor.java   |  4 ++
 .../src/org/netbeans/core/UIExceptions.java        |  4 ++
 .../netbeans/core/ui/ProductInformationPanel.java  |  1 +
 .../org/netbeans/core/modules/ModuleInitTest.java  |  1 +
 .../src/org/netbeans/swing/etable/ETableTest.java  |  6 +-
 .../org/netbeans/swing/outline/OutlineTest.java    |  6 +-
 .../netbeans/swing/plaf/aqua/AquaSeparatorUI.java  | 10 +++-
 .../swing/plaf/gtk/GtkToolBarButtonUI.java         |  8 ++-
 .../org/netbeans/swing/plaf/gtk/GtkToolbarUI.java  | 26 ++++++---
 .../swing/plaf/metal/EditorToolbarBorder.java      |  2 +
 .../swing/plaf/metal/MetalScrollPaneBorder.java    |  2 +
 .../swing/plaf/metal/StatusLineBorder.java         |  3 +
 .../src/org/netbeans/swing/plaf/util/NbTheme.java  | 17 +++++-
 .../netbeans/swing/plaf/util/UIBootstrapValue.java |  1 +
 .../swing/plaf/winclassic/EditorToolbarBorder.java |  2 +
 .../swing/plaf/winclassic/StatusLineBorder.java    |  2 +
 .../swing/plaf/windows8/StatusLineBorder.java      |  2 +
 .../swing/plaf/winvista/EditorToolbarBorder.java   |  2 +
 .../swing/plaf/winvista/StatusLineBorder.java      |  2 +
 .../swing/plaf/winxp/EditorToolbarBorder.java      |  2 +
 .../swing/plaf/winxp/StatusLineBorder.java         |  2 +
 .../netbeans/swing/tabcontrol/demo/TestFrame.java  |  5 ++
 .../swing/tabcontrol/plaf/ChicletDemo.java         |  1 +
 .../swing/popupswitcher/SwitcherTableModel.java    |  9 ++-
 .../netbeans/swing/tabcontrol/TabbedContainer.java |  1 +
 .../swing/tabcontrol/TabbedContainerUI.java        |  1 +
 .../tabcontrol/event/ComplexListDataEvent.java     |  1 +
 .../tabcontrol/plaf/DefaultTabbedContainerUI.java  | 12 ++--
 .../tabcontrol/plaf/ToolbarTabDisplayerUI.java     | 16 ++++--
 .../tabcontrol/ButtonPopupSwitcherTestHid.java     |  1 +
 .../actions/AbstractCallbackActionTestHidden.java  |  8 ++-
 .../src/org/openide/awt/EqualFlowLayout.java       |  3 +
 .../src/org/openide/awt/JInlineMenu.java           |  1 +
 .../openide.awt/src/org/openide/awt/ListPane.java  | 17 ++++++
 .../src/org/openide/awt/MouseUtils.java            |  2 +
 .../src/org/openide/awt/SplittedPanel.java         |  7 +++
 .../src/org/openide/explorer/ExplorerActions.java  |  7 +++
 .../src/org/openide/util/WeakListener.java         |  3 +
 .../openide/explorer/propertysheet/ComboTest.java  | 28 +++++++---
 .../propertysheet/CustomEditorDisplayerTest.java   | 12 +++-
 .../propertysheet/NewPropertyPanelTest.java        | 24 +++++---
 .../explorer/propertysheet/PropertyPanelTest.java  |  5 +-
 .../src/org/openide/DialogDisplayer.java           |  1 +
 .../src/org/openide/NotifyDescriptor.java          |  3 +-
 .../src/org/openide/WizardValidationException.java |  1 +
 .../src/org/openide/execution/NbClassLoader.java   |  3 +
 .../org/openide/execution/NbClassLoaderTest.java   |  3 +
 .../openide/explorer/propertysheet/BaseTable.java  | 32 ++++++++++-
 .../explorer/propertysheet/ButtonPanel.java        | 16 ++++++
 .../propertysheet/CheckboxInplaceEditor.java       |  3 +
 .../explorer/propertysheet/CustomEditorAction.java |  5 +-
 .../propertysheet/EditorPropertyDisplayer.java     | 10 ++++
 .../openide/explorer/propertysheet/IconPanel.java  | 13 +++++
 .../explorer/propertysheet/IndexedEditorPanel.java |  1 +
 .../explorer/propertysheet/MarginViewportUI.java   |  4 ++
 .../org/openide/explorer/propertysheet/PSheet.java |  5 ++
 .../explorer/propertysheet/PropertyPanel.java      | 20 +++++++
 .../explorer/propertysheet/RadioInplaceEditor.java | 13 +++++
 .../explorer/propertysheet/RendererFactory.java    | 12 ++++
 .../propertysheet/RendererPropertyDisplayer.java   |  7 +++
 .../propertysheet/WrapperInplaceEditor.java        |  2 +
 .../src/org/openide/explorer/view/MenuView.java    |  4 ++
 .../src/org/openide/explorer/view/TableSheet.java  | 11 ++++
 .../openide/explorer/propertysheet/ComboTest.java  | 28 +++++++---
 .../propertysheet/CustomInplaceEditorTest.java     |  6 +-
 .../propertysheet/EditableDisplayerTest.java       | 62 +++++++++++++++------
 .../propertysheet/EditorDisplayerTest.java         | 57 ++++++++++++++-----
 .../explorer/propertysheet/ExtTestCase.java        |  1 +
 .../propertysheet/FocusAfterBadEditTest.java       | 15 +++--
 .../explorer/propertysheet/GraphicsTestCase.java   |  2 +
 .../propertysheet/IndexedPropertyTest.java         | 17 ++++--
 .../propertysheet/InplaceEditorFactoryTest.java    |  9 ++-
 ...oModifyOnTextChangeContractComboEditorTest.java |  9 ++-
 ...ModifyOnTextChangeContractStringEditorTest.java |  6 +-
 .../explorer/propertysheet/NodeDeletionTest.java   | 11 +++-
 .../propertysheet/PropertyMarkingTest.java         | 23 +++++---
 .../propertysheet/PropertyPanelInDialogTest.java   | 60 +++++++++++++++-----
 .../explorer/propertysheet/PropertyPanelTest.java  |  5 +-
 .../explorer/propertysheet/PropertySheetTest.java  | 11 +++-
 .../propertysheet/RendererDisplayerTest.java       | 64 +++++++++++++++++-----
 .../explorer/propertysheet/SheetTableTest.java     | 29 +++++++---
 .../explorer/propertysheet/TagsAndEditorsTest.java | 63 ++++++++++++++-------
 .../openide/filesystems/FileSystemCapability.java  |  4 ++
 .../filesystems/declmime/DefaultParser.java        |  5 ++
 .../filesystems/declmime/XMLMIMEComponent.java     |  8 ++-
 .../src/org/openide/filesystems/FileURL.java       | 11 ++++
 .../org/openide/filesystems/MemoryFileSystem.java  |  4 +-
 .../src/org/openide/filesystems/XMLMapAttr.java    |  1 +
 .../openide/filesystems/FileObject75826Test.java   |  1 +
 .../src/org/openide/filesystems/TestUtilHid.java   |  6 +-
 .../openide/filesystems/URLMapper50852Test.java    |  3 +-
 .../src/org/openide/windows/IOProvider.java        |  1 +
 .../modules/openide/loaders/EntityCatalogImpl.java |  2 +
 .../src/org/openide/awt/DynaMenuModel.java         |  3 +-
 .../src/org/openide/loaders/DataNode.java          |  1 +
 .../openide/loaders/DataObjectExistsException.java |  1 +
 .../src/org/openide/loaders/FilesSet.java          |  1 +
 .../src/org/openide/loaders/InstanceSupport.java   |  1 +
 .../src/org/openide/loaders/NewObjectPanel.java    |  2 +
 .../src/org/openide/loaders/OperationEvent.java    | 10 +++-
 .../src/org/openide/loaders/SortModeEditor.java    |  3 +
 .../src/org/openide/loaders/TemplateWizard1.java   |  3 +
 .../src/org/openide/loaders/TemplateWizard2.java   |  4 +-
 .../src/org/openide/text/EditorSupport.java        |  1 +
 .../org/openide/loaders/DataLoaderOrigTest.java    |  1 +
 .../src/org/openide/nodes/IndexedCustomizer.java   |  3 +
 .../org/openide/nodes/Bean21341HiddenBeanInfo.java |  6 ++
 .../unit/src/org/openide/nodes/BeanNodeTest.java   |  2 +
 .../unit/src/org/openide/nodes/NodeLookupTest.java |  1 +
 .../org/openide/util/actions/NodeActionTest.java   |  2 +
 .../org/openide/options/ContextSystemOption.java   |  3 +
 .../options/ContextSystemOptionBeanInfo.java       |  2 +
 .../org/openide/options/SystemOptionBeanInfo.java  |  1 +
 .../src/org/openide/text/PrintSettings.java        |  6 ++
 .../org/openide/text/PrintSettingsBeanInfo.java    |  2 +
 .../org/openide/text/CloneableEditorSupport.java   |  1 +
 .../src/org/openide/text/QuietEditorPane.java      |  3 +-
 .../openide/text/CloneableEditor143143Test.java    |  2 +
 .../openide/text/CloneableEditorAssociateTest.java |  1 +
 .../text/CloneableEditorCreationFinishedTest.java  |  2 +
 .../text/CloneableEditorRecentPaneTest.java        |  2 +
 .../CloneableEditorSupportCOSRedirectorTest.java   |  1 +
 .../text/CloneableEditorSupportDoubleSaveTest.java |  1 +
 .../text/CloneableEditorSupportOpenCloseTest.java  |  1 +
 .../text/CloneableEditorSupportPaneAsyncTest.java  |  1 +
 .../text/CloneableEditorSupportPaneTest.java       |  4 +-
 .../text/CloneableEditorSupportRedirectorTest.java |  2 +
 .../text/CloneableEditorSupportSaveTest.java       |  1 +
 .../openide/text/CloneableEditorSupportTest.java   |  1 +
 .../src/org/openide/text/CloneableEditorTest.java  |  1 +
 .../src/org/openide/text/Deadlock169717Test.java   |  1 +
 .../src/org/openide/text/Deadlock207571Test.java   |  8 ++-
 .../DocumentCannotBeClosedWhenReadLockedTest.java  |  1 +
 .../org/openide/text/EditToBeUndoneRedoneTest.java |  2 +
 .../openide/text/InitializeOnBackgroundTest.java   |  1 +
 .../unit/src/org/openide/text/NbLikeEditorKit.java |  6 ++
 .../openide/text/NetworkConnectionLostTest.java    |  1 +
 .../src/org/openide/text/ReusableEditor2Test.java  |  1 +
 .../src/org/openide/text/ReusableEditorTest.java   |  1 +
 .../openide/text/Starvation37045SecondTest.java    |  1 +
 .../src/org/openide/text/Starvation37045Test.java  |  1 +
 .../org/openide/text/UndoRedoCooperationTest.java  |  1 +
 .../unit/src/org/openide/text/UndoRedoTest.java    |  1 +
 .../text/UndoRedoWrappingCooperationTest.java      |  1 +
 .../openide/text/UndoRedoWrappingExampleTest.java  |  1 +
 .../test/unit/src/org/bar/Iterator2.java           |  3 +-
 .../test/unit/src/org/foo/impl/Iterator1.java      |  3 +-
 .../src/org/openide/ErrorManager.java              |  6 ++
 .../src/org/openide/LifecycleManager.java          |  1 +
 .../openide/util/UtilitiesCompositeActionMap.java  |  9 +++
 .../openide/util/actions/CallbackSystemAction.java |  1 +
 .../src/org/openide/ErrorManagerCyclicDepTest.java |  3 +-
 .../org/openide/util/SharedClassObjectTest.java    |  2 +
 .../src/org/openide/util/UtilitiesActionsTest.java |  3 +-
 .../openide/util/UtilitiesProgressCursorTest.java  |  3 +-
 .../unit/src/org/openide/util/UtilitiesTest.java   |  7 ++-
 .../org/openide/util/UtilitiesTranslateTest.java   |  4 +-
 .../util/actions/CallbackSystemActionTest.java     |  9 ++-
 .../src/org/openide/util/EditableProperties.java   |  3 +-
 .../src/org/openide/util/MutexException.java       |  1 +
 .../src/org/openide/util/NbCollections.java        |  2 +
 .../src/org/openide/util/TimedSoftReference.java   |  1 +
 .../org/openide/util/TopologicalSortException.java |  2 +
 .../org/openide/util/io/FoldingIOException.java    |  5 ++
 .../org/openide/util/io/NbObjectInputStream.java   |  2 +
 .../org/openide/util/io/NbObjectOutputStream.java  |  2 +
 .../org/openide/util/io/OperationException.java    |  2 +
 .../unit/src/org/openide/util/WeakSetTest.java     |  1 +
 .../org/openide/windows/DummyWindowManager.java    |  2 +
 .../src/org/openide/windows/TopComponent.java      |  7 +++
 .../modules/options/classic/ExplorerPanel.java     |  4 ++
 .../netbeans/modules/options/ui/LoweredBorder.java |  5 +-
 .../modules/options/keymap/KeymapListRenderer.java |  3 +-
 .../modules/options/keymap/ShortcutPopupPanel.java |  3 +
 .../src/org/netbeans/modules/print/ui/Preview.java |  3 +
 .../org/netbeans/modules/print/util/Percent.java   |  1 +
 .../src/org/netbeans/modules/print/util/UI.java    |  1 +
 .../modules/progress/ui/NbProgressBar.java         |  3 +-
 .../netbeans/api/sendopts/CommandException.java    |  1 +
 .../org/netbeans/modules/sendopts/OptionImpl.java  |  7 ++-
 .../examples/JavaCompilerSettingBeanInfo.java      |  6 ++
 .../settings/examples/ProxySettingsBeanInfo.java   |  6 ++
 .../settings/convertors/XMLSettingsSupport.java    | 15 +++--
 .../modules/quicksearch/QuickSearchPopup.java      |  4 ++
 .../netbeans/modules/exceptions/ReportPanel.java   |  1 +
 .../netbeans/modules/uihandler/ReminderPanel.java  |  3 +
 .../modules/uihandler/ActivatedDeativatedTest.java |  1 +
 .../org/netbeans/modules/uihandler/MemoryURL.java  |  3 +
 .../modules/uihandler/ShutdownFromAWTTest.java     |  1 +
 250 files changed, 1237 insertions(+), 263 deletions(-)

diff --git a/platform/api.visual/src/org/netbeans/api/visual/widget/SceneComponent.java b/platform/api.visual/src/org/netbeans/api/visual/widget/SceneComponent.java
index a0cf34aa02..1723fe6e46 100644
--- a/platform/api.visual/src/org/netbeans/api/visual/widget/SceneComponent.java
+++ b/platform/api.visual/src/org/netbeans/api/visual/widget/SceneComponent.java
@@ -653,10 +653,12 @@ final class SceneComponent extends JComponent implements Accessible, MouseListen
 
     private class AccessibleSceneComponent extends AccessibleJComponent {
 
+        @Override
         public int getAccessibleChildrenCount () {
             return 1;
         }
 
+        @Override
         public Accessible getAccessibleChild (int i) {
             return i == 0 ? scene : null;
         }
diff --git a/platform/api.visual/src/org/netbeans/modules/visual/action/TextFieldInplaceEditorProvider.java b/platform/api.visual/src/org/netbeans/modules/visual/action/TextFieldInplaceEditorProvider.java
index 2bc6603f2a..2764d8e3fb 100644
--- a/platform/api.visual/src/org/netbeans/modules/visual/action/TextFieldInplaceEditorProvider.java
+++ b/platform/api.visual/src/org/netbeans/modules/visual/action/TextFieldInplaceEditorProvider.java
@@ -65,6 +65,7 @@ public final class TextFieldInplaceEditorProvider implements InplaceEditorProvid
     public void notifyOpened (final EditorController controller, Widget widget, JTextField editor) {
         editor.setMinimumSize (new Dimension (64, 19));
         keyListener = new KeyAdapter() {
+            @Override
             public void keyPressed (KeyEvent e) {
                 switch (e.getKeyChar ()) {
                     case KeyEvent.VK_ESCAPE:
@@ -79,6 +80,7 @@ public final class TextFieldInplaceEditorProvider implements InplaceEditorProvid
             }
         };
         focusListener = new FocusAdapter() {
+            @Override
             public void focusLost (FocusEvent e) {
                 controller.closeEditor (true);
             }
diff --git a/platform/api.visual/src/org/netbeans/modules/visual/graph/layout/HierarchicalLayout.java b/platform/api.visual/src/org/netbeans/modules/visual/graph/layout/HierarchicalLayout.java
index 6ff41266a3..7fa6538f33 100644
--- a/platform/api.visual/src/org/netbeans/modules/visual/graph/layout/HierarchicalLayout.java
+++ b/platform/api.visual/src/org/netbeans/modules/visual/graph/layout/HierarchicalLayout.java
@@ -289,6 +289,7 @@ public class HierarchicalLayout<N, E> extends GraphLayout<N, E> {
             }
         }
 
+        @Override
         public void postCheck() {
 
             assert vertexToLayoutNode.keySet().size() == nodes.size();
@@ -408,6 +409,7 @@ public class HierarchicalLayout<N, E> extends GraphLayout<N, E> {
             oldTo.succs.add(e);
         }
 
+        @Override
         public void postCheck() {
 
             for (LayoutNode n : nodes) {
@@ -437,6 +439,7 @@ public class HierarchicalLayout<N, E> extends GraphLayout<N, E> {
 
     private class AssignLayers extends AlgorithmPart {
 
+        @Override
         public void preCheck() {
             for (LayoutNode n : nodes) {
                 assert n.layer == -1;
@@ -515,12 +518,14 @@ public class HierarchicalLayout<N, E> extends GraphLayout<N, E> {
 
         }
 
+        @Override
         public void printStatistics() {
             //for(LayoutNode n : nodes) {
             //	System.out.println(n + " on layer " + n.layer);
             //}
         }
 
+        @Override
         public void postCheck() {
             for (LayoutNode n : nodes) {
                 assert n.layer >= 0;
@@ -536,6 +541,7 @@ public class HierarchicalLayout<N, E> extends GraphLayout<N, E> {
 
         private int oldNodeCount;
 
+        @Override
         protected void preCheck() {
             for (LayoutNode n : nodes) {
                 for (LayoutEdge e : n.succs) {
@@ -591,10 +597,12 @@ public class HierarchicalLayout<N, E> extends GraphLayout<N, E> {
             return result;
         }
 
+        @Override
         public void printStatistics() {
             System.out.println("Dummy nodes created: " + (nodes.size() - oldNodeCount));
         }
 
+        @Override
         public void postCheck() {
             ArrayList<LayoutNode> currentNodes = new ArrayList<LayoutNode>(nodes);
             for (LayoutNode n : currentNodes) {
@@ -627,6 +635,7 @@ public class HierarchicalLayout<N, E> extends GraphLayout<N, E> {
 
     private class CrossingReduction extends AlgorithmPart {
 
+        @Override
         public void preCheck() {
             for (LayoutNode n : nodes) {
                 assert n.layer < layerCount;
@@ -760,6 +769,7 @@ public class HierarchicalLayout<N, E> extends GraphLayout<N, E> {
             return 0;
         }
 
+        @Override
         public void postCheck() {
 
             HashSet<LayoutNode> visited = new HashSet<LayoutNode>();
@@ -1162,6 +1172,7 @@ public class HierarchicalLayout<N, E> extends GraphLayout<N, E> {
             graph.getScene().revalidate();
         }
 
+        @Override
         protected void printStatistics() {
             System.out.println("Number of nodes: " + nodes.size());
             int edgeCount = 0;
diff --git a/platform/api.visual/src/org/netbeans/modules/visual/graph/layout/hierarchicalsupport/DirectedGraph.java b/platform/api.visual/src/org/netbeans/modules/visual/graph/layout/hierarchicalsupport/DirectedGraph.java
index 46d6b98ec1..fb203d6c18 100644
--- a/platform/api.visual/src/org/netbeans/modules/visual/graph/layout/hierarchicalsupport/DirectedGraph.java
+++ b/platform/api.visual/src/org/netbeans/modules/visual/graph/layout/hierarchicalsupport/DirectedGraph.java
@@ -638,6 +638,7 @@ public class DirectedGraph<N, E> {
             return type;
         }
 
+        @Override
         public String toString() {
             return "dummy vertex " + index;
         }
diff --git a/platform/api.visual/src/org/netbeans/modules/visual/router/OrthogonalSearchRouterRegion.java b/platform/api.visual/src/org/netbeans/modules/visual/router/OrthogonalSearchRouterRegion.java
index 08ef81a8bf..85c3bf085d 100644
--- a/platform/api.visual/src/org/netbeans/modules/visual/router/OrthogonalSearchRouterRegion.java
+++ b/platform/api.visual/src/org/netbeans/modules/visual/router/OrthogonalSearchRouterRegion.java
@@ -321,6 +321,7 @@ final class OrthogonalSearchRouterRegion extends Rectangle {
         return point.x >= x && point.x <= x + width && point.y >= y && point.y <= y + height;
     }
 
+    @Override
     public String toString () {
         return "pos: " + x + "," + y + " size: " + width + "," + height + " dir: " + direction + " depth: " + depth;
     }
diff --git a/platform/api.visual/src/org/netbeans/modules/visual/widget/BirdViewWindow.java b/platform/api.visual/src/org/netbeans/modules/visual/widget/BirdViewWindow.java
index 71e420722c..ac7c47453e 100644
--- a/platform/api.visual/src/org/netbeans/modules/visual/widget/BirdViewWindow.java
+++ b/platform/api.visual/src/org/netbeans/modules/visual/widget/BirdViewWindow.java
@@ -221,6 +221,7 @@ public class BirdViewWindow extends JWindow implements MouseMotionListener {
 
     private class BirdViewComponent extends JComponent {
 
+        @Override
         public void paint (Graphics g) {
             Graphics2D gr = (Graphics2D) g;
             super.paint (g);
diff --git a/platform/api.visual/src/org/netbeans/modules/visual/widget/SatelliteComponent.java b/platform/api.visual/src/org/netbeans/modules/visual/widget/SatelliteComponent.java
index 513b323461..b959bbc6d3 100644
--- a/platform/api.visual/src/org/netbeans/modules/visual/widget/SatelliteComponent.java
+++ b/platform/api.visual/src/org/netbeans/modules/visual/widget/SatelliteComponent.java
@@ -41,6 +41,7 @@ public final class SatelliteComponent extends JComponent implements MouseListene
         addMouseMotionListener (this);
     }
 
+    @Override
     public void addNotify () {
         super.addNotify ();
         scene.addSceneListener (this);
@@ -51,12 +52,14 @@ public final class SatelliteComponent extends JComponent implements MouseListene
         repaint ();
     }
 
+    @Override
     public void removeNotify () {
         scene.getView ().removeComponentListener (this);
         scene.removeSceneListener (this);
         super.removeNotify ();
     }
 
+    @Override
     public void paint (Graphics g) {
         Graphics2D gr = (Graphics2D) g;
         super.paint (g);
diff --git a/platform/autoupdate.services/libsrc/org/netbeans/updater/Localization.java b/platform/autoupdate.services/libsrc/org/netbeans/updater/Localization.java
index 96e7e61548..f23d98cf1b 100644
--- a/platform/autoupdate.services/libsrc/org/netbeans/updater/Localization.java
+++ b/platform/autoupdate.services/libsrc/org/netbeans/updater/Localization.java
@@ -329,6 +329,7 @@ class Localization {
             return (current != null);
         }
 
+        @Override
         public void remove () throws UnsupportedOperationException {
             throw new UnsupportedOperationException ();
         }
diff --git a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/HTMLEditorKitEx.java b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/HTMLEditorKitEx.java
index 37769b2d48..a07540a280 100644
--- a/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/HTMLEditorKitEx.java
+++ b/platform/autoupdate.ui/src/org/netbeans/modules/autoupdate/ui/HTMLEditorKitEx.java
@@ -27,6 +27,7 @@ import javax.swing.text.*;
  */
 public class HTMLEditorKitEx extends HTMLEditorKit {
 
+    @Override
     public ViewFactory getViewFactory() {
         return new HTMLFactory() {
             @Override
diff --git a/platform/core.execution/src/org/netbeans/core/execution/IOPermissionCollection.java b/platform/core.execution/src/org/netbeans/core/execution/IOPermissionCollection.java
index c06ab77f2b..889769d4a3 100644
--- a/platform/core.execution/src/org/netbeans/core/execution/IOPermissionCollection.java
+++ b/platform/core.execution/src/org/netbeans/core/execution/IOPermissionCollection.java
@@ -73,6 +73,7 @@ final class IOPermissionCollection extends PermissionCollection implements java.
         this.io = io;
     }
 
+    @Override
     public String toString() {
         return delegated.toString();
     }
diff --git a/platform/core.execution/src/org/netbeans/core/execution/OutputStreamWriter.java b/platform/core.execution/src/org/netbeans/core/execution/OutputStreamWriter.java
index ad71986453..9b95fe82c2 100644
--- a/platform/core.execution/src/org/netbeans/core/execution/OutputStreamWriter.java
+++ b/platform/core.execution/src/org/netbeans/core/execution/OutputStreamWriter.java
@@ -50,6 +50,7 @@ final class OutputStreamWriter extends Writer {
      *
      * @exception  IOException  If an I/O error occurs
      */
+    @Override
     public void write(int c) throws IOException {
         char cbuf[] = new char[1];
         cbuf[0] = (char) c;
@@ -87,6 +88,7 @@ final class OutputStreamWriter extends Writer {
      *
      * @exception  IOException  If an I/O error occurs
      */
+    @Override
     public void write(String str, int off, int len) throws IOException {
         synchronized (lock) {
             ensureOpen();
diff --git a/platform/core.execution/src/org/netbeans/core/execution/SysIn.java b/platform/core.execution/src/org/netbeans/core/execution/SysIn.java
index 4af594161e..6f440e370b 100644
--- a/platform/core.execution/src/org/netbeans/core/execution/SysIn.java
+++ b/platform/core.execution/src/org/netbeans/core/execution/SysIn.java
@@ -38,6 +38,7 @@ final class SysIn extends InputStream {
     }
 
     /** reads an array of bytes */
+    @Override
     public int read(byte[] b, int off, final int len) throws IOException {
         char[] b2 = new char[len];
         int ret = ExecutionEngine.getTaskIOs().getIn().read(b2, 0, len);
@@ -48,11 +49,13 @@ final class SysIn extends InputStream {
     }
 
     /** closes the stream */
+    @Override
     public void close() throws IOException {
         ExecutionEngine.getTaskIOs().getIn().close();
     }
 
     /** marks position at position <code>x</code> */
+    @Override
     public void mark(int x) {
         try {
             ExecutionEngine.getTaskIOs().getIn().mark(x);
@@ -62,6 +65,7 @@ final class SysIn extends InputStream {
     }
 
     /** resets the stream */
+    @Override
     public void reset() throws IOException {
         ExecutionEngine.getTaskIOs().getIn().reset();
     }
@@ -69,6 +73,7 @@ final class SysIn extends InputStream {
     /**
     * @return true iff mark is supported false otherwise
     */
+    @Override
     public boolean markSupported() {
         return ExecutionEngine.getTaskIOs().getIn().markSupported();
     }
@@ -76,6 +81,7 @@ final class SysIn extends InputStream {
     /** skips <code>l</code> bytes
     * @return number of skipped bytes
     */
+    @Override
     public long skip(long l) throws IOException {
         return ExecutionEngine.getTaskIOs().getIn().skip(l);
     }
diff --git a/platform/core.execution/src/org/netbeans/core/execution/WindowTable.java b/platform/core.execution/src/org/netbeans/core/execution/WindowTable.java
index 36eef52cb6..944360a179 100644
--- a/platform/core.execution/src/org/netbeans/core/execution/WindowTable.java
+++ b/platform/core.execution/src/org/netbeans/core/execution/WindowTable.java
@@ -48,7 +48,8 @@ final class WindowTable extends HashMap<Window,TaskThreadGroup> {
         super(16);
         windowMap = new HashMap<ThreadGroup,ArrayList<Window>>(16);
         winListener = new WindowAdapter() {
-                          public void windowClosed(WindowEvent ev) {
+            @Override
+            public void windowClosed(WindowEvent ev) {
                               Window win;
                               removeWindow(win = (Window)ev.getSource());
                               win.removeWindowListener(this);
diff --git a/platform/core.execution/src/org/netbeans/core/execution/WriterPrintStream.java b/platform/core.execution/src/org/netbeans/core/execution/WriterPrintStream.java
index 108cae6cc9..0df2492184 100644
--- a/platform/core.execution/src/org/netbeans/core/execution/WriterPrintStream.java
+++ b/platform/core.execution/src/org/netbeans/core/execution/WriterPrintStream.java
@@ -41,9 +41,11 @@ final class WriterPrintStream extends PrintStream {
     }
 
     /** Empty */
+    @Override
     public void close() {
     }
 
+    @Override
     public void flush() {
         try {
             if (stdOut) {
@@ -77,6 +79,7 @@ final class WriterPrintStream extends PrintStream {
      *
      * @param      b   The <code>boolean</code> to be printed
      */
+    @Override
     public void print(boolean b) {
 	write(b ? "true" : "false"); // NOI18N
     }
@@ -89,6 +92,7 @@ final class WriterPrintStream extends PrintStream {
      *
      * @param      c   The <code>char</code> to be printed
      */
+    @Override
     public void print(char c) {
         try {
             if (stdOut) {
@@ -111,6 +115,7 @@ final class WriterPrintStream extends PrintStream {
      * @param      i   The <code>int</code> to be printed
      * @see        java.lang.Integer#toString(int)
      */
+    @Override
     public void print(int i) {
 	write(String.valueOf(i));
     }
@@ -125,6 +130,7 @@ final class WriterPrintStream extends PrintStream {
      * @param      l   The <code>long</code> to be printed
      * @see        java.lang.Long#toString(long)
      */
+    @Override
     public void print(long l) {
 	write(String.valueOf(l));
     }
@@ -139,6 +145,7 @@ final class WriterPrintStream extends PrintStream {
      * @param      f   The <code>float</code> to be printed
      * @see        java.lang.Float#toString(float)
      */
+    @Override
     public void print(float f) {
 	write(String.valueOf(f));
     }
@@ -153,6 +160,7 @@ final class WriterPrintStream extends PrintStream {
      * @param      d   The <code>double</code> to be printed
      * @see        java.lang.Double#toString(double)
      */
+    @Override
     public void print(double d) {
 	write(String.valueOf(d));
     }
@@ -167,6 +175,7 @@ final class WriterPrintStream extends PrintStream {
      * 
      * @throws  NullPointerException  If <code>s</code> is <code>null</code>
      */
+    @Override
     public void print(char s[]) {
         try {
             if (stdOut) {
@@ -188,6 +197,7 @@ final class WriterPrintStream extends PrintStream {
      *
      * @param      s   The <code>String</code> to be printed
      */
+    @Override
     public void print(String s) {
 	if (s == null) {
 	    s = "null"; // NOI18N
@@ -205,6 +215,7 @@ final class WriterPrintStream extends PrintStream {
      * @param      obj   The <code>Object</code> to be printed
      * @see        java.lang.Object#toString()
      */
+    @Override
     public void print(Object obj) {
 	write(String.valueOf(obj));
     }
@@ -218,6 +229,7 @@ final class WriterPrintStream extends PrintStream {
      * <code>line.separator</code>, and is not necessarily a single newline
      * character (<code>'\n'</code>).
      */
+    @Override
     public void println() {
         print(getNewLine());
     }
@@ -229,6 +241,7 @@ final class WriterPrintStream extends PrintStream {
      *
      * @param x  The <code>boolean</code> to be printed
      */
+    @Override
     public void println(boolean x) {
         String out = (x ? "true" : "false"); // NOI18N
         write(out.concat(getNewLine()));
@@ -241,6 +254,7 @@ final class WriterPrintStream extends PrintStream {
      *
      * @param x  The <code>char</code> to be printed.
      */
+    @Override
     public void println(char x) {
         String nline = getNewLine();
         int nlinelen = nline.length();
@@ -267,6 +281,7 @@ final class WriterPrintStream extends PrintStream {
      *
      * @param x  The <code>int</code> to be printed.
      */
+    @Override
     public void println(int x) {
 	write(String.valueOf(x).concat(getNewLine()));
     }
@@ -278,6 +293,7 @@ final class WriterPrintStream extends PrintStream {
      *
      * @param x  a The <code>long</code> to be printed.
      */
+    @Override
     public void println(long x) {
 	write(String.valueOf(x).concat(getNewLine()));
     }
@@ -289,6 +305,7 @@ final class WriterPrintStream extends PrintStream {
      *
      * @param x  The <code>float</code> to be printed.
      */
+    @Override
     public void println(float x) {
 	write(String.valueOf(x).concat(getNewLine()));
     }
@@ -300,6 +317,7 @@ final class WriterPrintStream extends PrintStream {
      *
      * @param x  The <code>double</code> to be printed.
      */
+    @Override
     public void println(double x) {
 	write(String.valueOf(x).concat(getNewLine()));
     }
@@ -311,6 +329,7 @@ final class WriterPrintStream extends PrintStream {
      *
      * @param x  an array of chars to print.
      */
+    @Override
     public void println(char x[]) {
         String nline = getNewLine();
         int nlinelen = nline.length();
@@ -338,6 +357,7 @@ final class WriterPrintStream extends PrintStream {
      *
      * @param x  The <code>String</code> to be printed.
      */
+    @Override
     public void println(String x) {
         if (x == null) {
             x = "null"; // NOI18N
@@ -352,6 +372,7 @@ final class WriterPrintStream extends PrintStream {
      *
      * @param x  The <code>Object</code> to be printed.
      */
+    @Override
     public void println(Object x) {
         if (x == null) {
 	    print("null".concat(getNewLine())); // NOI18N
diff --git a/platform/core.execution/src/org/netbeans/core/execution/beaninfo/editors/NbClassPathCustomEditor.java b/platform/core.execution/src/org/netbeans/core/execution/beaninfo/editors/NbClassPathCustomEditor.java
index b0f1077bfb..191ab84f47 100644
--- a/platform/core.execution/src/org/netbeans/core/execution/beaninfo/editors/NbClassPathCustomEditor.java
+++ b/platform/core.execution/src/org/netbeans/core/execution/beaninfo/editors/NbClassPathCustomEditor.java
@@ -180,6 +180,7 @@ class NbClassPathCustomEditor extends javax.swing.JPanel {
         innerPanel.add(removeButton, gridBagConstraints);
 
         pathList.addMouseListener(new java.awt.event.MouseAdapter() {
+            @Override
             public void mouseClicked(java.awt.event.MouseEvent evt) {
                 pathListMouseClicked(evt);
             }
diff --git a/platform/core.execution/src/org/netbeans/core/execution/beaninfo/editors/NbProcessDescriptorCustomEditor.java b/platform/core.execution/src/org/netbeans/core/execution/beaninfo/editors/NbProcessDescriptorCustomEditor.java
index 0de0f3bce5..6e7ad1f41a 100644
--- a/platform/core.execution/src/org/netbeans/core/execution/beaninfo/editors/NbProcessDescriptorCustomEditor.java
+++ b/platform/core.execution/src/org/netbeans/core/execution/beaninfo/editors/NbProcessDescriptorCustomEditor.java
@@ -69,6 +69,7 @@ implements PropertyChangeListener {
         env.addPropertyChangeListener(this);
     }
 
+    @Override
     public java.awt.Dimension getPreferredSize() {
         java.awt.Dimension inh = super.getPreferredSize ();
         return new java.awt.Dimension (DEFAULT_WIDTH, Math.max (inh.height, DEFAULT_HEIGHT));
diff --git a/platform/core.multiview/src/org/netbeans/core/multiview/MultiViewActionMap.java b/platform/core.multiview/src/org/netbeans/core/multiview/MultiViewActionMap.java
index c29f3082d4..2ddbfd249a 100644
--- a/platform/core.multiview/src/org/netbeans/core/multiview/MultiViewActionMap.java
+++ b/platform/core.multiview/src/org/netbeans/core/multiview/MultiViewActionMap.java
@@ -50,11 +50,13 @@ final class MultiViewActionMap extends ActionMap {
     public void setDelegateMap(ActionMap map) {
         delegate = map;
     }
-    
+
+    @Override
     public int size() {
         return keys ().length;
     }
 
+    @Override
     public Action get(Object key) {
         // the multiview's action map first.. for stuff like the closewindow and clonewindow from TopComponent.initActionMap
         javax.swing.ActionMap m = topComponentMap;
@@ -111,10 +113,12 @@ final class MultiViewActionMap extends ActionMap {
         return owner == component ? found : null;
     }
 
+    @Override
     public Object[] allKeys() {
         return keys (true);
     }
 
+    @Override
     public Object[] keys() {
         return keys (false);
     }
@@ -153,22 +157,27 @@ final class MultiViewActionMap extends ActionMap {
     // 
     // Not implemented
     //
+    @Override
     public void remove(Object key) {
         topComponentMap.remove(key);
-    }        
+    }
 
+    @Override
     public void setParent(ActionMap map) {
         topComponentMap.setParent(map);
     }
 
+    @Override
     public void clear() {
         topComponentMap.clear();
     }
 
+    @Override
     public void put(Object key, Action action) {
         topComponentMap.put (key, action);
     }
 
+    @Override
     public ActionMap getParent() {
         return topComponentMap.getParent();
     }
diff --git a/platform/core.output2/test/unit/src/org/netbeans/core/output2/TestFrame.java b/platform/core.output2/test/unit/src/org/netbeans/core/output2/TestFrame.java
index 0637251429..3bf7f62f69 100644
--- a/platform/core.output2/test/unit/src/org/netbeans/core/output2/TestFrame.java
+++ b/platform/core.output2/test/unit/src/org/netbeans/core/output2/TestFrame.java
@@ -77,6 +77,7 @@ import org.openide.windows.OutputListener;
         System.err.println("DONE");
     }
 
+    @Override
     public void setVisible (boolean val) {
        boolean go = val != isVisible();
        super.setVisible(val);
diff --git a/platform/core.startup.base/src/org/netbeans/core/startup/layers/NbinstURLStreamHandler.java b/platform/core.startup.base/src/org/netbeans/core/startup/layers/NbinstURLStreamHandler.java
index a697cbf1ca..99d8cb61ca 100644
--- a/platform/core.startup.base/src/org/netbeans/core/startup/layers/NbinstURLStreamHandler.java
+++ b/platform/core.startup.base/src/org/netbeans/core/startup/layers/NbinstURLStreamHandler.java
@@ -127,6 +127,7 @@ public class NbinstURLStreamHandler extends URLStreamHandler {
             }
         }
 
+        @Override
         public int getContentLength() {
             try {
                 this.connect();
@@ -137,6 +138,7 @@ public class NbinstURLStreamHandler extends URLStreamHandler {
         }
 
 
+        @Override
         public InputStream getInputStream() throws IOException {
             this.connect();
             if (iStream == null) {
@@ -146,6 +148,7 @@ public class NbinstURLStreamHandler extends URLStreamHandler {
         }
 
 
+        @Override
         public String getHeaderField (String name) {
             if ("content-type".equals(name)) {                  //NOI18N
                 try {
diff --git a/platform/core.startup/src/org/netbeans/core/startup/layers/BinaryFS.java b/platform/core.startup/src/org/netbeans/core/startup/layers/BinaryFS.java
index 0224ba2c36..2eb77a1178 100644
--- a/platform/core.startup/src/org/netbeans/core/startup/layers/BinaryFS.java
+++ b/platform/core.startup/src/org/netbeans/core/startup/layers/BinaryFS.java
@@ -1136,6 +1136,7 @@ final class BinaryFS extends FileSystem implements DataInput {
                     return new FOEntry(fo, s);
                 }
 
+                @Override
                 public void remove() {
                     throw new UnsupportedOperationException();
                 }
diff --git a/platform/core.startup/test/unit/src/org/netbeans/core/startup/CLILookupHelpNoDirTest.java b/platform/core.startup/test/unit/src/org/netbeans/core/startup/CLILookupHelpNoDirTest.java
index 9c1809fb70..1985a4ba37 100644
--- a/platform/core.startup/test/unit/src/org/netbeans/core/startup/CLILookupHelpNoDirTest.java
+++ b/platform/core.startup/test/unit/src/org/netbeans/core/startup/CLILookupHelpNoDirTest.java
@@ -174,17 +174,20 @@ public class CLILookupHelpNoDirTest extends NbTestCase {
     
     private static final class NoExit extends SecurityManager {
         public static boolean disable;
-        
+
+        @Override
         public void checkExit(int status) {
             if (!disable) {
                 throw new SecurityException(String.valueOf(status));
             }
         }
 
+        @Override
         public void checkPermission(Permission perm) {
             
         }
 
+        @Override
         public void checkPermission(Permission perm, Object context) {
             
         }
diff --git a/platform/core.startup/test/unit/src/org/netbeans/core/startup/CLILookupHelpTest.java b/platform/core.startup/test/unit/src/org/netbeans/core/startup/CLILookupHelpTest.java
index 3a79e5c57d..d81003dedc 100644
--- a/platform/core.startup/test/unit/src/org/netbeans/core/startup/CLILookupHelpTest.java
+++ b/platform/core.startup/test/unit/src/org/netbeans/core/startup/CLILookupHelpTest.java
@@ -179,17 +179,20 @@ public class CLILookupHelpTest extends NbTestCase {
     
     private static final class NoExit extends SecurityManager {
         public static boolean disable;
-        
+
+        @Override
         public void checkExit(int status) {
             if (!disable) {
                 throw new SecurityException(String.valueOf(status));
             }
         }
 
+        @Override
         public void checkPermission(Permission perm) {
             
         }
 
+        @Override
         public void checkPermission(Permission perm, Object context) {
             
         }
diff --git a/platform/core.startup/test/unit/src/org/netbeans/core/startup/NbURLStreamHandlerFactoryTest.java b/platform/core.startup/test/unit/src/org/netbeans/core/startup/NbURLStreamHandlerFactoryTest.java
index f1056baf35..02c44668eb 100644
--- a/platform/core.startup/test/unit/src/org/netbeans/core/startup/NbURLStreamHandlerFactoryTest.java
+++ b/platform/core.startup/test/unit/src/org/netbeans/core/startup/NbURLStreamHandlerFactoryTest.java
@@ -208,7 +208,8 @@ public class NbURLStreamHandlerFactoryTest extends NbTestCase {
             first = null;
             return f;
         }
-        
+
+        @Override
         protected URL findResource(String name) {
             if (first == null) {
                 first = name;
@@ -229,6 +230,7 @@ public class NbURLStreamHandlerFactoryTest extends NbTestCase {
             }
         }
 
+        @Override
         protected Enumeration<URL> findResources(String name) throws IOException {
             URL u = findResource(name);
             if (u != null) {
@@ -276,11 +278,13 @@ public class NbURLStreamHandlerFactoryTest extends NbTestCase {
         }
 
         public void connect() throws IOException {}
-        
+
+        @Override
         public int getContentLength() {
             return path.length();
         }
 
+        @Override
         public String getContentType() {
             if (path.endsWith(".html")) {
                 return "text/html";
@@ -289,6 +293,7 @@ public class NbURLStreamHandlerFactoryTest extends NbTestCase {
             }
         }
 
+        @Override
         public InputStream getInputStream() throws IOException {
             return new ByteArrayInputStream(path.getBytes(StandardCharsets.UTF_8));
         }
diff --git a/platform/core.startup/test/unit/src/org/netbeans/core/startup/TopLoggingTest.java b/platform/core.startup/test/unit/src/org/netbeans/core/startup/TopLoggingTest.java
index 83e53a8be6..415a6640f9 100644
--- a/platform/core.startup/test/unit/src/org/netbeans/core/startup/TopLoggingTest.java
+++ b/platform/core.startup/test/unit/src/org/netbeans/core/startup/TopLoggingTest.java
@@ -69,18 +69,22 @@ public class TopLoggingTest extends NbTestCase {
         TopLogging.initialize();
 
         w = new ByteArrayOutputStream() {
+            @Override
             public void write(byte[] b, int off, int len) {
                 super.write(b, off, len);
             }
 
+            @Override
             public void write(byte[] b) throws IOException {
                 super.write(b);
             }
 
+            @Override
             public void write(int b) {
                 super.write(b);
             }
 
+            @Override
             public String toString() {
                 handler.flush();
 
diff --git a/platform/core.ui/src/org/netbeans/core/ui/options/general/AdvancedProxyPanel.java b/platform/core.ui/src/org/netbeans/core/ui/options/general/AdvancedProxyPanel.java
index d99bafbff2..84a01aea6f 100644
--- a/platform/core.ui/src/org/netbeans/core/ui/options/general/AdvancedProxyPanel.java
+++ b/platform/core.ui/src/org/netbeans/core/ui/options/general/AdvancedProxyPanel.java
@@ -341,6 +341,7 @@ public class AdvancedProxyPanel extends javax.swing.JPanel {
         org.openide.awt.Mnemonics.setLocalizedText(lblBasicAuthNote, org.openide.util.NbBundle.getMessage(AdvancedProxyPanel.class, "AdvancedProxyPanel.lblBasicAuthNote.text")); // NOI18N
         lblBasicAuthNote.setCursor(new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR));
         lblBasicAuthNote.addMouseListener(new java.awt.event.MouseAdapter() {
+            @Override
             public void mouseClicked(java.awt.event.MouseEvent evt) {
                 lblBasicAuthNoteMouseClicked(evt);
             }
diff --git a/platform/core.ui/src/org/netbeans/core/ui/options/general/GeneralOptionsPanel.java b/platform/core.ui/src/org/netbeans/core/ui/options/general/GeneralOptionsPanel.java
index 7033b2b37f..f877312692 100644
--- a/platform/core.ui/src/org/netbeans/core/ui/options/general/GeneralOptionsPanel.java
+++ b/platform/core.ui/src/org/netbeans/core/ui/options/general/GeneralOptionsPanel.java
@@ -212,9 +212,11 @@ public class GeneralOptionsPanel extends JPanel implements ActionListener {
         org.openide.awt.Mnemonics.setLocalizedText(lProxyHost, org.openide.util.NbBundle.getMessage(GeneralOptionsPanel.class, "CTL_Proxy_Host", new Object[] {})); // NOI18N
 
         tfProxyHost.addFocusListener(new java.awt.event.FocusAdapter() {
+            @Override
             public void focusGained(java.awt.event.FocusEvent evt) {
                 tfProxyHostFocusGained(evt);
             }
+            @Override
             public void focusLost(java.awt.event.FocusEvent evt) {
                 tfProxyHostFocusLost(evt);
             }
@@ -225,9 +227,11 @@ public class GeneralOptionsPanel extends JPanel implements ActionListener {
 
         tfProxyPort.setColumns(4);
         tfProxyPort.addFocusListener(new java.awt.event.FocusAdapter() {
+            @Override
             public void focusGained(java.awt.event.FocusEvent evt) {
                 tfProxyPortFocusGained(evt);
             }
+            @Override
             public void focusLost(java.awt.event.FocusEvent evt) {
                 tfProxyPortFocusLost(evt);
             }
@@ -253,9 +257,11 @@ public class GeneralOptionsPanel extends JPanel implements ActionListener {
 
         org.openide.awt.Mnemonics.setLocalizedText(lblLearnMore, org.openide.util.NbBundle.getMessage(GeneralOptionsPanel.class, "CTL_Learn_More")); // NOI18N
         lblLearnMore.addMouseListener(new java.awt.event.MouseAdapter() {
+            @Override
             public void mouseEntered(java.awt.event.MouseEvent evt) {
                 lblLearnMoreMouseEntered(evt);
             }
+            @Override
             public void mousePressed(java.awt.event.MouseEvent evt) {
                 lblLearnMoreMousePressed(evt);
             }
diff --git a/platform/core.windows/src/org/netbeans/core/windows/actions/CloseAllDocumentsAction.java b/platform/core.windows/src/org/netbeans/core/windows/actions/CloseAllDocumentsAction.java
index dfe1c7bcdd..be5d6d30ef 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/actions/CloseAllDocumentsAction.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/actions/CloseAllDocumentsAction.java
@@ -69,7 +69,8 @@ public class CloseAllDocumentsAction extends AbstractAction {
 
     /** Overriden to share accelerator with 
      * org.netbeans.core.windows.actions.ActionUtils.CloseAllDocumentsAction
-     */ 
+     */
+    @Override
     public void putValue(String key, Object newValue) {
         if (Action.ACCELERATOR_KEY.equals(key)) {
             ActionUtils.putSharedAccelerator("CloseAllDocuments", newValue);
@@ -80,7 +81,8 @@ public class CloseAllDocumentsAction extends AbstractAction {
     
     /** Overriden to share accelerator with 
      * org.netbeans.core.windows.actions.ActionUtils.CloseAllDocumentsAction
-     */ 
+     */
+    @Override
     public Object getValue(String key) {
         if (Action.ACCELERATOR_KEY.equals(key)) {
             return ActionUtils.getSharedAccelerator("CloseAllDocuments");
diff --git a/platform/core.windows/src/org/netbeans/core/windows/actions/CloseWindowAction.java b/platform/core.windows/src/org/netbeans/core/windows/actions/CloseWindowAction.java
index a7d4b7c6d3..9f7f6fd3ca 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/actions/CloseWindowAction.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/actions/CloseWindowAction.java
@@ -111,7 +111,8 @@ implements PropertyChangeListener {
     
     /** Overriden to share accelerator with 
      * org.netbeans.core.windows.actions.ActionUtils.CloseWindowAction
-     */ 
+     */
+    @Override
     public void putValue(String key, Object newValue) {
         if (Action.ACCELERATOR_KEY.equals(key)) {
             ActionUtils.putSharedAccelerator("CloseWindow", newValue);
@@ -122,7 +123,8 @@ implements PropertyChangeListener {
     
     /** Overriden to share accelerator with 
      * org.netbeans.core.windows.actions.ActionUtils.CloseWindowAction
-     */ 
+     */
+    @Override
     public Object getValue(String key) {
         if (Action.ACCELERATOR_KEY.equals(key)) {
             return ActionUtils.getSharedAccelerator("CloseWindow");
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 a87c35669a..67113ecff0 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
@@ -894,6 +894,7 @@ class SplitSubModel {
 
         /** Overrides superclass method. Adds info about dividePos, orientation,
          * first and second sub-nodes. */
+        @Override
         public String toString() {
             StringBuffer sb = new StringBuffer();
             sb.append(super.toString());
@@ -1028,6 +1029,7 @@ class SplitSubModel {
         }
 
         /** Indicates whether component represented by this node is visible or not. */
+        @Override
         public boolean isVisibleInSplit() {
             int count = 0;
             for(Iterator it = index2child.values().iterator(); it.hasNext(); ) {
@@ -1045,6 +1047,7 @@ class SplitSubModel {
         }
 
         /** Indicates whether there is at least one visible descendant. */
+        @Override
         public boolean hasVisibleDescendant() {
             for(Iterator it = index2child.values().iterator(); it.hasNext(); ) {
                 Node node = (Node)it.next();
@@ -1106,6 +1109,7 @@ class SplitSubModel {
             return mode;
         }
 
+        @Override
         public boolean isVisibleInSplit() {
             if(mode.getOpenedTopComponents().isEmpty()) {
                 return false;
diff --git a/platform/core.windows/src/org/netbeans/core/windows/persistence/GroupParser.java b/platform/core.windows/src/org/netbeans/core/windows/persistence/GroupParser.java
index 66faefa8ca..f02f2cb768 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/persistence/GroupParser.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/persistence/GroupParser.java
@@ -491,7 +491,8 @@ class GroupParser {
             groupConfig = null;
             internalConfig = null;
         }
-        
+
+        @Override
         public void startElement (String nameSpace, String name, String qname, Attributes attrs) throws SAXException {
             if ("group".equals(qname)) { // NOI18N
                 handleGroup(attrs);
@@ -509,7 +510,8 @@ class GroupParser {
                 //Parse version < 2.0
             }
         }
-        
+
+        @Override
         public void error(SAXParseException ex) throws SAXException  {
             throw ex;
         }
@@ -694,6 +696,7 @@ class GroupParser {
         
         /** Implementation of entity resolver. Points to the local DTD
          * for our public ID */
+        @Override
         public InputSource resolveEntity (String publicId, String systemId)
         throws SAXException {
             if (INSTANCE_DTD_ID_2_0.equals(publicId)) {
diff --git a/platform/core.windows/src/org/netbeans/core/windows/persistence/ModeParser.java b/platform/core.windows/src/org/netbeans/core/windows/persistence/ModeParser.java
index 6109773a89..a0429a09af 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/persistence/ModeParser.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/persistence/ModeParser.java
@@ -1028,7 +1028,8 @@ class ModeParser {
             modeConfig = null;
             internalConfig = null;
         }
-        
+
+        @Override
         public void startElement (String nameSpace, String name, String qname, Attributes attrs) throws SAXException {
             if ("mode".equals(qname)) { // NOI18N
                 handleMode(attrs);
@@ -1069,7 +1070,8 @@ class ModeParser {
                 //Parse version < 2.0
             }
         }
-        
+
+        @Override
         public void error(SAXParseException ex) throws SAXException  {
             throw ex;
         }
diff --git a/platform/core.windows/src/org/netbeans/core/windows/persistence/TCGroupParser.java b/platform/core.windows/src/org/netbeans/core/windows/persistence/TCGroupParser.java
index 33139d2b80..4d17fa0aac 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/persistence/TCGroupParser.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/persistence/TCGroupParser.java
@@ -231,8 +231,9 @@ class TCGroupParser {
             tcGroupConfig = null;
             internalConfig = null;
         }
-        
-        public void startElement (String nameSpace, String name, String qname, Attributes attrs) 
+
+        @Override
+        public void startElement (String nameSpace, String name, String qname, Attributes attrs)
         throws SAXException {
             if ("tc-group".equals(qname)) { // NOI18N
                 handleTCGroup(attrs);
@@ -253,6 +254,7 @@ class TCGroupParser {
             }
         }
 
+        @Override
         public void error(SAXParseException ex) throws SAXException  {
             throw ex;
         }
diff --git a/platform/core.windows/src/org/netbeans/core/windows/persistence/TCRefParser.java b/platform/core.windows/src/org/netbeans/core/windows/persistence/TCRefParser.java
index 7fd35d7470..eeaf7ff038 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/persistence/TCRefParser.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/persistence/TCRefParser.java
@@ -244,8 +244,9 @@ class TCRefParser {
             tcRefConfig = null;
             internalConfig = null;
         }
-        
-        public void startElement (String nameSpace, String name, String qname, Attributes attrs) 
+
+        @Override
+        public void startElement (String nameSpace, String name, String qname, Attributes attrs)
         throws SAXException {
             if ("tc-ref".equals(qname)) { // NOI18N
                 handleTCRef(attrs);
@@ -270,6 +271,7 @@ class TCRefParser {
             }
         }
 
+        @Override
         public void error(SAXParseException ex) throws SAXException  {
             throw ex;
         }
diff --git a/platform/core.windows/src/org/netbeans/core/windows/persistence/WindowManagerParser.java b/platform/core.windows/src/org/netbeans/core/windows/persistence/WindowManagerParser.java
index 116942afd9..3c3bca8aed 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/persistence/WindowManagerParser.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/persistence/WindowManagerParser.java
@@ -990,7 +990,8 @@ public class WindowManagerParser {
             winMgrConfig = null;
             internalConfig = null;
         }
-        
+
+        @Override
         public void startElement (String nameSpace, String name, String qname, Attributes attrs) throws SAXException {
             if ("windowmanager".equals(qname)) { // NOI18N
                 handleWindowManager(attrs);
@@ -1032,6 +1033,7 @@ public class WindowManagerParser {
             }
         }
 
+        @Override
         public void error(SAXParseException ex) throws SAXException  {
             throw ex;
         }
diff --git a/platform/core.windows/src/org/netbeans/core/windows/services/FileSelector.java b/platform/core.windows/src/org/netbeans/core/windows/services/FileSelector.java
index e315b19dfd..a813430e61 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/services/FileSelector.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/services/FileSelector.java
@@ -159,6 +159,7 @@ final class FileSelector extends JPanel implements PropertyChangeListener, Explo
 
     /** Gets preferred size. Overrides superclass method. Height is adjusted
      * to 1/2 screen. */
+    @Override
     public Dimension getPreferredSize() {
         Dimension dim = super.getPreferredSize();
         dim.height = Math.max(dim.height, org.openide.util.Utilities.getUsableScreenBounds().height / 2);
diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/dnd/ZOrderManager.java b/platform/core.windows/src/org/netbeans/core/windows/view/dnd/ZOrderManager.java
index fc6f32cfd3..cb11562d43 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/view/dnd/ZOrderManager.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/view/dnd/ZOrderManager.java
@@ -197,12 +197,15 @@ public final class ZOrderManager extends WindowAdapter {
 
     /*** Implementation of WindowListener ******/
 
+    @Override
     public void windowOpened(WindowEvent e) {
     }
 
+    @Override
     public void windowClosed(WindowEvent e) {
     }
 
+    @Override
     public void windowActivated(WindowEvent e) {
         logger.entering(getClass().getName(), "windowActivated");
 
@@ -216,6 +219,7 @@ public final class ZOrderManager extends WindowAdapter {
         }
     }
 
+    @Override
     public void windowDeactivated(WindowEvent e) {
     }
 
diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/ui/DecorationUtils.java b/platform/core.windows/src/org/netbeans/core/windows/view/ui/DecorationUtils.java
index 05283677f6..64c208c617 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/view/ui/DecorationUtils.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/view/ui/DecorationUtils.java
@@ -67,10 +67,12 @@ final class DecorationUtils {
     /** Simple border with line and the space */
     private static class SeparateBorder extends AbstractBorder {
 
+        @Override
         public Insets getBorderInsets (Component c) {
             return new Insets(3, 3, 3, 3);
         }
 
+        @Override
         public void paintBorder (Component c, Graphics g, int x, int y, int width, int height) {
             g.setColor(Color.DARK_GRAY);
             g.drawRect(x, y, width - 1, height - 1);
@@ -110,6 +112,7 @@ final class DecorationUtils {
             this.insets = insets;
         }
 
+        @Override
         public void mouseDragged(MouseEvent e) {
             check(e);
             Window w = SwingUtilities.getWindowAncestor((Component)e.getSource());
@@ -125,6 +128,7 @@ final class DecorationUtils {
             }
         }
 
+        @Override
         public void mouseMoved(MouseEvent e) {
             check(e);
             Component comp = (Component)e.getSource();
@@ -134,6 +138,7 @@ final class DecorationUtils {
             comp.setCursor(Cursor.getPredefinedCursor(cursorType));
         }
 
+        @Override
         public void mousePressed(MouseEvent e) {
             isPressed = true;
             startDragLoc = getScreenLoc(e);
@@ -144,6 +149,7 @@ final class DecorationUtils {
             minSize = w.getMinimumSize();
         }
 
+        @Override
         public void mouseReleased(MouseEvent e) {
             isPressed = false;
             startDragLoc = null;
@@ -151,6 +157,7 @@ final class DecorationUtils {
             minSize = null;
         }
 
+        @Override
         public void mouseExited(MouseEvent e) {
             Component comp = (Component)e.getSource();
             comp.setCursor(Cursor.getDefaultCursor());
diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/ui/DocumentsDlg.java b/platform/core.windows/src/org/netbeans/core/windows/view/ui/DocumentsDlg.java
index d5ebcff989..ea34638016 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/view/ui/DocumentsDlg.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/view/ui/DocumentsDlg.java
@@ -393,7 +393,8 @@ public class DocumentsDlg extends JPanel implements PropertyChangeListener, Expl
         w.setVisible(false);
         w.dispose();
     }
-    
+
+    @Override
     public void addNotify () {
         explorer.addPropertyChangeListener(this);
         jButtonActivate.setEnabled(false);
@@ -401,7 +402,8 @@ public class DocumentsDlg extends JPanel implements PropertyChangeListener, Expl
         jButtonSave.setEnabled(false);
         super.addNotify();
     }
-    
+
+    @Override
     public void removeNotify () {
         // save dialog size on click at [x] in titlebar
         Window dlg = SwingUtilities.getWindowAncestor(this);
diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/ui/EditorAreaFrame.java b/platform/core.windows/src/org/netbeans/core/windows/view/ui/EditorAreaFrame.java
index 265b4011d6..e1a7cea0ac 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/view/ui/EditorAreaFrame.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/view/ui/EditorAreaFrame.java
@@ -52,23 +52,27 @@ public class EditorAreaFrame extends JFrame {
     public void setWindowActivationListener(Controller control) {
         controller = control;
         addWindowListener(new WindowAdapter() {
+            @Override
             public void windowActivated(WindowEvent evt) {
                 if (frametimestamp != 0 && System.currentTimeMillis() > frametimestamp + 500) {
                     controller.userActivatedEditorWindow();
                 }
             }
+            @Override
             public void windowOpened(WindowEvent event) {
                 frametimestamp = System.currentTimeMillis();
             }
         });
     }
-    
+
+    @Override
     public void toFront() {
         // ignore the window activation event, is not done by user.
         frametimestamp = System.currentTimeMillis();
         super.toFront();
     }
-    
+
+    @Override
     public void setVisible(boolean visible) {
         frametimestamp = System.currentTimeMillis();
         super.setVisible(visible);
diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/ui/MultiSplitDivider.java b/platform/core.windows/src/org/netbeans/core/windows/view/ui/MultiSplitDivider.java
index b9a69e05f1..1608cdb214 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/view/ui/MultiSplitDivider.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/view/ui/MultiSplitDivider.java
@@ -293,6 +293,7 @@ public class MultiSplitDivider implements Accessible {
                 return Integer.valueOf( rect.y );
         }
 
+        @Override
         public AccessibleValue getAccessibleValue() {
             return this;
         }
diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/ui/slides/ScaleFx.java b/platform/core.windows/src/org/netbeans/core/windows/view/ui/slides/ScaleFx.java
index 1eaca18bf5..dc72720bed 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/view/ui/slides/ScaleFx.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/view/ui/slides/ScaleFx.java
@@ -325,6 +325,7 @@ System.out.println("Rendering using comp renderer...");
             targetSize = null;
         }
 
+        @Override
         public void paint(Graphics g) {
             Rectangle bounds = getBounds();
             
diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/ui/slides/SlideBarActionEvent.java b/platform/core.windows/src/org/netbeans/core/windows/view/ui/slides/SlideBarActionEvent.java
index cef606a50c..61c91c6559 100644
--- a/platform/core.windows/src/org/netbeans/core/windows/view/ui/slides/SlideBarActionEvent.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/view/ui/slides/SlideBarActionEvent.java
@@ -63,6 +63,7 @@ public final class SlideBarActionEvent extends ActionEvent {
         return slideOperation;
     }
 
+    @Override
     public String toString() {
         StringBuffer sb = new StringBuffer("SlideBarActionEvent:"); //NOI18N
         sb.append ("Tab " + tabIndex + " " + getActionCommand()); //NOI18N
diff --git a/platform/core.windows/test/unit/src/org/netbeans/core/windows/services/NotifyLaterTest.java b/platform/core.windows/test/unit/src/org/netbeans/core/windows/services/NotifyLaterTest.java
index 0121db79a1..30871cf802 100644
--- a/platform/core.windows/test/unit/src/org/netbeans/core/windows/services/NotifyLaterTest.java
+++ b/platform/core.windows/test/unit/src/org/netbeans/core/windows/services/NotifyLaterTest.java
@@ -80,7 +80,8 @@ public class NotifyLaterTest extends NbTestCase {
     public void testIfLasterWhenSplashShownThanWaitTillItFinished() throws Exception {
         class MyObj extends JComponent {
             public int called;
-            
+
+            @Override
             public void addNotify() {
                 called = 1;
                 LOG.log(Level.INFO, "addNotify called=" + called, new Exception("Stacktrace"));
diff --git a/platform/javahelp/src/org/netbeans/modules/javahelp/BrowserDisplayerBeanInfo.java b/platform/javahelp/src/org/netbeans/modules/javahelp/BrowserDisplayerBeanInfo.java
index 336109c719..ff24201bb7 100644
--- a/platform/javahelp/src/org/netbeans/modules/javahelp/BrowserDisplayerBeanInfo.java
+++ b/platform/javahelp/src/org/netbeans/modules/javahelp/BrowserDisplayerBeanInfo.java
@@ -34,7 +34,8 @@ public class BrowserDisplayerBeanInfo extends SimpleBeanInfo {
     public BrowserDisplayerBeanInfo () {
     }
 
-    public PropertyDescriptor[] getPropertyDescriptors () {
+	@Override
+	public PropertyDescriptor[] getPropertyDescriptors () {
 	PropertyDescriptor back[] = new PropertyDescriptor[7];
 	try {
 	    back[0] = new PropertyDescriptor("content", BrowserDisplayer.class);
diff --git a/platform/javahelp/src/org/netbeans/modules/javahelp/NbDocsStreamHandler.java b/platform/javahelp/src/org/netbeans/modules/javahelp/NbDocsStreamHandler.java
index a736803976..0cd351ee0c 100644
--- a/platform/javahelp/src/org/netbeans/modules/javahelp/NbDocsStreamHandler.java
+++ b/platform/javahelp/src/org/netbeans/modules/javahelp/NbDocsStreamHandler.java
@@ -190,6 +190,7 @@ public final class NbDocsStreamHandler extends URLStreamHandler {
          * @param n index of the header
          * @return the header value
          */
+        @Override
         public String getHeaderField(int n) {
             tryToConnect();
             if (connected)
@@ -202,6 +203,7 @@ public final class NbDocsStreamHandler extends URLStreamHandler {
          * @param n the index
          * @return the header name
          */
+        @Override
         public String getHeaderFieldKey(int n) {
             tryToConnect();
             if (connected)
@@ -214,6 +216,7 @@ public final class NbDocsStreamHandler extends URLStreamHandler {
          * @param key the header name
          * @return the value
          */
+        @Override
         public String getHeaderField(String key) {
             tryToConnect();
             if (connected)
@@ -226,6 +229,7 @@ public final class NbDocsStreamHandler extends URLStreamHandler {
          * @throws IOException for the usual reasons
          * @return a stream to the object
          */
+        @Override
         public InputStream getInputStream() throws IOException {
             connect();
             return real.getInputStream();
@@ -235,6 +239,7 @@ public final class NbDocsStreamHandler extends URLStreamHandler {
          * @throws IOException for the usual reasons
          * @return an output stream writing to it
          */
+        @Override
         public OutputStream getOutputStream() throws IOException {
             connect();
             return real.getOutputStream();
@@ -243,6 +248,7 @@ public final class NbDocsStreamHandler extends URLStreamHandler {
         /** Get the type of the content.
          * @return the MIME type
          */
+        @Override
         public String getContentType() {
             tryToConnect();
             if (connected)
@@ -254,6 +260,7 @@ public final class NbDocsStreamHandler extends URLStreamHandler {
         /** Get the length of content.
          * @return the length in bytes
          */
+        @Override
         public int getContentLength() {
             tryToConnect();
             if (connected)
@@ -350,6 +357,7 @@ public final class NbDocsStreamHandler extends URLStreamHandler {
          * @throws IOException for the usual reasons
          * @return a stream to the object
          */
+        @Override
         public InputStream getInputStream() throws IOException {
             connect();
             return stream;
@@ -359,6 +367,7 @@ public final class NbDocsStreamHandler extends URLStreamHandler {
         /** Get the type of the content.
          * @return the MIME type
          */
+        @Override
         public String getContentType() {
             return "text/html"; // NOI18N
         }
@@ -366,6 +375,7 @@ public final class NbDocsStreamHandler extends URLStreamHandler {
         /** Get the length of content.
          * @return the length in bytes
          */
+        @Override
         public int getContentLength() {
             tryToConnect();
             if (connected) {
diff --git a/platform/lib.uihandler/src/org/netbeans/lib/uihandler/MultiPartHandler.java b/platform/lib.uihandler/src/org/netbeans/lib/uihandler/MultiPartHandler.java
index b7183953c1..70c8dec4a3 100644
--- a/platform/lib.uihandler/src/org/netbeans/lib/uihandler/MultiPartHandler.java
+++ b/platform/lib.uihandler/src/org/netbeans/lib/uihandler/MultiPartHandler.java
@@ -780,6 +780,7 @@ class MultiPartHandler {
        *
        * throws IOException  if an I/O error occurs.
        */
+      @Override
       public int read() throws IOException {
           if (count - pos <= 2) {
               fill();
@@ -798,6 +799,7 @@ class MultiPartHandler {
        *
        * throws IOException  if an I/O error occurs.
        */
+      @Override
       public int read(byte b[]) throws IOException {
           return read(b, 0, b.length);
       }
@@ -809,6 +811,7 @@ class MultiPartHandler {
        *
        * throws IOException  if an I/O error occurs.
        */
+      @Override
       public int read(byte b[], int off, int len) throws IOException
 {
           int total = 0;
@@ -851,6 +854,7 @@ class MultiPartHandler {
        *
        * throws IOException  if an I/O error occurs.
        */
+      @Override
       public int available() throws IOException {
           int avail = (count - pos - 2) + in.available();
           // Never return a negative value
@@ -865,6 +869,7 @@ class MultiPartHandler {
        *
        * throws IOException  if an I/O error occurs.
        */
+      @Override
       public void close() throws IOException {
           if (!eof) {
               while (read(buf, 0, buf.length) != -1)
diff --git a/platform/libs.junit4/src/org/netbeans/libs/junit4/NbJUnitProcessor.java b/platform/libs.junit4/src/org/netbeans/libs/junit4/NbJUnitProcessor.java
index 0a4c6b2e4f..917950239b 100644
--- a/platform/libs.junit4/src/org/netbeans/libs/junit4/NbJUnitProcessor.java
+++ b/platform/libs.junit4/src/org/netbeans/libs/junit4/NbJUnitProcessor.java
@@ -32,6 +32,7 @@ public final class NbJUnitProcessor extends AbstractProcessor {
         return true;
     }
 
+    @Override
     public Set<String> getSupportedAnnotationTypes() {
         TreeSet<String> all = new TreeSet<>();
 
diff --git a/platform/o.n.bootstrap/src/org/netbeans/JarClassLoader.java b/platform/o.n.bootstrap/src/org/netbeans/JarClassLoader.java
index 7a238bcd86..799cfa92f9 100644
--- a/platform/o.n.bootstrap/src/org/netbeans/JarClassLoader.java
+++ b/platform/o.n.bootstrap/src/org/netbeans/JarClassLoader.java
@@ -946,7 +946,8 @@ public class JarClassLoader extends ProxyClassLoader {
             super(BaseUtilities.toURI(file).toURL());
             dir = file;
         }
-        
+
+        @Override
         public Manifest getManifest() {
             Manifest mf = manifest;
             if (mf != null) {
diff --git a/platform/o.n.bootstrap/test/unit/src/org/netbeans/JarClassLoaderTest.java b/platform/o.n.bootstrap/test/unit/src/org/netbeans/JarClassLoaderTest.java
index cc6e36f84d..0a603593bb 100644
--- a/platform/o.n.bootstrap/test/unit/src/org/netbeans/JarClassLoaderTest.java
+++ b/platform/o.n.bootstrap/test/unit/src/org/netbeans/JarClassLoaderTest.java
@@ -363,6 +363,7 @@ public class JarClassLoaderTest extends NbTestCase {
                 controlSemaphore.acquire();
             }
 
+            @Override
             public void run() {
                 controlSemaphore.release(); // we're about to start blocking
                 try {
diff --git a/platform/o.n.core/src/org/netbeans/beaninfo/editors/ArrayOfIntSupport.java b/platform/o.n.core/src/org/netbeans/beaninfo/editors/ArrayOfIntSupport.java
index fabac44641..f22dde281c 100644
--- a/platform/o.n.core/src/org/netbeans/beaninfo/editors/ArrayOfIntSupport.java
+++ b/platform/o.n.core/src/org/netbeans/beaninfo/editors/ArrayOfIntSupport.java
@@ -73,6 +73,7 @@ implements XMLPropertyEditor, ExPropertyEditor  {
     * @return A fragment of Java code representing an initializer for the
     *    current value.
     */
+    @Override
     public String getJavaInitializationString() {
         int[] val = getValues();
         StringBuffer buf = new StringBuffer("new "); // NOI18N
@@ -100,6 +101,7 @@ implements XMLPropertyEditor, ExPropertyEditor  {
     * <p>   If a non-null value is returned, then the PropertyEditor should
     *       be prepared to parse that string back in setAsText().
     */
+    @Override
     public String getAsText() {
         if (getValue() == null)
             return "null"; // NOI18N
@@ -135,6 +137,7 @@ implements XMLPropertyEditor, ExPropertyEditor  {
     * as text.
     * @param text  The string to be parsed.
     */
+    @Override
     public void setAsText(String text) throws IllegalArgumentException {
         if ("null".equals(text) || "".equals(text)) { // NOI18N
             setValue(null);
diff --git a/platform/o.n.core/src/org/netbeans/beaninfo/editors/CharEditor.java b/platform/o.n.core/src/org/netbeans/beaninfo/editors/CharEditor.java
index 7ee77f3951..fe0e5cdcb7 100644
--- a/platform/o.n.core/src/org/netbeans/beaninfo/editors/CharEditor.java
+++ b/platform/o.n.core/src/org/netbeans/beaninfo/editors/CharEditor.java
@@ -34,6 +34,7 @@ public class CharEditor extends PropertyEditorSupport implements EnhancedPropert
      * Converts the char to String by either leaving
      * the single char or by creating unicode escape.
      */
+    @Override
     public String getAsText () {
         char value = ((Character)getValue()).charValue();
         final StringBuffer buf = new StringBuffer(6);
@@ -61,6 +62,7 @@ public class CharEditor extends PropertyEditorSupport implements EnhancedPropert
      * Set the property value by parsing given String.
      * @param text  The string to be parsed.
      */
+    @Override
     public void setAsText(String text) throws IllegalArgumentException {
         if (text.length() < 1) {
             // ignore empty value
@@ -107,6 +109,7 @@ public class CharEditor extends PropertyEditorSupport implements EnhancedPropert
      * a String the first character is taken as the new value.
      * @param v new value
      */
+    @Override
     public void setValue(Object newValue) throws IllegalArgumentException {
         if (newValue instanceof Character ) {
             super.setValue(newValue);
@@ -138,6 +141,7 @@ public class CharEditor extends PropertyEditorSupport implements EnhancedPropert
      * @return A fragment of Java code representing an initializer for the
      *   	current value.
      */
+    @Override
     public String getJavaInitializationString() {
         if ( ((Character)getValue()).charValue() == '\'' )
             return "'\\''";                 // NOI18N
diff --git a/platform/o.n.core/src/org/netbeans/beaninfo/editors/ClassEditor.java b/platform/o.n.core/src/org/netbeans/beaninfo/editors/ClassEditor.java
index d71a23d72b..2465551590 100644
--- a/platform/o.n.core/src/org/netbeans/beaninfo/editors/ClassEditor.java
+++ b/platform/o.n.core/src/org/netbeans/beaninfo/editors/ClassEditor.java
@@ -41,6 +41,7 @@ public class ClassEditor extends java.beans.PropertyEditorSupport {
      * @return A fragment of Java code representing an initializer for the
      *    current value.
      */
+    @Override
     public String getJavaInitializationString() {
         Class<?> clazz = (Class)getValue();
         if (clazz == null) return "null"; // NOI18N
@@ -55,6 +56,7 @@ public class ClassEditor extends java.beans.PropertyEditorSupport {
     * <p>   If a non-null value is returned, then the PropertyEditor should
     *       be prepared to parse that string back in setAsText().
     */
+    @Override
     public String getAsText() {
         Class<?> clazz = (Class)getValue();
         if (clazz == null) return "null"; // NOI18N
@@ -67,6 +69,7 @@ public class ClassEditor extends java.beans.PropertyEditorSupport {
     * as text.
     * @param text  The string to be parsed.
     */
+    @Override
     public void setAsText(String text) throws java.lang.IllegalArgumentException {
         try {
             ClassLoader loader = Lookup.getDefault().lookup(ClassLoader.class);
diff --git a/platform/o.n.core/src/org/netbeans/beaninfo/editors/ColorEditor.java b/platform/o.n.core/src/org/netbeans/beaninfo/editors/ColorEditor.java
index 1c9f4aab7f..6ddac08c29 100644
--- a/platform/o.n.core/src/org/netbeans/beaninfo/editors/ColorEditor.java
+++ b/platform/o.n.core/src/org/netbeans/beaninfo/editors/ColorEditor.java
@@ -157,6 +157,7 @@ public final class ColorEditor implements PropertyEditor, XMLPropertyEditor {
     public static JColorChooser getStaticChooser(ColorEditor ce) {
         JColorChooser staticChooser = new JColorChooser(new SuperColorSelectionModel())
                             {
+                                @Override
                                 public void setColor (Color c) {
                                     if (c == null) return;
                                     super.setColor (c);
@@ -571,12 +572,14 @@ public final class ColorEditor implements PropertyEditor, XMLPropertyEditor {
         }
 
         /** Overrides superclass method. Adds removing of change listener. */
+        @Override
         public void removeNotify () {
             super.removeNotify();
             selectionModel.removeChangeListener (this);
         }
 
         /** Overrides superclass method. Adds 50 pixels to each side. */
+        @Override
         public Dimension getPreferredSize () {
             Dimension s = super.getPreferredSize ();
             return new Dimension (s.width + 50, s.height + 10);
@@ -623,6 +626,7 @@ public final class ColorEditor implements PropertyEditor, XMLPropertyEditor {
         }
 
         /** Overrides the equals(Object obj) method of java.awt.Color */
+        @Override
         public boolean equals(Object obj) {
             boolean superEquals = super.equals(obj);
             String objID = null;
diff --git a/platform/o.n.core/src/org/netbeans/beaninfo/editors/DateEditor.java b/platform/o.n.core/src/org/netbeans/beaninfo/editors/DateEditor.java
index 9d3f2f674b..01c7456323 100644
--- a/platform/o.n.core/src/org/netbeans/beaninfo/editors/DateEditor.java
+++ b/platform/o.n.core/src/org/netbeans/beaninfo/editors/DateEditor.java
@@ -33,6 +33,7 @@ public class DateEditor extends PropertyEditorSupport {
 
     private static DateFormat fmt = DateFormat.getDateTimeInstance();
 
+    @Override
     public String getAsText() {
         Date d = (Date)getValue();
         if (d != null) {
@@ -41,7 +42,8 @@ public class DateEditor extends PropertyEditorSupport {
             return ""; // NOI18N
         }
     }
-    
+
+    @Override
     public void setAsText(String text) throws IllegalArgumentException {
         if ("".equals(text)) { // NOI18N
             setValue(null);
@@ -55,6 +57,7 @@ public class DateEditor extends PropertyEditorSupport {
     }
     
     // #67524: Properties Editor doesn't support Date type. Replaces them with '???'
+    @Override
     public String getJavaInitializationString () {
         return "new java.util.Date(" + ((Date) getValue()).getTime() + "L)"; // NOI18N
     }
diff --git a/platform/o.n.core/src/org/netbeans/beaninfo/editors/FileArrayEditor.java b/platform/o.n.core/src/org/netbeans/beaninfo/editors/FileArrayEditor.java
index 356596de3d..ca7a280052 100644
--- a/platform/o.n.core/src/org/netbeans/beaninfo/editors/FileArrayEditor.java
+++ b/platform/o.n.core/src/org/netbeans/beaninfo/editors/FileArrayEditor.java
@@ -145,6 +145,7 @@ public class FileArrayEditor extends PropertyEditorSupport implements ExProperty
     /** Returns human readable form of the edited value.
      * @return string reprezentation
      */
+    @Override
     public String getAsText() {
         File[] file = (File[])getValue();
         if (file == null) {
@@ -164,6 +165,7 @@ public class FileArrayEditor extends PropertyEditorSupport implements ExProperty
      * @param str string reprezentation of the file (used as a parameter for File).
      * @throws IllegalArgumentException If the given string cannot be parsed
      */
+    @Override
     public void setAsText(String str) throws IllegalArgumentException {
         if (str == null) {
             throw new IllegalArgumentException("null"); // NOI18N
@@ -180,6 +182,7 @@ public class FileArrayEditor extends PropertyEditorSupport implements ExProperty
     /** Custon editor.
      * @return Returns custom editor component.
      */
+    @Override
     public Component getCustomEditor() {
         if (!editable) {
             return new StringCustomEditor(getAsText(), false);
@@ -237,6 +240,7 @@ public class FileArrayEditor extends PropertyEditorSupport implements ExProperty
     /** Implements PropertyEditor method.
      * @return Returns true.
      */
+    @Override
     public boolean supportsCustomEditor() {
         return true;
     }
@@ -244,6 +248,7 @@ public class FileArrayEditor extends PropertyEditorSupport implements ExProperty
     /** Should create a string insertable to the newly generated source code.
      * @return initialization string
      */
+    @Override
     public String getJavaInitializationString() {
         File[] value = (File[]) getValue ();
         if (value == null) {
diff --git a/platform/o.n.core/src/org/netbeans/beaninfo/editors/FileEditor.java b/platform/o.n.core/src/org/netbeans/beaninfo/editors/FileEditor.java
index 933c2b1ab5..9d61af0000 100644
--- a/platform/o.n.core/src/org/netbeans/beaninfo/editors/FileEditor.java
+++ b/platform/o.n.core/src/org/netbeans/beaninfo/editors/FileEditor.java
@@ -174,6 +174,7 @@ public class FileEditor extends PropertyEditorSupport implements ExPropertyEdito
     /** Returns human readable form of the edited value.
      * @return string reprezentation
      */
+    @Override
     public String getAsText() {
         File file = (File)getValue();
         if (file == null) {
@@ -190,6 +191,7 @@ public class FileEditor extends PropertyEditorSupport implements ExPropertyEdito
      * @param str string reprezentation of the file (used as a parameter for File).
      * @throws IllegalArgumentException If the given string cannot be parsed
      */
+    @Override
     public void setAsText(String str) throws IllegalArgumentException {
         if (str == null) {
             throw new IllegalArgumentException("null"); // NOI18N
@@ -206,6 +208,7 @@ public class FileEditor extends PropertyEditorSupport implements ExPropertyEdito
     /** Custon editor.
      * @return Returns custom editor component.
      */
+    @Override
     public Component getCustomEditor() {
         if (!editable) {
             String info = "";
@@ -265,6 +268,7 @@ public class FileEditor extends PropertyEditorSupport implements ExPropertyEdito
     /** Implements PropertyEditor method.
      * @return Returns true.
      */
+    @Override
     public boolean supportsCustomEditor() {
         return true;
     }
@@ -272,6 +276,7 @@ public class FileEditor extends PropertyEditorSupport implements ExPropertyEdito
     /** Should create a string insertable to the newly generated source code.
      * @return initialization string
      */
+    @Override
     public String getJavaInitializationString() {
         File value = (File) getValue ();
         if (value == null) {
diff --git a/platform/o.n.core/src/org/netbeans/beaninfo/editors/HtmlBrowser.java b/platform/o.n.core/src/org/netbeans/beaninfo/editors/HtmlBrowser.java
index b4a67912ce..c94281362c 100644
--- a/platform/o.n.core/src/org/netbeans/beaninfo/editors/HtmlBrowser.java
+++ b/platform/o.n.core/src/org/netbeans/beaninfo/editors/HtmlBrowser.java
@@ -50,7 +50,8 @@ public class HtmlBrowser extends Object {
         /** Creates new FactoryEditor */
         public FactoryEditor () {
         }
-        
+
+        @Override
         public String getAsText () {
             try {
                 org.openide.awt.HtmlBrowser.Factory f = (org.openide.awt.HtmlBrowser.Factory)getValue ();
@@ -66,7 +67,8 @@ public class HtmlBrowser extends Object {
             }
             return NbBundle.getMessage (FactoryEditor.class, "CTL_UnspecifiedBrowser"); //NOI18N
         }
-        
+
+        @Override
         public void setAsText (java.lang.String str) throws java.lang.IllegalArgumentException {
             try {
                 if (NbBundle.getMessage (FactoryEditor.class, "CTL_UnspecifiedBrowser").equals (str) //NOI18N
@@ -95,7 +97,8 @@ public class HtmlBrowser extends Object {
             throw iae;
             }
         }
-        
+
+        @Override
         public java.lang.String[] getTags () {
             ArrayList<String> list = new ArrayList<String> (6);
             Lookup.Result<org.openide.awt.HtmlBrowser.Factory> r = Lookup.getDefault().lookupResult(org.openide.awt.HtmlBrowser.Factory.class);
diff --git a/platform/o.n.core/src/org/netbeans/beaninfo/editors/ListImageEditor.java b/platform/o.n.core/src/org/netbeans/beaninfo/editors/ListImageEditor.java
index 9647b252b0..7a47542729 100644
--- a/platform/o.n.core/src/org/netbeans/beaninfo/editors/ListImageEditor.java
+++ b/platform/o.n.core/src/org/netbeans/beaninfo/editors/ListImageEditor.java
@@ -104,12 +104,14 @@ public class ListImageEditor extends PropertyEditorSupport implements ExProperty
     public boolean isEditable () {
         return canWrite;
     }
-    
+
+    @Override
     public String getAsText () {
         int i = findIndex (values, getValue ());
         return (String) findObject (descriptions, i);
     }
-    
+
+    @Override
     public void setAsText (String str) throws java.lang.IllegalArgumentException {
         int i = findIndex (descriptions, str);
         if (i == -1) {
@@ -123,15 +125,18 @@ public class ListImageEditor extends PropertyEditorSupport implements ExProperty
         }
         setValue (findObject (values, i));
     }
-    
+
+    @Override
     public String[] getTags () {
         return descriptions;
     }
 
+    @Override
     public boolean isPaintable () {
         return true;
     }
-    
+
+    @Override
     public void paintValue (java.awt.Graphics g, java.awt.Rectangle rectangle) {
         Image img = (Image) findObject (images, findIndex (values, getValue ()));
     
@@ -144,7 +149,8 @@ public class ListImageEditor extends PropertyEditorSupport implements ExProperty
                 null);
         }
     }
-    
+
+    @Override
     public String getJavaInitializationString () {
         return "new Integer(" + getValue () + ")"; // NOI18N
     }
diff --git a/platform/o.n.core/src/org/netbeans/beaninfo/editors/PropertiesEditor.java b/platform/o.n.core/src/org/netbeans/beaninfo/editors/PropertiesEditor.java
index 5c512917de..9a160825c8 100644
--- a/platform/o.n.core/src/org/netbeans/beaninfo/editors/PropertiesEditor.java
+++ b/platform/o.n.core/src/org/netbeans/beaninfo/editors/PropertiesEditor.java
@@ -37,6 +37,7 @@ import org.openide.util.NbBundle;
 public class PropertiesEditor extends PropertyEditorSupport {
 
     /** Overrides superclass method. */
+    @Override
     public String getAsText() {
         Object value = getValue();
         
@@ -64,6 +65,7 @@ public class PropertiesEditor extends PropertyEditorSupport {
     /** Overrides superclass method.
      * @exception IllegalArgumentException if <code>null</code> value
      * is passes in or some io problem by converting occured */
+    @Override
     public void setAsText(String text) throws IllegalArgumentException {
         try {
             if(text == null) {
@@ -88,14 +90,17 @@ public class PropertiesEditor extends PropertyEditorSupport {
         }
     }
 
+    @Override
     public String getJavaInitializationString () {
         return null; // does not generate any code
     }
 
+    @Override
     public boolean supportsCustomEditor () {
         return true;
     }
 
+    @Override
     public java.awt.Component getCustomEditor () {
         return new PropertiesCustomEditor (this);
     }
diff --git a/platform/o.n.core/src/org/netbeans/beaninfo/editors/StringArrayCustomEditor.java b/platform/o.n.core/src/org/netbeans/beaninfo/editors/StringArrayCustomEditor.java
index 85bf055220..84bb71f33d 100644
--- a/platform/o.n.core/src/org/netbeans/beaninfo/editors/StringArrayCustomEditor.java
+++ b/platform/o.n.core/src/org/netbeans/beaninfo/editors/StringArrayCustomEditor.java
@@ -102,7 +102,8 @@ public class StringArrayCustomEditor extends javax.swing.JPanel {
 
         updateButtons ();
         itemField.addKeyListener(new KeyAdapter() {
-           public void keyReleased(KeyEvent event) {
+            @Override
+            public void keyReleased(KeyEvent event) {
                 boolean containsCurrent = containsCurrent();
                 String txt = itemField.getText().trim();
                 boolean en = itemField.isEnabled() &&
@@ -365,6 +366,7 @@ public class StringArrayCustomEditor extends javax.swing.JPanel {
         updateValue ();
     }//GEN-LAST:event_addButtonActionPerformed
 
+    @Override
     public void setEnabled (boolean val) {
         Component[] c = getComponents();
         super.setEnabled(val);
diff --git a/platform/o.n.core/src/org/netbeans/beaninfo/editors/StringCustomEditor.java b/platform/o.n.core/src/org/netbeans/beaninfo/editors/StringCustomEditor.java
index 16afedb9ca..0ceb6beb41 100644
--- a/platform/o.n.core/src/org/netbeans/beaninfo/editors/StringCustomEditor.java
+++ b/platform/o.n.core/src/org/netbeans/beaninfo/editors/StringCustomEditor.java
@@ -176,7 +176,8 @@ public class StringCustomEditor extends javax.swing.JPanel implements PropertyCh
                 prefHeight));
         }
     }
-    
+
+    @Override
     public void addNotify () {
         super.addNotify();
         //force focus to the editable area
diff --git a/platform/o.n.core/src/org/netbeans/beaninfo/editors/URLEditor.java b/platform/o.n.core/src/org/netbeans/beaninfo/editors/URLEditor.java
index f23b757275..3a516e8de3 100644
--- a/platform/o.n.core/src/org/netbeans/beaninfo/editors/URLEditor.java
+++ b/platform/o.n.core/src/org/netbeans/beaninfo/editors/URLEditor.java
@@ -33,6 +33,7 @@ import org.openide.util.NbBundle;
 public class URLEditor extends PropertyEditorSupport implements org.openide.explorer.propertysheet.editors.XMLPropertyEditor  {
 
     /** sets new value */
+    @Override
     public void setAsText(String s) {
         if ("null".equals(s)) { // NOI18N
             setValue(null);
@@ -54,16 +55,19 @@ public class URLEditor extends PropertyEditorSupport implements org.openide.expl
     }
 
     /** @return the current value as String */
+    @Override
     public String getAsText() {
         URL url = (URL)getValue();
         return url != null ? url.toString() : "null"; // NOI18N
     }
 
+    @Override
     public String getJavaInitializationString () {
         URL url = (URL) getValue ();
         return "new java.net.URL(\""+url.toString ()+"\")"; // NOI18N
     }
 
+    @Override
     public boolean supportsCustomEditor () {
         return false;
     }
diff --git a/platform/o.n.core/src/org/netbeans/core/UIExceptions.java b/platform/o.n.core/src/org/netbeans/core/UIExceptions.java
index 7f28e20559..173796f15f 100644
--- a/platform/o.n.core/src/org/netbeans/core/UIExceptions.java
+++ b/platform/o.n.core/src/org/netbeans/core/UIExceptions.java
@@ -72,6 +72,7 @@ public final class UIExceptions {
     private static final class AnnException extends Exception implements Callable<LogRecord[]> {
         private List<LogRecord> records;
 
+        @Override
         public String getMessage() {
             StringBuilder sb = new StringBuilder();
             String sep = "";
@@ -114,16 +115,19 @@ public final class UIExceptions {
             return r == null ? empty : r.toArray(empty);
         }
 
+        @Override
         public void printStackTrace(PrintStream s) {
             super.printStackTrace(s);
             logRecords(s);
         }
 
+        @Override
         public void printStackTrace(PrintWriter s) {
             super.printStackTrace(s);
             logRecords(s);
         }
 
+        @Override
         public void printStackTrace() {
             printStackTrace(System.err);
         }
diff --git a/platform/o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.java b/platform/o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.java
index a6d3b7f1f8..dc0876c31c 100644
--- a/platform/o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.java
+++ b/platform/o.n.core/src/org/netbeans/core/ui/ProductInformationPanel.java
@@ -186,6 +186,7 @@ public class ProductInformationPanel extends JPanel implements HyperlinkListener
         copyright.setMinimumSize(new java.awt.Dimension(50, 0));
         copyright.setCaretPosition(0); // so that text is not scrolled down
         copyright.addMouseListener(new java.awt.event.MouseAdapter() {
+            @Override
             public void mouseClicked(java.awt.event.MouseEvent evt) {
                 copyrightMouseClicked(evt);
             }
diff --git a/platform/o.n.core/test/perf/src/org/netbeans/core/modules/ModuleInitTest.java b/platform/o.n.core/test/perf/src/org/netbeans/core/modules/ModuleInitTest.java
index 9204839684..82352d6474 100644
--- a/platform/o.n.core/test/perf/src/org/netbeans/core/modules/ModuleInitTest.java
+++ b/platform/o.n.core/test/perf/src/org/netbeans/core/modules/ModuleInitTest.java
@@ -545,6 +545,7 @@ public class ModuleInitTest extends Benchmark {
             this.is = is;
             this.ps = ps;
         }
+        @Override
         public void run() {
             try {
                 copyStream(is, ps);
diff --git a/platform/o.n.swing.outline/test/unit/src/org/netbeans/swing/etable/ETableTest.java b/platform/o.n.swing.outline/test/unit/src/org/netbeans/swing/etable/ETableTest.java
index adaa5c41a4..0b0f6260ea 100644
--- a/platform/o.n.swing.outline/test/unit/src/org/netbeans/swing/etable/ETableTest.java
+++ b/platform/o.n.swing.outline/test/unit/src/org/netbeans/swing/etable/ETableTest.java
@@ -452,11 +452,13 @@ public class ETableTest extends NbTestCase {
             boolean[] canEdit = new boolean [] {
                 cellsEditable, cellsEditable, cellsEditable, cellsEditable
             };
-            
+
+            @Override
             public Class getColumnClass(int columnIndex) {
                 return types [columnIndex];
             }
-            
+
+            @Override
             public boolean isCellEditable(int rowIndex, int columnIndex) {
                 return canEdit [columnIndex];
             }
diff --git a/platform/o.n.swing.outline/test/unit/src/org/netbeans/swing/outline/OutlineTest.java b/platform/o.n.swing.outline/test/unit/src/org/netbeans/swing/outline/OutlineTest.java
index 0c25042bdc..6dae4e3155 100644
--- a/platform/o.n.swing.outline/test/unit/src/org/netbeans/swing/outline/OutlineTest.java
+++ b/platform/o.n.swing.outline/test/unit/src/org/netbeans/swing/outline/OutlineTest.java
@@ -93,11 +93,13 @@ public class OutlineTest extends NbTestCase {
             boolean[] canEdit = new boolean [] {
                 cellsEditable, cellsEditable, cellsEditable, cellsEditable
             };
-            
+
+            @Override
             public Class getColumnClass(int columnIndex) {
                 return types [columnIndex];
             }
-            
+
+            @Override
             public boolean isCellEditable(int rowIndex, int columnIndex) {
                 return canEdit [columnIndex];
             }
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 f0c5318b2d..0b2ec46e83 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
@@ -49,7 +49,8 @@ public class AquaSeparatorUI extends SeparatorUI {
     public static ComponentUI createUI(JComponent c) {
         return separatorui;
     }
-    
+
+    @Override
     public void paint( Graphics g, JComponent c ) {
         Dimension s = c.getSize();
 
@@ -61,7 +62,8 @@ public class AquaSeparatorUI extends SeparatorUI {
             g.drawLine(0, 1, 0, s.height - 2);
         }
     }
-    
+
+    @Override
     public Dimension getPreferredSize(JComponent c) {
         if (((JSeparator) c).getOrientation() == JSeparator.HORIZONTAL) {
             return new Dimension( 0, 12 );
@@ -69,7 +71,9 @@ public class AquaSeparatorUI extends SeparatorUI {
             return new Dimension( 1, 11 );
         }
     }
-    
+
+    @Override
     public Dimension getMinimumSize( JComponent c ) { return null; }
+    @Override
     public Dimension getMaximumSize( JComponent c ) { return null; }
 }
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkToolBarButtonUI.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkToolBarButtonUI.java
index 59767fa01f..c2576a0f3e 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkToolBarButtonUI.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkToolBarButtonUI.java
@@ -37,7 +37,8 @@ class GtkToolBarButtonUI extends ButtonUI implements ChangeListener {
     /** Creates a new instance of AquaToolBarButtonUI */
     public GtkToolBarButtonUI() {
     }
-    
+
+    @Override
     public void installUI (JComponent c) {
         AbstractButton b = (AbstractButton) c;
         b.addMouseListener (listener);
@@ -49,7 +50,8 @@ class GtkToolBarButtonUI extends ButtonUI implements ChangeListener {
         b.setBorder (BorderFactory.createEmptyBorder());
         b.putClientProperty("hideActionText", Boolean.TRUE); //NOI18N
     }
-    
+
+    @Override
     public void uninstallUI(JComponent c) {
         c.removeMouseListener (listener);
     }
@@ -59,6 +61,7 @@ class GtkToolBarButtonUI extends ButtonUI implements ChangeListener {
     }
     
     private final Rectangle scratch = new Rectangle();
+    @Override
     public void paint (Graphics g, JComponent c) {
         Rectangle r = c.getBounds(scratch);
         AbstractButton b = (AbstractButton) c;
@@ -146,6 +149,7 @@ class GtkToolBarButtonUI extends ButtonUI implements ChangeListener {
     }
     
     private static final int minButtonSize = 32;
+    @Override
     public Dimension getPreferredSize(JComponent c) {
         if (c instanceof AbstractButton) {
             Icon ic = getIconForState((AbstractButton) c);
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkToolbarUI.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkToolbarUI.java
index 2d21c24a09..3575863e87 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkToolbarUI.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkToolbarUI.java
@@ -47,7 +47,8 @@ public class GtkToolbarUI extends BasicToolBarUI implements ContainerListener {
     public static ComponentUI createUI(JComponent c) {
         return new GtkToolbarUI();
     }
-    
+
+    @Override
     public void installUI( JComponent c ) {
         super.installUI(c);
         //c.setBorder(b);
@@ -55,13 +56,15 @@ public class GtkToolbarUI extends BasicToolBarUI implements ContainerListener {
         c.addContainerListener(this);
         installButtonUIs (c);
     }
-    
+
+    @Override
     public void uninstallUI (JComponent c) {
         super.uninstallUI (c);
         c.setBorder (null);
         c.removeContainerListener(this);
     }
-    
+
+    @Override
     public void paint(Graphics g, JComponent c) {
         GradientPaint gp = new GradientPaint (0f, 0f, 
             UIManager.getColor("controlHighlight"), //NOI18N
@@ -71,12 +74,14 @@ public class GtkToolbarUI extends BasicToolBarUI implements ContainerListener {
         Insets ins = c.getInsets();
         g.fillRect (ins.left, ins.top, c.getWidth() - (ins.left + ins.top), c.getHeight() - (ins.top + ins.bottom));
     }
-    
-    
+
+
+    @Override
     protected Border createRolloverBorder() {
         return BorderFactory.createEmptyBorder(2,2,2,2);
     }
-    
+
+    @Override
     protected Border createNonRolloverBorder() {
         return createRolloverBorder();
     }
@@ -84,7 +89,8 @@ public class GtkToolbarUI extends BasicToolBarUI implements ContainerListener {
     private Border createNonRolloverToggleBorder() {
         return createRolloverBorder();
     }
-    
+
+    @Override
     protected void setBorderToRollover(Component c) {
         if (c instanceof AbstractButton) {
             ((AbstractButton) c).setBorderPainted(false);
@@ -96,7 +102,8 @@ public class GtkToolbarUI extends BasicToolBarUI implements ContainerListener {
             ((JComponent) c).setOpaque(false);
         }
     }
-    
+
+    @Override
     protected void setBorderToNormal(Component c) {
         if (c instanceof AbstractButton) {
             ((AbstractButton) c).setBorderPainted(false);
@@ -107,7 +114,8 @@ public class GtkToolbarUI extends BasicToolBarUI implements ContainerListener {
             ((JComponent) c).setOpaque(false);
         }
     }
-    
+
+    @Override
     public void setFloating(boolean b, Point p) {
         //nobody wants this
     }
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/EditorToolbarBorder.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/EditorToolbarBorder.java
index 9bb8c05566..00da29b03d 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/EditorToolbarBorder.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/EditorToolbarBorder.java
@@ -35,12 +35,14 @@ import java.awt.*;
 public class EditorToolbarBorder extends AbstractBorder {
     private static final Insets insets = new Insets(0, 0, 1, 0);
 
+    @Override
     public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
         Color borderC = UIManager.getColor("controlDarkShadow");
         g.setColor(borderC);
         g.drawLine(x, y + h - 1, x + w - 1, y + h - 1);
     }
 
+    @Override
     public Insets getBorderInsets(Component c) {
         return insets;
     }    
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/MetalScrollPaneBorder.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/MetalScrollPaneBorder.java
index aeebe6457e..9210df0e75 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/MetalScrollPaneBorder.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/MetalScrollPaneBorder.java
@@ -36,6 +36,7 @@ class MetalScrollPaneBorder extends AbstractBorder {
 
     private static final Insets insets = new Insets(1, 1, 2, 2);
 
+    @Override
     public void paintBorder(Component c, Graphics g, int x, int y,
     int w, int h) {
         g.translate(x, y);
@@ -51,6 +52,7 @@ class MetalScrollPaneBorder extends AbstractBorder {
         g.translate(-x, -y);
     }
 
+    @Override
     public Insets getBorderInsets(Component c) {
         return insets;
     }
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/StatusLineBorder.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/StatusLineBorder.java
index ef536af0ca..2292a36809 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/StatusLineBorder.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/StatusLineBorder.java
@@ -44,6 +44,7 @@ class StatusLineBorder extends AbstractBorder {
         this.type = type;
     }
 
+    @Override
     public void paintBorder(Component c, Graphics g, int x, int y,
     int w, int h) {
         g.translate(x, y);
@@ -80,6 +81,7 @@ class StatusLineBorder extends AbstractBorder {
         g.translate(-x, -y);
     }
 
+    @Override
     public Insets getBorderInsets(Component c) {
         if (insets == null) {
             insets = getBorderInsets(c, new Insets(0, 0, 0, 0));
@@ -87,6 +89,7 @@ class StatusLineBorder extends AbstractBorder {
         return insets;
     }
 
+    @Override
     public Insets getBorderInsets(Component c, Insets insets) {
         insets.left = (type & LEFT) != 0 ? 2 : 0;
         insets.top = (type & TOP) != 0 ? 4 : 0;
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/util/NbTheme.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/util/NbTheme.java
index de332eb882..c585cad31a 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/util/NbTheme.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/util/NbTheme.java
@@ -121,6 +121,7 @@ public class NbTheme extends DefaultMetalTheme implements org.xml.sax.DocumentHa
     private URL themeURL = null;
     
     private UIDefaults defaults;
+    @Override
     public String getName(){ return "NetBeans XML Theme"; } // NOI18N
     /** Create a new instance of NBTheme */
     public NbTheme(URL themeURL, LookAndFeel lf) {
@@ -403,20 +404,34 @@ public class NbTheme extends DefaultMetalTheme implements org.xml.sax.DocumentHa
     private final FontUIResource getFont(String key) {
         return (FontUIResource) defaults.get (key);
     }
-    
+
+    @Override
     public FontUIResource getControlTextFont() { return getFont (CONTROLFONT); }
+    @Override
     public FontUIResource getSystemTextFont() { return getFont (SYSTEMFONT); }
+    @Override
     public FontUIResource getUserTextFont() { return getFont (USERFONT); }
+    @Override
     public FontUIResource getMenuTextFont() { return getFont (MENUFONT); }
+    @Override
     public FontUIResource getWindowTitleFont() { return getFont (WINDOWTITLEFONT); }
+    @Override
     public FontUIResource getSubTextFont() { return getFont (SUBFONT); }
+    @Override
     protected ColorUIResource getPrimary1() { return getColor (PRIMARY1); }
+    @Override
     protected ColorUIResource getPrimary2() { return getColor (PRIMARY2); }
+    @Override
     protected ColorUIResource getPrimary3() { return getColor (PRIMARY3); }
+    @Override
     protected ColorUIResource getSecondary1() { return getColor (SECONDARY1); }
+    @Override
     protected ColorUIResource getSecondary2() { return getColor (SECONDARY2); }
+    @Override
     protected ColorUIResource getSecondary3() { return getColor (SECONDARY3); }
+    @Override
     protected ColorUIResource getWhite() { return getColor (WHITE); }
+    @Override
     protected ColorUIResource getBlack() { return getColor (BLACK); }
     
 }
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/util/UIBootstrapValue.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/util/UIBootstrapValue.java
index 098dedb71a..66b78ce767 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/util/UIBootstrapValue.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/util/UIBootstrapValue.java
@@ -127,6 +127,7 @@ public class UIBootstrapValue implements UIDefaults.LazyValue {
             super (uiClassName, null);
         }
 
+        @Override
         public Object[] getKeysAndValues() {
             if (defaults == null) {
                 defaults = createKeysAndValues();
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winclassic/EditorToolbarBorder.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winclassic/EditorToolbarBorder.java
index ebcbc7336e..26988e52ed 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winclassic/EditorToolbarBorder.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winclassic/EditorToolbarBorder.java
@@ -35,6 +35,7 @@ import java.awt.*;
 class EditorToolbarBorder extends AbstractBorder {
     private static final Insets insets = new Insets(1, 0, 2, 0);
 
+    @Override
     public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
         g.setColor(UIManager.getColor("InternalFrame.borderShadow")); //NOI18N
         g.drawLine(x, y + h - 2, x + w - 1, y + h - 2);
@@ -42,6 +43,7 @@ class EditorToolbarBorder extends AbstractBorder {
         g.drawLine(x, y + h - 1, x + w - 1, y + h - 1);
     }
 
+    @Override
     public Insets getBorderInsets(Component c) {
         return insets;
     }
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winclassic/StatusLineBorder.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winclassic/StatusLineBorder.java
index 018c481b58..c1bca730a5 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winclassic/StatusLineBorder.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winclassic/StatusLineBorder.java
@@ -44,6 +44,7 @@ class StatusLineBorder extends AbstractBorder {
         this.type = type;
     }
 
+    @Override
     public void paintBorder(Component c, Graphics g, int x, int y,
     int w, int h) {
         g.translate(x, y);
@@ -80,6 +81,7 @@ class StatusLineBorder extends AbstractBorder {
         g.translate(-x, -y);
     }
 
+    @Override
     public Insets getBorderInsets(Component c) {
         if (insets == null) {
             insets = new Insets((type & TOP) != 0 ? 4 : 0,
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/windows8/StatusLineBorder.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/windows8/StatusLineBorder.java
index a69e7c210c..9e59ce9805 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/windows8/StatusLineBorder.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/windows8/StatusLineBorder.java
@@ -47,6 +47,7 @@ class StatusLineBorder extends AbstractBorder {
         this.type = type;
     }
 
+    @Override
     public void paintBorder(Component c, Graphics g, int x, int y,
     int w, int h) {
         g.translate(x, y);
@@ -68,6 +69,7 @@ class StatusLineBorder extends AbstractBorder {
         g.translate(-x, -y);
     }
 
+    @Override
     public Insets getBorderInsets(Component c) {
         if (insets == null) {
             insets = new Insets((type & TOP) != 0 ? 1 : 0,
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winvista/EditorToolbarBorder.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winvista/EditorToolbarBorder.java
index 009436d198..838434de73 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winvista/EditorToolbarBorder.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winvista/EditorToolbarBorder.java
@@ -31,12 +31,14 @@ import java.awt.*;
 class EditorToolbarBorder extends AbstractBorder {
     private static final Insets insets = new Insets(1, 0, 1, 0);
 
+    @Override
     public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
         Color borderC = UIManager.getColor (LFCustoms.SCROLLPANE_BORDER_COLOR);
         g.setColor(borderC);
         g.drawLine(x, y + h - 1, x + w - 1, y + h - 1);
     }
 
+    @Override
     public Insets getBorderInsets(Component c) {
         return insets;
     }  
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winvista/StatusLineBorder.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winvista/StatusLineBorder.java
index 44848d8f83..30ac83e929 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winvista/StatusLineBorder.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winvista/StatusLineBorder.java
@@ -46,6 +46,7 @@ class StatusLineBorder extends AbstractBorder {
         this.type = type;
     }
 
+    @Override
     public void paintBorder(Component c, Graphics g, int x, int y,
     int w, int h) {
         g.translate(x, y);
@@ -67,6 +68,7 @@ class StatusLineBorder extends AbstractBorder {
         g.translate(-x, -y);
     }
 
+    @Override
     public Insets getBorderInsets(Component c) {
         if (insets == null) {
             insets = new Insets((type & TOP) != 0 ? 1 : 0,
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winxp/EditorToolbarBorder.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winxp/EditorToolbarBorder.java
index 40371223d4..80b0162181 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winxp/EditorToolbarBorder.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winxp/EditorToolbarBorder.java
@@ -37,12 +37,14 @@ import java.awt.*;
 class EditorToolbarBorder extends AbstractBorder {
     private static final Insets insets = new Insets(1, 0, 1, 0);
 
+    @Override
     public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
         Color borderC = UIManager.getColor (LFCustoms.SCROLLPANE_BORDER_COLOR);
         g.setColor(borderC);
         g.drawLine(x, y + h - 1, x + w - 1, y + h - 1);
     }
 
+    @Override
     public Insets getBorderInsets(Component c) {
         return insets;
     }  
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winxp/StatusLineBorder.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winxp/StatusLineBorder.java
index cce88cabeb..28739132fd 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winxp/StatusLineBorder.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winxp/StatusLineBorder.java
@@ -46,6 +46,7 @@ class StatusLineBorder extends AbstractBorder {
         this.type = type;
     }
 
+    @Override
     public void paintBorder(Component c, Graphics g, int x, int y,
     int w, int h) {
         g.translate(x, y);
@@ -67,6 +68,7 @@ class StatusLineBorder extends AbstractBorder {
         g.translate(-x, -y);
     }
 
+    @Override
     public Insets getBorderInsets(Component c) {
         if (insets == null) {
             insets = new Insets((type & TOP) != 0 ? 1 : 0,
diff --git a/platform/o.n.swing.tabcontrol/demosrc/org/netbeans/swing/tabcontrol/demo/TestFrame.java b/platform/o.n.swing.tabcontrol/demosrc/org/netbeans/swing/tabcontrol/demo/TestFrame.java
index 926bf46397..7f1ab51e27 100644
--- a/platform/o.n.swing.tabcontrol/demosrc/org/netbeans/swing/tabcontrol/demo/TestFrame.java
+++ b/platform/o.n.swing.tabcontrol/demosrc/org/netbeans/swing/tabcontrol/demo/TestFrame.java
@@ -351,6 +351,7 @@ public class TestFrame extends javax.swing.JFrame {
     private void initComponents() {//GEN-BEGIN:initComponents
 
         addWindowListener(new java.awt.event.WindowAdapter() {
+            @Override
             public void windowClosing(java.awt.event.WindowEvent evt) {
                 exitForm(evt);
             }
@@ -420,12 +421,14 @@ public class TestFrame extends javax.swing.JFrame {
             this.r = r;
         }
 
+        @Override
         public synchronized void addInvalidComponent(
                 JComponent invalidComponent) {
             System.err.println("AddInvalidComponent " + invalidComponent);
             super.addInvalidComponent(invalidComponent);
         }
 
+        @Override
         public synchronized void addDirtyRegion(JComponent c, int x, int y,
                                                 int w, int h) {
             System.err.println("addDirtyRegion " + x + "," + y + "," + w + ","
@@ -435,11 +438,13 @@ public class TestFrame extends javax.swing.JFrame {
 //            Thread.dumpStack();
         }
 
+        @Override
         public void markCompletelyDirty(JComponent aComponent) {
             System.err.println("MarkCompletelyDirty " + aComponent);
             super.markCompletelyDirty(aComponent);
         }
 
+        @Override
         public void markCompletelyClean(JComponent aComponent) {
             super.markCompletelyClean(aComponent);
         }
diff --git a/platform/o.n.swing.tabcontrol/demosrc/org/netbeans/swing/tabcontrol/plaf/ChicletDemo.java b/platform/o.n.swing.tabcontrol/demosrc/org/netbeans/swing/tabcontrol/plaf/ChicletDemo.java
index 4f337b67aa..b1bc22ad3b 100644
--- a/platform/o.n.swing.tabcontrol/demosrc/org/netbeans/swing/tabcontrol/plaf/ChicletDemo.java
+++ b/platform/o.n.swing.tabcontrol/demosrc/org/netbeans/swing/tabcontrol/plaf/ChicletDemo.java
@@ -38,6 +38,7 @@ public class ChicletDemo {
         }
 
 
+        @Override
         public void paint(Graphics g) {
             super.paint(g);
             ColorUtil.setupAntialiasing(g);
diff --git a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/popupswitcher/SwitcherTableModel.java b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/popupswitcher/SwitcherTableModel.java
index 7b2eabce36..a735f244d8 100644
--- a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/popupswitcher/SwitcherTableModel.java
+++ b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/popupswitcher/SwitcherTableModel.java
@@ -95,15 +95,18 @@ class SwitcherTableModel extends AbstractTableModel {
             fireTableChanged(event);
         }
     }
-    
+
+    @Override
     public Class getColumnClass(int columnIndex) {
         return SwitcherTableItem.class;
     }
-    
+
+    @Override
     public String getColumnName(int columnIndex) {
         return "";
     }
-    
+
+    @Override
     public boolean isCellEditable(int rowIndex, int columnIndex) {
         return true;
     }
diff --git a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/TabbedContainer.java b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/TabbedContainer.java
index 63c3a55db1..5323fa7369 100644
--- a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/TabbedContainer.java
+++ b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/TabbedContainer.java
@@ -516,6 +516,7 @@ public class TabbedContainer extends JComponent implements Accessible {
         return true;
     }
 
+    @Override
     public boolean isPaintingOrigin() {
         return true;
     }
diff --git a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/TabbedContainerUI.java b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/TabbedContainerUI.java
index 7c8dc2dfcc..5b1c49f132 100644
--- a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/TabbedContainerUI.java
+++ b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/TabbedContainerUI.java
@@ -58,6 +58,7 @@ public abstract class TabbedContainerUI extends ComponentUI {
         this.container = container;
     }
 
+    @Override
     public void installUI(JComponent c) {
         assert c == container;
     }
diff --git a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/event/ComplexListDataEvent.java b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/event/ComplexListDataEvent.java
index aa2b03b087..1f8ce49485 100644
--- a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/event/ComplexListDataEvent.java
+++ b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/event/ComplexListDataEvent.java
@@ -141,6 +141,7 @@ public class ComplexListDataEvent extends ListDataEvent {
         return componentChanged;
     }
 
+    @Override
     public String toString() {
         String[] types = new String[]{
             "CONTENTS_CHANGED", "INTERVAL_ADDED", //NOI18N
diff --git a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/DefaultTabbedContainerUI.java b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/DefaultTabbedContainerUI.java
index eeb7d13430..3cfae3cc35 100644
--- a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/DefaultTabbedContainerUI.java
+++ b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/DefaultTabbedContainerUI.java
@@ -940,13 +940,15 @@ public class DefaultTabbedContainerUI extends TabbedContainerUI {
     protected class ContainerComponentListener extends ComponentAdapter {
         public ContainerComponentListener() {
         }
-        
+
+        @Override
         public void componentMoved (ComponentEvent e) {
             if (container.getType() == TabbedContainer.TYPE_SLIDING) {
                 updateOrientation();
             }
         }
-        
+
+        @Override
         public void componentResized (ComponentEvent e) {
             if (container.getType() == TabbedContainer.TYPE_SLIDING) {
                 updateOrientation();
@@ -1542,7 +1544,8 @@ public class DefaultTabbedContainerUI extends TabbedContainerUI {
                 changed = false;
                 return rect;
             }
-            
+
+            @Override
             public void paint(Graphics g) {
                 try {
                     if (USE_SWINGPAINTING) {
@@ -1679,7 +1682,8 @@ public class DefaultTabbedContainerUI extends TabbedContainerUI {
                 }
                 doLayout();
             }
-            
+
+            @Override
             public void doLayout() {
                 Rectangle r = getImageBounds();
                 comp.setBounds (r.x, r.y, r.width, r.height);
diff --git a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/ToolbarTabDisplayerUI.java b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/ToolbarTabDisplayerUI.java
index 5ea2a1b337..6328f1b15d 100644
--- a/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/ToolbarTabDisplayerUI.java
+++ b/platform/o.n.swing.tabcontrol/src/org/netbeans/swing/tabcontrol/plaf/ToolbarTabDisplayerUI.java
@@ -247,12 +247,14 @@ public class ToolbarTabDisplayerUI extends AbstractTabDisplayerUI {
 
         }
 
+        @Override
         public void addNotify() {
             super.addNotify();
             ToolTipManager.sharedInstance().registerComponent(this);
             bg.add(this);
         }
 
+        @Override
         public void removeNotify() {
             super.removeNotify();
             ToolTipManager.sharedInstance().unregisterComponent(this);
@@ -263,7 +265,8 @@ public class ToolbarTabDisplayerUI extends AbstractTabDisplayerUI {
         public boolean isActive() {
             return displayer.isActive();
         }
-        
+
+        @Override
         public String getText() {
              //so the font height is included in super.getPreferredSize();
             return " ";
@@ -283,7 +286,8 @@ public class ToolbarTabDisplayerUI extends AbstractTabDisplayerUI {
             }
             return lastKnownText;
         }
-        
+
+        @Override
         public Dimension getPreferredSize() {
             Dimension result = super.getPreferredSize();
             String s = doGetText();
@@ -298,6 +302,7 @@ public class ToolbarTabDisplayerUI extends AbstractTabDisplayerUI {
             return result;
         }
 
+        @Override
         public void paintComponent (Graphics g) {
             super.paintComponent(g);
             
@@ -325,7 +330,8 @@ public class ToolbarTabDisplayerUI extends AbstractTabDisplayerUI {
             HtmlRenderer.renderString(s, g, x, y, w, h, getFont(), getForeground(), 
                 HtmlRenderer.STYLE_TRUNCATE, true);
         }
-        
+
+        @Override
         public String getToolTipText() {
             return displayer.getModel().getTab(getIndex()).getTooltip();
         }
@@ -342,7 +348,8 @@ public class ToolbarTabDisplayerUI extends AbstractTabDisplayerUI {
             }
             return -1;
         }
-        
+
+        @Override
         public Icon getIcon() {
             return null;
         }
@@ -515,6 +522,7 @@ public class ToolbarTabDisplayerUI extends AbstractTabDisplayerUI {
     }    
     
     static class TabToolbar extends JToolBar {
+        @Override
         public void paintComponent(Graphics g) {
             super.paintComponent(g);
 
diff --git a/platform/o.n.swing.tabcontrol/test/unit/src/org/netbeans/swing/tabcontrol/ButtonPopupSwitcherTestHid.java b/platform/o.n.swing.tabcontrol/test/unit/src/org/netbeans/swing/tabcontrol/ButtonPopupSwitcherTestHid.java
index bddedb65ab..05891597fe 100644
--- a/platform/o.n.swing.tabcontrol/test/unit/src/org/netbeans/swing/tabcontrol/ButtonPopupSwitcherTestHid.java
+++ b/platform/o.n.swing.tabcontrol/test/unit/src/org/netbeans/swing/tabcontrol/ButtonPopupSwitcherTestHid.java
@@ -87,6 +87,7 @@ public class ButtonPopupSwitcherTestHid extends TestCase {
         frame.getContentPane().setLayout(new FlowLayout());
         JButton pBut = new JButton("Popup");
         pBut.addMouseListener(new MouseAdapter() {
+            @Override
             public void mousePressed(MouseEvent e) {
                 pButAction(e);
             }
diff --git a/platform/openide.actions/test/unit/src/org/openide/actions/AbstractCallbackActionTestHidden.java b/platform/openide.actions/test/unit/src/org/openide/actions/AbstractCallbackActionTestHidden.java
index a9e53c9563..8a3f83ec9e 100644
--- a/platform/openide.actions/test/unit/src/org/openide/actions/AbstractCallbackActionTestHidden.java
+++ b/platform/openide.actions/test/unit/src/org/openide/actions/AbstractCallbackActionTestHidden.java
@@ -128,12 +128,14 @@ public abstract class AbstractCallbackActionTestHidden extends NbTestCase {
                 fail (msg + " listeners expected: " + count + " but are " + this.listeners);
             }
         }
-        
+
+        @Override
         public void addPropertyChangeListener(PropertyChangeListener listener) {
             super.addPropertyChangeListener (listener);
             listeners.add (listener);
-        }        
-        
+        }
+
+        @Override
         public synchronized void removePropertyChangeListener(PropertyChangeListener listener) {
             super.removePropertyChangeListener (listener);
             listeners.remove (listener);
diff --git a/platform/openide.awt/src/org/openide/awt/EqualFlowLayout.java b/platform/openide.awt/src/org/openide/awt/EqualFlowLayout.java
index aac15184fc..9536eb570d 100644
--- a/platform/openide.awt/src/org/openide/awt/EqualFlowLayout.java
+++ b/platform/openide.awt/src/org/openide/awt/EqualFlowLayout.java
@@ -104,6 +104,7 @@ public class EqualFlowLayout extends FlowLayout {
     * @see       java.awt.Container#getPreferredSize
     * @since     JDK1.0
     */
+    @Override
     public Dimension preferredLayoutSize(Container target) {
         int maxWidth = getMaximumWidth(target);
 
@@ -145,6 +146,7 @@ public class EqualFlowLayout extends FlowLayout {
     * @see       java.awt.Container#doLayout
     * @since     JDK1.0
     */
+    @Override
     public Dimension minimumLayoutSize(Container target) {
         synchronized (target.getTreeLock()) {
             Dimension dim = new Dimension(0, 0);
@@ -221,6 +223,7 @@ public class EqualFlowLayout extends FlowLayout {
     * @see       java.awt.Container#doLayout
     * @since     JDK1.0
     */
+    @Override
     public void layoutContainer(Container target) {
         int maxWidth = getMaximumWidth(target);
 
diff --git a/platform/openide.awt/src/org/openide/awt/JInlineMenu.java b/platform/openide.awt/src/org/openide/awt/JInlineMenu.java
index d9928b7d0b..eb3016d6bc 100644
--- a/platform/openide.awt/src/org/openide/awt/JInlineMenu.java
+++ b/platform/openide.awt/src/org/openide/awt/JInlineMenu.java
@@ -76,6 +76,7 @@ public class JInlineMenu extends JMenuItem implements DynamicMenuContent {
 
     /** Overriden to eliminate big gap at top of JInline popup painting.
      * @return cleared instets (0, 0, 0, 0) */
+    @Override
     public Insets getInsets() {
         return new Insets(0, 0, 0, 0);
     }
diff --git a/platform/openide.awt/src/org/openide/awt/ListPane.java b/platform/openide.awt/src/org/openide/awt/ListPane.java
index 080ec34635..a091566eed 100644
--- a/platform/openide.awt/src/org/openide/awt/ListPane.java
+++ b/platform/openide.awt/src/org/openide/awt/ListPane.java
@@ -124,6 +124,7 @@ public class ListPane extends JList {
      * JList components are always opaque.
      * @return true
      */
+    @Override
     public boolean isOpaque() {
         return true;
     }
@@ -162,6 +163,7 @@ public class ListPane extends JList {
      * @see JComponent#scrollRectToVisible
      * @see #getVisibleRect
      */
+    @Override
     public void ensureIndexIsVisible(int index) {
         Point first = indexToLocation(index);
 
@@ -179,6 +181,7 @@ public class ListPane extends JList {
      * @param location The JList relative coordinates of the cell
      * @return The index of the cell at location, or -1.
      */
+    @Override
     public int locationToIndex(Point location) {
         int x = location.x / fixedCellWidth;
 
@@ -204,6 +207,7 @@ public class ListPane extends JList {
      * @param index The index of the JList cell.
      * @return The origin of the index'th cell.
      */
+    @Override
     public Point indexToLocation(int index) {
         if (index >= getModel().getSize()) {
             return null;
@@ -223,6 +227,7 @@ public class ListPane extends JList {
      * @param index2 end index of the JList cell.
      * @return The bounds of the index'th cell.
      */
+    @Override
     public Rectangle getCellBounds(int index1, int index2) {
         /*
         int minIndex = Math.min(index1, index2);
@@ -269,6 +274,7 @@ public class ListPane extends JList {
      *
      * @see #getPreferredScrollableViewportSize
      */
+    @Override
     public Dimension getPreferredScrollableViewportSize() {
         Insets insets = getInsets();
         int w = insets.left + insets.right + (visibleColumnCount * fixedCellWidth);
@@ -290,6 +296,7 @@ public class ListPane extends JList {
      * @return The distance to scroll to expose the next or previous row.
      * @see Scrollable#getScrollableUnitIncrement
      */
+    @Override
     public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) {
         if (orientation == SwingConstants.HORIZONTAL) {
             return 1;
@@ -338,6 +345,7 @@ public class ListPane extends JList {
      * @return The visibleRect.height or visibleRect.width per the orientation.
      * @see Scrollable#getScrollableUnitIncrement
      */
+    @Override
     public int getScrollableBlockIncrement(Rectangle visibleRect, int orientation, int direction) {
         return (orientation == SwingConstants.VERTICAL) ? visibleRect.height : visibleRect.width;
     }
@@ -350,6 +358,7 @@ public class ListPane extends JList {
      * @return False - don't track the viewports width.
      * @see Scrollable#getScrollableTracksViewportWidth
      */
+    @Override
     public boolean getScrollableTracksViewportWidth() {
         return true;
     }
@@ -362,6 +371,7 @@ public class ListPane extends JList {
      * @return False - don't track the viewports width.
      * @see Scrollable#getScrollableTracksViewportWidth
      */
+    @Override
     public boolean getScrollableTracksViewportHeight() {
         return false;
     }
@@ -408,6 +418,7 @@ public class ListPane extends JList {
      *
      * @see #paintBackground
      */
+    @Override
     protected void paintComponent(Graphics g) {
         updateLayoutState();
 
@@ -484,6 +495,7 @@ public class ListPane extends JList {
      *
      * @return The total size of the
      */
+    @Override
     public Dimension getPreferredSize() {
         Insets insets = getInsets();
 
@@ -514,6 +526,7 @@ public class ListPane extends JList {
     /**
      * @return the size of one cell
      */
+    @Override
     public Dimension getMinimumSize() {
         return new Dimension(fixedCellWidth, fixedCellHeight);
     }
@@ -595,14 +608,17 @@ public class ListPane extends JList {
         super.removeSelectionInterval(index0, index1);
     }
 
+    @Override
     public void setSelectionInterval(int anchor, int lead) {
         //        super.setSelectionInterval(anchor, lead);
     }
 
+    @Override
     public void addSelectionInterval(int anchor, int lead) {
         //        super.addSelectionInterval(anchor, lead);
     }
 
+    @Override
     public void removeSelectionInterval(int index0, int index1) {
         //        super.removeSelectionInterval(index0, index1);
     }
@@ -627,6 +643,7 @@ public class ListPane extends JList {
         }
 
         // ==== Mouse methods =====
+        @Override
         public void mousePressed(MouseEvent e) {
             updateSelection(locationToIndex(e.getPoint()), e);
 
diff --git a/platform/openide.awt/src/org/openide/awt/MouseUtils.java b/platform/openide.awt/src/org/openide/awt/MouseUtils.java
index 1e6fd92bc6..09b6bae519 100644
--- a/platform/openide.awt/src/org/openide/awt/MouseUtils.java
+++ b/platform/openide.awt/src/org/openide/awt/MouseUtils.java
@@ -155,10 +155,12 @@ public class MouseUtils extends Object {
             super();
         }
 
+        @Override
         public void mousePressed(MouseEvent e) {
             maybePopup(e);
         }
 
+        @Override
         public void mouseReleased(MouseEvent e) {
             maybePopup(e);
         }
diff --git a/platform/openide.awt/src/org/openide/awt/SplittedPanel.java b/platform/openide.awt/src/org/openide/awt/SplittedPanel.java
index 58608a3297..2291ba4f91 100644
--- a/platform/openide.awt/src/org/openide/awt/SplittedPanel.java
+++ b/platform/openide.awt/src/org/openide/awt/SplittedPanel.java
@@ -234,6 +234,7 @@ public class SplittedPanel extends JComponent implements Accessible {
     }
 
     /** Updates splitting, too. */
+    @Override
     public void updateUI() {
         super.updateUI();
         updateSplitting();
@@ -884,13 +885,16 @@ public class SplittedPanel extends JComponent implements Accessible {
             getAccessibleContext().setAccessibleName(bundle.getString("ACSD_SplittedPanel_EmptySplitter"));
         }
 
+        @Override
         public Dimension getPreferredSize() {
             return new Dimension(width, width);
         }
 
+        @Override
         public AccessibleContext getAccessibleContext() {
             if (accessibleContext == null) {
                 accessibleContext = new AccessibleJComponent() {
+                            @Override
                             public AccessibleRole getAccessibleRole() {
                                 return AccessibleRole.SPLIT_PANE;
                             }
@@ -920,10 +924,12 @@ public class SplittedPanel extends JComponent implements Accessible {
             }
         }
 
+        @Override
         public Dimension getPreferredSize() {
             return new Dimension(splitterSize, splitterSize);
         }
 
+        @Override
         public void paint(Graphics g) {
             super.paint(g);
 
@@ -1034,6 +1040,7 @@ public class SplittedPanel extends JComponent implements Accessible {
             }
         }
 
+        @Override
         public AccessibleContext getAccessibleContext() {
             return SplittedPanel.this.getAccessibleContext();
         }
diff --git a/platform/openide.compat/src/org/openide/explorer/ExplorerActions.java b/platform/openide.compat/src/org/openide/explorer/ExplorerActions.java
index 7ed71d1973..a50a023ff1 100644
--- a/platform/openide.compat/src/org/openide/explorer/ExplorerActions.java
+++ b/platform/openide.compat/src/org/openide/explorer/ExplorerActions.java
@@ -553,6 +553,7 @@ public class ExplorerActions {
         OwnPaste() {
         }
 
+        @Override
         public boolean isEnabled() {
             updateActionsState();
 
@@ -578,6 +579,7 @@ public class ExplorerActions {
             }
         }
 
+        @Override
         public Object getValue(String s) {
             updateActionsState();
 
@@ -600,6 +602,7 @@ public class ExplorerActions {
             copyCut = b;
         }
 
+        @Override
         public boolean isEnabled() {
             updateActionsState();
 
@@ -654,6 +657,7 @@ public class ExplorerActions {
         DeleteActionPerformer() {
         }
 
+        @Override
         public boolean isEnabled() {
             updateActionsState();
 
@@ -831,16 +835,19 @@ public class ExplorerActions {
             super(delay, l);
         }
 
+        @Override
         public void restart() {
             super.restart();
             running = true;
         }
 
+        @Override
         public void stop() {
             running = false;
             super.stop();
         }
 
+        @Override
         public boolean isRunning() {
             return running;
         }
diff --git a/platform/openide.compat/src/org/openide/util/WeakListener.java b/platform/openide.compat/src/org/openide/util/WeakListener.java
index ac5f3f3a3d..0769144f22 100644
--- a/platform/openide.compat/src/org/openide/util/WeakListener.java
+++ b/platform/openide.compat/src/org/openide/util/WeakListener.java
@@ -776,6 +776,7 @@ public abstract class WeakListener implements java.util.EventListener {
         * @return name of method of the source object that should be used
         *   to remove the listener from listening on source of events
         */
+        @Override
         protected String removeMethodName() {
             return "removeNodeListener"; // NOI18N
         }
@@ -901,6 +902,7 @@ public abstract class WeakListener implements java.util.EventListener {
 
         /** To string prints class.
         */
+        @Override
         public String toString() {
             return super.toString() + "[" + listenerClass + "]"; // NOI18N
         }
@@ -911,6 +913,7 @@ public abstract class WeakListener implements java.util.EventListener {
             return (proxy == obj) || (this == obj);
         }
 
+        @Override
         Object getImplementator() {
             return proxy;
         }
diff --git a/platform/openide.compat/test/unit/src/org/openide/explorer/propertysheet/ComboTest.java b/platform/openide.compat/test/unit/src/org/openide/explorer/propertysheet/ComboTest.java
index 0092050653..8ed25187a8 100644
--- a/platform/openide.compat/test/unit/src/org/openide/explorer/propertysheet/ComboTest.java
+++ b/platform/openide.compat/test/unit/src/org/openide/explorer/propertysheet/ComboTest.java
@@ -160,7 +160,8 @@ public class ComboTest extends NbTestCase {
                 }
             }
         }
-        
+
+        @Override
         public void windowOpened(WindowEvent e) {
             shown = true;
             synchronized(this) {
@@ -213,6 +214,7 @@ public class ComboTest extends NbTestCase {
         //uncomment the code below for diagnosing painting problems
         //and seeing which pixel you'return really checking
         JFrame jf = new JFrame("assertPixelFromImage " + count + " (look for the yellow line)") {
+            @Override
             public void paint (Graphics g) {
                 new ImageIcon (bi).paintIcon(this, g, 25, 25);
                 g.setColor (Color.YELLOW);
@@ -269,6 +271,7 @@ public class ComboTest extends NbTestCase {
         //uncomment the code below for diagnosing painting problems
         //and seeing which pixel you'return really checking
         JFrame jf = new JFrame("Assert pixel test " + count + " (look for the yellow line)") {
+            @Override
             public void paint (Graphics g) {
                 new ImageIcon (bi).paintIcon(this, g, 25, 25);
                 g.setColor (Color.YELLOW);
@@ -420,15 +423,18 @@ public class ComboTest extends NbTestCase {
         }
         
         // Set that this Editor doesn't support custom Editor
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
-        
+
+        @Override
         public String getAsText() {
             return getValue() == null ? "null" : getValue().toString();
         }
@@ -440,7 +446,8 @@ public class ComboTest extends NbTestCase {
         
         public TagsEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             return new String[] {"a","b","c","d","Value"};
         }
@@ -450,11 +457,13 @@ public class ComboTest extends NbTestCase {
             
             env.getFeatureDescriptor().setValue("canEditAsText", Boolean.TRUE);
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
@@ -591,7 +600,8 @@ public class ComboTest extends NbTestCase {
         
         public BadEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             //return new String[] {"a","b","c","d","Value"};
             return null;
@@ -601,11 +611,13 @@ public class ComboTest extends NbTestCase {
             this.env = env;
             env.setState(env.STATE_INVALID);
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
diff --git a/platform/openide.compat/test/unit/src/org/openide/explorer/propertysheet/CustomEditorDisplayerTest.java b/platform/openide.compat/test/unit/src/org/openide/explorer/propertysheet/CustomEditorDisplayerTest.java
index 6d3305ea62..0ed1419486 100644
--- a/platform/openide.compat/test/unit/src/org/openide/explorer/propertysheet/CustomEditorDisplayerTest.java
+++ b/platform/openide.compat/test/unit/src/org/openide/explorer/propertysheet/CustomEditorDisplayerTest.java
@@ -393,7 +393,8 @@ public class CustomEditorDisplayerTest extends NbTestCase {
                 }
             }
         }
-        
+
+        @Override
         public void windowOpened(WindowEvent e) {
             shown = true;
             synchronized(this) {
@@ -678,21 +679,25 @@ public class CustomEditorDisplayerTest extends NbTestCase {
         }
         
         // Set that this Editor doesn't support custom Editor
+        @Override
         public boolean supportsCustomEditor() {
             return true;
         }
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             System.err.println(" BasicEditor.setValue: " + newValue);
             super.setValue(newValue);
         }
-        
+
+        @Override
         public String getAsText() {
             return getValue() == null ? "null" : getValue().toString();
         }
 
         private Component custom;
+        @Override
         public Component getCustomEditor() {
             if (custom == null) {
                 custom = new BasicCustomEditor(this);
@@ -722,7 +727,8 @@ public class CustomEditorDisplayerTest extends NbTestCase {
                 throw pve;
             }
         }
-        
+
+        @Override
         public void setAsText(String s) {
             System.err.println(" BasicEditor.setAsText: " + s);
             if ("invalidValue".equals(s)) {
diff --git a/platform/openide.compat/test/unit/src/org/openide/explorer/propertysheet/NewPropertyPanelTest.java b/platform/openide.compat/test/unit/src/org/openide/explorer/propertysheet/NewPropertyPanelTest.java
index 23d11e89c9..bcc513ac0b 100644
--- a/platform/openide.compat/test/unit/src/org/openide/explorer/propertysheet/NewPropertyPanelTest.java
+++ b/platform/openide.compat/test/unit/src/org/openide/explorer/propertysheet/NewPropertyPanelTest.java
@@ -681,7 +681,8 @@ public class NewPropertyPanelTest extends NbTestCase {
                 }
             }
         }
-        
+
+        @Override
         public void windowOpened(WindowEvent e) {
             shown = true;
             synchronized(this) {
@@ -993,7 +994,8 @@ public class NewPropertyPanelTest extends NbTestCase {
         
         public TagsEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             return new String[] {"a","b","c","d","Value"};
         }
@@ -1006,15 +1008,18 @@ public class NewPropertyPanelTest extends NbTestCase {
                 env.setState(env.STATE_VALID);
             }
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return true;
         }
-        
+
+        @Override
         public Component getCustomEditor() {
             return new JColorChooser();
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
             if (env != null) {
@@ -1052,21 +1057,25 @@ public class NewPropertyPanelTest extends NbTestCase {
         }
         
         // Set that this Editor doesn't support custom Editor
+        @Override
         public boolean supportsCustomEditor() {
             return true;
         }
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             System.err.println(" BasicEditor.setValue: " + newValue);
             super.setValue(newValue);
         }
-        
+
+        @Override
         public String getAsText() {
             return getValue() == null ? "null" : getValue().toString();
         }
 
         private Component custom;
+        @Override
         public Component getCustomEditor() {
             if (custom == null) {
                 custom = new BasicCustomEditor(this);
@@ -1096,7 +1105,8 @@ public class NewPropertyPanelTest extends NbTestCase {
                 throw pve;
             }
         }
-        
+
+        @Override
         public void setAsText(String s) {
             System.err.println(" BasicEditor.setAsText: " + s);
             if ("invalidValue".equals(s)) {
diff --git a/platform/openide.compat/test/unit/src/org/openide/explorer/propertysheet/PropertyPanelTest.java b/platform/openide.compat/test/unit/src/org/openide/explorer/propertysheet/PropertyPanelTest.java
index 99445cbb40..02aaecb1db 100644
--- a/platform/openide.compat/test/unit/src/org/openide/explorer/propertysheet/PropertyPanelTest.java
+++ b/platform/openide.compat/test/unit/src/org/openide/explorer/propertysheet/PropertyPanelTest.java
@@ -508,7 +508,8 @@ public final class PropertyPanelTest extends NbTestCase {
         
         public Ed () {
         }
-        
+
+        @Override
         public void addPropertyChangeListener (PropertyChangeListener pcl) {
             super.addPropertyChangeListener(pcl);
         }
@@ -523,11 +524,13 @@ public final class PropertyPanelTest extends NbTestCase {
         //editor - and the PropertyPanel cannot be initialized into custom
         //editor mode for a property editor that doesn't actually support
         //custom editors
+        @Override
         public boolean supportsCustomEditor() {
             return true;
         }
         
         //To avoid NPE when propertypanel tries to add the custom editor
+        @Override
         public Component getCustomEditor() {
             JPanel result = new JPanel();
             result.setBackground(java.awt.Color.ORANGE);
diff --git a/platform/openide.dialogs/src/org/openide/DialogDisplayer.java b/platform/openide.dialogs/src/org/openide/DialogDisplayer.java
index bcc938b119..73eb8eeee3 100644
--- a/platform/openide.dialogs/src/org/openide/DialogDisplayer.java
+++ b/platform/openide.dialogs/src/org/openide/DialogDisplayer.java
@@ -361,6 +361,7 @@ public abstract class DialogDisplayer {
                 getRootPane().getActionMap().put(actionKey, cancelAction);
                 addWindowListener(
                     new WindowAdapter() {
+                        @Override
                         public void windowClosing(WindowEvent ev) {
                             if (!haveFinalValue) {
                                 StandardDialog.this.nd.setValue(NotifyDescriptor.CLOSED_OPTION);
diff --git a/platform/openide.dialogs/src/org/openide/NotifyDescriptor.java b/platform/openide.dialogs/src/org/openide/NotifyDescriptor.java
index 104b68398b..3cb28029ec 100644
--- a/platform/openide.dialogs/src/org/openide/NotifyDescriptor.java
+++ b/platform/openide.dialogs/src/org/openide/NotifyDescriptor.java
@@ -1020,7 +1020,8 @@ public class NotifyDescriptor extends Object {
         public PasswordLine(String text, String title) {
             super(text, title);
         }
-        
+
+        @Override
         JTextField createTextField() {
             return new JPasswordField(25);
         }
diff --git a/platform/openide.dialogs/src/org/openide/WizardValidationException.java b/platform/openide.dialogs/src/org/openide/WizardValidationException.java
index 88fb14cd11..7c33f0e20b 100644
--- a/platform/openide.dialogs/src/org/openide/WizardValidationException.java
+++ b/platform/openide.dialogs/src/org/openide/WizardValidationException.java
@@ -61,6 +61,7 @@ public final class WizardValidationException extends Exception {
      *
      * @return description will notifies an user what value must be corrected
      */
+    @Override
     public String getLocalizedMessage() {
         return (localizedMessage != null) ? localizedMessage : this.getMessage();
     }
diff --git a/platform/openide.execution/src/org/openide/execution/NbClassLoader.java b/platform/openide.execution/src/org/openide/execution/NbClassLoader.java
index 72f62c5ec1..ee66a38ddf 100644
--- a/platform/openide.execution/src/org/openide/execution/NbClassLoader.java
+++ b/platform/openide.execution/src/org/openide/execution/NbClassLoader.java
@@ -123,6 +123,7 @@ public class NbClassLoader extends URLClassLoader {
     * @param name resource name
     * @return URL to that resource or <code>null</code>
     */
+    @Override
     public URL getResource (String name) {
         return super.getResource (name.startsWith ("/") ? name.substring (1) : name); // NOI18N
     }
@@ -133,6 +134,7 @@ public class NbClassLoader extends URLClassLoader {
        would simply define packages loaded from such a URL with no
        particular info. We want it to have specification version and
        all that good stuff. */
+    @Override
     protected Class findClass (final String name) throws ClassNotFoundException {
         if (!fast && name.indexOf ('.') != -1) {
             Logger.getLogger(NbClassLoader.class.getName()).log(Level.FINE, "NBFS used!");
@@ -197,6 +199,7 @@ public class NbClassLoader extends URLClassLoader {
     }
 
     /* @return a PermissionCollection for given CodeSource. */
+    @Override
     protected final synchronized PermissionCollection getPermissions(CodeSource cs) {
 
         if (permissionCollections != null) {
diff --git a/platform/openide.execution/test/unit/src/org/openide/execution/NbClassLoaderTest.java b/platform/openide.execution/test/unit/src/org/openide/execution/NbClassLoaderTest.java
index ec36af4fef..989b5763c7 100644
--- a/platform/openide.execution/test/unit/src/org/openide/execution/NbClassLoaderTest.java
+++ b/platform/openide.execution/test/unit/src/org/openide/execution/NbClassLoaderTest.java
@@ -127,6 +127,7 @@ public class NbClassLoaderTest extends NbTestCase {
     }
     
     private static final class MySecurityManager extends SecurityManager {
+        @Override
         public void checkPermission(Permission p) {
             //System.err.println("cP: " + p);
             if (ok()) {/*System.err.println("ok");*/return;}
@@ -138,10 +139,12 @@ public class NbClassLoaderTest extends NbTestCase {
                 throw se;
             }
         }
+        @Override
         public void checkPermission(Permission p, Object c) {
             if (ok()) {/*System.err.println("ok");*/return;}
             super.checkPermission(p, c);
         }
+        @Override
         public void checkRead(String file) {
             // Do not honor file read checks. TopSecurityManager actually leaves
             // this blank for performance, but in fact very little would work if
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/BaseTable.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/BaseTable.java
index ed3d8e4832..60257f50b0 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/BaseTable.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/BaseTable.java
@@ -267,6 +267,7 @@ abstract class BaseTable extends JTable implements FocusListener {
     }
 
     /** Overridden to set the flag for recalculating the fixed row height */
+    @Override
     public void setFont(Font f) {
         needCalcRowHeight = true;
         super.setFont(f);
@@ -356,6 +357,7 @@ abstract class BaseTable extends JTable implements FocusListener {
     }
 
     /** Overridden to not allow edits on the names column (0) */
+    @Override
     public boolean isCellEditable(int row, int col) {
         return col != 0;
     }
@@ -364,6 +366,7 @@ abstract class BaseTable extends JTable implements FocusListener {
      * becomes visible.  This will cause the combo box to close its popup because
      * it has lost focus, unless we intervene here and make sure focus must be
      * passed directly to the editor if present */
+    @Override
     public final void requestFocus() {
         if (isEditing()) {
             if (PropUtils.isLoggable(BaseTable.class)) {
@@ -386,6 +389,7 @@ abstract class BaseTable extends JTable implements FocusListener {
      * becomes visible.  This will cause the combo box to close its popup because
      * it has lost focus, unless we intervene here and make sure focus must be
      * passed directly to the editor if present */
+    @Override
     public final boolean requestFocusInWindow() {
         if (isEditing()) {
             if (PropUtils.isLoggable(BaseTable.class)) {
@@ -416,6 +420,7 @@ abstract class BaseTable extends JTable implements FocusListener {
      * can be started in a single click, to set the selection before editing,
      * so that the editor will be painted with the selection color, and
      * to request focus on the editor component */
+    @Override
     public boolean editCellAt(int row, int col, EventObject e) {
         enterEditRequest();
 
@@ -577,6 +582,7 @@ abstract class BaseTable extends JTable implements FocusListener {
 
     /** Overridden to set the colors apropriately - we always want the editor
      * to appear selected */
+    @Override
     public Component prepareEditor(TableCellEditor editor, int row, int col) {
         Component result = editor.getTableCellEditorComponent(this, getValueAt(row, col), false, row, col);
 
@@ -591,6 +597,7 @@ abstract class BaseTable extends JTable implements FocusListener {
 
     /** Overridden to hide the selection when not focused, and paint across the
      * selected row if focused. */
+    @Override
     public Component prepareRenderer(TableCellRenderer renderer, int row, int col) {
         Object value = getValueAt(row, col);
 
@@ -620,6 +627,7 @@ abstract class BaseTable extends JTable implements FocusListener {
         (hasFocus() || isKnownComponent(focusOwner) || inEditRequest());
     }
 
+    @Override
     public void setUI(TableUI ui) {
         needCalcRowHeight = true;
         inSetUI = true;
@@ -632,12 +640,14 @@ abstract class BaseTable extends JTable implements FocusListener {
      * only repaint the selected *cell*.  Since we don't differentiate selecting
      * only a cell, we need to repaint the entire row that is selected, which
      * we will do from processFocusEvent() */
+    @Override
     public void addFocusListener(FocusListener fl) {
         if (!inSetUI) {
             super.addFocusListener(fl);
         }
     }
 
+    @Override
     public void updateUI() {
         super.updateUI();
 
@@ -650,6 +660,7 @@ abstract class BaseTable extends JTable implements FocusListener {
      *  in the left edge with the appropriate color, and then calls paintExpandableSets()
      *  to paint the property sets, which are not painted by the default painting
      *  methods because they need to be painted across two rows.    */
+    @Override
     public void paint(Graphics g) {
         if (needCalcRowHeight) {
             calcRowHeight(g);
@@ -681,6 +692,7 @@ abstract class BaseTable extends JTable implements FocusListener {
 
     /** Overridden to add the entire row that was being edited to RepaintManager
      * as a dirty region */
+    @Override
     public void removeEditor() {
         enterEditorRemoveRequest();
 
@@ -709,6 +721,7 @@ abstract class BaseTable extends JTable implements FocusListener {
     /** Overridden - JTable's implementation of the method will
      *  actually attach (and leave behind) a gratuitous border
      *  on the enclosing scroll pane. */
+    @Override
     protected final void configureEnclosingScrollPane() {
         Container p = getParent();
 
@@ -746,6 +759,7 @@ abstract class BaseTable extends JTable implements FocusListener {
 
     /** Overridden to not change the selection if the user is currently
      * dragging the center line */
+    @Override
     public void changeSelection(int row, int column, boolean toggle, boolean extend) {
         //DragListener can be null, because changeSelection is called in
         //superclass constructor
@@ -769,6 +783,7 @@ abstract class BaseTable extends JTable implements FocusListener {
     }
 
     /** Overridden to remove the editor on focus lost */
+    @Override
     public void processFocusEvent(FocusEvent fe) {
         super.processFocusEvent(fe);
 
@@ -832,6 +847,7 @@ abstract class BaseTable extends JTable implements FocusListener {
 
     /** Overridden to allow standard keybinding processing of VK_TAB and
      * abort any pending drag operation on the vertical grid. */
+    @Override
     public void processKeyEvent(KeyEvent e) {
         if (dragListener.isArmed()) {
             dragListener.setArmed(false);
@@ -994,6 +1010,7 @@ abstract class BaseTable extends JTable implements FocusListener {
         }
     }
 
+    @Override
     public boolean isOptimizedDrawingEnabled() {
         if ((searchField != null) && searchField.isShowing()) {
             return false;
@@ -1002,6 +1019,7 @@ abstract class BaseTable extends JTable implements FocusListener {
         }
     }
 
+    @Override
     public void paintComponent(Graphics g) {
         super.paintComponent(g);
 
@@ -1013,6 +1031,7 @@ abstract class BaseTable extends JTable implements FocusListener {
 
     /** Overridden to fire a change event on a change in the table, so the
      * property sheet can refresh the displayed description if necessary */
+    @Override
     public void tableChanged(TableModelEvent e) {
         super.tableChanged(e);
         fireChange();
@@ -1137,6 +1156,7 @@ abstract class BaseTable extends JTable implements FocusListener {
     }
 
     WL parentListener;
+    @Override
     public void addNotify() {
         super.addNotify();
 
@@ -1149,11 +1169,13 @@ abstract class BaseTable extends JTable implements FocusListener {
     }
     
     private class WL extends WindowAdapter {
+        @Override
         public void windowDeactivated(java.awt.event.WindowEvent we) {
             doFocusLost(we.getOppositeWindow());
         }
     }
-    
+
+    @Override
     public void removeNotify() {
         // #57560: properties should always save changes
         Container top = getTopLevelAncestor();
@@ -1175,11 +1197,13 @@ abstract class BaseTable extends JTable implements FocusListener {
             setFont(BaseTable.this.getFont());
         }
 
+        @Override
         public void addNotify() {
             super.addNotify();
             selectionBeforeLastShow = BaseTable.this.getSelectedRow();
         }
 
+        @Override
         public void processKeyEvent(KeyEvent ke) {
             if (!isShowing()) {
                 super.processKeyEvent(ke);
@@ -1386,6 +1410,7 @@ abstract class BaseTable extends JTable implements FocusListener {
             }
         }
 
+        @Override
         public boolean isEnabled() {
             return isEditing();
         }
@@ -1577,16 +1602,19 @@ abstract class BaseTable extends JTable implements FocusListener {
         boolean dragging;
         int pos = -1;
 
+        @Override
         public void mouseExited(MouseEvent e) {
             setArmed(false);
         }
 
+        @Override
         public void mousePressed(MouseEvent e) {
             if (isArmed() && onCenterLine(e)) {
                 beginDrag();
             }
         }
 
+        @Override
         public void mouseReleased(MouseEvent e) {
             if (isDragging()) {
                 finishDrag();
@@ -1594,10 +1622,12 @@ abstract class BaseTable extends JTable implements FocusListener {
             }
         }
 
+        @Override
         public void mouseMoved(MouseEvent e) {
             setArmed(!isEditing() && onCenterLine(e));
         }
 
+        @Override
         public void mouseDragged(MouseEvent e) {
             if (!armed && !dragging) {
                 return;
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/ButtonPanel.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/ButtonPanel.java
index 3bff739203..a503e22b0f 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/ButtonPanel.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/ButtonPanel.java
@@ -93,12 +93,14 @@ class ButtonPanel extends javax.swing.JComponent implements InplaceEditor {
         button.setRolloverIcon(PropUtils.getCustomButtonIcon());
     }
 
+    @Override
     public void setOpaque(boolean b) {
         if (getInplaceEditor() != null) {
             getInplaceEditor().getComponent().setOpaque(true);
         }
     }
 
+    @Override
     public void setFont(Font f) {
         if (comp != null) {
             comp.setFont(f);
@@ -139,6 +141,7 @@ class ButtonPanel extends javax.swing.JComponent implements InplaceEditor {
         }
     }
 
+    @Override
     public Dimension getPreferredSize() {
         Dimension result;
 
@@ -156,6 +159,7 @@ class ButtonPanel extends javax.swing.JComponent implements InplaceEditor {
     /** Overridden to forward the setEnabled call to the contained
      *   component - the custom editor button should always be
      *   enabled if present */
+    @Override
     public void setEnabled(boolean val) {
         super.setEnabled(val);
 
@@ -200,6 +204,7 @@ class ButtonPanel extends javax.swing.JComponent implements InplaceEditor {
         needLayout = true;
     }
 
+    @Override
     public void setBackground(Color c) {
         super.setBackground(c);
 
@@ -216,6 +221,7 @@ class ButtonPanel extends javax.swing.JComponent implements InplaceEditor {
         }
     }
 
+    @Override
     public void setForeground(Color c) {
         super.setForeground(c);
 
@@ -228,6 +234,7 @@ class ButtonPanel extends javax.swing.JComponent implements InplaceEditor {
         }
     }
 
+    @Override
     public void paint(Graphics g) {
         if (isShowing()) {
             super.paint(g);
@@ -279,6 +286,7 @@ class ButtonPanel extends javax.swing.JComponent implements InplaceEditor {
      * needed since the component may be painted without a parent, so
      * invalidate will not do anything */
     @SuppressWarnings("deprecation")
+    @Override
     public void reshape(int x, int y, int w, int h) {
         super.reshape(x, y, w, h);
         needLayout = true;
@@ -287,6 +295,7 @@ class ButtonPanel extends javax.swing.JComponent implements InplaceEditor {
     /** Overridden to force focus requests to the contained editor
      *  component - setting focus to this component directly will
      *  never be desirable. */
+    @Override
     public void requestFocus() {
         if (comp != null) {
             comp.requestFocus();
@@ -296,6 +305,7 @@ class ButtonPanel extends javax.swing.JComponent implements InplaceEditor {
     /** Overridden to force focus requests to the contained editor
      *  component - setting focus to this component directly will
      *  never be desirable. */
+    @Override
     public boolean requestFocusInWindow() {
         if (comp != null) {
             return comp.requestFocusInWindow();
@@ -306,6 +316,7 @@ class ButtonPanel extends javax.swing.JComponent implements InplaceEditor {
 
     /** Overridden to proxy adds to the custom editor button and the
      * installed component */
+    @Override
     public void addFocusListener(FocusListener l) {
         if (comp != null) {
             button.addFocusListener(l);
@@ -315,6 +326,7 @@ class ButtonPanel extends javax.swing.JComponent implements InplaceEditor {
 
     /** Overridden to proxy removes to the custom editor button and the
      * installed component */
+    @Override
     public void removeFocusListener(FocusListener l) {
         if (comp != null) {
             button.removeFocusListener(l);
@@ -409,6 +421,7 @@ class ButtonPanel extends javax.swing.JComponent implements InplaceEditor {
         return inplace.supportsTextEntry();
     }
 
+    @Override
     public void doLayout() {
         if (comp != null) {
             comp.setBounds(0, 0, getWidth() - PropUtils.getCustomButtonWidth(), getHeight());
@@ -430,6 +443,7 @@ class ButtonPanel extends javax.swing.JComponent implements InplaceEditor {
         needLayout = false;
     }
 
+    @Override
     public Dimension getMinimumSize() {
         return getPreferredSize();
     }
@@ -455,10 +469,12 @@ class ButtonPanel extends javax.swing.JComponent implements InplaceEditor {
         public ConditionallyFocusableButton() {
         }
 
+        @Override
         public boolean isFocusable() {
             return (ButtonPanel.this.getParent() != null) && !clearing;
         }
 
+        @Override
         public void paint(Graphics g) {
             if (PropUtils.useOptimizedCustomButtonPainting() && !hasFocus()) {
                 if (log) {
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/CheckboxInplaceEditor.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/CheckboxInplaceEditor.java
index 1ca8638b54..835e1c68a0 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/CheckboxInplaceEditor.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/CheckboxInplaceEditor.java
@@ -69,6 +69,7 @@ class CheckboxInplaceEditor extends JCheckBox implements InplaceEditor {
         }
     }
 
+    @Override
     public void setSelected(boolean val) {
         boolean fire = val == isSelected();
         String s = getText();
@@ -140,6 +141,7 @@ class CheckboxInplaceEditor extends JCheckBox implements InplaceEditor {
         }
     }
 
+    @Override
     public String getText() {
         //OptimizeIt shows 1% of drawing time can be spent in re-fetching
         //text, so cache it as a microoptimization
@@ -236,6 +238,7 @@ class CheckboxInplaceEditor extends JCheckBox implements InplaceEditor {
 
     /** Overridden to be able to calculate the preferred size without having
      * to be added to the AWT hierarchy */
+    @Override
     public Dimension getPreferredSize() {
         if (isShowing()) {
             return super.getPreferredSize();
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/CustomEditorAction.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/CustomEditorAction.java
index 3f2e0f9ffa..e760148509 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/CustomEditorAction.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/CustomEditorAction.java
@@ -237,6 +237,7 @@ class CustomEditorAction extends AbstractAction {
         final java.awt.Window w = pdm.getDialog();
 
         WindowListener wl = new WindowAdapter() {
+                @Override
                 public void windowClosed(WindowEvent e) {
                     if (pdm.getComponent() instanceof EnhancedCustomPropertyEditor) {
                         if (!pdm.wasCancelled() && !closedOption && pdm.wasOK() && !pdm.wasReset()) {
@@ -258,6 +259,7 @@ class CustomEditorAction extends AbstractAction {
                     //                        customEditing=false;
                 }
 
+                @Override
                 public void windowOpened(WindowEvent e) {
                     invoker.editorOpened();
                     if (curComp != null) {
@@ -265,7 +267,8 @@ class CustomEditorAction extends AbstractAction {
                     }
                 }
 
-                // MCF ISSUE 44366 
+                // MCF ISSUE 44366
+                @Override
                 public void windowClosing(WindowEvent ev) {
                     if (PropUtils.isLoggable(CustomEditorAction.class)) {
                         PropUtils.log(CustomEditorAction.class, "CustomerEditorAction windowClosing event");
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/EditorPropertyDisplayer.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/EditorPropertyDisplayer.java
index 69f14fe70e..d46161b2d3 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/EditorPropertyDisplayer.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/EditorPropertyDisplayer.java
@@ -86,6 +86,7 @@ class EditorPropertyDisplayer extends JComponent implements PropertyDisplayer_In
         }
     }
 
+    @Override
     public void addNotify() {
         try {
             if (inner == null) {
@@ -96,6 +97,7 @@ class EditorPropertyDisplayer extends JComponent implements PropertyDisplayer_In
         }
     }
 
+    @Override
     protected void processFocusEvent(FocusEvent fe) {
         super.processFocusEvent(fe);
 
@@ -104,6 +106,7 @@ class EditorPropertyDisplayer extends JComponent implements PropertyDisplayer_In
         }
     }
 
+    @Override
     public void removeNotify() {
         super.removeNotify();
         setInplaceEditor(null);
@@ -219,6 +222,7 @@ class EditorPropertyDisplayer extends JComponent implements PropertyDisplayer_In
         }
     }
 
+    @Override
     public final void requestFocus() {
         if (inner != null) {
             inner.requestFocus();
@@ -227,6 +231,7 @@ class EditorPropertyDisplayer extends JComponent implements PropertyDisplayer_In
         }
     }
 
+    @Override
     public final Dimension getPreferredSize() {
         Dimension result;
 
@@ -240,6 +245,7 @@ class EditorPropertyDisplayer extends JComponent implements PropertyDisplayer_In
         return result;
     }
 
+    @Override
     public final boolean requestFocusInWindow() {
         boolean result;
 
@@ -351,6 +357,7 @@ class EditorPropertyDisplayer extends JComponent implements PropertyDisplayer_In
         }
     }
 
+    @Override
     public void setEnabled(boolean b) {
         if (inner != null) {
             inner.setEnabled(b);
@@ -359,6 +366,7 @@ class EditorPropertyDisplayer extends JComponent implements PropertyDisplayer_In
         super.setEnabled(b);
     }
 
+    @Override
     public void setBackground(Color c) {
         super.setBackground(c);
 
@@ -371,6 +379,7 @@ class EditorPropertyDisplayer extends JComponent implements PropertyDisplayer_In
         }
     }
 
+    @Override
     public void setForeground(Color c) {
         super.setForeground(c);
 
@@ -407,6 +416,7 @@ class EditorPropertyDisplayer extends JComponent implements PropertyDisplayer_In
     }
 
     @SuppressWarnings("deprecation")
+    @Override
     public void reshape(int x, int y, int w, int h) {
         if (inner != null) {
             inner.setBounds(0, 0, w, h);
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/IconPanel.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/IconPanel.java
index 984c54115f..d45603c386 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/IconPanel.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/IconPanel.java
@@ -70,6 +70,7 @@ class IconPanel extends JComponent implements InplaceEditor {
         return inplaceEditor;
     }
 
+    @Override
     public void setEnabled(boolean val) {
         if (comp != null) {
             //Can be called from setUI in superclass constructor
@@ -79,6 +80,7 @@ class IconPanel extends JComponent implements InplaceEditor {
         super.setEnabled(val);
     }
 
+    @Override
     public void setBackground(Color c) {
         if (comp != null) {
             //Can be called from setUI in superclass constructor
@@ -88,6 +90,7 @@ class IconPanel extends JComponent implements InplaceEditor {
         super.setBackground(c);
     }
 
+    @Override
     public void setForeground(Color c) {
         if (comp != null) {
             //Can be called from setUI in superclass constructor
@@ -97,6 +100,7 @@ class IconPanel extends JComponent implements InplaceEditor {
         super.setForeground(c);
     }
 
+    @Override
     public void setFont(Font f) {
         if (comp != null) {
             comp.setFont(f);
@@ -126,6 +130,7 @@ class IconPanel extends JComponent implements InplaceEditor {
     }
 
     /** Overridden to paint the icon */
+    @Override
     public void paintComponent(Graphics g) {
         if (needLayout) {
             doLayout();
@@ -188,6 +193,7 @@ class IconPanel extends JComponent implements InplaceEditor {
         }
     }
 
+    @Override
     public void setOpaque(boolean val) {
         if (getInplaceEditor() != null) {
             getInplaceEditor().getComponent().setOpaque(true);
@@ -250,14 +256,17 @@ class IconPanel extends JComponent implements InplaceEditor {
         return inplaceEditor.supportsTextEntry();
     }
 
+    @Override
     public void requestFocus() {
         comp.requestFocus();
     }
 
+    @Override
     public boolean requestFocusInWindow() {
         return comp.requestFocusInWindow();
     }
 
+    @Override
     public void addFocusListener(FocusListener fl) {
         if (comp != null) {
             comp.addFocusListener(fl);
@@ -266,6 +275,7 @@ class IconPanel extends JComponent implements InplaceEditor {
         }
     }
 
+    @Override
     public void removeFocusListener(FocusListener fl) {
         if (comp != null) {
             comp.removeFocusListener(fl);
@@ -275,6 +285,7 @@ class IconPanel extends JComponent implements InplaceEditor {
     }
 
     @SuppressWarnings("deprecation")
+    @Override
     public void layout() {
         Insets ins = getInsets();
 
@@ -300,6 +311,7 @@ class IconPanel extends JComponent implements InplaceEditor {
         }
     }
 
+    @Override
     public Dimension getPreferredSize() {
         Insets ins = getInsets();
         Component c = comp;
@@ -322,6 +334,7 @@ class IconPanel extends JComponent implements InplaceEditor {
         return result;
     }
 
+    @Override
     public Dimension getMinimumSize() {
         return getPreferredSize();
     }
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/IndexedEditorPanel.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/IndexedEditorPanel.java
index f5119a91ae..d3713141d6 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/IndexedEditorPanel.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/IndexedEditorPanel.java
@@ -131,6 +131,7 @@ class IndexedEditorPanel extends javax.swing.JPanel implements ExplorerManager.P
         getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_IndexedEditorPanel"));
     }
 
+    @Override
     public void addNotify() {
         super.addNotify();
         updateButtonState();
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/MarginViewportUI.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/MarginViewportUI.java
index 84453000af..50695242f0 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/MarginViewportUI.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/MarginViewportUI.java
@@ -68,6 +68,7 @@ class MarginViewportUI extends ViewportUI implements ComponentListener, Containe
         return new MarginViewportUI((JViewport) c);
     }
 
+    @Override
     public void installUI(JComponent c) {
         super.installUI(c);
 
@@ -114,6 +115,7 @@ class MarginViewportUI extends ViewportUI implements ComponentListener, Containe
         }
     }
 
+    @Override
     public void uninstallUI(JComponent vp) {
         JViewport jv = (JViewport) vp;
         Component[] c = jv.getComponents();
@@ -147,6 +149,7 @@ class MarginViewportUI extends ViewportUI implements ComponentListener, Containe
     }
 
     /** Overridden to draw "no properties" if necessary */
+    @Override
     public void paint(Graphics g, JComponent c) {
         Component view = ((JViewport) c).getView();
 
@@ -194,6 +197,7 @@ class MarginViewportUI extends ViewportUI implements ComponentListener, Containe
         return scratch;
     }
 
+    @Override
     public void update(Graphics g, JComponent c) {
         g.setColor(c.getBackground());
 
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 7efa584bde..e9b1a7e119 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/PSheet.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/PSheet.java
@@ -297,6 +297,7 @@ class PSheet extends JPanel implements MouseListener {
     /**
      * Overridden to handle our layout requirements
      */
+    @Override
     public void doLayout() {
         Component[] c = getComponents();
 
@@ -327,6 +328,7 @@ class PSheet extends JPanel implements MouseListener {
     }
 
     /** Transfers focus to the table */
+    @Override
     public void requestFocus() {
         JScrollPane jsc = findScrollPane();
 
@@ -336,6 +338,7 @@ class PSheet extends JPanel implements MouseListener {
     }
 
     /** Transfers focus to the table */
+    @Override
     public boolean requestFocusInWindow() {
         JScrollPane jsc = findScrollPane();
 
@@ -484,6 +487,7 @@ class PSheet extends JPanel implements MouseListener {
      * add/remove things, or even more simply, call setState(), which handles
      * that.
      */
+    @Override
     protected void addImpl(Component comp, Object constraints, int idx) {
         if (
             !(comp instanceof JSplitPane || comp instanceof JScrollPane || comp instanceof DescriptionComponent ||
@@ -605,6 +609,7 @@ class PSheet extends JPanel implements MouseListener {
      * (for convenience), or with a component that is a child of a child of
      * this container.
      */
+    @Override
     public void remove(Component c) {
         if (c == null) {
             return;
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropertyPanel.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropertyPanel.java
index 31fa958191..067b90e90d 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropertyPanel.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/PropertyPanel.java
@@ -287,6 +287,7 @@ public class PropertyPanel extends JComponent implements javax.accessibility.Acc
         PropertyPanelBridge.register(this, new BridgeAccessor(this));
     }
 
+    @Override
     public void setBackground(Color c) {
         if (inner != null) {
             inner.setBackground(c);
@@ -295,6 +296,7 @@ public class PropertyPanel extends JComponent implements javax.accessibility.Acc
         super.setBackground(c);
     }
 
+    @Override
     public void setForeground(Color c) {
         if (inner != null) {
             inner.setForeground(c);
@@ -525,21 +527,25 @@ public class PropertyPanel extends JComponent implements javax.accessibility.Acc
         }
     }
 
+    @Override
     public void doLayout() {
         layout();
     }
 
     @SuppressWarnings("deprecation")
+    @Override
     public void layout() {
         if (inner != null) {
             inner.setBounds(0, 0, getWidth(), getHeight());
         }
     }
 
+    @Override
     public Dimension getMinimumSize() {
         return getPreferredSize();
     }
 
+    @Override
     public Dimension getPreferredSize() {
         Dimension result;
 
@@ -609,6 +615,7 @@ public class PropertyPanel extends JComponent implements javax.accessibility.Acc
 
     /** Overridden to catch changes in those client properties that are
      * relevant to PropertyPanel */
+    @Override
     protected void firePropertyChange(String nm, Object old, Object nue) {
         if (
             ("flat".equals(nm) || "radioButtonMax".equals(nm) || "suppressCustomEditor".equals(nm) ||
@@ -650,6 +657,7 @@ public class PropertyPanel extends JComponent implements javax.accessibility.Acc
 
     /** Overridden to return false in cases that the preferences specify a
      * read-only state */
+    @Override
     public boolean isFocusable() {
         return super.isFocusable() && isEnabled() && ((preferences & PREF_READ_ONLY) == 0);
     }
@@ -658,6 +666,7 @@ public class PropertyPanel extends JComponent implements javax.accessibility.Acc
      * nothing in a read only state, since some custom property editors (File
      * chooser) are capable of receiving focus even if they are disabled,
      * effectively making focus disappear */
+    @Override
     public void requestFocus() {
         //Do this because even if everything is disabled, JFileChooser's UI
         //*does* supply some focusable components
@@ -683,6 +692,7 @@ public class PropertyPanel extends JComponent implements javax.accessibility.Acc
         }
     }
 
+    @Override
     protected void processFocusEvent(FocusEvent fe) {
         super.processFocusEvent(fe);
 
@@ -704,6 +714,7 @@ public class PropertyPanel extends JComponent implements javax.accessibility.Acc
     }
 
     /** Overridden to install the inner component that will display the property*/
+    @Override
     public void addNotify() {
         attachToModel();
 
@@ -720,6 +731,7 @@ public class PropertyPanel extends JComponent implements javax.accessibility.Acc
 
     /** Overridden to dispose the component that actually displays the property
      * and any state information associated with it */
+    @Override
     public void removeNotify() {
         super.removeNotify();
         detachFromModel();
@@ -1040,6 +1052,7 @@ public class PropertyPanel extends JComponent implements javax.accessibility.Acc
      * all panel components gets disabled when enabled parameter is set false
      * @param enabled flag defining the action.
      */
+    @Override
     public void setEnabled(boolean enabled) {
         // bugfix# 10171, explicitly disable components inside the custom editor
         super.setEnabled(enabled);
@@ -1103,6 +1116,7 @@ public class PropertyPanel extends JComponent implements javax.accessibility.Acc
 
     /** Overridden to provide information from the embedded property renderer
      * if not in custom editor mode */
+    @Override
     public String toString() {
         if ((preferences & PREF_CUSTOM_EDITOR) != 0) {
             //custom editor mode, not much useful to say here
@@ -1141,6 +1155,7 @@ public class PropertyPanel extends JComponent implements javax.accessibility.Acc
      * setOpaque(true).
      * @see http://www.netbeans.org/issues/show_bug.cgi?id=43024
      */
+    @Override
     public void paint(Graphics g) {
         if (isGtk) {
             //Presumably we can get this fixed for JDK 1.5.1
@@ -1164,6 +1179,7 @@ public class PropertyPanel extends JComponent implements javax.accessibility.Acc
     }
 
     ////////////////// Accessibility support ///////////////////////////////////
+    @Override
     public javax.accessibility.AccessibleContext getAccessibleContext() {
         if (accessibleContext == null) {
             accessibleContext = new AccessiblePropertyPanel();
@@ -1194,6 +1210,7 @@ public class PropertyPanel extends JComponent implements javax.accessibility.Acc
             return pd.getCustomEditorAction();
         }
 
+        @Override
         public boolean isEnabled() {
             Action wrapped = getWrapped();
 
@@ -1219,10 +1236,12 @@ public class PropertyPanel extends JComponent implements javax.accessibility.Acc
         AccessiblePropertyPanel() {
         }
 
+        @Override
         public javax.accessibility.AccessibleRole getAccessibleRole() {
             return javax.accessibility.AccessibleRole.PANEL;
         }
 
+        @Override
         public String getAccessibleName() {
             String name = super.getAccessibleName();
 
@@ -1234,6 +1253,7 @@ public class PropertyPanel extends JComponent implements javax.accessibility.Acc
             return name;
         }
 
+        @Override
         public String getAccessibleDescription() {
             String description = super.getAccessibleDescription();
 
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/RadioInplaceEditor.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/RadioInplaceEditor.java
index 183f6be9b9..266cbd5322 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/RadioInplaceEditor.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/RadioInplaceEditor.java
@@ -97,6 +97,7 @@ class RadioInplaceEditor extends JPanel implements InplaceEditor, ActionListener
     }
 
     /** Overridden to avoid grabbing the AWT tree lock */
+    @Override
     public Dimension getPreferredSize() {
         if (getLayout() != null) {
             return getLayout().preferredLayoutSize(this);
@@ -105,6 +106,7 @@ class RadioInplaceEditor extends JPanel implements InplaceEditor, ActionListener
         }
     }
 
+    @Override
     public void addNotify() {
         super.addNotify();
         isFirstEvent = true;
@@ -134,6 +136,7 @@ class RadioInplaceEditor extends JPanel implements InplaceEditor, ActionListener
         return result;
     }
 
+    @Override
     public void setEnabled(boolean val) {
         //        System.err.println("RadioEditor.setEnabled " + val);
         super.setEnabled(val);
@@ -145,6 +148,7 @@ class RadioInplaceEditor extends JPanel implements InplaceEditor, ActionListener
         }
     }
 
+    @Override
     public void setBackground(Color col) {
         super.setBackground(col);
 
@@ -155,6 +159,7 @@ class RadioInplaceEditor extends JPanel implements InplaceEditor, ActionListener
         }
     }
 
+    @Override
     public void setForeground(Color col) {
         super.setForeground(col);
 
@@ -169,6 +174,7 @@ class RadioInplaceEditor extends JPanel implements InplaceEditor, ActionListener
      * focus policy, we're responsible for all possible subcomponents.
      * Therfore just proxy requestFocusInWindow for the selected radio
      * button  */
+    @Override
     public void requestFocus() {
         Component[] c = getComponents();
 
@@ -187,6 +193,7 @@ class RadioInplaceEditor extends JPanel implements InplaceEditor, ActionListener
         }
     }
 
+    @Override
     public boolean requestFocusInWindow() {
         Component[] c = getComponents();
 
@@ -414,6 +421,7 @@ class RadioInplaceEditor extends JPanel implements InplaceEditor, ActionListener
         fireActionPerformed(ae);
     }
 
+    @Override
     public void paint(Graphics g) {
         if (isShowing()) {
             super.paint(g);
@@ -450,6 +458,7 @@ class RadioInplaceEditor extends JPanel implements InplaceEditor, ActionListener
         }
     }
 
+    @Override
     public void processMouseEvent(MouseEvent me) {
         if (isFirstEvent) {
             handleInitialInputEvent(me);
@@ -459,6 +468,7 @@ class RadioInplaceEditor extends JPanel implements InplaceEditor, ActionListener
         }
     }
 
+    @Override
     public Component getComponentAt(int x, int y) {
         getLayout().layoutContainer(this);
 
@@ -475,10 +485,12 @@ class RadioInplaceEditor extends JPanel implements InplaceEditor, ActionListener
             super();
         }
 
+        @Override
         public String getName() {
             return "InvRadioButton - " + getText(); //NOI18N
         }
 
+        @Override
         public void processKeyEvent(KeyEvent ke) {
             super.processKeyEvent(ke);
 
@@ -495,6 +507,7 @@ class RadioInplaceEditor extends JPanel implements InplaceEditor, ActionListener
             }
         }
 
+        @Override
         public Dimension getPreferredSize() {
             int w = 0;
             int h = 0;
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/RendererFactory.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/RendererFactory.java
index d3a5f9f920..4484ce07f5 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/RendererFactory.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/RendererFactory.java
@@ -680,10 +680,12 @@ final class RendererFactory {
 
         /** OptimizeIt shows about 12Ms overhead calling back to Component.enable(),
          * so overriding */
+        @Override
         public void setEnabled(boolean val) {
             enabled = val;
         }
 
+        @Override
         public void setText(String s) {
             if (s != null) {
                 if (s.length() > 512) {
@@ -699,35 +701,43 @@ final class RendererFactory {
 
         /** OptimizeIt shows about 12Ms overhead calling back to Component.enable(),
          * so overriding */
+        @Override
         public boolean isEnabled() {
             return enabled;
         }
 
         /** Overridden to do nothing */
+        @Override
         protected void firePropertyChange(String name, Object old, Object nue) {
             //do nothing
         }
 
+        @Override
         public void validate() {
             //do nothing
         }
 
+        @Override
         public void invalidate() {
             //do nothing
         }
 
+        @Override
         public void revalidate() {
             //do nothing
         }
 
+        @Override
         public void repaint() {
             //do nothing
         }
 
+        @Override
         public void repaint(long tm, int x, int y, int w, int h) {
             //do nothing
         }
 
+        @Override
         public Dimension getPreferredSize() {
             if (getText().length() > 1024) {
                 //IZ 44152, avoid excessive calculations when debugger
@@ -743,6 +753,7 @@ final class RendererFactory {
             return result;
         }
 
+        @Override
         public void paint(Graphics g) {
             if (editor != null) {
                 setEnabled(PropUtils.checkEnabled(this, editor, env));
@@ -1243,6 +1254,7 @@ final class RendererFactory {
             //do nothing
         }
 
+        @Override
         public Color getForeground() {
             return PropUtils.getErrorColor();
         }
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/RendererPropertyDisplayer.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/RendererPropertyDisplayer.java
index 483f0e07fd..c673beeaf1 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/RendererPropertyDisplayer.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/RendererPropertyDisplayer.java
@@ -72,12 +72,14 @@ final class RendererPropertyDisplayer extends JComponent implements PropertyDisp
         repaint();
     }
 
+    @Override
     public void validate() {
         if (!tableUI) {
             super.validate();
         }
     }
 
+    @Override
     public boolean isValid() {
         if (tableUI) {
             return true;
@@ -86,6 +88,7 @@ final class RendererPropertyDisplayer extends JComponent implements PropertyDisp
         }
     }
 
+    @Override
     public boolean isShowing() {
         if (tableUI) {
             return true;
@@ -218,6 +221,7 @@ final class RendererPropertyDisplayer extends JComponent implements PropertyDisp
         }
     }
 
+    @Override
     public String toString() {
         StringBuffer sb = new StringBuffer("Inline editor for property "); //NOI18N
         sb.append(getProperty().getDisplayName());
@@ -236,6 +240,7 @@ final class RendererPropertyDisplayer extends JComponent implements PropertyDisp
         return sb.toString();
     }
 
+    @Override
     public void paintComponent(Graphics g) {
         //Hack for issue 38132 - Beans are set via TTVBridge as a package
         //private property on the parent PropertyPanel (if there is one).
@@ -326,6 +331,7 @@ final class RendererPropertyDisplayer extends JComponent implements PropertyDisp
         }
     }
 
+    @Override
     public Dimension getPreferredSize() {
         //Optimize it shows 16% of painting time is in this call.  In some
         //cases it will be called more than once, so cache the return value
@@ -379,6 +385,7 @@ final class RendererPropertyDisplayer extends JComponent implements PropertyDisp
         return reusableEnv;
     }
 
+    @Override
     public void firePropertyChange(String name, Object old, Object nue) {
         //do nothing
     }
diff --git a/platform/openide.explorer/src/org/openide/explorer/propertysheet/WrapperInplaceEditor.java b/platform/openide.explorer/src/org/openide/explorer/propertysheet/WrapperInplaceEditor.java
index 344a1d15b0..9070ac6e52 100644
--- a/platform/openide.explorer/src/org/openide/explorer/propertysheet/WrapperInplaceEditor.java
+++ b/platform/openide.explorer/src/org/openide/explorer/propertysheet/WrapperInplaceEditor.java
@@ -326,6 +326,7 @@ class WrapperInplaceEditor extends JPanel implements InplaceEditor, ActionListen
      * Registers FocusListener to receive events.
      * @param listener The listener to register.
      */
+    @Override
     public synchronized void addFocusListener(FocusListener listener) {
         if (listenerList == null) {
             listenerList = new EventListenerList();
@@ -339,6 +340,7 @@ class WrapperInplaceEditor extends JPanel implements InplaceEditor, ActionListen
      * Removes FocusListener from the list of listeners.
      * @param listener The listener to remove.
      */
+    @Override
     public synchronized void removeFocusListener(FocusListener listener) {
         listenerList.remove(java.awt.event.FocusListener.class, listener);
         super.removeFocusListener(listener);
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 b9ba2afdec..1165397665 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/MenuView.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/MenuView.java
@@ -150,6 +150,7 @@ public class MenuView extends JPanel {
 
     /* Initializes view.
     */
+    @Override
     public void addNotify() {
         super.addNotify();
         explorerManager = ExplorerManager.find(this);
@@ -159,6 +160,7 @@ public class MenuView extends JPanel {
 
     /* Deinitializes view.
     */
+    @Override
     public void removeNotify() {
         super.removeNotify();
         explorerManager.removePropertyChangeListener(listener);
@@ -196,6 +198,7 @@ public class MenuView extends JPanel {
             this.root = root;
         }
 
+        @Override
         public void mousePressed(MouseEvent e) {
             if (e.getComponent().isEnabled()) {
                 // open the popup menu
@@ -512,6 +515,7 @@ public class MenuView extends JPanel {
         /** Inform the acceptor.
          * @param time see superclass
          */
+        @Override
         public void doClick(int time) {
             action.acceptNodes(new Node[] { node });
         }
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 b25c38d841..b76a67d211 100644
--- a/platform/openide.explorer/src/org/openide/explorer/view/TableSheet.java
+++ b/platform/openide.explorer/src/org/openide/explorer/view/TableSheet.java
@@ -210,6 +210,7 @@ class TableSheet extends JScrollPane {
         }
 
         /** Validate root is outer scroll pane. */
+        @Override
         public boolean isValidateRoot() {
             return false;
         }
@@ -252,6 +253,7 @@ class TableSheet extends JScrollPane {
          * @param tm table model
          * @return table
          */
+        @Override
         JTable createTable() {
             return new ATable();
         }
@@ -263,6 +265,7 @@ class TableSheet extends JScrollPane {
         /** Overriden because I can't set border to null by calling setBorder(null).
          * @param border
          */
+        @Override
         public void setBorder(Border border) {
             super.setBorder(null);
         }
@@ -326,6 +329,7 @@ class TableSheet extends JScrollPane {
                 getActionMap().put("cancel", new OurCancelEditingAction()); // NOI18N
             }
 
+            @Override
             public Dimension getPreferredScrollableViewportSize() {
                 Dimension pref = super.getPreferredScrollableViewportSize();
 
@@ -341,6 +345,7 @@ class TableSheet extends JScrollPane {
             /** Try to revalidate once again because we want table to have
              * width that it asked for.
              */
+            @Override
             public void setBounds(int x, int y, int width, int height) {
                 super.setBounds(x, y, width, height);
 
@@ -364,6 +369,7 @@ class TableSheet extends JScrollPane {
                     table.removeEditor();
                 }
 
+                @Override
                 public boolean isEnabled() {
                     return ATable.this.isEditing();
                 }
@@ -377,6 +383,7 @@ class TableSheet extends JScrollPane {
             MouseDragHandler() {
             }
 
+            @Override
             public void mousePressed(MouseEvent e) {
                 Point p = e.getPoint();
                 dragging = canResize(p);
@@ -393,6 +400,7 @@ class TableSheet extends JScrollPane {
                 return mousePoint.x >= (header.getSize().width - 3);
             }
 
+            @Override
             public void mouseMoved(MouseEvent e) {
                 if (canResize(e.getPoint()) || dragging) {
                     setCursor(Cursor.getPredefinedCursor(Cursor.E_RESIZE_CURSOR));
@@ -401,6 +409,7 @@ class TableSheet extends JScrollPane {
                 }
             }
 
+            @Override
             public void mouseDragged(MouseEvent e) {
                 int mouseX = e.getX();
                 int deltaX = lastMouseX - mouseX;
@@ -434,6 +443,7 @@ class TableSheet extends JScrollPane {
                 }
             }
 
+            @Override
             public void mouseReleased(MouseEvent e) {
                 dragging = false;
             }
@@ -478,6 +488,7 @@ class TableSheet extends JScrollPane {
             dependentScrollPane = scrollPane;
         }
 
+        @Override
         public void layoutContainer(Container parent) {
             super.layoutContainer(parent);
 
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/ComboTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/ComboTest.java
index 11d7110a2b..dce7b7601e 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/ComboTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/ComboTest.java
@@ -167,7 +167,8 @@ public class ComboTest extends NbTestCase {
                 }
             }
         }
-        
+
+        @Override
         public void windowOpened(WindowEvent e) {
             shown = true;
             synchronized(this) {
@@ -220,6 +221,7 @@ public class ComboTest extends NbTestCase {
         //uncomment the code below for diagnosing painting problems
         //and seeing which pixel you'return really checking
         JFrame jf = new JFrame("assertPixelFromImage " + count + " (look for the yellow line)") {
+            @Override
             public void paint(Graphics g) {
                 new ImageIcon(bi).paintIcon(this, g, 25, 25);
                 g.setColor(Color.YELLOW);
@@ -276,6 +278,7 @@ public class ComboTest extends NbTestCase {
         //uncomment the code below for diagnosing painting problems
         //and seeing which pixel you'return really checking
         JFrame jf = new JFrame("Assert pixel test " + count + " (look for the yellow line)") {
+            @Override
             public void paint(Graphics g) {
                 new ImageIcon(bi).paintIcon(this, g, 25, 25);
                 g.setColor(Color.YELLOW);
@@ -427,15 +430,18 @@ public class ComboTest extends NbTestCase {
         }
         
         // Set that this Editor doesn't support custom Editor
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
-        
+
+        @Override
         public String getAsText() {
             return getValue() == null ? "null" : getValue().toString();
         }
@@ -447,7 +453,8 @@ public class ComboTest extends NbTestCase {
         
         public TagsEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             return new String[] {"a","b","c","d","Value"};
         }
@@ -457,11 +464,13 @@ public class ComboTest extends NbTestCase {
             
             env.getFeatureDescriptor().setValue("canEditAsText", Boolean.TRUE);
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
@@ -598,7 +607,8 @@ public class ComboTest extends NbTestCase {
         
         public BadEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             //return new String[] {"a","b","c","d","Value"};
             return null;
@@ -608,11 +618,13 @@ public class ComboTest extends NbTestCase {
             this.env = env;
             env.setState(env.STATE_INVALID);
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/CustomInplaceEditorTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/CustomInplaceEditorTest.java
index e6fc8f2dfa..9f9e34f9e9 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/CustomInplaceEditorTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/CustomInplaceEditorTest.java
@@ -132,11 +132,13 @@ public class CustomInplaceEditorTest extends NbTestCase {
             this.env = env;
             env.registerInplaceEditorFactory(this);
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/EditableDisplayerTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/EditableDisplayerTest.java
index 4520ee274b..f8b68dfef6 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/EditableDisplayerTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/EditableDisplayerTest.java
@@ -750,6 +750,7 @@ public class EditableDisplayerTest extends NbTestCase {
         
         if (!match) {
             JFrame jf = new JFrame("assertPaintIdentically diff") {
+                @Override
                 public void paint(Graphics g) {
                     new ImageIcon(diff).paintIcon(this, g, 25, 25);
                     new ImageIcon(bia).paintIcon(this, g, 25, d.height+25);
@@ -875,7 +876,8 @@ public class EditableDisplayerTest extends NbTestCase {
                 }
             }
         }
-        
+
+        @Override
         public void windowOpened(WindowEvent e) {
             shown = true;
             synchronized(this) {
@@ -928,6 +930,7 @@ public class EditableDisplayerTest extends NbTestCase {
         //uncomment the code below for diagnosing painting problems
         //and seeing which pixel you'return really checking
         JFrame jf = new JFrame("assertPixelFromImage " + count + " (look for the yellow line)") {
+            @Override
             public void paint(Graphics g) {
                 new ImageIcon(bi).paintIcon(this, g, 25, 25);
                 g.setColor(Color.YELLOW);
@@ -987,6 +990,7 @@ public class EditableDisplayerTest extends NbTestCase {
         //uncomment the code below for diagnosing painting problems
         //and seeing which pixel you'return really checking
         JFrame jf = new JFrame("Assert pixel test " + count + " (look for the yellow line)") {
+            @Override
             public void paint(Graphics g) {
                 new ImageIcon(bi).paintIcon(this, g, 25, 25);
                 g.setColor(Color.YELLOW);
@@ -1227,15 +1231,18 @@ public class EditableDisplayerTest extends NbTestCase {
         }
         
         // Set that this Editor doesn't support custom Editor
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
-        
+
+        @Override
         public String getAsText() {
             return getValue() == null ? "null" : getValue().toString();
         }
@@ -1248,7 +1255,8 @@ public class EditableDisplayerTest extends NbTestCase {
         public TagsEditor(String[] tags) {
             this.tags = tags;
         }
-        
+
+        @Override
         public String[] getTags() {
             return tags;
         }
@@ -1256,11 +1264,13 @@ public class EditableDisplayerTest extends NbTestCase {
         public void attachEnv(PropertyEnv env) {
             this.env = env;
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
@@ -1398,12 +1408,14 @@ public class EditableDisplayerTest extends NbTestCase {
                 throw iae;
             }
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             myVal = newValue;
             firePropertyChange();
         }
-        
+
+        @Override
         public Object getValue() {
             return "Value";
         }
@@ -1432,25 +1444,30 @@ public class EditableDisplayerTest extends NbTestCase {
         }
         
         // Set that this Editor doesn't support custom Editor
+        @Override
         public boolean supportsCustomEditor() {
             return true;
         }
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
-        
+
+        @Override
         public String getAsText() {
             return getValue() == null ? "null" : getValue().toString();
         }
-        
+
+        @Override
         public Component getCustomEditor() {
             JLabel result = new JLabel("Everything is exactly as it should be.  Relax.");
             result.putClientProperty("title","Don't panic");
             return result;
         }
-        
+
+        @Override
         public void setAsText(String s) {
             super.setValue(s);
             if (!"Value".equals(s) && !"VALUE".equals(s)) {
@@ -1490,7 +1507,8 @@ public class EditableDisplayerTest extends NbTestCase {
         public EditableNumProperty(String name, boolean isWriteable) {
             super(name, isWriteable, new String[]{"boo"});
         }
-        
+
+        @Override
         public PropertyEditor getPropertyEditor() {
             return new EditableDisplayerTest.EditableTagsEditor();
         }
@@ -1503,22 +1521,26 @@ public class EditableDisplayerTest extends NbTestCase {
         // Create new BasicEditor
         public NumberedTagsEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             return new String[] {"zero","one","two","three","four","five","six","seven"};
         }
         
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             val = ((Integer) newValue).intValue();
             firePropertyChange();
         }
-        
+
+        @Override
         public String getAsText() {
             return getTags()[((Integer) getValue()).intValue()];
         }
-        
+
+        @Override
         public void setAsText(String txt) {
             String[] t = getTags();
             for (int i=0; i < t.length; i++) {
@@ -1530,11 +1552,13 @@ public class EditableDisplayerTest extends NbTestCase {
             IllegalArgumentException iae = new IllegalArgumentException(txt);
             Exceptions.attachMessage(iae, txt + " is not a valid value");
         }
-        
+
+        @Override
         public Object getValue() {
             return new Integer(val);
         }
-        
+
+        @Override
         public Component getCustomEditor() {
             return new JPanel();
         }
@@ -1548,21 +1572,27 @@ public class EditableDisplayerTest extends NbTestCase {
         public void attachEnv(PropertyEnv env) {
             env.getFeatureDescriptor().setValue("canEditAsText", Boolean.TRUE);
         }
+        @Override
         public void setAsText(String s) {
             setValue(s);
         }
+        @Override
         public void setValue(Object val) {
             this.val = val;
         }
+        @Override
         public Object getValue() {
             return val;
         }
+        @Override
         public String getAsText() {
             return val.toString();
         }
+        @Override
         public boolean supportsCustomEditor() {
             return true;
         }
+        @Override
         public Component getCustomEditor() {
             return new JLabel("You called?");
         }
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/EditorDisplayerTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/EditorDisplayerTest.java
index ca05437bbb..5cb725b8d3 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/EditorDisplayerTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/EditorDisplayerTest.java
@@ -314,7 +314,8 @@ public class EditorDisplayerTest extends NbTestCase {
                 }
             }
         }
-        
+
+        @Override
         public void windowOpened(WindowEvent e) {
             shown = true;
             synchronized(this) {
@@ -555,15 +556,18 @@ public class EditorDisplayerTest extends NbTestCase {
         }
         
         // Set that this Editor doesn't support custom Editor
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
-        
+
+        @Override
         public String getAsText() {
             return getValue() == null ? "null" : getValue().toString();
         }
@@ -576,7 +580,8 @@ public class EditorDisplayerTest extends NbTestCase {
         public TagsEditor(String[] tags) {
             this.tags = tags;
         }
-        
+
+        @Override
         public String[] getTags() {
             return tags;
         }
@@ -584,11 +589,13 @@ public class EditorDisplayerTest extends NbTestCase {
         public void attachEnv(PropertyEnv env) {
             this.env = env;
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
@@ -707,6 +714,7 @@ public class EditorDisplayerTest extends NbTestCase {
     public static class ExEditor extends PropertyEditorSupport {
         private Object myVal="Value";
         public ExEditor() {}
+        @Override
         public void setAsText(String val) {
             //System.err.println("SetAsText");
             if (val.equals("Value")) {
@@ -717,12 +725,14 @@ public class EditorDisplayerTest extends NbTestCase {
                 throw iae;
             }
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             myVal = newValue;
             firePropertyChange();
         }
-        
+
+        @Override
         public Object getValue() {
             return "Value";
         }
@@ -747,19 +757,23 @@ public class EditorDisplayerTest extends NbTestCase {
         }
         
         // Set that this Editor doesn't support custom Editor
+        @Override
         public boolean supportsCustomEditor() {
             return true;
         }
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
-        
+
+        @Override
         public String getAsText() {
             return getValue() == null ? "null" : getValue().toString();
         }
-        
+
+        @Override
         public Component getCustomEditor() {
             return new JPanel();
         }
@@ -794,7 +808,8 @@ public class EditorDisplayerTest extends NbTestCase {
         public EditableNumProperty(String name, boolean isWriteable) {
             super(name, isWriteable, new String[]{"boo"});
         }
-        
+
+        @Override
         public PropertyEditor getPropertyEditor() {
             return new EditorDisplayerTest.EditableTagsEditor();
         }
@@ -807,22 +822,26 @@ public class EditorDisplayerTest extends NbTestCase {
         // Create new BasicEditor
         public NumberedTagsEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             return new String[] {"zero","one","two","three","four","five","six","seven"};
         }
         
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             val = ((Integer) newValue).intValue();
             firePropertyChange();
         }
-        
+
+        @Override
         public String getAsText() {
             return getTags()[((Integer) getValue()).intValue()];
         }
-        
+
+        @Override
         public void setAsText(String txt) {
             String[] t = getTags();
             for (int i=0; i < t.length; i++) {
@@ -834,11 +853,13 @@ public class EditorDisplayerTest extends NbTestCase {
             IllegalArgumentException iae = new IllegalArgumentException(txt);
             Exceptions.attachLocalizedMessage(iae, txt + " is not a valid value");
         }
-        
+
+        @Override
         public Object getValue() {
             return new Integer(val);
         }
-        
+
+        @Override
         public Component getCustomEditor() {
             return new JPanel();
         }
@@ -852,21 +873,27 @@ public class EditorDisplayerTest extends NbTestCase {
         public void attachEnv(PropertyEnv env) {
             env.getFeatureDescriptor().setValue("canEditAsText", Boolean.TRUE);
         }
+        @Override
         public void setAsText(String s) {
             setValue(s);
         }
+        @Override
         public void setValue(Object val) {
             this.val = val;
         }
+        @Override
         public Object getValue() {
             return val;
         }
+        @Override
         public String getAsText() {
             return val.toString();
         }
+        @Override
         public boolean supportsCustomEditor() {
             return true;
         }
+        @Override
         public Component getCustomEditor() {
             return new JLabel("You called?");
         }
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/ExtTestCase.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/ExtTestCase.java
index 35ddeb79d8..2c7e2ad33d 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/ExtTestCase.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/ExtTestCase.java
@@ -857,6 +857,7 @@ public class ExtTestCase extends NbTestCase {
             }
         }
         
+        @Override
         public void windowOpened(WindowEvent e) {
             shown = true;
             synchronized(this) {
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/FocusAfterBadEditTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/FocusAfterBadEditTest.java
index 7250a666a8..e6d5d010d8 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/FocusAfterBadEditTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/FocusAfterBadEditTest.java
@@ -182,7 +182,8 @@ public class FocusAfterBadEditTest extends NbTestCase {
                 }
             }
         }
-        
+
+        @Override
         public void windowOpened(WindowEvent e) {
             shown = true;
             synchronized(this) {
@@ -338,7 +339,8 @@ public class FocusAfterBadEditTest extends NbTestCase {
         
         public BadEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             //return new String[] {"a","b","c","d","Value"};
             return null;
@@ -348,15 +350,18 @@ public class FocusAfterBadEditTest extends NbTestCase {
             this.env = env;
             env.setState(env.STATE_INVALID);
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
-        
+
+        @Override
         public void setAsText(String txt) {
             IllegalArgumentException iae = new IllegalArgumentException("Bad, bad, bad");
             Exceptions.attachLocalizedMessage(iae, "I can\'t be nice, I\'m the evil property editor.");
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/GraphicsTestCase.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/GraphicsTestCase.java
index 4e4d195f99..8d824a4054 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/GraphicsTestCase.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/GraphicsTestCase.java
@@ -304,6 +304,7 @@ public class GraphicsTestCase extends ExtTestCase {
         
         private void showFrameForImage(final BufferedImage bi) throws Exception {
             JFrame jf = new JFrame("assertPixelFromImage " + (count ++) + " (look for the yellow line)") {
+                @Override
                 public void paint(Graphics g) {
                     new ImageIcon(bi).paintIcon(this, g, 25, 25);
                     g.setColor(Color.YELLOW);
@@ -350,6 +351,7 @@ public class GraphicsTestCase extends ExtTestCase {
         
         private void showFrameForImage(final BufferedImage bi, final Point p) throws Exception {
             JFrame jf = new JFrame("assertPixelFromImage " + (count ++) + " (look for the yellow line)") {
+                @Override
                 public void paint(Graphics g) {
                     new ImageIcon(bi).paintIcon(this, g, 25, 25);
                     g.setColor(Color.YELLOW);
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/IndexedPropertyTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/IndexedPropertyTest.java
index 0676af417a..1c6d11b76f 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/IndexedPropertyTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/IndexedPropertyTest.java
@@ -230,11 +230,13 @@ public class IndexedPropertyTest extends ExtTestCase {
             setDisplayName("Fancy");
             setName(getDisplayName());
         }
-        
+
+        @Override
         public PropertyEditor getPropertyEditor() {
             return te;
         }
-        
+
+        @Override
         public int hashCode() {
             return 24;
         }
@@ -257,14 +259,17 @@ public class IndexedPropertyTest extends ExtTestCase {
         }
         
         // Set that this Editor doesn't support custom Editor
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void addPropertyChangeListener(PropertyChangeListener l) {
             super.addPropertyChangeListener(l);
         }
-        
+
+        @Override
         public void removePropertyChangeListener(PropertyChangeListener l) {
             super.removePropertyChangeListener(l);
         }
@@ -272,10 +277,12 @@ public class IndexedPropertyTest extends ExtTestCase {
         
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
-        
+
+        @Override
         public void firePropertyChange() {
             super.firePropertyChange();
         }
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/InplaceEditorFactoryTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/InplaceEditorFactoryTest.java
index 3780ead643..9d7268aefa 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/InplaceEditorFactoryTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/InplaceEditorFactoryTest.java
@@ -98,7 +98,8 @@ public class InplaceEditorFactoryTest extends NbTestCase {
         
         public TagsEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             return new String[] {"a","b","c","d","Value"};
         }
@@ -106,11 +107,13 @@ public class InplaceEditorFactoryTest extends NbTestCase {
         public void attachEnv(PropertyEnv env) {
             this.env = env;
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/InplaceEditorNoModifyOnTextChangeContractComboEditorTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/InplaceEditorNoModifyOnTextChangeContractComboEditorTest.java
index 44801e6498..bcb4f7ba4b 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/InplaceEditorNoModifyOnTextChangeContractComboEditorTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/InplaceEditorNoModifyOnTextChangeContractComboEditorTest.java
@@ -230,7 +230,8 @@ public class InplaceEditorNoModifyOnTextChangeContractComboEditorTest extends Nb
         
         public TagsEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             return new String[] {"a","b","c","d","Value"};
         }
@@ -238,11 +239,13 @@ public class InplaceEditorNoModifyOnTextChangeContractComboEditorTest extends Nb
         public void attachEnv(PropertyEnv env) {
             this.env = env;
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/InplaceEditorNoModifyOnTextChangeContractStringEditorTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/InplaceEditorNoModifyOnTextChangeContractStringEditorTest.java
index 106924cc5e..4ee706c775 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/InplaceEditorNoModifyOnTextChangeContractStringEditorTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/InplaceEditorNoModifyOnTextChangeContractStringEditorTest.java
@@ -181,11 +181,13 @@ public class InplaceEditorNoModifyOnTextChangeContractStringEditorTest extends N
         public void attachEnv(PropertyEnv env) {
             this.env = env;
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/NodeDeletionTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/NodeDeletionTest.java
index 8952c92485..d74229c927 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/NodeDeletionTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/NodeDeletionTest.java
@@ -267,14 +267,17 @@ public class NodeDeletionTest extends NbTestCase {
         }
         
         // Set that this Editor doesn't support custom Editor
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void addPropertyChangeListener(PropertyChangeListener l) {
             super.addPropertyChangeListener(l);
         }
-        
+
+        @Override
         public void removePropertyChangeListener(PropertyChangeListener l) {
             super.removePropertyChangeListener(l);
         }
@@ -282,10 +285,12 @@ public class NodeDeletionTest extends NbTestCase {
         
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
-        
+
+        @Override
         public void firePropertyChange() {
             super.firePropertyChange();
         }
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertyMarkingTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertyMarkingTest.java
index 5ba24bd137..e0dc9e69b7 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertyMarkingTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertyMarkingTest.java
@@ -295,15 +295,18 @@ public class PropertyMarkingTest extends GraphicsTestCase {
         }
         
         // Set that this Editor doesn't support custom Editor
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
-        
+
+        @Override
         public String getAsText() {
             return getValue() == null ? "null" : getValue().toString();
         }
@@ -315,7 +318,8 @@ public class PropertyMarkingTest extends GraphicsTestCase {
         
         public TagsEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             return new String[] {"a","b","c","d","Value"};
         }
@@ -324,11 +328,13 @@ public class PropertyMarkingTest extends GraphicsTestCase {
             this.env = env;
             env.setState(env.STATE_INVALID);
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
@@ -457,7 +463,8 @@ public class PropertyMarkingTest extends GraphicsTestCase {
         
         public BadEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             //return new String[] {"a","b","c","d","Value"};
             return null;
@@ -467,11 +474,13 @@ public class PropertyMarkingTest extends GraphicsTestCase {
             this.env = env;
             env.setState(env.STATE_INVALID);
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return true;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertyPanelInDialogTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertyPanelInDialogTest.java
index e507afeb77..43fa3d9873 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertyPanelInDialogTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertyPanelInDialogTest.java
@@ -443,7 +443,8 @@ public class PropertyPanelInDialogTest extends NbTestCase {
                 }
             }
         }
-        
+
+        @Override
         public void windowOpened(WindowEvent e) {
             shown = true;
             synchronized(this) {
@@ -652,15 +653,18 @@ public class PropertyPanelInDialogTest extends NbTestCase {
         }
         
         // Set that this Editor doesn't support custom Editor
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
-        
+
+        @Override
         public String getAsText() {
             return getValue() == null ? "null" : getValue().toString();
         }
@@ -672,7 +676,8 @@ public class PropertyPanelInDialogTest extends NbTestCase {
         public TagsEditor(String[] tags) {
             this.tags = tags;
         }
-        
+
+        @Override
         public String[] getTags() {
             return tags;
         }
@@ -680,11 +685,13 @@ public class PropertyPanelInDialogTest extends NbTestCase {
         public void attachEnv(PropertyEnv env) {
             this.env = env;
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
@@ -788,6 +795,8 @@ public class PropertyPanelInDialogTest extends NbTestCase {
     public static class ExEditor extends PropertyEditorSupport {
         private Object myVal="Value";
         public ExEditor() {}
+
+        @Override
         public void setAsText(String val) {
             //System.err.println("SetAsText");
             if (val.equals("Value")) {
@@ -798,12 +807,14 @@ public class PropertyPanelInDialogTest extends NbTestCase {
                 throw iae;
             }
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             myVal = newValue;
             firePropertyChange();
         }
-        
+
+        @Override
         public Object getValue() {
             return "Value";
         }
@@ -827,19 +838,23 @@ public class PropertyPanelInDialogTest extends NbTestCase {
         }
         
         // Set that this Editor doesn't support custom Editor
+        @Override
         public boolean supportsCustomEditor() {
             return true;
         }
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
-        
+
+        @Override
         public String getAsText() {
             return getValue() == null ? "null" : getValue().toString();
         }
-        
+
+        @Override
         public Component getCustomEditor() {
             return new JPanel();
         }
@@ -882,7 +897,8 @@ public class PropertyPanelInDialogTest extends NbTestCase {
         public EditableNumProperty(String name, boolean isWriteable) {
             super(name, isWriteable, new String[]{"boo"});
         }
-        
+
+        @Override
         public PropertyEditor getPropertyEditor() {
             return new PropertyPanelInDialogTest.EditableTagsEditor();
         }
@@ -895,22 +911,26 @@ public class PropertyPanelInDialogTest extends NbTestCase {
         // Create new BasicEditor
         public NumberedTagsEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             return new String[] {"zero","one","two","three","four","five","six","seven"};
         }
         
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             val = ((Integer) newValue).intValue();
             firePropertyChange();
         }
-        
+
+        @Override
         public String getAsText() {
             return getTags()[((Integer) getValue()).intValue()];
         }
-        
+
+        @Override
         public void setAsText(String txt) {
             String[] t = getTags();
             for (int i=0; i < t.length; i++) {
@@ -922,11 +942,13 @@ public class PropertyPanelInDialogTest extends NbTestCase {
             IllegalArgumentException iae = new IllegalArgumentException(txt);
             Exceptions.attachLocalizedMessage(iae, txt + " is not a valid value");
         }
-        
+
+        @Override
         public Object getValue() {
             return new Integer(val);
         }
-        
+
+        @Override
         public Component getCustomEditor() {
             return new JPanel();
         }
@@ -940,15 +962,23 @@ public class PropertyPanelInDialogTest extends NbTestCase {
         public void attachEnv(PropertyEnv env) {
             env.getFeatureDescriptor().setValue("canEditAsText", Boolean.TRUE);
         }
+
+        @Override
         public void setAsText(String s) {
             setValue(s);
         }
+
+        @Override
         public void setValue(Object val) {
             this.val = val;
         }
+
+        @Override
         public Object getValue() {
             return val;
         }
+
+        @Override
         public String getAsText() {
             return val.toString();
         }
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertyPanelTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertyPanelTest.java
index 59a74b4c99..bb7c00901c 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertyPanelTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertyPanelTest.java
@@ -383,7 +383,8 @@ public final class PropertyPanelTest extends NbTestCase {
         
         public Ed () {
         }
-        
+
+        @Override
         public void addPropertyChangeListener (PropertyChangeListener pcl) {
             super.addPropertyChangeListener(pcl);
         }
@@ -398,11 +399,13 @@ public final class PropertyPanelTest extends NbTestCase {
         //editor - and the PropertyPanel cannot be initialized into custom
         //editor mode for a property editor that doesn't actually support
         //custom editors
+        @Override
         public boolean supportsCustomEditor() {
             return true;
         }
         
         //To avoid NPE when propertypanel tries to add the custom editor
+        @Override
         public Component getCustomEditor() {
             JPanel result = new JPanel();
             result.setBackground(java.awt.Color.ORANGE);
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertySheetTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertySheetTest.java
index 05cdf58566..5ad613c1c2 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertySheetTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/PropertySheetTest.java
@@ -257,15 +257,18 @@ public class PropertySheetTest extends NbTestCase {
         }
         
         // Set that this Editor doesn't support custom Editor
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void addPropertyChangeListener(PropertyChangeListener l) {
             LOG.info("Property change listener added to property editor " + System.identityHashCode(this) + " - " + l);
             super.addPropertyChangeListener(l);
         }
-        
+
+        @Override
         public void removePropertyChangeListener(PropertyChangeListener l) {
             LOG.info("Property change listener removed from property editor " + System.identityHashCode(this) + " - " + l);
             super.removePropertyChangeListener(l);
@@ -274,11 +277,13 @@ public class PropertySheetTest extends NbTestCase {
         
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             LOG.info("TEditor.setValue: " + newValue);
             super.setValue(newValue);
         }
-        
+
+        @Override
         public void firePropertyChange() {
             LOG.info("TEditor.firePropertyChange");
             super.firePropertyChange();
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/RendererDisplayerTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/RendererDisplayerTest.java
index dca82c189d..6298ab307f 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/RendererDisplayerTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/RendererDisplayerTest.java
@@ -266,7 +266,8 @@ public class RendererDisplayerTest extends NbTestCase {
                 }
             }
         }
-        
+
+        @Override
         public void windowOpened(WindowEvent e) {
             shown = true;
             synchronized(this) {
@@ -507,15 +508,18 @@ public class RendererDisplayerTest extends NbTestCase {
         }
         
         // Set that this Editor doesn't support custom Editor
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
-        
+
+        @Override
         public String getAsText() {
             return getValue() == null ? "null" : getValue().toString();
         }
@@ -528,7 +532,8 @@ public class RendererDisplayerTest extends NbTestCase {
         public TagsEditor(String[] tags) {
             this.tags = tags;
         }
-        
+
+        @Override
         public String[] getTags() {
             return tags;
         }
@@ -536,11 +541,13 @@ public class RendererDisplayerTest extends NbTestCase {
         public void attachEnv(PropertyEnv env) {
             this.env = env;
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
@@ -644,6 +651,8 @@ public class RendererDisplayerTest extends NbTestCase {
     public static class ExEditor extends PropertyEditorSupport {
         private Object myVal="Value";
         public ExEditor() {}
+
+        @Override
         public void setAsText(String val) {
             //System.err.println("SetAsText");
             if (val.equals("Value")) {
@@ -654,12 +663,14 @@ public class RendererDisplayerTest extends NbTestCase {
                 throw iae;
             }
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             myVal = newValue;
             firePropertyChange();
         }
-        
+
+        @Override
         public Object getValue() {
             return "Value";
         }
@@ -683,19 +694,23 @@ public class RendererDisplayerTest extends NbTestCase {
         }
         
         // Set that this Editor doesn't support custom Editor
+        @Override
         public boolean supportsCustomEditor() {
             return true;
         }
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
-        
+
+        @Override
         public String getAsText() {
             return getValue() == null ? "null" : getValue().toString();
         }
-        
+
+        @Override
         public Component getCustomEditor() {
             return new JPanel();
         }
@@ -730,7 +745,8 @@ public class RendererDisplayerTest extends NbTestCase {
         public EditableNumProperty(String name, boolean isWriteable) {
             super(name, isWriteable, new String[]{"boo"});
         }
-        
+
+        @Override
         public PropertyEditor getPropertyEditor() {
             return new RendererDisplayerTest.EditableTagsEditor();
         }
@@ -743,22 +759,26 @@ public class RendererDisplayerTest extends NbTestCase {
         // Create new BasicEditor
         public NumberedTagsEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             return new String[] {"zero","one","two","three","four","five","six","seven"};
         }
         
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             val = ((Integer) newValue).intValue();
             firePropertyChange();
         }
-        
+
+        @Override
         public String getAsText() {
             return getTags()[((Integer) getValue()).intValue()];
         }
-        
+
+        @Override
         public void setAsText(String txt) {
             String[] t = getTags();
             for (int i=0; i < t.length; i++) {
@@ -770,11 +790,13 @@ public class RendererDisplayerTest extends NbTestCase {
             IllegalArgumentException iae = new IllegalArgumentException(txt);
             Exceptions.attachLocalizedMessage(iae, txt + " is not a valid value");
         }
-        
+
+        @Override
         public Object getValue() {
             return new Integer(val);
         }
-        
+
+        @Override
         public Component getCustomEditor() {
             return new JPanel();
         }
@@ -788,21 +810,33 @@ public class RendererDisplayerTest extends NbTestCase {
         public void attachEnv(PropertyEnv env) {
             env.getFeatureDescriptor().setValue("canEditAsText", Boolean.TRUE);
         }
+
+        @Override
         public void setAsText(String s) {
             setValue(s);
         }
+
+        @Override
         public void setValue(Object val) {
             this.val = val;
         }
+
+        @Override
         public Object getValue() {
             return val;
         }
+
+        @Override
         public String getAsText() {
             return val.toString();
         }
+
+        @Override
         public boolean supportsCustomEditor() {
             return true;
         }
+
+        @Override
         public Component getCustomEditor() {
             return new JLabel("You called?");
         }
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/SheetTableTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/SheetTableTest.java
index e7eb66eec2..1f6b78b1c0 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/SheetTableTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/SheetTableTest.java
@@ -287,7 +287,8 @@ public class SheetTableTest extends NbTestCase {
                 }
             }
         }
-        
+
+        @Override
         public void windowOpened(WindowEvent e) {
             shown = true;
             synchronized(this) {
@@ -601,15 +602,18 @@ public class SheetTableTest extends NbTestCase {
         }
         
         // Set that this Editor doesn't support custom Editor
+        @Override
         public boolean supportsCustomEditor() {
             return true;
         }
         
         // Set the Property value threw the Editor
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
-        
+
+        @Override
         public String getAsText() {
             return getValue() == null ? "null" : getValue().toString();
         }
@@ -620,7 +624,8 @@ public class SheetTableTest extends NbTestCase {
         
         public TagsEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             return new String[] {"a","b","c","d","Value"};
         }
@@ -628,11 +633,13 @@ public class SheetTableTest extends NbTestCase {
         public void attachEnv(PropertyEnv env) {
             this.env = env;
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
@@ -707,7 +714,8 @@ public class SheetTableTest extends NbTestCase {
         
         public BadEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             //return new String[] {"a","b","c","d","Value"};
             return null;
@@ -717,15 +725,18 @@ public class SheetTableTest extends NbTestCase {
             this.env = env;
             env.setState(env.STATE_INVALID);
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
-        
+
+        @Override
         public Object getValue() {
             return Boolean.FALSE;
         }
diff --git a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/TagsAndEditorsTest.java b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/TagsAndEditorsTest.java
index 3d6d748de6..25628b5777 100644
--- a/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/TagsAndEditorsTest.java
+++ b/platform/openide.explorer/test/unit/src/org/openide/explorer/propertysheet/TagsAndEditorsTest.java
@@ -187,7 +187,8 @@ public class TagsAndEditorsTest extends ExtTestCase {
             assertSame("Wrong component repainted:" + repaintedComponent, repaintedComponent, target);
             assertEquals("Wrong rectangle repainted:" + repaintedRect + " should be " + rect, rect, repaintedRect);
         }
-        
+
+        @Override
         public synchronized void addDirtyRegion(JComponent c, int x, int y, int w, int h) {
             super.addDirtyRegion(c, x, y, w, h);
             if (repaintedComponent == null) {
@@ -311,7 +312,8 @@ public class TagsAndEditorsTest extends ExtTestCase {
         
         public SingleTagEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             return new String[]{"lonely tag"};
         }
@@ -319,11 +321,13 @@ public class TagsAndEditorsTest extends ExtTestCase {
         public void attachEnv(PropertyEnv env) {
             this.env = env;
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
@@ -334,7 +338,8 @@ public class TagsAndEditorsTest extends ExtTestCase {
         
         public EditableSingleTagEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             return new String[]{"lonely tag"};
         }
@@ -343,11 +348,13 @@ public class TagsAndEditorsTest extends ExtTestCase {
             this.env = env;
             env.getFeatureDescriptor().setValue("canEditAsText", Boolean.TRUE);
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
@@ -358,7 +365,8 @@ public class TagsAndEditorsTest extends ExtTestCase {
         
         public EmptyTagsEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             return new String[0];
         }
@@ -366,11 +374,13 @@ public class TagsAndEditorsTest extends ExtTestCase {
         public void attachEnv(PropertyEnv env) {
             this.env = env;
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
@@ -381,7 +391,8 @@ public class TagsAndEditorsTest extends ExtTestCase {
         
         public EditableEmptyTagsEditor() {
         }
-        
+
+        @Override
         public String[] getTags() {
             return new String[0];
         }
@@ -390,11 +401,13 @@ public class TagsAndEditorsTest extends ExtTestCase {
             this.env = env;
             env.getFeatureDescriptor().setValue("canEditAsText", Boolean.TRUE);
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
@@ -406,7 +419,8 @@ public class TagsAndEditorsTest extends ExtTestCase {
         
         public BadEditorWithoutTags() {
         }
-        
+
+        @Override
         public String[] getTags() {
             return null;
         }
@@ -415,15 +429,18 @@ public class TagsAndEditorsTest extends ExtTestCase {
             this.env = env;
             env.setState(env.STATE_INVALID);
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
-        
+
+        @Override
         public Object getValue() {
             return Boolean.FALSE;
         }
@@ -434,7 +451,8 @@ public class TagsAndEditorsTest extends ExtTestCase {
         
         public BadEditorWithTags() {
         }
-        
+
+        @Override
         public String[] getTags() {
             return new String[] {"a","b","c","d","Value"};
         }
@@ -443,15 +461,18 @@ public class TagsAndEditorsTest extends ExtTestCase {
             this.env = env;
             env.setState(env.STATE_INVALID);
         }
-        
+
+        @Override
         public boolean supportsCustomEditor() {
             return false;
         }
-        
+
+        @Override
         public void setValue(Object newValue) {
             super.setValue(newValue);
         }
-        
+
+        @Override
         public Object getValue() {
             return Boolean.FALSE;
         }
diff --git a/platform/openide.filesystems.compat8/src/org/openide/filesystems/FileSystemCapability.java b/platform/openide.filesystems.compat8/src/org/openide/filesystems/FileSystemCapability.java
index d419e81c96..06a6b04a9e 100644
--- a/platform/openide.filesystems.compat8/src/org/openide/filesystems/FileSystemCapability.java
+++ b/platform/openide.filesystems.compat8/src/org/openide/filesystems/FileSystemCapability.java
@@ -44,6 +44,7 @@ public class FileSystemCapability extends Object {
     /** Object that is capable of every thing.
     */
     public static final FileSystemCapability ALL = new FileSystemCapability() {
+            @Override
             public boolean capableOf(FileSystemCapability c) {
                 return true;
             }
@@ -262,6 +263,7 @@ public class FileSystemCapability extends Object {
         * @param c capability to test
         * @return true if yes
         */
+        @Override
         public boolean capableOf(FileSystemCapability c) {
             if (c == COMPILE) {
                 return compilation;
@@ -394,6 +396,7 @@ public class FileSystemCapability extends Object {
             }
         }
 
+        @Override
         public synchronized void addPropertyChangeListener(PropertyChangeListener l) {
             if (supp == null) {
                 supp = new PropertyChangeSupport(this);
@@ -402,6 +405,7 @@ public class FileSystemCapability extends Object {
             supp.addPropertyChangeListener(l);
         }
 
+        @Override
         public void removePropertyChangeListener(PropertyChangeListener l) {
             if (supp != null) {
                 supp.removePropertyChangeListener(l);
diff --git a/platform/openide.filesystems/src/org/netbeans/modules/openide/filesystems/declmime/DefaultParser.java b/platform/openide.filesystems/src/org/netbeans/modules/openide/filesystems/declmime/DefaultParser.java
index 3c4e0401e8..efb8f5daba 100644
--- a/platform/openide.filesystems/src/org/netbeans/modules/openide/filesystems/declmime/DefaultParser.java
+++ b/platform/openide.filesystems/src/org/netbeans/modules/openide/filesystems/declmime/DefaultParser.java
@@ -209,22 +209,27 @@ abstract class DefaultParser  extends DefaultHandler {
         throw sex;
     }
 
+    @Override
     public void error(SAXParseException exception) throws SAXException {
         throw exception;
     }
 
+    @Override
     public void fatalError(SAXParseException exception) throws SAXException {
         throw exception;
     }
 
+    @Override
     public void endDocument() throws SAXException {
         state = PARSED;
     }
 
+    @Override
     public void setDocumentLocator(Locator locator) {
         this.locator = locator;
     }
 
+    @Override
     public InputSource resolveEntity (String publicID, String systemID) {
         // Read nothing whatsoever.
         return new InputSource (new ByteArrayInputStream (new byte[] { }));
diff --git a/platform/openide.filesystems/src/org/netbeans/modules/openide/filesystems/declmime/XMLMIMEComponent.java b/platform/openide.filesystems/src/org/netbeans/modules/openide/filesystems/declmime/XMLMIMEComponent.java
index 8ecfeb8afc..79b978b08b 100644
--- a/platform/openide.filesystems/src/org/netbeans/modules/openide/filesystems/declmime/XMLMIMEComponent.java
+++ b/platform/openide.filesystems/src/org/netbeans/modules/openide/filesystems/declmime/XMLMIMEComponent.java
@@ -207,8 +207,9 @@ final class XMLMIMEComponent extends DefaultParser {
         LocalSniffingParser() {}
         
         private WeakReference<SniffingParser> wref = null;
-        
-        protected WeakReference<SniffingParser> initialValue() {            
+
+        @Override
+        protected WeakReference<SniffingParser> initialValue() {
             SniffingParser parser = new SniffingParser();
             wref = new WeakReference<SniffingParser>(parser);
             return wref;
@@ -224,7 +225,8 @@ final class XMLMIMEComponent extends DefaultParser {
             }
             return cached;            
         }
-        
+
+        @Override
         public void set(WeakReference<SniffingParser> data) {
             // we are read only!
         }
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/FileURL.java b/platform/openide.filesystems/src/org/openide/filesystems/FileURL.java
index 87176b1b69..0bc9570395 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/FileURL.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/FileURL.java
@@ -104,6 +104,7 @@ class FileURL extends URLConnection {
     /*
     * @return InputStream or given FileObject.
     */
+    @Override
     public InputStream getInputStream() throws IOException, UnknownServiceException {
         connect();
 
@@ -126,6 +127,7 @@ class FileURL extends URLConnection {
     /*
     * @return OutputStream for given FileObject.
     */
+    @Override
     public OutputStream getOutputStream() throws IOException, UnknownServiceException {
         connect();
 
@@ -144,6 +146,7 @@ class FileURL extends URLConnection {
     /*
     * @return length of FileObject.
     */
+    @Override
     public int getContentLength() {
         try {
             connect();
@@ -158,6 +161,7 @@ class FileURL extends URLConnection {
     * @param name the header name. Only <code>content-type</code> is guaranteed to be present.
     * @return the value (i.e., MIME type)
     */
+    @Override
     public String getHeaderField(String name) {
         if (name.equalsIgnoreCase("content-type")) { // NOI18N
 
@@ -190,6 +194,7 @@ class FileURL extends URLConnection {
     // #13038: URLClassPath is going to check this.
     // Better not return AllPermission!
     // SocketPermission on localhost might also work.
+    @Override
     public Permission getPermission() throws IOException {
         // Note this is normally called by URLClassPath with an unconnected
         // URLConnection, so the fo will probably be null anyway.
@@ -233,6 +238,7 @@ class FileURL extends URLConnection {
         }
 
         /** overriden */
+        @Override
         public void close() throws IOException {
             flock.releaseLock();
             super.close();
@@ -302,6 +308,7 @@ class FileURL extends URLConnection {
             return reader.read();
         }
 
+        @Override
         public int read(byte[] b, int off, int len) throws IOException {
             char[] ch = new char[len];
             int r = reader.read(ch, 0, len);
@@ -312,18 +319,22 @@ class FileURL extends URLConnection {
             return r;
         }
 
+        @Override
         public long skip(long skip) throws IOException {
             return reader.skip(skip);
         }
 
+        @Override
         public void close() throws IOException {
             reader.close();
         }
 
+        @Override
         public void reset() throws IOException {
             reader.reset();
         }
 
+        @Override
         public boolean markSupported() {
             return false;
         }
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/MemoryFileSystem.java b/platform/openide.filesystems/src/org/openide/filesystems/MemoryFileSystem.java
index 9f9057200e..3f71c9fc21 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/MemoryFileSystem.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/MemoryFileSystem.java
@@ -270,6 +270,7 @@ final class MemoryFileSystem extends AbstractFileSystem implements AbstractFileS
     public OutputStream outputStream(final String name)
     throws java.io.IOException {
         class Out extends ByteArrayOutputStream {
+            @Override
             public void close() throws IOException {
                 super.close();
 
@@ -343,7 +344,8 @@ final class MemoryFileSystem extends AbstractFileSystem implements AbstractFileS
 		return retval;
 	    }
 
-	    public MemoryFileSystem.Entry put(String key, MemoryFileSystem.Entry value) {
+        @Override
+        public MemoryFileSystem.Entry put(String key, MemoryFileSystem.Entry value) {
 		MemoryFileSystem.Entry retval = super.put(key, value);
 		logMessage("called: PUT" + " key: "+key  + " value: "+value+ " result: " + retval);//NOI18N		
 		return retval;            
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java b/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java
index bff7986b85..54c2edae57 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/XMLMapAttr.java
@@ -1294,6 +1294,7 @@ final class XMLMapAttr implements Map {
                     return new FOEntry(fo, s);
                 }
 
+                @Override
                 public void remove() {
                     throw new UnsupportedOperationException();
                 }
diff --git a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/FileObject75826Test.java b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/FileObject75826Test.java
index 2ddc070b22..42fd7a84b7 100644
--- a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/FileObject75826Test.java
+++ b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/FileObject75826Test.java
@@ -104,6 +104,7 @@ public class FileObject75826Test extends NbTestCase {
                 this.info = new LocalFileSystem.Impl(this) {
                     public OutputStream outputStream(String name) throws java.io.IOException {
                         return new FilterOutputStream(super.outputStream(name)) {
+                            @Override
                             public void close() throws IOException {
                                 throw new IOException();
                             }
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 471b60d7ea..d8d7b0c79d 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
@@ -319,11 +319,13 @@ public class TestUtilHid {
             this.forceFolder = true;
             return this;
         }
-        
+
+        @Override
         public boolean isLeaf() {
             return !forceFolder && super.isLeaf();
         }
-        
+
+        @Override
         public void serialize(String path, String tab, PrintWriter pw, File baseFolder) throws IOException {
             if (!getName().isEmpty()) {
                 String n = getName();
diff --git a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/URLMapper50852Test.java b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/URLMapper50852Test.java
index 766de38636..91f3cce9c2 100644
--- a/platform/openide.filesystems/test/unit/src/org/openide/filesystems/URLMapper50852Test.java
+++ b/platform/openide.filesystems/test/unit/src/org/openide/filesystems/URLMapper50852Test.java
@@ -137,7 +137,8 @@ public class URLMapper50852Test extends NbTestCase {
 
     private static class MyThread extends Thread {
         private boolean finished = false;
-        
+
+        @Override
         public void run() {
             super.run();
             URLMapper.findFileObject(testURL);
diff --git a/platform/openide.io/src/org/openide/windows/IOProvider.java b/platform/openide.io/src/org/openide/windows/IOProvider.java
index fbd5f21cc6..e3cc15ba96 100644
--- a/platform/openide.io/src/org/openide/windows/IOProvider.java
+++ b/platform/openide.io/src/org/openide/windows/IOProvider.java
@@ -192,6 +192,7 @@ public abstract class IOProvider {
     private static final class Trivial extends IOProvider {
         
         private static final Reader in = new BufferedReader(new InputStreamReader(System.in)) {
+            @Override
             public void close() {
                 // do nothing, prevent blocking between System.in.read() and System.in.close();
             }
diff --git a/platform/openide.loaders/src/org/netbeans/modules/openide/loaders/EntityCatalogImpl.java b/platform/openide.loaders/src/org/netbeans/modules/openide/loaders/EntityCatalogImpl.java
index dd8ea40ae1..2c5dee673a 100644
--- a/platform/openide.loaders/src/org/netbeans/modules/openide/loaders/EntityCatalogImpl.java
+++ b/platform/openide.loaders/src/org/netbeans/modules/openide/loaders/EntityCatalogImpl.java
@@ -96,6 +96,7 @@ public final class EntityCatalogImpl extends EntityCatalog {
 
         // DefaultHandler extension
 
+        @Override
         public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
             if ("public".equals(qName)) {  //NOI18N
                 String key = atts.getValue("publicId");  //NOI18N
@@ -109,6 +110,7 @@ public final class EntityCatalogImpl extends EntityCatalog {
             }
         }
 
+        @Override
         public InputSource resolveEntity(String pid, String sid) {
             if (EntityCatalog.PUBLIC_ID.equals(pid)) {
                 // Don't use a nbres: URL here; can deadlock NbURLStreamHandlerFactory during startup
diff --git a/platform/openide.loaders/src/org/openide/awt/DynaMenuModel.java b/platform/openide.loaders/src/org/openide/awt/DynaMenuModel.java
index a436434f57..2671fc62cb 100644
--- a/platform/openide.loaders/src/org/openide/awt/DynaMenuModel.java
+++ b/platform/openide.loaders/src/org/openide/awt/DynaMenuModel.java
@@ -313,7 +313,8 @@ class DynaMenuModel {
     }
     
     static final class InvisibleMenuItem extends JMenuItem {
-        
+
+        @Override
         public boolean isVisible() {
             return false;
         }
diff --git a/platform/openide.loaders/src/org/openide/loaders/DataNode.java b/platform/openide.loaders/src/org/openide/loaders/DataNode.java
index 174704e4df..9dacc089d6 100644
--- a/platform/openide.loaders/src/org/openide/loaders/DataNode.java
+++ b/platform/openide.loaders/src/org/openide/loaders/DataNode.java
@@ -1299,6 +1299,7 @@ public class DataNode extends AbstractNode {
                 }
             }
 
+            @Override
             public void remove() {
                 getIteratorDelegate().remove();
             }
diff --git a/platform/openide.loaders/src/org/openide/loaders/DataObjectExistsException.java b/platform/openide.loaders/src/org/openide/loaders/DataObjectExistsException.java
index 245c63aa4f..0986070674 100644
--- a/platform/openide.loaders/src/org/openide/loaders/DataObjectExistsException.java
+++ b/platform/openide.loaders/src/org/openide/loaders/DataObjectExistsException.java
@@ -53,6 +53,7 @@ public class DataObjectExistsException extends java.io.IOException {
     }
 
     /** Performance trick */
+    @Override
     public /*final*/ Throwable fillInStackTrace() {
         return this;
     }
diff --git a/platform/openide.loaders/src/org/openide/loaders/FilesSet.java b/platform/openide.loaders/src/org/openide/loaders/FilesSet.java
index 2c3a40454a..c6233ce153 100644
--- a/platform/openide.loaders/src/org/openide/loaders/FilesSet.java
+++ b/platform/openide.loaders/src/org/openide/loaders/FilesSet.java
@@ -204,6 +204,7 @@ final class FilesSet implements Set<FileObject> {
             }
         }
 
+        @Override
         public void remove() {
             getIteratorDelegate().remove();
         }
diff --git a/platform/openide.loaders/src/org/openide/loaders/InstanceSupport.java b/platform/openide.loaders/src/org/openide/loaders/InstanceSupport.java
index 9b2393fd5c..23e1b7d0ce 100644
--- a/platform/openide.loaders/src/org/openide/loaders/InstanceSupport.java
+++ b/platform/openide.loaders/src/org/openide/loaders/InstanceSupport.java
@@ -415,6 +415,7 @@ public class InstanceSupport extends Object implements InstanceCookie.Of {
 
             /** Throws exception to signal the kind of class found.
             */
+            @Override
             public Class resolveClass (ObjectStreamClass osc)
             throws IOException, ClassNotFoundException {
                 Class c = findClass (osc.getName (), null);
diff --git a/platform/openide.loaders/src/org/openide/loaders/NewObjectPanel.java b/platform/openide.loaders/src/org/openide/loaders/NewObjectPanel.java
index 15b6113fa1..cd2e51795e 100644
--- a/platform/openide.loaders/src/org/openide/loaders/NewObjectPanel.java
+++ b/platform/openide.loaders/src/org/openide/loaders/NewObjectPanel.java
@@ -62,6 +62,7 @@ final class NewObjectPanel extends javax.swing.JPanel implements DocumentListene
     }
 
     /** Preffered size */
+    @Override
     public java.awt.Dimension getPreferredSize() {
         return TemplateWizard.PREF_DIM;
     }
@@ -175,6 +176,7 @@ final class NewObjectPanel extends javax.swing.JPanel implements DocumentListene
         changedUpdate (p1);
     }
 
+    @Override
     public void addNotify () {
         super.addNotify ();
         newObjectName.requestFocus ();
diff --git a/platform/openide.loaders/src/org/openide/loaders/OperationEvent.java b/platform/openide.loaders/src/org/openide/loaders/OperationEvent.java
index fdce12b9a1..dbd20614d4 100644
--- a/platform/openide.loaders/src/org/openide/loaders/OperationEvent.java
+++ b/platform/openide.loaders/src/org/openide/loaders/OperationEvent.java
@@ -49,6 +49,7 @@ public class OperationEvent extends EventObject {
         return obj;
     }
 
+    @Override
     public String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append(super.toString());
@@ -85,6 +86,7 @@ public class OperationEvent extends EventObject {
             return name;
         }
 
+        @Override
         final void writeDebug(StringBuffer sb) {
             sb.append(" originalname: ");
             sb.append(name);
@@ -112,7 +114,8 @@ public class OperationEvent extends EventObject {
         public FileObject getOriginalPrimaryFile () {
             return file;
         }
-        
+
+        @Override
         final void writeDebug(StringBuffer sb) {
             sb.append(" originalfile: ");
             sb.append(file);
@@ -142,8 +145,9 @@ public class OperationEvent extends EventObject {
         public DataObject getOriginalDataObject () {
             return orig;
         }
-        
-        
+
+
+        @Override
         final void writeDebug(StringBuffer sb) {
             sb.append(" originalobj: ");
             sb.append(orig);
diff --git a/platform/openide.loaders/src/org/openide/loaders/SortModeEditor.java b/platform/openide.loaders/src/org/openide/loaders/SortModeEditor.java
index 6dcd5fe966..541e7970c9 100644
--- a/platform/openide.loaders/src/org/openide/loaders/SortModeEditor.java
+++ b/platform/openide.loaders/src/org/openide/loaders/SortModeEditor.java
@@ -50,11 +50,13 @@ class SortModeEditor extends PropertyEditorSupport {
     };
 
     /** @return names of the two possible modes */
+    @Override
     public String[] getTags () {
         return modes;
     }
 
     /** @return text for the current value (File or Element mode) */
+    @Override
     public String getAsText () {
         Object obj = getValue ();
         for (int i = 0; i < values.length; i++) {
@@ -68,6 +70,7 @@ class SortModeEditor extends PropertyEditorSupport {
     /** Setter.
     * @param str string equal to one value from modes array
     */
+    @Override
     public void setAsText (String str) {
         for (int i = 0; i < modes.length; i++) {
             if (str.equals (modes[i])) {
diff --git a/platform/openide.loaders/src/org/openide/loaders/TemplateWizard1.java b/platform/openide.loaders/src/org/openide/loaders/TemplateWizard1.java
index f0a1bd4284..7a932ca506 100644
--- a/platform/openide.loaders/src/org/openide/loaders/TemplateWizard1.java
+++ b/platform/openide.loaders/src/org/openide/loaders/TemplateWizard1.java
@@ -125,6 +125,7 @@ final class TemplateWizard1 extends javax.swing.JPanel implements DataFilter,
         Utilities.attachInitJob(this, this);
     }
 
+    @Override
     public void addNotify() {
         // overriden to set the labels later than in constructor
         // in order to fix #19667
@@ -156,11 +157,13 @@ final class TemplateWizard1 extends javax.swing.JPanel implements DataFilter,
 
     /** Forward focus to tree view. */
     @SuppressWarnings("deprecation")
+    @Override
     public boolean requestDefaultFocus() {
         return treeView.requestDefaultFocus();
     }
 
     /** Preffered size */
+    @Override
     public java.awt.Dimension getPreferredSize() {
         return TemplateWizard.PREF_DIM;
     }
diff --git a/platform/openide.loaders/src/org/openide/loaders/TemplateWizard2.java b/platform/openide.loaders/src/org/openide/loaders/TemplateWizard2.java
index ec0b172010..1e964b8497 100644
--- a/platform/openide.loaders/src/org/openide/loaders/TemplateWizard2.java
+++ b/platform/openide.loaders/src/org/openide/loaders/TemplateWizard2.java
@@ -165,7 +165,8 @@ final class TemplateWizard2 extends javax.swing.JPanel implements DocumentListen
      * Reference to the current wizard
      */
     private TemplateWizard theWizard;
-    
+
+    @Override
     public void addNotify () {
         super.addNotify();
         //Fix for issue 31086, initial focus on Back button 
@@ -356,6 +357,7 @@ final class TemplateWizard2 extends javax.swing.JPanel implements DocumentListen
 
     /** Request focus.
     */
+    @Override
     public void requestFocus () {
         newObjectName.requestFocus();
         newObjectName.selectAll ();
diff --git a/platform/openide.loaders/src/org/openide/text/EditorSupport.java b/platform/openide.loaders/src/org/openide/text/EditorSupport.java
index 6df5fdf096..94b961a072 100644
--- a/platform/openide.loaders/src/org/openide/text/EditorSupport.java
+++ b/platform/openide.loaders/src/org/openide/text/EditorSupport.java
@@ -929,6 +929,7 @@ implements EditorCookie.Observable, OpenCookie, CloseCookie, PrintCookie {
         
         /** Finds delegating environment for this editor object.
         */
+        @Override
         public CloneableOpenSupport findCloneableOpenSupport() {
 	    // Svata: is this really needed ? EditorSupport does not implement CloneableOpenSupport anyway.
             CloneableOpenSupport o = super.findCloneableOpenSupport ();
diff --git a/platform/openide.loaders/test/unit/src/org/openide/loaders/DataLoaderOrigTest.java b/platform/openide.loaders/test/unit/src/org/openide/loaders/DataLoaderOrigTest.java
index 80777934a5..b188f4f624 100644
--- a/platform/openide.loaders/test/unit/src/org/openide/loaders/DataLoaderOrigTest.java
+++ b/platform/openide.loaders/test/unit/src/org/openide/loaders/DataLoaderOrigTest.java
@@ -206,6 +206,7 @@ public class DataLoaderOrigTest extends NbTestCase {
             final FileObject filefolder = lfs.findResource("folder");
             final boolean[] stop = new boolean[] {false};
             Thread t = new Thread("recognizing objects sometimes") {
+                @Override
                 public void run() {
                     try {
                         DataFolder folder = DataFolder.findFolder(filefolder);
diff --git a/platform/openide.nodes/src/org/openide/nodes/IndexedCustomizer.java b/platform/openide.nodes/src/org/openide/nodes/IndexedCustomizer.java
index a28be55138..ff0147e7b8 100644
--- a/platform/openide.nodes/src/org/openide/nodes/IndexedCustomizer.java
+++ b/platform/openide.nodes/src/org/openide/nodes/IndexedCustomizer.java
@@ -395,6 +395,7 @@ public final class IndexedCustomizer extends JDialog implements Customizer {
         }
     }
 
+    @Override
     public Dimension getPreferredSize() {
         return new Dimension(300, super.getPreferredSize().height);
     }
@@ -457,9 +458,11 @@ public final class IndexedCustomizer extends JDialog implements Customizer {
     }
 
     // I don't change any property...
+    @Override
     public void addPropertyChangeListener(PropertyChangeListener listener) {
     }
 
+    @Override
     public void removePropertyChangeListener(PropertyChangeListener listener) {
     }
 
diff --git a/platform/openide.nodes/test/unit/src/org/openide/nodes/Bean21341HiddenBeanInfo.java b/platform/openide.nodes/test/unit/src/org/openide/nodes/Bean21341HiddenBeanInfo.java
index b2ef32b940..229876c22e 100644
--- a/platform/openide.nodes/test/unit/src/org/openide/nodes/Bean21341HiddenBeanInfo.java
+++ b/platform/openide.nodes/test/unit/src/org/openide/nodes/Bean21341HiddenBeanInfo.java
@@ -96,6 +96,7 @@ public class Bean21341HiddenBeanInfo extends SimpleBeanInfo {
      * properties of this bean.  May return null if the
      * information should be obtained by automatic analysis.
      */
+    @Override
     public BeanDescriptor getBeanDescriptor() {
         return getBdescriptor();
     }
@@ -112,6 +113,7 @@ public class Bean21341HiddenBeanInfo extends SimpleBeanInfo {
      * A client of getPropertyDescriptors can use "instanceof" to check
      * if a given PropertyDescriptor is an IndexedPropertyDescriptor.
      */
+    @Override
     public PropertyDescriptor[] getPropertyDescriptors() {
         return getPdescriptor();
     }
@@ -123,6 +125,7 @@ public class Bean21341HiddenBeanInfo extends SimpleBeanInfo {
      * events fired by this bean.  May return null if the information
      * should be obtained by automatic analysis.
      */
+    @Override
     public EventSetDescriptor[] getEventSetDescriptors() {
         return getEdescriptor();
     }
@@ -134,6 +137,7 @@ public class Bean21341HiddenBeanInfo extends SimpleBeanInfo {
      * implemented by this bean.  May return null if the information
      * should be obtained by automatic analysis.
      */
+    @Override
     public MethodDescriptor[] getMethodDescriptors() {
         return getMdescriptor();
     }
@@ -146,6 +150,7 @@ public class Bean21341HiddenBeanInfo extends SimpleBeanInfo {
      * 		returned by getPropertyDescriptors.
      * <P>	Returns -1 if there is no default property.
      */
+    @Override
     public int getDefaultPropertyIndex() {
         return defaultPropertyIndex;
     }
@@ -157,6 +162,7 @@ public class Bean21341HiddenBeanInfo extends SimpleBeanInfo {
      *		returned by getEventSetDescriptors.
      * <P>	Returns -1 if there is no default event.
      */
+    @Override
     public int getDefaultEventIndex() {
         return defaultEventIndex;
     }
diff --git a/platform/openide.nodes/test/unit/src/org/openide/nodes/BeanNodeTest.java b/platform/openide.nodes/test/unit/src/org/openide/nodes/BeanNodeTest.java
index 3821812173..c2bfaea826 100644
--- a/platform/openide.nodes/test/unit/src/org/openide/nodes/BeanNodeTest.java
+++ b/platform/openide.nodes/test/unit/src/org/openide/nodes/BeanNodeTest.java
@@ -205,6 +205,7 @@ public class BeanNodeTest extends NbTestCase {
     }
     
     public static final class Bean1BeanInfo extends SimpleBeanInfo {
+        @Override
         public PropertyDescriptor[] getPropertyDescriptors() {
             try {
                 PropertyDescriptor foo = new PropertyDescriptor("foo", Bean1.class);
@@ -334,6 +335,7 @@ public class BeanNodeTest extends NbTestCase {
     }
     
     public static class HidenPropertyBeanBeanInfo extends SimpleBeanInfo {
+        @Override
         public PropertyDescriptor[] getPropertyDescriptors () {
             PropertyDescriptor[] properties = new PropertyDescriptor[1];
 
diff --git a/platform/openide.nodes/test/unit/src/org/openide/nodes/NodeLookupTest.java b/platform/openide.nodes/test/unit/src/org/openide/nodes/NodeLookupTest.java
index c5267440bf..98e941e2ee 100644
--- a/platform/openide.nodes/test/unit/src/org/openide/nodes/NodeLookupTest.java
+++ b/platform/openide.nodes/test/unit/src/org/openide/nodes/NodeLookupTest.java
@@ -589,6 +589,7 @@ public class NodeLookupTest extends NbTestCase {
                 }
                 getCookieSet ().add (org.openide.cookies.OpenCookie.class, new F ());
             }
+            @Override
             public Node.Cookie getCookie (Class c) {
                 if (org.openide.cookies.OpenCookie.class == c) {
                     return new org.openide.cookies.OpenCookie () {
diff --git a/platform/openide.nodes/test/unit/src/org/openide/util/actions/NodeActionTest.java b/platform/openide.nodes/test/unit/src/org/openide/util/actions/NodeActionTest.java
index 57d654fcf1..f6e29e140e 100644
--- a/platform/openide.nodes/test/unit/src/org/openide/util/actions/NodeActionTest.java
+++ b/platform/openide.nodes/test/unit/src/org/openide/util/actions/NodeActionTest.java
@@ -464,9 +464,11 @@ public class NodeActionTest extends NbTestCase {
         protected boolean surviveFocusChange() {
             return false;
         }
+        @Override
         public String getName() {
             return "DoesNotSurviveFocusChgAction";
         }
+        @Override
         protected boolean asynchronous() {
             return false;
         }
diff --git a/platform/openide.options/src/org/openide/options/ContextSystemOption.java b/platform/openide.options/src/org/openide/options/ContextSystemOption.java
index 10855610b1..b7aa9ddd34 100644
--- a/platform/openide.options/src/org/openide/options/ContextSystemOption.java
+++ b/platform/openide.options/src/org/openide/options/ContextSystemOption.java
@@ -203,6 +203,7 @@ public abstract class ContextSystemOption extends SystemOption implements BeanCo
         /** Overridden from base class.
         * @exception IllegalArgumentException if not targetChild instanceof SystemOption
         */
+        @Override
         public boolean add(Object targetChild) {
             if (!(targetChild instanceof SystemOption)) {
                 throw new IllegalArgumentException("Not a SystemOption: " + targetChild); // NOI18N
@@ -217,6 +218,7 @@ public abstract class ContextSystemOption extends SystemOption implements BeanCo
             return b;
         }
 
+        @Override
         public boolean remove(Object targetChild) {
             if (!(targetChild instanceof SystemOption)) {
                 throw new IllegalArgumentException("Not a SystemOption: " + targetChild); // NOI18N
@@ -231,6 +233,7 @@ public abstract class ContextSystemOption extends SystemOption implements BeanCo
             return b;
         }
 
+        @Override
         public void propertyChange(java.beans.PropertyChangeEvent evt) {
             if (parent != null) {
                 parent.firePropertyChange(evt.getPropertyName(), evt.getOldValue(), evt.getNewValue());
diff --git a/platform/openide.options/src/org/openide/options/ContextSystemOptionBeanInfo.java b/platform/openide.options/src/org/openide/options/ContextSystemOptionBeanInfo.java
index 515da345b6..57f66ecf5f 100644
--- a/platform/openide.options/src/org/openide/options/ContextSystemOptionBeanInfo.java
+++ b/platform/openide.options/src/org/openide/options/ContextSystemOptionBeanInfo.java
@@ -30,6 +30,7 @@ import org.openide.util.Exceptions;
 */
 public class ContextSystemOptionBeanInfo extends SimpleBeanInfo {
 
+    @Override
     public BeanInfo[] getAdditionalBeanInfo () {
         try {
             return new BeanInfo[] { Introspector.getBeanInfo (SystemOption.class) };
@@ -42,6 +43,7 @@ public class ContextSystemOptionBeanInfo extends SimpleBeanInfo {
     /** No properties.
     * @return array of hidden properties
     */
+    @Override
     public PropertyDescriptor[] getPropertyDescriptors () {
         try {
             PropertyDescriptor beanContextProxy = new PropertyDescriptor ("beanContextProxy", ContextSystemOption.class, "getBeanContextProxy", null);
diff --git a/platform/openide.options/src/org/openide/options/SystemOptionBeanInfo.java b/platform/openide.options/src/org/openide/options/SystemOptionBeanInfo.java
index e41b6ba17d..1e15b3def1 100644
--- a/platform/openide.options/src/org/openide/options/SystemOptionBeanInfo.java
+++ b/platform/openide.options/src/org/openide/options/SystemOptionBeanInfo.java
@@ -32,6 +32,7 @@ public class SystemOptionBeanInfo extends SimpleBeanInfo {
     /** No properties.
     * @return array of hidden properties
     */
+    @Override
     public PropertyDescriptor[] getPropertyDescriptors () {
         try {
             PropertyDescriptor name = new PropertyDescriptor ("name", SystemOption.class, "getName", null);
diff --git a/platform/openide.options/src/org/openide/text/PrintSettings.java b/platform/openide.options/src/org/openide/text/PrintSettings.java
index 8f96367099..364b746ebe 100644
--- a/platform/openide.options/src/org/openide/text/PrintSettings.java
+++ b/platform/openide.options/src/org/openide/text/PrintSettings.java
@@ -231,14 +231,17 @@ public final class PrintSettings extends ContextSystemOption {
                 sRIGHT = NbBundle.getMessage(PrintSettings.class, "CTL_RIGHT")
             };
 
+        @Override
         public String[] getTags() {
             return tags;
         }
 
+        @Override
         public String getAsText() {
             return tags[((Integer) getValue()).intValue()];
         }
 
+        @Override
         public void setAsText(String s) {
             if (s.equals(sLEFT)) {
                 setValue(new Integer(0));
@@ -253,11 +256,13 @@ public final class PrintSettings extends ContextSystemOption {
     /** Property editor for PageFormat instances */
     public static class PageFormatEditor extends java.beans.PropertyEditorSupport {
         /** No text */
+        @Override
         public String getAsText() {
             return null;
         }
 
         /* @return <tt>true</tt> */
+        @Override
         public boolean supportsCustomEditor() {
             return true;
         }
@@ -265,6 +270,7 @@ public final class PrintSettings extends ContextSystemOption {
         /**
         * @return <tt>null</tt> Shows pageDialog, however.
         */
+        @Override
         public java.awt.Component getCustomEditor() {
             PageFormat pf = (PageFormat) getValue();
             PrinterJob pj = PrinterJob.getPrinterJob();
diff --git a/platform/openide.options/src/org/openide/text/PrintSettingsBeanInfo.java b/platform/openide.options/src/org/openide/text/PrintSettingsBeanInfo.java
index ec30d3f4af..fc1287613a 100644
--- a/platform/openide.options/src/org/openide/text/PrintSettingsBeanInfo.java
+++ b/platform/openide.options/src/org/openide/text/PrintSettingsBeanInfo.java
@@ -30,6 +30,7 @@ import org.openide.util.*;
 */
 public class PrintSettingsBeanInfo extends SimpleBeanInfo {
     /** Returns the PrintSettings' icon */
+    @Override
     public Image getIcon(int type) {
         return ImageUtilities.loadImage("org/openide/text/printSettings.gif"); // NOI18N
     }
@@ -37,6 +38,7 @@ public class PrintSettingsBeanInfo extends SimpleBeanInfo {
     /** Descriptor of valid properties
     * @return array of properties
     */
+    @Override
     public PropertyDescriptor[] getPropertyDescriptors() {
         try {
             PropertyDescriptor[] desc = new PropertyDescriptor[] {
diff --git a/platform/openide.text/src/org/openide/text/CloneableEditorSupport.java b/platform/openide.text/src/org/openide/text/CloneableEditorSupport.java
index 9d1ff9364e..07c2313632 100644
--- a/platform/openide.text/src/org/openide/text/CloneableEditorSupport.java
+++ b/platform/openide.text/src/org/openide/text/CloneableEditorSupport.java
@@ -660,6 +660,7 @@ public abstract class CloneableEditorSupport extends CloneableOpenSupport {
                 super(size);
             }
 
+            @Override
             public void writeTo(OutputStream os) throws IOException {
                 os.write(buf, 0, count);
             }
diff --git a/platform/openide.text/src/org/openide/text/QuietEditorPane.java b/platform/openide.text/src/org/openide/text/QuietEditorPane.java
index 103d2cb1a9..409d62cd81 100644
--- a/platform/openide.text/src/org/openide/text/QuietEditorPane.java
+++ b/platform/openide.text/src/org/openide/text/QuietEditorPane.java
@@ -104,7 +104,8 @@ final class QuietEditorPane extends JEditorPane {
     public QuietEditorPane() {
         setFontHeightWidth(getFont());
     }
-    
+
+    @Override
     public AccessibleContext getAccessibleContext() {
         AccessibleContext ctx = super.getAccessibleContext();
         if (ctx != null) {
diff --git a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditor143143Test.java b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditor143143Test.java
index 943e152c07..ed82ac5052 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditor143143Test.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditor143143Test.java
@@ -160,6 +160,7 @@ implements CloneableEditorSupport.Env {
     }
     public OutputStream outputStream() throws IOException {
         class ContentStream extends ByteArrayOutputStream {
+            @Override
             public void close () throws IOException {
                 super.close ();
                 content = new String (toByteArray ());
@@ -181,6 +182,7 @@ implements CloneableEditorSupport.Env {
         if (cannotBeModified != null) {
             final String notify = cannotBeModified;
             IOException e = new IOException () {
+                @Override
                 public String getLocalizedMessage () {
                     return notify;
                 }
diff --git a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorAssociateTest.java b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorAssociateTest.java
index 05f4629f4e..29b56fb66e 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorAssociateTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorAssociateTest.java
@@ -147,6 +147,7 @@ implements CloneableEditorSupport.Env {
     }
     public OutputStream outputStream() throws IOException {
         class ContentStream extends ByteArrayOutputStream {
+            @Override
             public void close () throws IOException {
                 super.close ();
                 content = new String (toByteArray ());
diff --git a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorCreationFinishedTest.java b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorCreationFinishedTest.java
index 5d80379c55..f8c8d8d3d9 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorCreationFinishedTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorCreationFinishedTest.java
@@ -194,6 +194,7 @@ implements CloneableEditorSupport.Env, PropertyChangeListener {
     }
     public OutputStream outputStream() throws IOException {
         class ContentStream extends ByteArrayOutputStream {
+            @Override
             public void close () throws IOException {
                 super.close ();
                 content = new String (toByteArray ());
@@ -215,6 +216,7 @@ implements CloneableEditorSupport.Env, PropertyChangeListener {
         if (cannotBeModified != null) {
             final String notify = cannotBeModified;
             IOException e = new IOException () {
+                @Override
                 public String getLocalizedMessage () {
                     return notify;
                 }
diff --git a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorRecentPaneTest.java b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorRecentPaneTest.java
index 3790d1fd36..321c145215 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorRecentPaneTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorRecentPaneTest.java
@@ -174,6 +174,7 @@ implements CloneableEditorSupport.Env {
     }
     public OutputStream outputStream() throws IOException {
         class ContentStream extends ByteArrayOutputStream {
+            @Override
             public void close () throws IOException {
                 super.close ();
                 content = new String (toByteArray ());
@@ -195,6 +196,7 @@ implements CloneableEditorSupport.Env {
         if (cannotBeModified != null) {
             final String notify = cannotBeModified;
             IOException e = new IOException () {
+                @Override
                 public String getLocalizedMessage () {
                     return notify;
                 }
diff --git a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportCOSRedirectorTest.java b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportCOSRedirectorTest.java
index 2457154b52..ad7e4ef005 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportCOSRedirectorTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportCOSRedirectorTest.java
@@ -280,6 +280,7 @@ implements CloneableEditorSupport.Env {
     }
     public java.io.OutputStream outputStream() throws java.io.IOException {
         class ContentStream extends java.io.ByteArrayOutputStream {
+            @Override
             public void close () throws java.io.IOException {
                 super.close ();
                 content.append(new String (toByteArray ()));
diff --git a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportDoubleSaveTest.java b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportDoubleSaveTest.java
index 63615c2f7c..5582f3532e 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportDoubleSaveTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportDoubleSaveTest.java
@@ -179,6 +179,7 @@ implements CloneableEditorSupport.Env {
     }
     public OutputStream outputStream() throws IOException {
         class ContentStream extends ByteArrayOutputStream {
+            @Override
             public void close () throws IOException {
                 super.close ();
                 content = new String (toByteArray ());
diff --git a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportOpenCloseTest.java b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportOpenCloseTest.java
index 9f18c90d22..6b0145f3d9 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportOpenCloseTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportOpenCloseTest.java
@@ -232,6 +232,7 @@ implements CloneableEditorSupport.Env {
         if (cannotBeModified != null) {
             final String notify = cannotBeModified;
             IOException e = new IOException () {
+                @Override
                 public String getLocalizedMessage () {
                     return notify;
                 }
diff --git a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportPaneAsyncTest.java b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportPaneAsyncTest.java
index 97a46c9cea..1503e02953 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportPaneAsyncTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportPaneAsyncTest.java
@@ -150,6 +150,7 @@ public class CloneableEditorSupportPaneAsyncTest extends NbTestCase implements C
     }
     public java.io.OutputStream outputStream() throws java.io.IOException {
         class ContentStream extends java.io.ByteArrayOutputStream {
+            @Override
             public void close () throws java.io.IOException {
                 super.close ();
                 content = new String (toByteArray ());
diff --git a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportPaneTest.java b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportPaneTest.java
index d622e798f0..fc01164466 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportPaneTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportPaneTest.java
@@ -202,6 +202,7 @@ public class CloneableEditorSupportPaneTest extends NbTestCase implements Clonea
     }
     public java.io.OutputStream outputStream() throws java.io.IOException {
         class ContentStream extends java.io.ByteArrayOutputStream {
+            @Override
             public void close () throws java.io.IOException {
                 super.close ();
                 content = new String (toByteArray ());
@@ -322,7 +323,8 @@ public class CloneableEditorSupportPaneTest extends NbTestCase implements Clonea
         public CES2 (Env env, Lookup l) {
             super (env, l);
         }
-        
+
+        @Override
         protected org.openide.text.CloneableEditorSupport.Pane createPane() {
             instance2 = new MyPaneNonNonTC();
             return instance2;
diff --git a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportRedirectorTest.java b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportRedirectorTest.java
index 5c509f5d24..82c4496f9f 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportRedirectorTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportRedirectorTest.java
@@ -261,6 +261,7 @@ implements CloneableEditorSupport.Env {
     }
     public java.io.OutputStream outputStream() throws java.io.IOException {
         class ContentStream extends java.io.ByteArrayOutputStream {
+            @Override
             public void close () throws java.io.IOException {
                 super.close ();
                 content = new String (toByteArray ());
@@ -282,6 +283,7 @@ implements CloneableEditorSupport.Env {
         if (cannotBeModified != null) {
             final String notify = cannotBeModified;
             IOException e = new IOException () {
+                @Override
                 public String getLocalizedMessage () {
                     return notify;
                 }
diff --git a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportSaveTest.java b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportSaveTest.java
index e1b0f50769..e265654bde 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportSaveTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportSaveTest.java
@@ -188,6 +188,7 @@ implements CloneableEditorSupport.Env {
     }
     public OutputStream outputStream() throws IOException {
         class ContentStream extends ByteArrayOutputStream {
+            @Override
             public void close () throws IOException {
                 super.close ();
                 content = new String (toByteArray ());
diff --git a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportTest.java b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportTest.java
index 3163b93d35..019252ade0 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorSupportTest.java
@@ -464,6 +464,7 @@ implements CloneableEditorSupport.Env {
         if (cannotBeModified != null) {
             final String notify = cannotBeModified;
             IOException e = new IOException () {
+                @Override
                 public String getLocalizedMessage () {
                     return notify;
                 }
diff --git a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorTest.java b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorTest.java
index 8f63dd9001..6e675362a3 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/CloneableEditorTest.java
@@ -152,6 +152,7 @@ implements CloneableEditorSupport.Env {
     }
     public OutputStream outputStream() throws IOException {
         class ContentStream extends ByteArrayOutputStream {
+            @Override
             public void close () throws IOException {
                 super.close ();
                 content = new String (toByteArray ());
diff --git a/platform/openide.text/test/unit/src/org/openide/text/Deadlock169717Test.java b/platform/openide.text/test/unit/src/org/openide/text/Deadlock169717Test.java
index 442db94a7d..c11d25cda5 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/Deadlock169717Test.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/Deadlock169717Test.java
@@ -186,6 +186,7 @@ implements CloneableEditorSupport.Env {
     }
     public OutputStream outputStream() throws IOException {
         class ContentStream extends ByteArrayOutputStream {
+            @Override
             public void close () throws IOException {
                 super.close ();
                 content = new String (toByteArray ());
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 112503c115..2bf1026411 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
@@ -217,6 +217,7 @@ implements CloneableEditorSupport.Env {
     }
     public OutputStream outputStream() throws IOException {
         class ContentStream extends ByteArrayOutputStream {
+            @Override
             public void close () throws IOException {
                 super.close ();
                 content = new String (toByteArray ());
@@ -238,6 +239,7 @@ implements CloneableEditorSupport.Env {
         if (cannotBeModified != null) {
             final String notify = cannotBeModified;
             IOException e = new IOException () {
+                @Override
                 public String getLocalizedMessage () {
                     return notify;
                 }
@@ -306,7 +308,8 @@ implements CloneableEditorSupport.Env {
         boolean redoFail;
         
         int undoFailedCount;
-        
+
+        @Override
         public void undo() throws CannotUndoException {
             assert (!undone) : "Already undone";
             if (undoFail) {
@@ -315,7 +318,8 @@ implements CloneableEditorSupport.Env {
             }
             undone = true;
         }
-        
+
+        @Override
         public void redo() throws CannotRedoException {
             assert (undone) : "Already redone";
             if (redoFail) {
diff --git a/platform/openide.text/test/unit/src/org/openide/text/DocumentCannotBeClosedWhenReadLockedTest.java b/platform/openide.text/test/unit/src/org/openide/text/DocumentCannotBeClosedWhenReadLockedTest.java
index ce54621a9d..f46f66ddbd 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/DocumentCannotBeClosedWhenReadLockedTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/DocumentCannotBeClosedWhenReadLockedTest.java
@@ -262,6 +262,7 @@ public class DocumentCannotBeClosedWhenReadLockedTest extends NbTestCase impleme
     }
     public java.io.OutputStream outputStream() throws java.io.IOException {
         class ContentStream extends java.io.ByteArrayOutputStream {
+            @Override
             public void close () throws java.io.IOException {
                 super.close ();
                 content = new String (toByteArray ());
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 507d0b3d2a..f9d6a2366c 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
@@ -194,6 +194,7 @@ implements CloneableEditorSupport.Env {
     }
     public OutputStream outputStream() throws IOException {
         class ContentStream extends ByteArrayOutputStream {
+            @Override
             public void close () throws IOException {
                 super.close ();
                 content = new String (toByteArray ());
@@ -215,6 +216,7 @@ implements CloneableEditorSupport.Env {
         if (cannotBeModified != null) {
             final String notify = cannotBeModified;
             IOException e = new IOException () {
+                @Override
                 public String getLocalizedMessage () {
                     return notify;
                 }
diff --git a/platform/openide.text/test/unit/src/org/openide/text/InitializeOnBackgroundTest.java b/platform/openide.text/test/unit/src/org/openide/text/InitializeOnBackgroundTest.java
index b0f6abadbe..fe3998da1c 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/InitializeOnBackgroundTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/InitializeOnBackgroundTest.java
@@ -254,6 +254,7 @@ public class InitializeOnBackgroundTest extends NbTestCase implements CloneableE
     }
     public java.io.OutputStream outputStream() throws java.io.IOException {
         class ContentStream extends java.io.ByteArrayOutputStream {
+            @Override
             public void close () throws java.io.IOException {
                 super.close ();
                 content = new String (toByteArray ());
diff --git a/platform/openide.text/test/unit/src/org/openide/text/NbLikeEditorKit.java b/platform/openide.text/test/unit/src/org/openide/text/NbLikeEditorKit.java
index 06e7f26ca5..3501ae8750 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/NbLikeEditorKit.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/NbLikeEditorKit.java
@@ -32,6 +32,7 @@ import javax.swing.undo.UndoManager;
  * @author  Jaroslav Tulach
  */
 class NbLikeEditorKit extends DefaultEditorKit implements Callable<Void> {
+    @Override
     public javax.swing.text.Document createDefaultDocument() {
         return new Doc ();
     }
@@ -102,10 +103,12 @@ class NbLikeEditorKit extends DefaultEditorKit implements Callable<Void> {
 
         private int changes;
         private boolean modifiable;
+        @Override
         public void insertString (int offs, String str, AttributeSet a) throws BadLocationException {
             insOrRemoveOrRunnable (offs, str, a, 0, true, null);
         }
 
+        @Override
         public void remove (int offs, int len) throws BadLocationException {
             insOrRemoveOrRunnable (offs, null, null, len, false, null);
         }
@@ -208,16 +211,19 @@ class NbLikeEditorKit extends DefaultEditorKit implements Callable<Void> {
             return canBeModified;
         }
 
+        @Override
         protected void fireRemoveUpdate (javax.swing.event.DocumentEvent e) {
             super.fireRemoveUpdate(e);
             changes++;
         }
 
+        @Override
         protected void fireInsertUpdate (javax.swing.event.DocumentEvent e) {
             super.fireInsertUpdate(e);
             changes++;
         }
 
+        @Override
         protected void fireChangedUpdate (javax.swing.event.DocumentEvent e) {
             super.fireChangedUpdate(e);
             changes++;
diff --git a/platform/openide.text/test/unit/src/org/openide/text/NetworkConnectionLostTest.java b/platform/openide.text/test/unit/src/org/openide/text/NetworkConnectionLostTest.java
index d633f6749d..553e478f3f 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/NetworkConnectionLostTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/NetworkConnectionLostTest.java
@@ -165,6 +165,7 @@ implements CloneableEditorSupport.Env {
         }
         
         class ContentStream extends java.io.ByteArrayOutputStream {
+            @Override
             public void close () throws java.io.IOException {
                 super.close ();
                 content = new String (toByteArray ());
diff --git a/platform/openide.text/test/unit/src/org/openide/text/ReusableEditor2Test.java b/platform/openide.text/test/unit/src/org/openide/text/ReusableEditor2Test.java
index 8900bb4058..bf63501707 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/ReusableEditor2Test.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/ReusableEditor2Test.java
@@ -274,6 +274,7 @@ public class ReusableEditor2Test extends NbTestCase {
         }
         public java.io.OutputStream outputStream() throws java.io.IOException {
             class ContentStream extends java.io.ByteArrayOutputStream {
+                @Override
                 public void close () throws java.io.IOException {
                     super.close ();
                     content = new String (toByteArray ());
diff --git a/platform/openide.text/test/unit/src/org/openide/text/ReusableEditorTest.java b/platform/openide.text/test/unit/src/org/openide/text/ReusableEditorTest.java
index a175f957b6..c05a970525 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/ReusableEditorTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/ReusableEditorTest.java
@@ -273,6 +273,7 @@ public class ReusableEditorTest extends NbTestCase {
         }
         public java.io.OutputStream outputStream() throws java.io.IOException {
             class ContentStream extends java.io.ByteArrayOutputStream {
+                @Override
                 public void close () throws java.io.IOException {
                     super.close ();
                     content = new String (toByteArray ());
diff --git a/platform/openide.text/test/unit/src/org/openide/text/Starvation37045SecondTest.java b/platform/openide.text/test/unit/src/org/openide/text/Starvation37045SecondTest.java
index 87785ddfa7..4468a7b073 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/Starvation37045SecondTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/Starvation37045SecondTest.java
@@ -127,6 +127,7 @@ public class Starvation37045SecondTest extends NbTestCase implements CloneableEd
     }
     public java.io.OutputStream outputStream() throws java.io.IOException {
         class ContentStream extends java.io.ByteArrayOutputStream {
+            @Override
             public void close () throws java.io.IOException {
                 super.close ();
                 content = new String (toByteArray ());
diff --git a/platform/openide.text/test/unit/src/org/openide/text/Starvation37045Test.java b/platform/openide.text/test/unit/src/org/openide/text/Starvation37045Test.java
index 732170b456..752eae67dd 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/Starvation37045Test.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/Starvation37045Test.java
@@ -127,6 +127,7 @@ implements CloneableEditorSupport.Env {
     }
     public java.io.OutputStream outputStream() throws java.io.IOException {
         class ContentStream extends java.io.ByteArrayOutputStream {
+            @Override
             public void close () throws java.io.IOException {
                 super.close ();
                 content = new String (toByteArray ());
diff --git a/platform/openide.text/test/unit/src/org/openide/text/UndoRedoCooperationTest.java b/platform/openide.text/test/unit/src/org/openide/text/UndoRedoCooperationTest.java
index 47d9117a1a..248752f7a5 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/UndoRedoCooperationTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/UndoRedoCooperationTest.java
@@ -268,6 +268,7 @@ public class UndoRedoCooperationTest extends NbTestCase implements CloneableEdit
     }
     public java.io.OutputStream outputStream() throws java.io.IOException {
         class ContentStream extends java.io.ByteArrayOutputStream {
+            @Override
             public void close () throws java.io.IOException {
                 super.close ();
                 content = new String (toByteArray ());
diff --git a/platform/openide.text/test/unit/src/org/openide/text/UndoRedoTest.java b/platform/openide.text/test/unit/src/org/openide/text/UndoRedoTest.java
index 1f21eacd91..85e2735ea5 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/UndoRedoTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/UndoRedoTest.java
@@ -222,6 +222,7 @@ public class UndoRedoTest extends NbTestCase implements CloneableEditorSupport.E
     }
     public java.io.OutputStream outputStream() throws java.io.IOException {
         class ContentStream extends java.io.ByteArrayOutputStream {
+            @Override
             public void close () throws java.io.IOException {
                 super.close ();
                 content = new String (toByteArray ());
diff --git a/platform/openide.text/test/unit/src/org/openide/text/UndoRedoWrappingCooperationTest.java b/platform/openide.text/test/unit/src/org/openide/text/UndoRedoWrappingCooperationTest.java
index 51a9cfd9a3..1c0c85edab 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/UndoRedoWrappingCooperationTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/UndoRedoWrappingCooperationTest.java
@@ -551,6 +551,7 @@ public class UndoRedoWrappingCooperationTest extends NbTestCase implements Clone
     }
     public java.io.OutputStream outputStream() throws java.io.IOException {
         class ContentStream extends java.io.ByteArrayOutputStream {
+            @Override
             public void close () throws java.io.IOException {
                 super.close ();
                 content = new String (toByteArray ());
diff --git a/platform/openide.text/test/unit/src/org/openide/text/UndoRedoWrappingExampleTest.java b/platform/openide.text/test/unit/src/org/openide/text/UndoRedoWrappingExampleTest.java
index db67b8c381..7544d6c566 100644
--- a/platform/openide.text/test/unit/src/org/openide/text/UndoRedoWrappingExampleTest.java
+++ b/platform/openide.text/test/unit/src/org/openide/text/UndoRedoWrappingExampleTest.java
@@ -200,6 +200,7 @@ public class UndoRedoWrappingExampleTest extends NbTestCase implements Cloneable
     }
     public java.io.OutputStream outputStream() throws java.io.IOException {
         class ContentStream extends java.io.ByteArrayOutputStream {
+            @Override
             public void close () throws java.io.IOException {
                 super.close ();
                 content = new String (toByteArray ());
diff --git a/platform/openide.util.lookup/test/unit/src/org/bar/Iterator2.java b/platform/openide.util.lookup/test/unit/src/org/bar/Iterator2.java
index d547de924a..12f19d52cb 100644
--- a/platform/openide.util.lookup/test/unit/src/org/bar/Iterator2.java
+++ b/platform/openide.util.lookup/test/unit/src/org/bar/Iterator2.java
@@ -23,7 +23,8 @@ public class Iterator2 implements java.util.Iterator {
     public boolean hasNext() {return false;}
     
     public Object next() {return null;}
-    
+
+    @Override
     public void remove() {}
    
 }
diff --git a/platform/openide.util.lookup/test/unit/src/org/foo/impl/Iterator1.java b/platform/openide.util.lookup/test/unit/src/org/foo/impl/Iterator1.java
index 3b68fcee9d..2c43d1fa14 100644
--- a/platform/openide.util.lookup/test/unit/src/org/foo/impl/Iterator1.java
+++ b/platform/openide.util.lookup/test/unit/src/org/foo/impl/Iterator1.java
@@ -23,7 +23,8 @@ public class Iterator1 implements java.util.Iterator {
     public boolean hasNext() {return false;}
     
     public Object next() {return null;}
-    
+
+    @Override
     public void remove() {}
    
 }
diff --git a/platform/openide.util.ui/src/org/openide/ErrorManager.java b/platform/openide.util.ui/src/org/openide/ErrorManager.java
index e047660419..001e72b0a4 100644
--- a/platform/openide.util.ui/src/org/openide/ErrorManager.java
+++ b/platform/openide.util.ui/src/org/openide/ErrorManager.java
@@ -711,6 +711,7 @@ public abstract class ErrorManager extends Object {
         }
 
         /** Calls all delegates. */
+        @Override
         public boolean isLoggable(int severity) {
             if (severity == UNKNOWN) {
                 throw new IllegalArgumentException("ErrorManager.isLoggable(UNKNOWN) is not permitted"); // NOI18N
@@ -730,6 +731,7 @@ public abstract class ErrorManager extends Object {
         }
 
         /** Calls all delegates. */
+        @Override
         public boolean isNotifiable(int severity) {
             if (severity == UNKNOWN) {
                 throw new IllegalArgumentException("ErrorManager.isNotifiable(UNKNOWN) is not permitted"); // NOI18N
@@ -818,6 +820,7 @@ public abstract class ErrorManager extends Object {
         /** additional mapping from throwables that refuse initCause call */
         private static Map<Throwable, AnnException> extras = new WeakHashMap<Throwable, AnnException>();
 
+        @Override
         public String getMessage() {
             StringBuilder sb = new StringBuilder();
             String sep = "";
@@ -880,16 +883,19 @@ public abstract class ErrorManager extends Object {
             return r == null ? empty : r.toArray(empty);
         }
 
+        @Override
         public void printStackTrace(PrintStream s) {
             super.printStackTrace(s);
             logRecords(s);
         }
 
+        @Override
         public void printStackTrace(PrintWriter s) {
             super.printStackTrace(s);
             logRecords(s);
         }
 
+        @Override
         public void printStackTrace() {
             printStackTrace(System.err);
         }
diff --git a/platform/openide.util.ui/src/org/openide/LifecycleManager.java b/platform/openide.util.ui/src/org/openide/LifecycleManager.java
index 6a186ec3ff..853d263a20 100644
--- a/platform/openide.util.ui/src/org/openide/LifecycleManager.java
+++ b/platform/openide.util.ui/src/org/openide/LifecycleManager.java
@@ -93,6 +93,7 @@ public abstract class LifecycleManager {
             System.exit(0);
         }
 
+        @Override
         public void exit(int status) {
             System.exit(status);
         }
diff --git a/platform/openide.util.ui/src/org/openide/util/UtilitiesCompositeActionMap.java b/platform/openide.util.ui/src/org/openide/util/UtilitiesCompositeActionMap.java
index 3bbab413dd..a81e0d4b88 100644
--- a/platform/openide.util.ui/src/org/openide/util/UtilitiesCompositeActionMap.java
+++ b/platform/openide.util.ui/src/org/openide/util/UtilitiesCompositeActionMap.java
@@ -39,10 +39,12 @@ final class UtilitiesCompositeActionMap extends ActionMap {
         this.component = c;
     }
 
+    @Override
     public int size() {
         return keys().length;
     }
 
+    @Override
     public Action get(Object key) {
         Component c = component;
 
@@ -73,10 +75,12 @@ final class UtilitiesCompositeActionMap extends ActionMap {
         return null;
     }
 
+    @Override
     public Object[] allKeys() {
         return keys(true);
     }
 
+    @Override
     public Object[] keys() {
         return keys(false);
     }
@@ -123,18 +127,23 @@ final class UtilitiesCompositeActionMap extends ActionMap {
     // 
     // Not implemented
     //
+    @Override
     public void remove(Object key) {
     }
 
+    @Override
     public void setParent(ActionMap map) {
     }
 
+    @Override
     public void clear() {
     }
 
+    @Override
     public void put(Object key, Action action) {
     }
 
+    @Override
     public ActionMap getParent() {
         return null;
     }
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 a798f87655..90bfa96531 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
@@ -482,6 +482,7 @@ public abstract class CallbackSystemAction extends CallableSystemAction implemen
             delegate.addPropertyChangeListener(this);
         }
 
+        @Override
         public void clear() {
             Action a;
 
diff --git a/platform/openide.util.ui/test/unit/src/org/openide/ErrorManagerCyclicDepTest.java b/platform/openide.util.ui/test/unit/src/org/openide/ErrorManagerCyclicDepTest.java
index 188b99b394..3cc87a2314 100644
--- a/platform/openide.util.ui/test/unit/src/org/openide/ErrorManagerCyclicDepTest.java
+++ b/platform/openide.util.ui/test/unit/src/org/openide/ErrorManagerCyclicDepTest.java
@@ -116,7 +116,8 @@ public class ErrorManagerCyclicDepTest extends NbTestCase {
                 }
             }
         }
-        
+
+        @Override
         public void log(LogRecord record) {
             init();
 
diff --git a/platform/openide.util.ui/test/unit/src/org/openide/util/SharedClassObjectTest.java b/platform/openide.util.ui/test/unit/src/org/openide/util/SharedClassObjectTest.java
index 21910a25db..7260873a23 100644
--- a/platform/openide.util.ui/test/unit/src/org/openide/util/SharedClassObjectTest.java
+++ b/platform/openide.util.ui/test/unit/src/org/openide/util/SharedClassObjectTest.java
@@ -207,6 +207,8 @@ public class SharedClassObjectTest extends NbTestCase {
             super(new URL[] {SharedClassObjectTest.class.getProtectionDomain().getCodeSource().getLocation()},
                   SharedClassObject.class.getClassLoader());
         }
+
+        @Override
         protected Class loadClass(String name, boolean resolve) throws ClassNotFoundException {
             if (name.startsWith("org.openide.util.SharedClassObjectTest")) {
                 // Do not proxy to parent!
diff --git a/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesActionsTest.java b/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesActionsTest.java
index d5a292554c..ac6588d047 100644
--- a/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesActionsTest.java
+++ b/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesActionsTest.java
@@ -55,7 +55,8 @@ public class UtilitiesActionsTest extends NbTestCase {
         implements org.openide.util.actions.Presenter.Popup {
             public JMenuItem item = new JMenuItem ("Ahoj");
             public int called;
-            
+
+            @Override
             protected CloneAction cloneAction () {
                 return new MyAction ();
             }
diff --git a/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesProgressCursorTest.java b/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesProgressCursorTest.java
index 70ef563358..15b0a93329 100644
--- a/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesProgressCursorTest.java
+++ b/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesProgressCursorTest.java
@@ -57,7 +57,8 @@ public class UtilitiesProgressCursorTest extends NbTestCase {
     /** testing component for setting cursor
      */
     private static class ProgressCursorComp extends JComponent {
-        
+
+        @Override
         public String getName () {
             return "TestProgressCursorComp";
         }
diff --git a/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTest.java b/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTest.java
index 9bada3d2d9..e615d1d89a 100644
--- a/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTest.java
+++ b/platform/openide.util.ui/test/unit/src/org/openide/util/UtilitiesTest.java
@@ -280,7 +280,8 @@ public class UtilitiesTest extends NbTestCase {
         public CustomToolkitComponent( Toolkit t ) {
             this.customToolkit = t;
         }
-        
+
+        @Override
         public Toolkit getToolkit() {
             return customToolkit;
         }
@@ -452,6 +453,8 @@ public class UtilitiesTest extends NbTestCase {
         }
 
         boolean createCustomCursorCalled = false;
+
+        @Override
         public Cursor createCustomCursor(Image cursor, Point hotSpot, String name) throws IndexOutOfBoundsException, HeadlessException {
 
             createCustomCursorCalled = true;
@@ -459,6 +462,8 @@ public class UtilitiesTest extends NbTestCase {
         }
 
         boolean getBestCursorSizeCalled = false;
+
+        @Override
         public Dimension getBestCursorSize(int preferredWidth, int preferredHeight) throws HeadlessException {
             getBestCursorSizeCalled = true;
             return new Dimension(0,0);
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 a0628bb9f2..77c68050ea 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
@@ -207,8 +207,8 @@ public class UtilitiesTranslateTest extends NbTestCase {
             super (java.lang.Object.class.getClassLoader());
             this.file = file;
         }
-     
-        
+
+        @Override
         protected Enumeration<java.net.URL> findResources (String res) throws IOException {
             if (file != null) {
                 return Enumerations.singleton (getClass ().getResource (file));
diff --git a/platform/openide.util.ui/test/unit/src/org/openide/util/actions/CallbackSystemActionTest.java b/platform/openide.util.ui/test/unit/src/org/openide/util/actions/CallbackSystemActionTest.java
index 2398678ba9..b1edc145ab 100644
--- a/platform/openide.util.ui/test/unit/src/org/openide/util/actions/CallbackSystemActionTest.java
+++ b/platform/openide.util.ui/test/unit/src/org/openide/util/actions/CallbackSystemActionTest.java
@@ -119,7 +119,8 @@ public class CallbackSystemActionTest extends NbTestCase {
         class MyAction extends AbstractAction {
             public int cntEnabled;
             public int cntPerformed;
-            
+
+            @Override
             public boolean isEnabled() {
                 cntEnabled++;
                 return true;
@@ -242,7 +243,8 @@ public class CallbackSystemActionTest extends NbTestCase {
         class MyAction extends AbstractAction {
             public int cntEnabled;
             public int cntPerformed;
-            
+
+            @Override
             public boolean isEnabled() {
                 cntEnabled++;
                 return true;
@@ -273,7 +275,8 @@ public class CallbackSystemActionTest extends NbTestCase {
         class CounterAction extends AbstractAction {
             public int cntEnabled;
             public int cntPerformed;
-            
+
+            @Override
             public boolean isEnabled() {
                 cntEnabled++;
                 return true;
diff --git a/platform/openide.util/src/org/openide/util/EditableProperties.java b/platform/openide.util/src/org/openide/util/EditableProperties.java
index 1e5b177be7..02c8c271f9 100644
--- a/platform/openide.util/src/org/openide/util/EditableProperties.java
+++ b/platform/openide.util/src/org/openide/util/EditableProperties.java
@@ -859,7 +859,8 @@ public final class EditableProperties extends AbstractMap<String,String> impleme
             delegate.next();
             return new MapEntryImpl(item);
         }
-        
+
+        @Override
         public void remove() {
             delegate.previous();
             Item item = findNext();
diff --git a/platform/openide.util/src/org/openide/util/MutexException.java b/platform/openide.util/src/org/openide/util/MutexException.java
index 6f93508939..49efdcfbfb 100644
--- a/platform/openide.util/src/org/openide/util/MutexException.java
+++ b/platform/openide.util/src/org/openide/util/MutexException.java
@@ -48,6 +48,7 @@ public class MutexException extends Exception {
         return ex;
     }
 
+    @Override
     public Throwable getCause() {
         return ex;
     }
diff --git a/platform/openide.util/src/org/openide/util/NbCollections.java b/platform/openide.util/src/org/openide/util/NbCollections.java
index 35ad347fa1..0dcd33da20 100644
--- a/platform/openide.util/src/org/openide/util/NbCollections.java
+++ b/platform/openide.util/src/org/openide/util/NbCollections.java
@@ -176,6 +176,7 @@ public class NbCollections {
             return x;
         }
 
+        @Override
         public void remove() {
             it.remove();
         }
@@ -539,6 +540,7 @@ public class NbCollections {
                     public E next() {
                         return enumeration.nextElement();
                     }
+                    @Override
                     public void remove() {
                         throw new UnsupportedOperationException();
                     }
diff --git a/platform/openide.util/src/org/openide/util/TimedSoftReference.java b/platform/openide.util/src/org/openide/util/TimedSoftReference.java
index 5f24879b4c..706cf11229 100644
--- a/platform/openide.util/src/org/openide/util/TimedSoftReference.java
+++ b/platform/openide.util/src/org/openide/util/TimedSoftReference.java
@@ -98,6 +98,7 @@ final class TimedSoftReference<T> extends SoftReference<T> implements Runnable {
         }
     }
 
+    @Override
     public T get() {
         synchronized (m) {
             if (o == null) {
diff --git a/platform/openide.util/src/org/openide/util/TopologicalSortException.java b/platform/openide.util/src/org/openide/util/TopologicalSortException.java
index 7f64f30cc2..6cdf3452be 100644
--- a/platform/openide.util/src/org/openide/util/TopologicalSortException.java
+++ b/platform/openide.util/src/org/openide/util/TopologicalSortException.java
@@ -141,6 +141,7 @@ public final class TopologicalSortException extends Exception {
     /** Adds description why the graph cannot be sorted.
      * @param w writer to write to
      */
+    @Override
     public final void printStackTrace(java.io.PrintWriter w) {
         printDebug(w);
         super.printStackTrace(w);
@@ -149,6 +150,7 @@ public final class TopologicalSortException extends Exception {
     /** Adds description why the graph cannot be sorted.
      * @param s stream to write to
      */
+    @Override
     public final void printStackTrace(java.io.PrintStream s) {
         java.io.PrintWriter w = new java.io.PrintWriter(s);
         this.printStackTrace(w);
diff --git a/platform/openide.util/src/org/openide/util/io/FoldingIOException.java b/platform/openide.util/src/org/openide/util/io/FoldingIOException.java
index c42398612d..087a5e1b9e 100644
--- a/platform/openide.util/src/org/openide/util/io/FoldingIOException.java
+++ b/platform/openide.util/src/org/openide/util/io/FoldingIOException.java
@@ -49,16 +49,19 @@ public class FoldingIOException extends IOException {
     }
 
     /** Prints stack trace of the foreign exception */
+    @Override
     public void printStackTrace() {
         t.printStackTrace();
     }
 
     /** Prints stack trace of the foreign exception */
+    @Override
     public void printStackTrace(java.io.PrintStream s) {
         t.printStackTrace(s);
     }
 
     /** Prints stack trace of the foreign exception */
+    @Override
     public void printStackTrace(java.io.PrintWriter s) {
         t.printStackTrace(s);
     }
@@ -66,6 +69,7 @@ public class FoldingIOException extends IOException {
     /**
     * @return toString of the foreign exception
     */
+    @Override
     public String toString() {
         return t.toString();
     }
@@ -73,6 +77,7 @@ public class FoldingIOException extends IOException {
     /**
     * @return getLocalizedMessage of the foreign exception
     */
+    @Override
     public String getLocalizedMessage() {
         return t.getLocalizedMessage();
     }
diff --git a/platform/openide.util/src/org/openide/util/io/NbObjectInputStream.java b/platform/openide.util/src/org/openide/util/io/NbObjectInputStream.java
index 8ba9061817..44d323dbd0 100644
--- a/platform/openide.util/src/org/openide/util/io/NbObjectInputStream.java
+++ b/platform/openide.util/src/org/openide/util/io/NbObjectInputStream.java
@@ -60,6 +60,7 @@ public class NbObjectInputStream extends ObjectInputStream {
     /* Uses NetBeans module classloader to load the class.
      * @param v description of the class to load
      */
+    @Override
     protected Class resolveClass(ObjectStreamClass v) throws IOException, ClassNotFoundException {
         ClassLoader cl = getNBClassLoader();
 
@@ -111,6 +112,7 @@ public class NbObjectInputStream extends ObjectInputStream {
      * can provide list of classes that changed name or want to suppress <code>serialVersionUID</code>.
      *
      */
+    @Override
     protected ObjectStreamClass readClassDescriptor() throws IOException, ClassNotFoundException {
         ObjectStreamClass ose = super.readClassDescriptor();
 
diff --git a/platform/openide.util/src/org/openide/util/io/NbObjectOutputStream.java b/platform/openide.util/src/org/openide/util/io/NbObjectOutputStream.java
index c78a41d04e..a3fa8c6a4f 100644
--- a/platform/openide.util/src/org/openide/util/io/NbObjectOutputStream.java
+++ b/platform/openide.util/src/org/openide/util/io/NbObjectOutputStream.java
@@ -73,6 +73,7 @@ public class NbObjectOutputStream extends ObjectOutputStream {
     /*
     * @param obj is an Object to be checked for replace
     */
+    @Override
     public Object replaceObject(Object obj) throws IOException {
         if (obj instanceof Image) {
             return null;
@@ -111,6 +112,7 @@ public class NbObjectOutputStream extends ObjectOutputStream {
         oo.write(bos.toByteArray());
     }
 
+    @Override
     protected void annotateClass(Class cl) throws IOException {
         super.annotateClass(cl);
 
diff --git a/platform/openide.util/src/org/openide/util/io/OperationException.java b/platform/openide.util/src/org/openide/util/io/OperationException.java
index 1f41f8c545..2178a5d45b 100644
--- a/platform/openide.util/src/org/openide/util/io/OperationException.java
+++ b/platform/openide.util/src/org/openide/util/io/OperationException.java
@@ -48,10 +48,12 @@ public class OperationException extends IOException {
 
     /** Description taken from previous message
     */
+    @Override
     public String getMessage() {
         return ex.getMessage();
     }
 
+    @Override
     public Throwable getCause() {
         return ex;
     }
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 55f6b803e3..a34fa80426 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
@@ -137,6 +137,7 @@ public class WeakSetTest extends NbTestCase {
                     return it.next ();
                 }
 
+                @Override
                 public void remove() {
                     it.remove();
                 }
diff --git a/platform/openide.windows/src/org/openide/windows/DummyWindowManager.java b/platform/openide.windows/src/org/openide/windows/DummyWindowManager.java
index 5e662a087f..81b18dec7d 100644
--- a/platform/openide.windows/src/org/openide/windows/DummyWindowManager.java
+++ b/platform/openide.windows/src/org/openide/windows/DummyWindowManager.java
@@ -323,6 +323,7 @@ final class DummyWindowManager extends WindowManager {
             final java.lang.ref.WeakReference<TopComponent> ref = new java.lang.ref.WeakReference<TopComponent>(tc);
             f.addWindowListener(
                 new WindowAdapter() {
+                    @Override
                     public void windowClosing(WindowEvent ev) {
                         TopComponent tc = ref.get();
 
@@ -333,6 +334,7 @@ final class DummyWindowManager extends WindowManager {
                         tc.close();
                     }
 
+                    @Override
                     public void windowActivated(WindowEvent e) {
                         TopComponent tc = ref.get();
 
diff --git a/platform/openide.windows/src/org/openide/windows/TopComponent.java b/platform/openide.windows/src/org/openide/windows/TopComponent.java
index 2eb922f75f..95608ef17e 100644
--- a/platform/openide.windows/src/org/openide/windows/TopComponent.java
+++ b/platform/openide.windows/src/org/openide/windows/TopComponent.java
@@ -939,6 +939,7 @@ public class TopComponent extends JComponent implements Externalizable, Accessib
     * The default implementation just notifies the window manager.
     * @param name the new display name
     */
+    @Override
     public void setName(final String name) {
         String old = getName();
 
@@ -1032,6 +1033,7 @@ public class TopComponent extends JComponent implements Externalizable, Accessib
 
     /** Sets toolTip for this <code>TopComponent</code>, adds notification
      * about the change to its <code>WindowManager.TopComponentManager</code>. */
+    @Override
     public void setToolTipText(String toolTip) {
         if ((toolTip != null) && toolTip.equals(getToolTipText())) {
             return;
@@ -1108,6 +1110,7 @@ public class TopComponent extends JComponent implements Externalizable, Accessib
 
     /** Overrides superclass method, adds possible additional handling of global keystrokes
      * in case this <code>TopComoponent</code> is ancestor of focused component. */
+    @Override
     protected boolean processKeyBinding(KeyStroke ks, KeyEvent e, int condition, boolean pressed) {
         boolean ret = super.processKeyBinding(ks, e, condition, pressed);
 
@@ -1248,13 +1251,16 @@ public class TopComponent extends JComponent implements Externalizable, Accessib
     /* Read accessible context
      * @return - accessible context
      */
+    @Override
     public AccessibleContext getAccessibleContext() {
         if (accessibleContext == null) {
             accessibleContext = new JComponent.AccessibleJComponent() {
+                        @Override
                         public AccessibleRole getAccessibleRole() {
                             return AccessibleRole.PANEL;
                         }
 
+                        @Override
                         public String getAccessibleName() {
                             if (accessibleName != null) {
                                 return accessibleName;
@@ -1264,6 +1270,7 @@ public class TopComponent extends JComponent implements Externalizable, Accessib
                         }
 
                         /* Fix for 19344: Null accessible decription of all TopComponents on JDK1.4 */
+                        @Override
                         public String getToolTipText() {
                             return TopComponent.this.getToolTipText();
                         }
diff --git a/platform/options.api/src/org/netbeans/modules/options/classic/ExplorerPanel.java b/platform/options.api/src/org/netbeans/modules/options/classic/ExplorerPanel.java
index 1296fe8485..3b7998fabf 100644
--- a/platform/options.api/src/org/netbeans/modules/options/classic/ExplorerPanel.java
+++ b/platform/options.api/src/org/netbeans/modules/options/classic/ExplorerPanel.java
@@ -42,10 +42,14 @@ public class ExplorerPanel extends JPanel implements ExplorerManager.Provider {
     public ExplorerManager getExplorerManager() {
         return manager;
     }
+
+    @Override
     public void addNotify() {
         super.addNotify();
         ExplorerUtils.activateActions(manager, true);
     }
+
+    @Override
     public void removeNotify() {
         ExplorerUtils.activateActions(manager, false);
         super.removeNotify();
diff --git a/platform/options.api/src/org/netbeans/modules/options/ui/LoweredBorder.java b/platform/options.api/src/org/netbeans/modules/options/ui/LoweredBorder.java
index cddefc7103..3a2ff5a8e0 100644
--- a/platform/options.api/src/org/netbeans/modules/options/ui/LoweredBorder.java
+++ b/platform/options.api/src/org/netbeans/modules/options/ui/LoweredBorder.java
@@ -35,6 +35,7 @@ public class LoweredBorder extends AbstractBorder {
     private Color darker = getLabelBackgroundColor().darker ().darker ();
     private Color brighter = getLabelBackgroundColor().brighter ().brighter ();
 
+    @Override
     public void paintBorder (
         Component c,
         Graphics g,
@@ -52,11 +53,13 @@ public class LoweredBorder extends AbstractBorder {
         g.setColor (oldColor);
     }
 
+    @Override
     public Insets getBorderInsets (Component c) {
 	return new Insets (1, 1, 1, 1);
     }
 
-    public boolean isBorderOpaque () { 
+    @Override
+    public boolean isBorderOpaque () {
         return true; 
     }
     
diff --git a/platform/options.keymap/src/org/netbeans/modules/options/keymap/KeymapListRenderer.java b/platform/options.keymap/src/org/netbeans/modules/options/keymap/KeymapListRenderer.java
index 3f72ae5345..9ee7fce86f 100644
--- a/platform/options.keymap/src/org/netbeans/modules/options/keymap/KeymapListRenderer.java
+++ b/platform/options.keymap/src/org/netbeans/modules/options/keymap/KeymapListRenderer.java
@@ -42,7 +42,8 @@ public class KeymapListRenderer extends DefaultTreeCellRenderer {
         //Image i = Utilities.loadImage ("org/openide/resources/actions/empty.gif");
         setLeafIcon (null);
     }
-    
+
+    @Override
     public Component getTreeCellRendererComponent (
         JTree tree, 
         Object value,
diff --git a/platform/options.keymap/src/org/netbeans/modules/options/keymap/ShortcutPopupPanel.java b/platform/options.keymap/src/org/netbeans/modules/options/keymap/ShortcutPopupPanel.java
index 5f0f1e8e23..d500afedbb 100644
--- a/platform/options.keymap/src/org/netbeans/modules/options/keymap/ShortcutPopupPanel.java
+++ b/platform/options.keymap/src/org/netbeans/modules/options/keymap/ShortcutPopupPanel.java
@@ -181,16 +181,19 @@ public class ShortcutPopupPanel extends javax.swing.JPanel {
 
         list.setModel(model);
         list.addMouseMotionListener(new java.awt.event.MouseMotionAdapter() {
+            @Override
             public void mouseMoved(java.awt.event.MouseEvent evt) {
                 listMouseMoved(evt);
             }
         });
         list.addKeyListener(new java.awt.event.KeyAdapter() {
+            @Override
             public void keyPressed(java.awt.event.KeyEvent evt) {
                 listKeyPressed(evt);
             }
         });
         list.addMouseListener(new java.awt.event.MouseAdapter() {
+            @Override
             public void mouseClicked(java.awt.event.MouseEvent evt) {
                 listMouseClicked(evt);
             }
diff --git a/platform/print/src/org/netbeans/modules/print/ui/Preview.java b/platform/print/src/org/netbeans/modules/print/ui/Preview.java
index 0926e04f08..faec563c90 100644
--- a/platform/print/src/org/netbeans/modules/print/ui/Preview.java
+++ b/platform/print/src/org/netbeans/modules/print/ui/Preview.java
@@ -73,6 +73,7 @@ public final class Preview extends Dialog implements Percent.Listener {
         myPrinter = new Printer();
         myKeyListener = new KeyAdapter() {
 
+            @Override
             public void keyPressed(KeyEvent event) {
                 char ch = event.getKeyChar();
                 int modifiers = event.getModifiers();
@@ -407,6 +408,7 @@ public final class Preview extends Dialog implements Percent.Listener {
             }
         });
         myScrollPane.addMouseListener(new MouseAdapter() {
+            @Override
             public void mouseClicked(MouseEvent event) {
                 if (event.getClickCount() != 2) {
                     return;
@@ -866,6 +868,7 @@ public final class Preview extends Dialog implements Percent.Listener {
             setPreferredSize(dimension);
         }
 
+        @Override
         public void addMouseWheelListener(MouseWheelListener listener) {
             if (myMouseWheelListeners == null) {
                 myMouseWheelListeners = new ArrayList<MouseWheelListener>();
diff --git a/platform/print/src/org/netbeans/modules/print/util/Percent.java b/platform/print/src/org/netbeans/modules/print/util/Percent.java
index 4701f2908e..070f8cd4d1 100644
--- a/platform/print/src/org/netbeans/modules/print/util/Percent.java
+++ b/platform/print/src/org/netbeans/modules/print/util/Percent.java
@@ -111,6 +111,7 @@ public final class Percent extends JComboBox implements ActionListener {
         return getEditor().getItem().toString();
     }
 
+    @Override
     public void actionPerformed(ActionEvent event) {
 //out();
         String value = getEditorItem();
diff --git a/platform/print/src/org/netbeans/modules/print/util/UI.java b/platform/print/src/org/netbeans/modules/print/util/UI.java
index c5c9003014..2e171df020 100644
--- a/platform/print/src/org/netbeans/modules/print/util/UI.java
+++ b/platform/print/src/org/netbeans/modules/print/util/UI.java
@@ -652,6 +652,7 @@ public final class UI {
                 }
                 myDialog.addComponentListener(
                     new ComponentAdapter() {
+                        @Override
                         public void componentResized(ComponentEvent event) {
                             resized();
                         }
diff --git a/platform/progress.ui/src/org/netbeans/modules/progress/ui/NbProgressBar.java b/platform/progress.ui/src/org/netbeans/modules/progress/ui/NbProgressBar.java
index 90ad1ae783..0ad2c52018 100644
--- a/platform/progress.ui/src/org/netbeans/modules/progress/ui/NbProgressBar.java
+++ b/platform/progress.ui/src/org/netbeans/modules/progress/ui/NbProgressBar.java
@@ -67,7 +67,8 @@ public class NbProgressBar extends JProgressBar implements ExtractedProgressUIWo
             putClientProperty("JProgressBar.largeHeight", use ? true : null); //NOI18N
         }
     }
-    
+
+    @Override
     public Dimension getPreferredSize() {
         Dimension supers = super.getPreferredSize();
         if (usedInStatusBar) {
diff --git a/platform/sendopts/src/org/netbeans/api/sendopts/CommandException.java b/platform/sendopts/src/org/netbeans/api/sendopts/CommandException.java
index 920d170e4d..76c4906fdf 100644
--- a/platform/sendopts/src/org/netbeans/api/sendopts/CommandException.java
+++ b/platform/sendopts/src/org/netbeans/api/sendopts/CommandException.java
@@ -70,6 +70,7 @@ public final class CommandException extends Exception {
     /** Localized message describing the problem that is usually printed
      * to the user.
      */
+    @Override
     public String getLocalizedMessage() {
         if (locMsg != null) {
             return locMsg;
diff --git a/platform/sendopts/src/org/netbeans/modules/sendopts/OptionImpl.java b/platform/sendopts/src/org/netbeans/modules/sendopts/OptionImpl.java
index e6a5579633..c309bddad8 100644
--- a/platform/sendopts/src/org/netbeans/modules/sendopts/OptionImpl.java
+++ b/platform/sendopts/src/org/netbeans/modules/sendopts/OptionImpl.java
@@ -517,7 +517,8 @@ public abstract class OptionImpl implements Cloneable {
                 // not everything is ok, more options present
                 return Appearance.createError(new MF());
             }
-            
+
+            @Override
             public void markConsistent(Appearance a) {
                 super.markConsistent(a);
                 for (OptionImpl i : arr) {
@@ -525,6 +526,7 @@ public abstract class OptionImpl implements Cloneable {
                 }
             }
 
+            @Override
             public OptionImpl findNotUsedOption(Set<OptionImpl> used) {
                 OptionImpl me = super.findNotUsedOption(used);
                 if (me != null) {
@@ -559,7 +561,8 @@ public abstract class OptionImpl implements Cloneable {
                     i.process(additionalArgs, optionsAndTheirArgs);
                 }
             }
-            
+
+            @Override
             public String findName(boolean usedOrAny, String[] args) {
                 for (Iterator it = arr.iterator(); it.hasNext();) {
                     OptionImpl elem = (OptionImpl) it.next();
diff --git a/platform/settings/examples/src/org/netbeans/modules/settings/examples/JavaCompilerSettingBeanInfo.java b/platform/settings/examples/src/org/netbeans/modules/settings/examples/JavaCompilerSettingBeanInfo.java
index 1a1b8d76ec..f608e53a6f 100644
--- a/platform/settings/examples/src/org/netbeans/modules/settings/examples/JavaCompilerSettingBeanInfo.java
+++ b/platform/settings/examples/src/org/netbeans/modules/settings/examples/JavaCompilerSettingBeanInfo.java
@@ -107,6 +107,7 @@ public class JavaCompilerSettingBeanInfo extends SimpleBeanInfo {
      * properties of this bean.  May return null if the
      * information should be obtained by automatic analysis.
      */
+    @Override
     public BeanDescriptor getBeanDescriptor() {
         return getBdescriptor();
     }
@@ -123,6 +124,7 @@ public class JavaCompilerSettingBeanInfo extends SimpleBeanInfo {
      * A client of getPropertyDescriptors can use "instanceof" to check
      * if a given PropertyDescriptor is an IndexedPropertyDescriptor.
      */
+    @Override
     public PropertyDescriptor[] getPropertyDescriptors() {
         return getPdescriptor();
     }
@@ -134,6 +136,7 @@ public class JavaCompilerSettingBeanInfo extends SimpleBeanInfo {
      * events fired by this bean.  May return null if the information
      * should be obtained by automatic analysis.
      */
+    @Override
     public EventSetDescriptor[] getEventSetDescriptors() {
         return getEdescriptor();
     }
@@ -145,6 +148,7 @@ public class JavaCompilerSettingBeanInfo extends SimpleBeanInfo {
      * implemented by this bean.  May return null if the information
      * should be obtained by automatic analysis.
      */
+    @Override
     public MethodDescriptor[] getMethodDescriptors() {
         return getMdescriptor();
     }
@@ -157,6 +161,7 @@ public class JavaCompilerSettingBeanInfo extends SimpleBeanInfo {
      * 		returned by getPropertyDescriptors.
      * <P>	Returns -1 if there is no default property.
      */
+    @Override
     public int getDefaultPropertyIndex() {
         return defaultPropertyIndex;
     }
@@ -168,6 +173,7 @@ public class JavaCompilerSettingBeanInfo extends SimpleBeanInfo {
      *		returned by getEventSetDescriptors.
      * <P>	Returns -1 if there is no default event.
      */
+    @Override
     public int getDefaultEventIndex() {
         return defaultEventIndex;
     }
diff --git a/platform/settings/examples/src/org/netbeans/modules/settings/examples/ProxySettingsBeanInfo.java b/platform/settings/examples/src/org/netbeans/modules/settings/examples/ProxySettingsBeanInfo.java
index ac9173d28d..d2bc4c7ed1 100644
--- a/platform/settings/examples/src/org/netbeans/modules/settings/examples/ProxySettingsBeanInfo.java
+++ b/platform/settings/examples/src/org/netbeans/modules/settings/examples/ProxySettingsBeanInfo.java
@@ -97,6 +97,7 @@ public class ProxySettingsBeanInfo extends SimpleBeanInfo {
      * properties of this bean.  May return null if the
      * information should be obtained by automatic analysis.
      */
+    @Override
     public BeanDescriptor getBeanDescriptor() {
         return getBdescriptor();
     }
@@ -113,6 +114,7 @@ public class ProxySettingsBeanInfo extends SimpleBeanInfo {
      * A client of getPropertyDescriptors can use "instanceof" to check
      * if a given PropertyDescriptor is an IndexedPropertyDescriptor.
      */
+    @Override
     public PropertyDescriptor[] getPropertyDescriptors() {
         return getPdescriptor();
     }
@@ -124,6 +126,7 @@ public class ProxySettingsBeanInfo extends SimpleBeanInfo {
      * events fired by this bean.  May return null if the information
      * should be obtained by automatic analysis.
      */
+    @Override
     public EventSetDescriptor[] getEventSetDescriptors() {
         return getEdescriptor();
     }
@@ -135,6 +138,7 @@ public class ProxySettingsBeanInfo extends SimpleBeanInfo {
      * implemented by this bean.  May return null if the information
      * should be obtained by automatic analysis.
      */
+    @Override
     public MethodDescriptor[] getMethodDescriptors() {
         return getMdescriptor();
     }
@@ -147,6 +151,7 @@ public class ProxySettingsBeanInfo extends SimpleBeanInfo {
      * 		returned by getPropertyDescriptors.
      * <P>	Returns -1 if there is no default property.
      */
+    @Override
     public int getDefaultPropertyIndex() {
         return defaultPropertyIndex;
     }
@@ -158,6 +163,7 @@ public class ProxySettingsBeanInfo extends SimpleBeanInfo {
      *		returned by getEventSetDescriptors.
      * <P>	Returns -1 if there is no default event.
      */
+    @Override
     public int getDefaultEventIndex() {
         return defaultEventIndex;
     }
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 3d218e0b03..e8985ceabb 100644
--- a/platform/settings/src/org/netbeans/modules/settings/convertors/XMLSettingsSupport.java
+++ b/platform/settings/src/org/netbeans/modules/settings/convertors/XMLSettingsSupport.java
@@ -198,6 +198,8 @@ final class XMLSettingsSupport {
         /* Uses NetBeans module classloader to load the class.
          * @param v description of the class to load
          */
+
+        @Override
         protected Class resolveClass(ObjectStreamClass v) throws IOException, ClassNotFoundException {
             ClassLoader cl = getNBClassLoader();
             try {
@@ -214,6 +216,7 @@ final class XMLSettingsSupport {
          * postponed to readResolve;
          * otherwise the same implementation like NbObjectInputStream.readClassDescriptor
          */
+        @Override
         protected ObjectStreamClass readClassDescriptor() throws IOException, ClassNotFoundException {
             ObjectStreamClass ose = super.readClassDescriptor();
 
@@ -431,7 +434,8 @@ final class XMLSettingsSupport {
             if (serialdata == null) return null;
             return new ByteArrayInputStream(serialdata);
         }
-        
+
+        @Override
         public org.xml.sax.InputSource resolveEntity(String publicId, String systemId)
         throws SAXException {
             if (INSTANCE_DTD_ID.equals (publicId) || "-//NetBeans//DTD XML beans 1.0//EN".equals(publicId)) {
@@ -440,7 +444,8 @@ final class XMLSettingsSupport {
                 return null; // i.e. follow advice of systemID
             }
         }
-        
+
+        @Override
         public void characters(char[] values, int start, int length) throws SAXException {
             if (header) return;
             String element = stack.peek();
@@ -450,7 +455,8 @@ final class XMLSettingsSupport {
                 chaos.write(values, start, length);
             }
         }
-        
+
+        @Override
         public void startElement(String uri, String localName, String qName, Attributes attribs) throws SAXException {
             stack.push(qName);
             if (ELM_SETTING.equals(qName)) {
@@ -510,7 +516,8 @@ final class XMLSettingsSupport {
                 codeNameRelease = -1;
             }
         }
-        
+
+        @Override
         public void endElement(String uri, String localName, String qName) throws SAXException {
             //if (header) return;
             String element = stack.pop();
diff --git a/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/QuickSearchPopup.java b/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/QuickSearchPopup.java
index 58ac8babc5..8d48065322 100644
--- a/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/QuickSearchPopup.java
+++ b/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/QuickSearchPopup.java
@@ -218,17 +218,21 @@ public class QuickSearchPopup extends javax.swing.JPanel
 
         jList1.setFocusable(false);
         jList1.addMouseListener(new java.awt.event.MouseAdapter() {
+            @Override
             public void mouseClicked(java.awt.event.MouseEvent evt) {
                 jList1MouseClicked(evt);
             }
+            @Override
             public void mousePressed(java.awt.event.MouseEvent evt) {
                 jList1MousePressed(evt);
             }
         });
         jList1.addMouseMotionListener(new java.awt.event.MouseMotionAdapter() {
+            @Override
             public void mouseDragged(java.awt.event.MouseEvent evt) {
                 jList1MouseDragged(evt);
             }
+            @Override
             public void mouseMoved(java.awt.event.MouseEvent evt) {
                 jList1MouseMoved(evt);
             }
diff --git a/platform/uihandler/src/org/netbeans/modules/exceptions/ReportPanel.java b/platform/uihandler/src/org/netbeans/modules/exceptions/ReportPanel.java
index a8d69b4c66..3ce0568a70 100644
--- a/platform/uihandler/src/org/netbeans/modules/exceptions/ReportPanel.java
+++ b/platform/uihandler/src/org/netbeans/modules/exceptions/ReportPanel.java
@@ -90,6 +90,7 @@ public class ReportPanel extends javax.swing.JPanel implements Scrollable{
         jLabel6.setForeground(new java.awt.Color(0, 0, 255));
         jLabel6.setText(org.openide.util.NbBundle.getMessage(ReportPanel.class, "ReportPanel.jLabel6.text")); // NOI18N
         jLabel6.addMouseListener(new java.awt.event.MouseAdapter() {
+            @Override
             public void mouseClicked(java.awt.event.MouseEvent evt) {
                 registerClicked(evt);
             }
diff --git a/platform/uihandler/src/org/netbeans/modules/uihandler/ReminderPanel.java b/platform/uihandler/src/org/netbeans/modules/uihandler/ReminderPanel.java
index 34db8a1539..d96a27af8a 100644
--- a/platform/uihandler/src/org/netbeans/modules/uihandler/ReminderPanel.java
+++ b/platform/uihandler/src/org/netbeans/modules/uihandler/ReminderPanel.java
@@ -77,9 +77,12 @@ public class ReminderPanel extends javax.swing.JPanel {
 
         lblLearnMore.setText("<html><font color=\"#0000FF\" <u>Learn more</u></font></html>"); // NOI18N
         lblLearnMore.addMouseListener(new java.awt.event.MouseAdapter() {
+            @Override
             public void mouseEntered(java.awt.event.MouseEvent evt) {
                 lblLearnMoreMouseEntered(evt);
             }
+
+            @Override
             public void mousePressed(java.awt.event.MouseEvent evt) {
                 lblLearnMoreMousePressed(evt);
             }
diff --git a/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/ActivatedDeativatedTest.java b/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/ActivatedDeativatedTest.java
index 6fdc2a3f76..6ce424c38b 100644
--- a/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/ActivatedDeativatedTest.java
+++ b/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/ActivatedDeativatedTest.java
@@ -94,6 +94,7 @@ public class ActivatedDeativatedTest extends NbTestCase {
 
         public Dialog createDialog(DialogDescriptor descriptor) {
             return new JDialog() {
+                @Override
                 public void setVisible(boolean v) {
                 }
             };
diff --git a/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/MemoryURL.java b/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/MemoryURL.java
index f3942688cd..b78a2b56e9 100644
--- a/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/MemoryURL.java
+++ b/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/MemoryURL.java
@@ -100,11 +100,13 @@ public class MemoryURL extends URLStreamHandler {
             }
         }
 
+        @Override
         public InputStream getInputStream() throws IOException {
             connect();
             return values;
         }
 
+        @Override
         public OutputStream getOutputStream() throws IOException {
             if (out == null) {
                 out = new ByteArrayOutputStream();
@@ -112,6 +114,7 @@ public class MemoryURL extends URLStreamHandler {
             return out;
         }
 
+        @Override
         public void setRequestProperty(String key, String value) {
             super.setRequestProperty(key, value);
             params.put(key.toLowerCase(), value);
diff --git a/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/ShutdownFromAWTTest.java b/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/ShutdownFromAWTTest.java
index a01db1bbcd..beb1752d19 100644
--- a/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/ShutdownFromAWTTest.java
+++ b/platform/uihandler/test/unit/src/org/netbeans/modules/uihandler/ShutdownFromAWTTest.java
@@ -85,6 +85,7 @@ public class ShutdownFromAWTTest extends NbTestCase {
             assertAWT();
             
             return new JDialog() {
+                @Override
                 public void setVisible(boolean v) {
                 }
             };


---------------------------------------------------------------------
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