diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java
index 471b71b79ce9..700c430969ec 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java
@@ -188,7 +188,7 @@ public class ArtifactEditorImpl implements ArtifactEditorEx {
   public JComponent createMainComponent() {
     mySourceItemsTree.initTree();
     myLayoutTreeComponent.initTree();
-    myMainPanel.putClientProperty(DataManager.CLIENT_PROPERTY_DATA_PROVIDER, new TypeSafeDataProviderAdapter(new MyDataProvider()));
+    DataManager.registerDataProvider(myMainPanel, new TypeSafeDataProviderAdapter(new MyDataProvider()));
 
     myErrorPanelPlace.add(myValidationManager.getMainErrorPanel(), BorderLayout.CENTER);
 
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java
index 20e34f12b7d2..fd4f1779f582 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java
@@ -324,7 +324,7 @@ public class AnalyzeDependenciesComponent extends MasterDetailsComponent {
       myExplanationTree = new Tree(new DefaultTreeModel(buildTree()));
       myExplanationTree.setRootVisible(false);
       myExplanationTree.setCellRenderer(new ExplanationTreeRenderer());
-      myExplanationTree.putClientProperty(DataManager.CLIENT_PROPERTY_DATA_PROVIDER, this);
+      DataManager.registerDataProvider(myExplanationTree, this);
       TreeUtil.expandAll(myExplanationTree);
       final NavigateAction navigateAction = new NavigateAction();
       navigateAction.registerCustomShortcutSet(new CustomShortcutSet(CommonShortcuts.DOUBLE_CLICK_1.getShortcuts()[0]), myExplanationTree);
diff --git a/platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java b/platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java
index f3e839b6ed01..6a4430179cf0 100644
--- a/platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java
+++ b/platform/lang-api/src/com/intellij/execution/ui/RunContentDescriptor.java
@@ -48,7 +48,7 @@ public class RunContentDescriptor {
     myComponent = component;
     myDisplayName = displayName;
     myIcon = icon;
-    myComponent.putClientProperty(DataManager.CLIENT_PROPERTY_DATA_PROVIDER, new DataProvider() {
+    DataManager.registerDataProvider(myComponent, new DataProvider() {
 
       public Object getData(@NonNls final String dataId) {
         if (RunContentManager.RUN_CONTENT_DESCRIPTOR.is(dataId)) {
diff --git a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
index 84a174bd6ed7..efa3437a6771 100644
--- a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
@@ -44,7 +44,6 @@ import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx;
 import com.intellij.openapi.fileEditor.impl.EditorWindow;
 import com.intellij.openapi.fileEditor.impl.FileDocumentManagerImpl;
 import com.intellij.openapi.fileEditor.impl.FileEditorManagerImpl;
-import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
@@ -70,7 +69,10 @@ import org.jetbrains.annotations.NotNull;
 import javax.swing.FocusManager;
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -128,7 +130,7 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider {
     myPanel.add(myHistoryViewer.getComponent());
     myPanel.add(myConsoleEditor.getComponent());
     setupComponents();
-    myPanel.putClientProperty(DataManager.CLIENT_PROPERTY_DATA_PROVIDER, new TypeSafeDataProviderAdapter(this));
+    DataManager.registerDataProvider(myPanel, new TypeSafeDataProviderAdapter(this));
     myUpdateQueue = new MergingUpdateQueue("ConsoleUpdateQueue", 300, true, null);
     Disposer.register(this, myUpdateQueue);
     myHistoryViewer.getComponent().addComponentListener(new ComponentAdapter() {
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java
index 114bfad87f13..6a24fe39bd40 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.java
@@ -132,7 +132,7 @@ public class ConfigurationSettingsEditorWrapper extends SettingsEditor<RunnerAnd
     myComponentPlace.setLayout(new GridBagLayout());
     myComponentPlace.add(myEditor.getComponent(), new GridBagConstraints(0,0,1,1,1.0,1.0, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH, new Insets(0,0,0,0), 0,0));
     myComponentPlace.doLayout();
-    myWholePanel.putClientProperty(DataManager.CLIENT_PROPERTY_DATA_PROVIDER, new TypeSafeDataProviderAdapter(new MyDataProvider()));
+    DataManager.registerDataProvider(myWholePanel, new TypeSafeDataProviderAdapter(new MyDataProvider()));
     final JBScrollPane scrollPane = new JBScrollPane(myWholePanel);
     scrollPane.setBorder(null);
     return scrollPane;
diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayoutUiImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayoutUiImpl.java
index 0445a7a41724..d373a17437bd 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayoutUiImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerLayoutUiImpl.java
@@ -319,7 +319,7 @@ public class RunnerLayoutUiImpl implements Disposable, RunnerLayoutUi, LayoutSta
         return myContentUI;
       }
 
-      final DataProvider provider = (DataProvider)getClientProperty(DataManager.CLIENT_PROPERTY_DATA_PROVIDER);
+      final DataProvider provider = DataManager.getDataProvider(this);
       return provider != null ? provider.getData(dataId) : null;
     }
   }
diff --git a/platform/platform-api/src/com/intellij/ide/DataManager.java b/platform/platform-api/src/com/intellij/ide/DataManager.java
index 377125f80590..314ae160f732 100644
--- a/platform/platform-api/src/com/intellij/ide/DataManager.java
+++ b/platform/platform-api/src/com/intellij/ide/DataManager.java
@@ -75,4 +75,13 @@ public abstract class DataManager {
   public static void registerDataProvider(JComponent component, DataProvider provider) {
     component.putClientProperty(CLIENT_PROPERTY_DATA_PROVIDER, provider);
   }
+
+  @Nullable
+  public static DataProvider getDataProvider(@NotNull JComponent component) {
+    return (DataProvider)component.getClientProperty(CLIENT_PROPERTY_DATA_PROVIDER);
+  }
+
+  public static void removeDataProvider(@NotNull JComponent component) {
+    component.putClientProperty(CLIENT_PROPERTY_DATA_PROVIDER, null);
+  }
 }
diff --git a/platform/platform-api/src/com/intellij/ui/components/JBList.java b/platform/platform-api/src/com/intellij/ui/components/JBList.java
index 971467643148..9726be82bb3f 100644
--- a/platform/platform-api/src/com/intellij/ui/components/JBList.java
+++ b/platform/platform-api/src/com/intellij/ui/components/JBList.java
@@ -147,7 +147,7 @@ public class JBList extends JList implements ComponentWithEmptyText, ComponentWi
   }
 
   public void setDataProvider(DataProvider provider) {
-    putClientProperty(DataManager.CLIENT_PROPERTY_DATA_PROVIDER, provider);
+    DataManager.registerDataProvider(this, provider);
   }
 
   public void disableEmptyText() {
diff --git a/platform/platform-impl/src/com/intellij/ide/impl/DataManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/impl/DataManagerImpl.java
index 866ab977907c..aa0f4b62e045 100644
--- a/platform/platform-impl/src/com/intellij/ide/impl/DataManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/ide/impl/DataManagerImpl.java
@@ -116,7 +116,7 @@ public class DataManagerImpl extends DataManager implements ApplicationComponent
       dataProvider = new TypeSafeDataProviderAdapter((TypeSafeDataProvider) component);
     }
     else if (component instanceof JComponent) {
-      dataProvider = (DataProvider)((JComponent)component).getClientProperty(CLIENT_PROPERTY_DATA_PROVIDER);
+      dataProvider = getDataProvider((JComponent)component);
     }
     
     return dataProvider;
diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/statistics/StatisticsPanel.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/statistics/StatisticsPanel.java
index bd0af3597493..77f56b8b4216 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/statistics/StatisticsPanel.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/statistics/StatisticsPanel.java
@@ -94,7 +94,7 @@ public class StatisticsPanel implements DataProvider {
     // Contex menu in Table
     PopupHandler.installPopupHandler(myStatisticsTableView, IdeActions.GROUP_TESTTREE_POPUP, ActionPlaces.TESTTREE_VIEW_POPUP);
     // set this statistic tab as dataprovider for test's table view
-    myStatisticsTableView.putClientProperty(DataManager.CLIENT_PROPERTY_DATA_PROVIDER, this);
+    DataManager.registerDataProvider(myStatisticsTableView, this);
   }
 
   public void addPropagateSelectionListener(final PropagateSelectionHandler handler) {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java
index b13265c2b963..a8137f0a51d1 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java
@@ -313,7 +313,7 @@ public class DirDiffPanel implements Disposable {
     }
     myCurrentElement = null;
     myDiffPanel.remove(getErrorLabel());
-    myDiffPanel.putClientProperty(DataManager.CLIENT_PROPERTY_DATA_PROVIDER, null);
+    DataManager.removeDataProvider(myDiffPanel);
   }
 
   public JComponent getPanel() {