avoid using deprecated constants from DataConstants (based on patch by Maas van den...

diff --git a/images/src/org/intellij/images/actions/ToggleTransparencyChessboardAction.java b/images/src/org/intellij/images/actions/ToggleTransparencyChessboardAction.java
index 0fd76172942c9454b1d71d18d04f282e553fb2f7..07634679fc41093500bcd20b829bfb2cc41371a5 100644 (file)
--- a/images/src/org/intellij/images/actions/ToggleTransparencyChessboardAction.java
+++ b/images/src/org/intellij/images/actions/ToggleTransparencyChessboardAction.java
@@ -27,12 +27,12 @@ import org.intellij.images.ui.ImageComponentDecorator;
  */
 public final class ToggleTransparencyChessboardAction extends ToggleAction {
   public boolean isSelected(AnActionEvent e) {
-    ImageComponentDecorator decorator = (ImageComponentDecorator)e.getDataContext().getData(ImageComponentDecorator.class.getName());
+    ImageComponentDecorator decorator = ImageComponentDecorator.DATA_KEY.getData(e.getDataContext());
     return decorator != null && decorator.isEnabledForActionPlace(e.getPlace()) && decorator.isTransparencyChessboardVisible();
   }
 
   public void setSelected(AnActionEvent e, boolean state) {
-    ImageComponentDecorator decorator = (ImageComponentDecorator)e.getDataContext().getData(ImageComponentDecorator.class.getName());
+    ImageComponentDecorator decorator = ImageComponentDecorator.DATA_KEY.getData(e.getDataContext());
     if (decorator != null && decorator.isEnabledForActionPlace(e.getPlace())) {
       decorator.setTransparencyChessboardVisible(state);
     }
@@ -40,7 +40,7 @@ public final class ToggleTransparencyChessboardAction extends ToggleAction {
 
   public void update(final AnActionEvent e) {
     super.update(e);
-    ImageComponentDecorator decorator = (ImageComponentDecorator)e.getDataContext().getData(ImageComponentDecorator.class.getName());
+    ImageComponentDecorator decorator = ImageComponentDecorator.DATA_KEY.getData(e.getDataContext());
     e.getPresentation().setEnabled(decorator != null && decorator.isEnabledForActionPlace(e.getPlace()));
     e.getPresentation().setText(isSelected(e) ? "Hide Chessboard" : "Show Chessboard");
   }

diff --git a/images/src/org/intellij/images/editor/impl/ImageEditorUI.java b/images/src/org/intellij/images/editor/impl/ImageEditorUI.java
index 9a6c8a2cd95076d869dabcea91ff663693df3ce7..1a93527258d2fa76b9446ad982c74f57274f69fd 100644 (file)
--- a/images/src/org/intellij/images/editor/impl/ImageEditorUI.java
+++ b/images/src/org/intellij/images/editor/impl/ImageEditorUI.java
@@ -73,7 +73,7 @@ final class ImageEditorUI extends JPanel implements DataProvider {
         final PsiActionSupportFactory factory = PsiActionSupportFactory.getInstance();
         copyPasteSupport = factory.createPsiBasedCopyPasteSupport(editor.getProject(), this, new PsiActionSupportFactory.PsiElementSelector() {
             public PsiElement[] getSelectedElements() {
-                return (PsiElement[]) getData(DataConstants.PSI_ELEMENT_ARRAY);
+                return LangDataKeys.PSI_ELEMENT_ARRAY.getData(ImageEditorUI.this);
             }
         });
 
@@ -342,26 +342,26 @@ final class ImageEditorUI extends JPanel implements DataProvider {
     @Nullable
     public Object getData(String dataId) {
 
-        if (DataConstants.PROJECT.equals(dataId)) {
+        if (PlatformDataKeys.PROJECT.is(dataId)) {
             return editor.getProject();
-        } else if (DataConstants.VIRTUAL_FILE.equals(dataId)) {
+        } else if (PlatformDataKeys.VIRTUAL_FILE.is(dataId)) {
             return editor.getFile();
-        } else if (DataConstants.VIRTUAL_FILE_ARRAY.equals(dataId)) {
+        } else if (PlatformDataKeys.VIRTUAL_FILE_ARRAY.is(dataId)) {
             return new VirtualFile[]{editor.getFile()};
-        } else if (DataConstants.PSI_FILE.equals(dataId)) {
-            return getData(DataConstants.PSI_ELEMENT);
-        } else if (DataConstants.PSI_ELEMENT.equals(dataId)) {
+        } else if (LangDataKeys.PSI_FILE.is(dataId)) {
+            return getData(LangDataKeys.PSI_ELEMENT.getName());
+        } else if (LangDataKeys.PSI_ELEMENT.is(dataId)) {
             VirtualFile file = editor.getFile();
             return file != null && file.isValid() ? PsiManager.getInstance(editor.getProject()).findFile(file) : null;
-        } else if (DataConstants.PSI_ELEMENT_ARRAY.equals(dataId)) {
-            return new PsiElement[]{(PsiElement) getData(DataConstants.PSI_ELEMENT)};
-        } else if (DataConstants.COPY_PROVIDER.equals(dataId)) {
+        } else if (LangDataKeys.PSI_ELEMENT_ARRAY.is(dataId)) {
+            return new PsiElement[]{(PsiElement) getData(LangDataKeys.PSI_ELEMENT.getName())};
+        } else if (PlatformDataKeys.COPY_PROVIDER.is(dataId)) {
             return copyPasteSupport.getCopyProvider();
-        } else if (DataConstants.CUT_PROVIDER.equals(dataId)) {
+        } else if (PlatformDataKeys.CUT_PROVIDER.is(dataId)) {
             return copyPasteSupport.getCutProvider();
-        } else if (DataConstants.DELETE_ELEMENT_PROVIDER.equals(dataId)) {
+        } else if (PlatformDataKeys.DELETE_ELEMENT_PROVIDER.is(dataId)) {
             return deleteProvider;
-        } else if (ImageComponentDecorator.class.getName().equals(dataId)) {
+        } else if (ImageComponentDecorator.DATA_KEY.is(dataId)) {
             return editor;
         }
 

diff --git a/images/src/org/intellij/images/thumbnail/ThumbnailView.java b/images/src/org/intellij/images/thumbnail/ThumbnailView.java
index 5f20f197697909635c0221694d785bcbf6106b08..cf0fc5d37b985d61e95134e3cdfc1abd11e4e02d 100644 (file)
--- a/images/src/org/intellij/images/thumbnail/ThumbnailView.java
+++ b/images/src/org/intellij/images/thumbnail/ThumbnailView.java
@@ -16,6 +16,7 @@
 package org.intellij.images.thumbnail;
 
 import com.intellij.openapi.Disposable;
+import com.intellij.openapi.actionSystem.DataKey;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.intellij.images.ImagesBundle;
@@ -28,45 +29,47 @@ import org.jetbrains.annotations.NotNull;
  * @author <a href="mailto:aefimov.box@gmail.com">Alexey Efimov</a>
  */
 public interface ThumbnailView extends Disposable, ImageComponentDecorator {
-    String TOOLWINDOW_ID = ImagesBundle.message("thumbnails.toolwindow.name");
+  DataKey<ThumbnailView> DATA_KEY = DataKey.create(ThumbnailView.class.getName());
 
-    @NotNull
-    Project getProject();
+  String TOOLWINDOW_ID = ImagesBundle.message("thumbnails.toolwindow.name");
 
-    /**
-     * Add virtual files to view
-     *
-     * @param root Root
-     */
-    void setRoot(@NotNull VirtualFile root);
+  @NotNull
+  Project getProject();
 
-    /**
-     * Return current root
-     *
-     * @return Current root
-     */
-    VirtualFile getRoot();
+  /**
+   * Add virtual files to view
+   *
+   * @param root Root
+   */
+  void setRoot(@NotNull VirtualFile root);
 
-    boolean isRecursive();
+  /**
+   * Return current root
+   *
+   * @return Current root
+   */
+  VirtualFile getRoot();
 
-    void setRecursive(boolean recursive);
+  boolean isRecursive();
 
-    void setSelected(@NotNull VirtualFile file, boolean selected);
+  void setRecursive(boolean recursive);
 
-    boolean isSelected(@NotNull VirtualFile file);
+  void setSelected(@NotNull VirtualFile file, boolean selected);
 
-    @NotNull
-    VirtualFile[] getSelection();
+  boolean isSelected(@NotNull VirtualFile file);
 
-    /**
-     * Scroll to selection. If ToolWindow is not active, then
-     * it will perform activatation before scroll.
-     */
-    void scrollToSelection();
+  @NotNull
+  VirtualFile[] getSelection();
 
-    void setVisible(boolean visible);
+  /**
+   * Scroll to selection. If ToolWindow is not active, then
+   * it will perform activatation before scroll.
+   */
+  void scrollToSelection();
 
-    boolean isVisible();
+  void setVisible(boolean visible);
 
-    void activate();
+  boolean isVisible();
+
+  void activate();
 }

diff --git a/images/src/org/intellij/images/thumbnail/actionSystem/ThumbnailViewActionUtil.java b/images/src/org/intellij/images/thumbnail/actionSystem/ThumbnailViewActionUtil.java
index b53040ab543afdf7bf8d391cae322ecea5f0e1ed..bf381dff43eed05da3a723ee021d56cba02b7d0d 100644 (file)
--- a/images/src/org/intellij/images/thumbnail/actionSystem/ThumbnailViewActionUtil.java
+++ b/images/src/org/intellij/images/thumbnail/actionSystem/ThumbnailViewActionUtil.java
@@ -16,7 +16,6 @@
 package org.intellij.images.thumbnail.actionSystem;
 
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.Presentation;
 import org.intellij.images.thumbnail.ThumbnailView;
 
@@ -44,8 +43,7 @@ public final class ThumbnailViewActionUtil {
     }
 
     public static ThumbnailView getThumbnailView(AnActionEvent e) {
-        DataContext dataContext = e.getDataContext();
-        return (ThumbnailView) dataContext.getData(ThumbnailView.class.getName());
+      return ThumbnailView.DATA_KEY.getData(e.getDataContext());
     }
 
     /**

diff --git a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java
index 490e742fe47f2603a0dce269db4e4ccd0a01875a..2de28dd40660b8dec2f620c67fd22efa73b71370 100644 (file)
--- a/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java
+++ b/images/src/org/intellij/images/thumbnail/impl/ThumbnailViewUI.java
@@ -90,7 +90,7 @@ final class ThumbnailViewUI extends JPanel implements DataProvider, Disposable {
         final PsiActionSupportFactory factory = PsiActionSupportFactory.getInstance();
         copyPasteSupport = factory.createPsiBasedCopyPasteSupport(thumbnailView.getProject(), this, new PsiActionSupportFactory.PsiElementSelector() {
             public PsiElement[] getSelectedElements() {
-                return (PsiElement[]) getData(DataConstants.PSI_ELEMENT_ARRAY);
+                return (PsiElement[]) getData(LangDataKeys.PSI_ELEMENT_ARRAY.getName());
             }
         });
 
@@ -410,32 +410,32 @@ final class ThumbnailViewUI extends JPanel implements DataProvider, Disposable {
 
     @Nullable
     public Object getData(String dataId) {
-        if (DataConstants.PROJECT.equals(dataId)) {
+        if (PlatformDataKeys.PROJECT.is(dataId)) {
             return thumbnailView.getProject();
-        } else if (DataConstants.VIRTUAL_FILE.equals(dataId)) {
+        } else if (PlatformDataKeys.VIRTUAL_FILE.is(dataId)) {
             VirtualFile[] selectedFiles = getSelectedFiles();
             return selectedFiles.length > 0 ? selectedFiles[0] : null;
-        } else if (DataConstants.VIRTUAL_FILE_ARRAY.equals(dataId)) {
+        } else if (PlatformDataKeys.VIRTUAL_FILE_ARRAY.is(dataId)) {
             return getSelectedFiles();
-        } else if (DataConstants.PSI_FILE.equals(dataId)) {
-            return getData(DataConstants.PSI_ELEMENT);
-        } else if (DataConstants.PSI_ELEMENT.equals(dataId)) {
+        } else if (LangDataKeys.PSI_FILE.is(dataId)) {
+            return getData(LangDataKeys.PSI_ELEMENT.getName());
+        } else if (LangDataKeys.PSI_ELEMENT.is(dataId)) {
             VirtualFile[] selectedFiles = getSelectedFiles();
             return selectedFiles.length > 0 ? PsiManager.getInstance(thumbnailView.getProject()).findFile(selectedFiles[0]) : null;
-        } else if (DataConstants.PSI_ELEMENT_ARRAY.equals(dataId)) {
+        } else if (LangDataKeys.PSI_ELEMENT_ARRAY.is(dataId)) {
             return getSelectedElements();
-        } else if (DataConstants.NAVIGATABLE.equals(dataId)) {
+        } else if (PlatformDataKeys.NAVIGATABLE.is(dataId)) {
             VirtualFile[] selectedFiles = getSelectedFiles();
             return new ThumbnailNavigatable(selectedFiles.length > 0 ? selectedFiles[0] : null);
-        } else if (DataConstants.COPY_PROVIDER.equals(dataId)) {
+        } else if (PlatformDataKeys.COPY_PROVIDER.is(dataId)) {
             return copyPasteSupport.getCopyProvider();
-        } else if (DataConstants.CUT_PROVIDER.equals(dataId)) {
+        } else if (PlatformDataKeys.CUT_PROVIDER.is(dataId)) {
             return copyPasteSupport.getCutProvider();
-        } else if (DataConstants.PASTE_PROVIDER.equals(dataId)) {
+        } else if (PlatformDataKeys.PASTE_PROVIDER.is(dataId)) {
             return copyPasteSupport.getPasteProvider();
-        } else if (DataConstants.DELETE_ELEMENT_PROVIDER.equals(dataId)) {
+        } else if (PlatformDataKeys.DELETE_ELEMENT_PROVIDER.is(dataId)) {
             return deleteProvider;
-        } else if (DataConstants.NAVIGATABLE_ARRAY.equals(dataId)) {
+        } else if (PlatformDataKeys.NAVIGATABLE_ARRAY.is(dataId)) {
             VirtualFile[] selectedFiles = getSelectedFiles();
             Set<Navigatable> navigatables = new HashSet<Navigatable>(selectedFiles.length);
             for (VirtualFile selectedFile : selectedFiles) {
@@ -444,9 +444,9 @@ final class ThumbnailViewUI extends JPanel implements DataProvider, Disposable {
                 }
             }
             return navigatables.toArray(EMPTY_NAVIGATABLE_ARRAY);
-        } else if (ThumbnailView.class.getName().equals(dataId)) {
+        } else if (ThumbnailView.DATA_KEY.is(dataId)) {
             return thumbnailView;
-        } else if (ImageComponentDecorator.class.getName().equals(dataId)) {
+        } else if (ImageComponentDecorator.DATA_KEY.is(dataId)) {
             return thumbnailView;
         }
 
@@ -466,7 +466,7 @@ final class ThumbnailViewUI extends JPanel implements DataProvider, Disposable {
                 psiElements.add(element);
             }
         }
-        return psiElements.toArray(PsiElement.EMPTY_ARRAY);
+        return psiElements.toArray(new PsiElement[psiElements.size()]);
     }
 
     @NotNull

diff --git a/images/src/org/intellij/images/ui/ImageComponentDecorator.java b/images/src/org/intellij/images/ui/ImageComponentDecorator.java
index a0a711b62c5f285ee91782317053b6d94877b588..da9ef9215b3a69ba4de1b78276de068a512e7dcc 100644 (file)
--- a/images/src/org/intellij/images/ui/ImageComponentDecorator.java
+++ b/images/src/org/intellij/images/ui/ImageComponentDecorator.java
@@ -15,21 +15,25 @@
  */
 package org.intellij.images.ui;
 
+import com.intellij.openapi.actionSystem.DataKey;
+
 /**
  * Image Component manager. It can toggle backround transparency, grid, etc.
  *
  * @author Alexey Efimov
  */
 public interface ImageComponentDecorator {
-    void setTransparencyChessboardVisible(boolean visible);
+  DataKey<ImageComponentDecorator> DATA_KEY = DataKey.create(ImageComponentDecorator.class.getName());
+
+  void setTransparencyChessboardVisible(boolean visible);
 
-    boolean isTransparencyChessboardVisible();
+  boolean isTransparencyChessboardVisible();
 
-    /**
-     * Return <code>true</code> if this decorator is enabled for this action place.
-     *
-     * @param place Action place
-     * @return <code>true</code> is decorator is enabled
-     */
-    boolean isEnabledForActionPlace(String place);
+  /**
+   * Return <code>true</code> if this decorator is enabled for this action place.
+   *
+   * @param place Action place
+   * @return <code>true</code> is decorator is enabled
+   */
+  boolean isEnabledForActionPlace(String place);
 }

diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/CompileDirtyAction.java b/java/compiler/impl/src/com/intellij/compiler/actions/CompileDirtyAction.java
index 0cfcab780c112b5667b52e03558ac166d150d6f0..8bea2886c3daf9c6533487d6acf533c74210a65e 100644 (file)
--- a/java/compiler/impl/src/com/intellij/compiler/actions/CompileDirtyAction.java
+++ b/java/compiler/impl/src/com/intellij/compiler/actions/CompileDirtyAction.java
@@ -16,8 +16,8 @@
 package com.intellij.compiler.actions;
 
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.compiler.CompilerManager;
 import com.intellij.openapi.project.Project;
@@ -34,6 +34,6 @@ public class CompileDirtyAction extends CompileActionBase {
     if (!presentation.isEnabled()) {
       return;
     }
-    presentation.setEnabled(event.getDataContext().getData(DataConstants.PROJECT) != null);
+    presentation.setEnabled(PlatformDataKeys.PROJECT.getData(event.getDataContext()) != null);
   }
 }
\ No newline at end of file

diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/MakeModuleAction.java b/java/compiler/impl/src/com/intellij/compiler/actions/MakeModuleAction.java
index 7698a151e4835f6cc74a9a061833e88454e8e995..08b85a8c7021d81ca08cebe703e79794159dce73 100644 (file)
--- a/java/compiler/impl/src/com/intellij/compiler/actions/MakeModuleAction.java
+++ b/java/compiler/impl/src/com/intellij/compiler/actions/MakeModuleAction.java
@@ -26,7 +26,7 @@ public class MakeModuleAction extends CompileActionBase {
   private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.actions.MakeModuleAction");
 
   protected void doAction(DataContext dataContext, Project project) {
-    Module[] modules = (Module[])dataContext.getData(DataConstants.MODULE_CONTEXT_ARRAY);
+    Module[] modules = LangDataKeys.MODULE_CONTEXT_ARRAY.getData(dataContext);
     Module module;
     if (modules == null) {
       module = LangDataKeys.MODULE.getData(dataContext);
@@ -51,7 +51,7 @@ public class MakeModuleAction extends CompileActionBase {
     }
     final DataContext dataContext = event.getDataContext();
     final Module module = LangDataKeys.MODULE.getData(dataContext);
-    Module[] modules = (Module[])dataContext.getData(DataConstants.MODULE_CONTEXT_ARRAY);
+    Module[] modules = LangDataKeys.MODULE_CONTEXT_ARRAY.getData(dataContext);
     final boolean isEnabled = module != null || modules != null;
     presentation.setEnabled(isEnabled);
     final String actionName = getTemplatePresentation().getTextWithMnemonic();
@@ -81,4 +81,4 @@ public class MakeModuleAction extends CompileActionBase {
     presentation.setText(presentationText);
     presentation.setVisible(isEnabled || !ActionPlaces.PROJECT_VIEW_POPUP.equals(event.getPlace()));
   }
-}
\ No newline at end of file
+}

diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/AddToWatchAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/AddToWatchAction.java
index d3521284f6dfc1c5e19e9cac191ca263d019a60b..a94a2c09ada15b78dadc948dee4babe9e1b2f2f2 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/actions/AddToWatchAction.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/AddToWatchAction.java
@@ -66,7 +66,7 @@ public class AddToWatchAction extends DebuggerAction {
       }
     }
     else {
-      final Editor editor = (Editor)context.getData(PlatformDataKeys.EDITOR.getName());
+      final Editor editor = e.getData(PlatformDataKeys.EDITOR);
       enabled = DebuggerUtilsEx.getEditorText(editor) != null;
     }
     e.getPresentation().setEnabled(enabled);
@@ -99,7 +99,7 @@ public class AddToWatchAction extends DebuggerAction {
       addFromNodes(debuggerContext, watchPanel, selectedNodes);
     }
     else {
-      final Editor editor = (Editor)context.getData(PlatformDataKeys.EDITOR.getName());
+      final Editor editor = e.getData(PlatformDataKeys.EDITOR);
       if (editor != null) {
         final TextWithImports editorText = DebuggerUtilsEx.getEditorText(editor);
         if (editorText != null) {
@@ -176,4 +176,4 @@ public class AddToWatchAction extends DebuggerAction {
     }
 
   }
-}
\ No newline at end of file
+}

diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerAction.java
index def5c3aead4bd933cd5597181b4f8ba075f84b5c..d149e8c388f0b85bcab195ff88a5a4364e0c8db7 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerAction.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerAction.java
@@ -45,12 +45,12 @@ public abstract class DebuggerAction extends AnAction {
 
   @Nullable
   public static DebuggerTree getTree(DataContext dataContext){
-    return (DebuggerTree)dataContext.getData(DebuggerActions.DEBUGGER_TREE);
+    return DebuggerTree.DATA_KEY.getData(dataContext);
   }
 
   @Nullable
   public static DebuggerTreePanel getPanel(DataContext dataContext){
-    return (DebuggerTreePanel)dataContext.getData(DebuggerActions.DEBUGGER_TREE_PANEL);
+    return DebuggerTreePanel.DATA_KEY.getData(dataContext);
   }
 
   @Nullable
@@ -80,11 +80,11 @@ public abstract class DebuggerAction extends AnAction {
     if (paths == null || paths.length == 0) {
       return EMPTY_TREE_NODE_ARRAY;
     }
-    List<Object> nodes = new ArrayList<Object>(paths.length);
+    List<DebuggerTreeNodeImpl> nodes = new ArrayList<DebuggerTreeNodeImpl>(paths.length);
     for (TreePath path : paths) {
       Object component = path.getLastPathComponent();
       if (component instanceof DebuggerTreeNodeImpl) {
-        nodes.add(component);
+        nodes.add((DebuggerTreeNodeImpl) component);
       }
     }
     return nodes.toArray(new DebuggerTreeNodeImpl[nodes.size()]);

diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerActions.java b/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerActions.java
index b8186a2426c1d1a1f6f25c6b75d0b99a76a5c43b..1220f5c9682bfe81cff036ad7dd84c1518a9008a 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerActions.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/DebuggerActions.java
@@ -20,6 +20,8 @@
  */
 package com.intellij.debugger.actions;
 
+import com.intellij.debugger.ui.impl.DebuggerTreePanel;
+import com.intellij.debugger.ui.impl.watch.DebuggerTree;
 import com.intellij.xdebugger.impl.actions.XDebuggerActions;
 import org.jetbrains.annotations.NonNls;
 
@@ -30,8 +32,8 @@ public interface DebuggerActions extends XDebuggerActions {
   @NonNls String INSPECT_PANEL_POPUP = "Debugger.InspectPanelPopup";
   @NonNls String THREADS_PANEL_POPUP = "Debugger.ThreadsPanelPopup";
   @NonNls String WATCH_PANEL_POPUP = "Debugger.WatchesPanelPopup";
-  @NonNls String DEBUGGER_TREE = "DebuggerTree";
-  @NonNls String DEBUGGER_TREE_PANEL = "DebuggerPanel";
+  @Deprecated @NonNls String DEBUGGER_TREE = DebuggerTree.DATA_KEY.getName();
+  @Deprecated @NonNls String DEBUGGER_TREE_PANEL = DebuggerTreePanel.DATA_KEY.getName();
   @NonNls String REMOVE_WATCH = "Debugger.RemoveWatch";
   @NonNls String NEW_WATCH = "Debugger.NewWatch";
   @NonNls String ADD_TO_WATCH = "Debugger.AddToWatch";
@@ -47,4 +49,4 @@ public interface DebuggerActions extends XDebuggerActions {
   @NonNls String EXPORT_THREADS = "ExportThreads";
   @NonNls String DUMP_THREADS = "DumpThreads";
 
-}
\ No newline at end of file
+}

diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/ToggleFieldBreakpointAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/ToggleFieldBreakpointAction.java
index 5900b31b6271d48c48e3a0f4320d78f5d3105301..dc3449921fc52d054c7c2f8abd095fd1f43b8d41 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/actions/ToggleFieldBreakpointAction.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/ToggleFieldBreakpointAction.java
@@ -107,12 +107,12 @@ public class ToggleFieldBreakpointAction extends AnAction {
     else if(DebuggerAction.isContextView(event)) {
       presentation.setText(DebuggerBundle.message("action.add.field.watchpoint.text"));
       Project project = event.getData(PlatformDataKeys.PROJECT);
-      if(place != null) {
+      if(project != null && place != null) {
         Document document = PsiDocumentManager.getInstance(project).getDocument(place.getFile());
         if (document != null) {
           final int offset = place.getOffset();
           final BreakpointManager breakpointManager = (DebuggerManagerEx.getInstanceEx(project)).getBreakpointManager();
-          final Breakpoint fieldBreakpoint = offset >= 0 ? (FieldBreakpoint)breakpointManager.findBreakpoint(document, offset, FieldBreakpoint.CATEGORY) : null;
+          final Breakpoint fieldBreakpoint = offset >= 0 ? breakpointManager.findBreakpoint(document, offset, FieldBreakpoint.CATEGORY) : null;
           if (fieldBreakpoint != null) {
             presentation.setEnabled(false);
             return;
@@ -147,7 +147,7 @@ public class ToggleFieldBreakpointAction extends AnAction {
     }
 
     if(DebuggerAction.isContextView(event)) {
-      DebuggerTree tree = (DebuggerTree)dataContext.getData(DebuggerActions.DEBUGGER_TREE);
+      DebuggerTree tree = DebuggerTree.DATA_KEY.getData(dataContext);
       if(tree != null && tree.getSelectionPath() != null) {
         DebuggerTreeNodeImpl node = ((DebuggerTreeNodeImpl)tree.getSelectionPath().getLastPathComponent());
         if(node != null && node.getDescriptor() instanceof FieldDescriptorImpl) {
@@ -188,4 +188,4 @@ public class ToggleFieldBreakpointAction extends AnAction {
     return null;
   }
 
-}
\ No newline at end of file
+}

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreePanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreePanel.java
index 269d8ce89e18a45a2c5265fffe46e1dc05bfe763..2e140372077cd5669dda0dec2a299d2ae7285376 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreePanel.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreePanel.java
@@ -24,10 +24,7 @@ import com.intellij.debugger.impl.DebuggerSession;
 import com.intellij.debugger.impl.DebuggerStateManager;
 import com.intellij.debugger.ui.impl.watch.DebuggerTree;
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.actionSystem.ActionPopupMenu;
-import com.intellij.openapi.actionSystem.CustomShortcutSet;
-import com.intellij.openapi.actionSystem.DataProvider;
-import com.intellij.openapi.actionSystem.Shortcut;
+import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.keymap.KeymapManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
@@ -39,6 +36,8 @@ import java.awt.*;
 import java.awt.event.KeyEvent;
 
 public abstract class DebuggerTreePanel extends UpdatableDebuggerView implements DataProvider {
+  public static final DataKey<DebuggerTreePanel> DATA_KEY = DataKey.create("DebuggerPanel");
+  
   protected final DebuggerTree myTree;
 
   public DebuggerTreePanel(Project project, DebuggerStateManager stateManager) {
@@ -101,7 +100,7 @@ public abstract class DebuggerTreePanel extends UpdatableDebuggerView implements
   }
 
   public Object getData(String dataId) {
-    if (DebuggerActions.DEBUGGER_TREE_PANEL.equals(dataId)) {
+    if (DebuggerTreePanel.DATA_KEY.is(dataId)) {
       return this;
     }
     return null;

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/ThreadsPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/ThreadsPanel.java
index c4a08b26e6a03a1d24d4f6ed8baa8f845e630ccc..e63cd8f42886f7b25e7665f266577ca303f38c8b 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/ThreadsPanel.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/ThreadsPanel.java
@@ -28,7 +28,7 @@ import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.ActionPopupMenu;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NonNls;
 
@@ -72,7 +72,7 @@ public class ThreadsPanel extends DebuggerTreePanel{
   }
 
   public Object getData(String dataId) {
-    if (DataConstantsEx.HELP_ID.equals(dataId)) {
+    if (PlatformDataKeys.HELP_ID.is(dataId)) {
       return HELP_ID;
     }
     return super.getData(dataId);
@@ -86,4 +86,4 @@ public class ThreadsPanel extends DebuggerTreePanel{
   public ThreadsDebuggerTree getThreadsTree() {
     return (ThreadsDebuggerTree) getTree();
   }
-}
\ No newline at end of file
+}

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/VariablesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/VariablesPanel.java
index 26972b427535c894b94f11501456234aed89b79d..5250b408d575daa32fd462cb12627d0b3fa003e1 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/VariablesPanel.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/VariablesPanel.java
@@ -58,7 +58,7 @@ public class VariablesPanel extends DebuggerTreePanel implements DataProvider{
   }
 
   public Object getData(String dataId) {
-    if (DataConstants.HELP_ID.equals(dataId)) {
+    if (PlatformDataKeys.HELP_ID.is(dataId)) {
       return HELP_ID;
     }
     return super.getData(dataId);
@@ -69,4 +69,4 @@ public class VariablesPanel extends DebuggerTreePanel implements DataProvider{
     return (FrameDebuggerTree) getTree();
   }
 
-}
\ No newline at end of file
+}

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/WatchPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/WatchPanel.java
index 60e2f35d1bae01e1bcb29199cfd0bc679e627852..e0564ac1c7be2c2999804da64aa5b7efff323a2c 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/WatchPanel.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/WatchPanel.java
@@ -30,7 +30,7 @@ import com.intellij.debugger.ui.impl.watch.DebuggerTreeNodeImpl;
 import com.intellij.debugger.ui.impl.watch.WatchItemDescriptor;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.ActionPopupMenu;
-import com.intellij.openapi.actionSystem.DataConstants;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NonNls;
 
@@ -71,7 +71,7 @@ public abstract class WatchPanel extends DebuggerTreePanel {
   }
 
   public Object getData(String dataId) {
-    if (DataConstants.HELP_ID.equals(dataId)) {
+    if (PlatformDataKeys.HELP_ID.is(dataId)) {
       return HELP_ID;
     }
     return super.getData(dataId);
@@ -80,4 +80,4 @@ public abstract class WatchPanel extends DebuggerTreePanel {
   public WatchDebuggerTree getWatchTree() {
     return (WatchDebuggerTree) getTree();
   }
-}
\ No newline at end of file
+}

diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java
index b3f3393156eaf67f8fbed08b15dec5a8e8371650..c2a42eb2e3fb56b352de7626bb0dfb80635e6d94 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/DebuggerTree.java
@@ -22,7 +22,6 @@ package com.intellij.debugger.ui.impl.watch;
 
 import com.intellij.debugger.DebuggerBundle;
 import com.intellij.debugger.DebuggerInvocationUtil;
-import com.intellij.debugger.actions.DebuggerActions;
 import com.intellij.debugger.engine.DebugProcessImpl;
 import com.intellij.debugger.engine.evaluation.EvaluateException;
 import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
@@ -44,6 +43,7 @@ import com.intellij.debugger.ui.tree.NodeDescriptor;
 import com.intellij.debugger.ui.tree.render.ChildrenBuilder;
 import com.intellij.debugger.ui.tree.render.NodeRenderer;
 import com.intellij.debugger.ui.tree.render.NodeRendererSettingsListener;
+import com.intellij.openapi.actionSystem.DataKey;
 import com.intellij.openapi.actionSystem.DataProvider;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
@@ -67,6 +67,8 @@ public abstract class DebuggerTree extends DebuggerTreeBase implements DataProvi
   private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.impl.watch.DebuggerTree");
   protected static final Key<Rectangle> VISIBLE_RECT = Key.create("VISIBLE_RECT");
 
+  public static final DataKey<DebuggerTree> DATA_KEY = DataKey.create("DebuggerTree"); 
+
   private final Project myProject;
   protected final NodeManagerImpl myNodeManager;
 
@@ -182,7 +184,7 @@ public abstract class DebuggerTree extends DebuggerTreeBase implements DataProvi
   }
 
   public Object getData(String dataId) {
-    if (DebuggerActions.DEBUGGER_TREE.equals(dataId)) {
+    if (DebuggerTree.DATA_KEY.is(dataId)) {
       return this;
     }
     return null;
@@ -705,4 +707,4 @@ public abstract class DebuggerTree extends DebuggerTreeBase implements DataProvi
   public void hideTooltip() {
     myTipManager.hideTooltip();
   }
-}
\ No newline at end of file
+}

diff --git a/java/idea-ui/src/com/intellij/ide/actions/ShowModulePropertiesAction.java b/java/idea-ui/src/com/intellij/ide/actions/ShowModulePropertiesAction.java
index 75a5c584770ed8e10740ad44516918af6e7b1015..1fa86ffb55f92d07535a9000a297c997a51971fa 100644 (file)
--- a/java/idea-ui/src/com/intellij/ide/actions/ShowModulePropertiesAction.java
+++ b/java/idea-ui/src/com/intellij/ide/actions/ShowModulePropertiesAction.java
@@ -15,10 +15,7 @@
  */
 package com.intellij.ide.actions;
 
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.DataConstants;
-import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ui.configuration.ModulesConfigurator;
@@ -31,11 +28,11 @@ public class ShowModulePropertiesAction extends AnAction{
 
   public void actionPerformed(AnActionEvent e) {
     final DataContext dataContext = e.getDataContext();
-    final Project project = (Project)dataContext.getData(DataConstants.PROJECT);
+    final Project project = PlatformDataKeys.PROJECT.getData(dataContext);
     if (project == null) {
       return;
     }
-    final Module module = (Module)dataContext.getData(DataConstants.MODULE_CONTEXT);
+    final Module module = LangDataKeys.MODULE_CONTEXT.getData(dataContext);
     if (module == null) {
       return;
     }
@@ -45,8 +42,8 @@ public class ShowModulePropertiesAction extends AnAction{
   public void update(AnActionEvent e) {
     super.update(e);
     final DataContext dataContext = e.getDataContext();
-    final Project project = (Project)dataContext.getData(DataConstants.PROJECT);
-    final Module module = (Module)dataContext.getData(DataConstants.MODULE_CONTEXT);
+    final Project project = PlatformDataKeys.PROJECT.getData(dataContext);
+    final Module module = LangDataKeys.MODULE_CONTEXT.getData(dataContext);
     e.getPresentation().setVisible(project != null && module != null);
   }
 }

diff --git a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java b/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java
index d97140aec6ac62007d6f9dfce6dbee96e1980b20..4640d69bbb59e32353d8ee668c54077e2e2620a2 100644 (file)
--- a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java
+++ b/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java
@@ -158,7 +158,7 @@ public class PaletteGroupHeader extends JCheckBox implements DataProvider {
   @Nullable public Object getData(String dataId) {
     Object data = myPaletteWindow.getData(dataId);
     if (data != null) return data;
-    Project project = (Project)myPaletteWindow.getData(DataConstants.PROJECT);
+    Project project = PlatformDataKeys.PROJECT.getData(myPaletteWindow);
     return myGroup.getData(project, dataId);
   }
 

diff --git a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java b/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java
index ccaf067a6b06543d3eb0c61bae56a627e2251b20..7ee8a74ec77a2f80043441020a91e7d0b0360704 100644 (file)
--- a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java
+++ b/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java
@@ -45,7 +45,7 @@ public class PaletteWindow extends JPanel implements DataProvider {
   private final Project myProject;
   private final ArrayList<PaletteGroupHeader> myGroupHeaders = new ArrayList<PaletteGroupHeader>();
   private final PaletteItemProvider[] myProviders;
-  private final PaletteWindow.MyPropertyChangeListener myPropertyChangeListener = new MyPropertyChangeListener();
+  private final MyPropertyChangeListener myPropertyChangeListener = new MyPropertyChangeListener();
   private final Set<PaletteGroup> myGroups = new HashSet<PaletteGroup>();
   private final JTabbedPane myTabbedPane = new JTabbedPane();
   private final JScrollPane myScrollPane = new JScrollPane();
@@ -190,10 +190,10 @@ public class PaletteWindow extends JPanel implements DataProvider {
   }
 
   @Nullable public Object getData(String dataId) {
-    if (dataId.equals(DataConstants.HELP_ID)) {
+    if (PlatformDataKeys.HELP_ID.is(dataId)) {
       return ourHelpID;
     }
-    if (dataId.equals(DataConstants.PROJECT)) {
+    if (PlatformDataKeys.PROJECT.is(dataId)) {
       return myProject;
     }
     PaletteItem item = getActiveItem();

diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathPanel.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathPanel.java
index 1ccc733676aa414bb694ab5778d00e49c0d12db4..45e052fe2d02b826e96675dbef0f0202b42ecae1 100644 (file)
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathPanel.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathPanel.java
@@ -1065,7 +1065,7 @@ public class ClasspathPanel extends JPanel {
 
     private static FileChooserDescriptor createFileChooserDescriptor(Component parent) {
       final FileChooserDescriptor descriptor = new FileChooserDescriptor(false, true, true, false, false, true);
-      final Module contextModule = (Module)DataManager.getInstance().getDataContext(parent).getData(DataConstants.MODULE_CONTEXT);
+      final Module contextModule = LangDataKeys.MODULE_CONTEXT.getData(DataManager.getInstance().getDataContext(parent));
       descriptor.putUserData(LangDataKeys.MODULE_CONTEXT, contextModule);
       return descriptor;
     }

diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java
index 02a10416ee55454740864f48369af7d9d60a77d1..57d9f5fdaa3162ce05390daf93d36f6ea3729b41 100644 (file)
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java
@@ -17,8 +17,8 @@ package com.intellij.openapi.roots.ui.configuration;
 
 import com.intellij.facet.impl.ProjectFacetsConfigurator;
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataProvider;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleConfigurationEditor;
@@ -556,7 +556,7 @@ public abstract class ModuleEditor implements Place.Navigator, Disposable {
     }
 
     public Object getData(String dataId) {
-      if (dataId.equals(DataConstants.MODULE_CONTEXT)) {
+      if (LangDataKeys.MODULE_CONTEXT.is(dataId)) {
         return getModule();
       }
       return null;

diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/actions/NewModuleInGroupAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/actions/NewModuleInGroupAction.java
index ed54db5fa71366a279dd10c4c5f44c8fc3358962..68f24603774ee2abffd1309cf9b74525481c34dd 100644 (file)
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/actions/NewModuleInGroupAction.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/actions/NewModuleInGroupAction.java
@@ -18,7 +18,6 @@ package com.intellij.openapi.roots.ui.configuration.actions;
 import com.intellij.ide.projectView.impl.ModuleGroup;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DataKeys;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.impl.ModuleManagerImpl;
 
@@ -29,7 +28,7 @@ public class NewModuleInGroupAction extends NewModuleAction {
   @Override
   public void update(final AnActionEvent e) {
     super.update(e);
-    final ModuleGroup[] moduleGroups = (ModuleGroup[])e.getDataContext().getData(DataConstantsEx.MODULE_GROUP_ARRAY);
+    final ModuleGroup[] moduleGroups = ModuleGroup.ARRAY_DATA_KEY.getData(e.getDataContext());
     final Module[] modules = e.getData(DataKeys.MODULE_CONTEXT_ARRAY);
     e.getPresentation().setVisible((moduleGroups != null && moduleGroups.length > 0) ||
                                    (modules != null && modules.length > 0));
@@ -37,7 +36,7 @@ public class NewModuleInGroupAction extends NewModuleAction {
 
   @Override
   protected Object prepareDataFromContext(final AnActionEvent e) {
-    final ModuleGroup[] moduleGroups = (ModuleGroup[])e.getDataContext().getData(DataConstantsEx.MODULE_GROUP_ARRAY);
+    final ModuleGroup[] moduleGroups = ModuleGroup.ARRAY_DATA_KEY.getData(e.getDataContext());
     if (moduleGroups != null && moduleGroups.length > 0) {
       return moduleGroups [0];
     }

diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java
index 16f9c4c266765e1f2151b318eddf9719e4e5b1ed..625b217f64582f1e5d63bcd312cfafc9e9dfae8c 100644 (file)
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java
@@ -43,7 +43,9 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import java.awt.*;
 import java.util.*;
+import java.util.List;
 
 /**
  * @author nik
@@ -238,7 +240,7 @@ public class FacetStructureConfigurable extends BaseStructureConfigurable {
   }
 
   public String getHelpTopic() {
-    final Object component = DataManager.getInstance().getDataContext().getData(DataKeys.CONTEXT_COMPONENT.getName());
+    final Component component = DataKeys.CONTEXT_COMPONENT.getData(DataManager.getInstance().getDataContext());
     if (myTree.equals(component)) {
       final NamedConfigurable selectedConfugurable = getSelectedConfugurable();
       if (selectedConfugurable instanceof FacetTypeConfigurable) {

diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java
index c1c07dd69cc2a02056cc5070a09e3b06792a970c..bc784b5e00a83681821bf559af04cd021fe7c9d6 100644 (file)
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java
@@ -28,7 +28,6 @@ import com.intellij.ide.util.projectWizard.ModuleBuilder;
 import com.intellij.ide.util.projectWizard.NamePathComponent;
 import com.intellij.ide.util.projectWizard.ProjectWizardUtil;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
@@ -47,7 +46,10 @@ import com.intellij.openapi.roots.ui.configuration.ClasspathEditor;
 import com.intellij.openapi.roots.ui.configuration.ModuleEditor;
 import com.intellij.openapi.roots.ui.configuration.ModulesConfigurator;
 import com.intellij.openapi.roots.ui.configuration.ProjectStructureConfigurable;
-import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.*;
+import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.LibraryProjectStructureElement;
+import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.ModuleProjectStructureElement;
+import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.ProjectStructureDaemonAnalyzer;
+import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.ProjectStructureElement;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.NamedConfigurable;
@@ -565,7 +567,7 @@ public class ModuleStructureConfigurable extends BaseStructureConfigurable imple
       if (DataKeys.MODULE_CONTEXT.is(dataId)){
         return getSelectedModule();
       }
-      if (DataConstantsEx.MODIFIABLE_MODULE_MODEL.equals(dataId)){
+      if (LangDataKeys.MODIFIABLE_MODULE_MODEL.is(dataId)){
         return myContext.myModulesConfigurator.getModuleModel();
       }
 

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToModuleFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToModuleFix.java
index 66b378c368d5460beac4d5f4fd22820a3ff347fe..354685a58b6b361e6f1fecc1fd46e8961d5dead3 100644 (file)
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToModuleFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/MoveClassToModuleFix.java
@@ -22,7 +22,7 @@ import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.ide.DataManager;
 import com.intellij.ide.util.PackageUtil;
 import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.actionSystem.impl.SimpleDataContext;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.module.Module;
@@ -43,6 +43,9 @@ import org.jetbrains.annotations.NotNull;
  * @author cdr
  */
 public class MoveClassToModuleFix {
+  private MoveClassToModuleFix() {
+  }
+
   public static void registerFixes(QuickFixActionRegistrar registrar, final PsiJavaCodeReferenceElement reference) {
     final PsiElement psiElement = reference.getElement();
     @NonNls final String referenceName = reference.getRangeInElement().substring(psiElement.getText());
@@ -102,8 +105,11 @@ public class MoveClassToModuleFix {
             DataManager dataManager = DataManager.getInstance();
             DataContext dataContext = dataManager.getDataContext();
             PsiDirectory directory = PackageUtil.findOrCreateDirectoryForPackage(currentModule, packageName, sourceRoot, true);
-            DataContext context = SimpleDataContext.getSimpleContext(DataConstantsEx.TARGET_PSI_ELEMENT, directory, dataContext);
+            DataContext context = SimpleDataContext.getSimpleContext(LangDataKeys.TARGET_PSI_ELEMENT.getName(), directory, dataContext);
             String qualifiedName = aClass.getQualifiedName();
+            if (qualifiedName == null) {
+              return;
+            }
             moveHandler.invoke(project, new PsiElement[]{aClass}, context);
             PsiReference reference = file.findReferenceAt(editor.getCaretModel().getOffset());
             PsiClass newClass = JavaPsiFacade.getInstance(project).findClass(qualifiedName, GlobalSearchScope.moduleScope(currentModule));

diff --git a/java/java-impl/src/com/intellij/cyclicDependencies/actions/CyclicDependenciesAction.java b/java/java-impl/src/com/intellij/cyclicDependencies/actions/CyclicDependenciesAction.java
index 880e2f57027ab9c0249d992d8256005afc277d5f..b1765a431d5c5fce08c89fc9e0ef89b9a690d154 100644 (file)
--- a/java/java-impl/src/com/intellij/cyclicDependencies/actions/CyclicDependenciesAction.java
+++ b/java/java-impl/src/com/intellij/cyclicDependencies/actions/CyclicDependenciesAction.java
@@ -48,7 +48,7 @@ public class CyclicDependenciesAction extends AnAction{
   public void update(AnActionEvent event) {
     Presentation presentation = event.getPresentation();
     presentation.setEnabled(
-      getInspectionScope(event.getDataContext()) != null || event.getDataContext().getData(DataConstants.PSI_FILE) != null);
+      getInspectionScope(event.getDataContext()) != null || event.getData(LangDataKeys.PSI_FILE) != null);
   }
 
   public void actionPerformed(AnActionEvent e) {
@@ -82,7 +82,7 @@ public class CyclicDependenciesAction extends AnAction{
   }
 
 
-  private AnalysisScope getInspectionScope(final DataContext dataContext) {
+  private static AnalysisScope getInspectionScope(final DataContext dataContext) {
     final Project project = PlatformDataKeys.PROJECT.getData(dataContext);
     if (project == null) return null;
 
@@ -91,19 +91,19 @@ public class CyclicDependenciesAction extends AnAction{
     return scope != null && scope.getScopeType() != AnalysisScope.INVALID ? scope : null;
   }
 
-  private AnalysisScope getInspectionScopeImpl(DataContext dataContext) {
+  private static AnalysisScope getInspectionScopeImpl(DataContext dataContext) {
     //Possible scopes: package, project, module.
     Project projectContext = PlatformDataKeys.PROJECT_CONTEXT.getData(dataContext);
     if (projectContext != null) {
       return new AnalysisScope(projectContext);
     }
 
-    Module moduleContext = (Module)dataContext.getData(DataConstants.MODULE_CONTEXT);
+    Module moduleContext = LangDataKeys.MODULE_CONTEXT.getData(dataContext);
     if (moduleContext != null) {
       return new AnalysisScope(moduleContext);
     }
 
-    Module [] modulesArray = (Module[])dataContext.getData(DataConstants.MODULE_CONTEXT_ARRAY);
+    Module [] modulesArray = LangDataKeys.MODULE_CONTEXT_ARRAY.getData(dataContext);
     if (modulesArray != null) {
       return new AnalysisScope(modulesArray);
     }
@@ -117,7 +117,7 @@ public class CyclicDependenciesAction extends AnAction{
     else if (psiTarget instanceof PsiPackage) {
       PsiPackage pack = (PsiPackage)psiTarget;
       PsiDirectory[] dirs = pack.getDirectories(GlobalSearchScope.projectScope(pack.getProject()));
-      if (dirs == null || dirs.length == 0) return null;
+      if (dirs.length == 0) return null;
       return new JavaAnalysisScope(pack, LangDataKeys.MODULE.getData(dataContext));
     } else if (psiTarget != null){
       return null;
@@ -127,12 +127,20 @@ public class CyclicDependenciesAction extends AnAction{
     return getProjectScope(dataContext);
   }
 
-  private AnalysisScope getProjectScope(DataContext dataContext) {
-    return new AnalysisScope(PlatformDataKeys.PROJECT.getData(dataContext));
+  private static AnalysisScope getProjectScope(DataContext dataContext) {
+    final Project data = PlatformDataKeys.PROJECT.getData(dataContext);
+    if (data == null) {
+      return null;
+    }
+    return new AnalysisScope(data);
   }
 
-  private AnalysisScope getModuleScope(DataContext dataContext) {
-    return new AnalysisScope(LangDataKeys.MODULE.getData(dataContext));
+  private static AnalysisScope getModuleScope(DataContext dataContext) {
+    final Module data = LangDataKeys.MODULE.getData(dataContext);
+    if (data == null) {
+      return null;
+    }
+    return new AnalysisScope(data);
   }
 
   private class ProjectModuleOrPackageDialog extends DialogWrapper {

diff --git a/java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java b/java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java
index 8b0856484f3a03bc1d572f7299c90348c3556f73..f9539ab1a8a0707794d2d6c03963c9220a06d8b8 100644 (file)
--- a/java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java
+++ b/java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java
@@ -388,7 +388,7 @@ public class CyclicDependenciesPanel extends JPanel implements Disposable, DataP
   @Nullable
   @NonNls
   public Object getData(@NonNls String dataId) {
-    if (dataId.equals(DataConstants.HELP_ID)) {
+    if (PlatformDataKeys.HELP_ID.is(dataId)) {
       return "dependency.viewer.tool.window";
     }
     return null;
@@ -497,7 +497,7 @@ public class CyclicDependenciesPanel extends JPanel implements Disposable, DataP
   private static class MyTree extends Tree implements DataProvider {
     public Object getData(String dataId) {
       PackageDependenciesNode node = getSelectedNode();
-      if (DataConstants.NAVIGATABLE.equals(dataId)) {
+      if (PlatformDataKeys.NAVIGATABLE.is(dataId)) {
         return node;
       }
       return null;

diff --git a/java/java-impl/src/com/intellij/ide/JavaDataAccessors.java b/java/java-impl/src/com/intellij/ide/JavaDataAccessors.java
index c6835e9d2c6fb7713a7d5ffa96ded7870ff8b22a..fabee57027f75e0402dfef7084c3cd3c7c5d6eaf 100644 (file)
--- a/java/java-impl/src/com/intellij/ide/JavaDataAccessors.java
+++ b/java/java-impl/src/com/intellij/ide/JavaDataAccessors.java
@@ -15,8 +15,11 @@
  */
 package com.intellij.ide;
 
-import com.intellij.psi.*;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.psi.JavaDirectoryService;
+import com.intellij.psi.PsiDirectory;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiPackage;
 
 public class JavaDataAccessors {
   public static final DataAccessor<PsiPackage> FILE_PACKAGE = new DataAccessor<PsiPackage>() {
@@ -27,7 +30,6 @@ public class JavaDataAccessors {
       return JavaDirectoryService.getInstance().getPackage(containingDirectory);
     }
   };
-  public static final DataAccessor<PsiJavaFile> PSI_JAVA_FILE = DataAccessor.SubClassDataAccessor.create(DataAccessors.PSI_FILE, PsiJavaFile.class);
 
   private JavaDataAccessors() {
   }

diff --git a/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiPackageFavoriteNodeProvider.java b/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiPackageFavoriteNodeProvider.java
index 38fd94258880fb7709c9ba0c01948a8c084844ac..df799d33f8b5aed5c4881e33554e53118d0ce0c5 100644 (file)
--- a/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiPackageFavoriteNodeProvider.java
+++ b/java/java-impl/src/com/intellij/ide/favoritesTreeView/PsiPackageFavoriteNodeProvider.java
@@ -30,7 +30,6 @@ import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.Project;
@@ -89,9 +88,9 @@ public class PsiPackageFavoriteNodeProvider extends FavoriteNodeProvider {
           }
         }
       } else {
-        final Object data = context.getData(DataConstantsEx.MODULE_GROUP_ARRAY);
-        if (data instanceof ModuleGroup[]) {
-          for (ModuleGroup moduleGroup : ((ModuleGroup[])data)) {
+        final ModuleGroup[] data = ModuleGroup.ARRAY_DATA_KEY.getData(context);
+        if (data != null) {
+          for (ModuleGroup moduleGroup : data) {
             if (currentViewId.equals(ProjectViewPane.ID)) {
               result.add(new ProjectViewModuleGroupNode(project, moduleGroup, viewSettings));
             }
@@ -198,4 +197,4 @@ public class PsiPackageFavoriteNodeProvider extends FavoriteNodeProvider {
     }
     return super.getPsiElement(element);
   }
-}
\ No newline at end of file
+}

diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/method/OverrideImplementMethodAction.java b/java/java-impl/src/com/intellij/ide/hierarchy/method/OverrideImplementMethodAction.java
index b2148fadb7ded2e5f4813dab276fc674790b0c8e..1bc9f6fb4b5e99fc22bf798f43f2870298d84a54 100644 (file)
--- a/java/java-impl/src/com/intellij/ide/hierarchy/method/OverrideImplementMethodAction.java
+++ b/java/java-impl/src/com/intellij/ide/hierarchy/method/OverrideImplementMethodAction.java
@@ -45,7 +45,7 @@ abstract class OverrideImplementMethodAction extends AnAction {
 
   public final void actionPerformed(final AnActionEvent event) {
     final DataContext dataContext = event.getDataContext();
-    final MethodHierarchyBrowser methodHierarchyBrowser = (MethodHierarchyBrowser)dataContext.getData(MethodHierarchyBrowserBase.METHOD_HIERARCHY_BROWSER_DATA_KEY);
+    final MethodHierarchyBrowser methodHierarchyBrowser = (MethodHierarchyBrowser)MethodHierarchyBrowserBase.DATA_KEY.getData(dataContext);
     if (methodHierarchyBrowser == null) return;
     final Project project = PlatformDataKeys.PROJECT.getData(dataContext);
     if (project == null) return;
@@ -98,7 +98,7 @@ abstract class OverrideImplementMethodAction extends AnAction {
     final Presentation presentation = e.getPresentation();
     final DataContext dataContext = e.getDataContext();
 
-    final MethodHierarchyBrowser methodHierarchyBrowser = (MethodHierarchyBrowser)dataContext.getData(MethodHierarchyBrowser.METHOD_HIERARCHY_BROWSER_DATA_KEY);
+    final MethodHierarchyBrowser methodHierarchyBrowser = (MethodHierarchyBrowser)MethodHierarchyBrowserBase.DATA_KEY.getData(dataContext);
     if (methodHierarchyBrowser == null) {
       presentation.setEnabled(false);
       presentation.setVisible(false);

diff --git a/java/java-impl/src/com/intellij/ide/macro/FileClassMacro.java b/java/java-impl/src/com/intellij/ide/macro/FileClassMacro.java
index 13306519d8cdaa86dfa7d2b327ea4aee22b7a2e2..3bcf55015e28656cf1a1f2200daea0907c17e8c8 100644 (file)
--- a/java/java-impl/src/com/intellij/ide/macro/FileClassMacro.java
+++ b/java/java-impl/src/com/intellij/ide/macro/FileClassMacro.java
@@ -15,11 +15,12 @@
  */
 package com.intellij.ide.macro;
 
+import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiJavaFile;
-import com.intellij.ide.IdeBundle;
-import com.intellij.ide.JavaDataAccessors;
 
 public final class FileClassMacro extends Macro {
   public String getName() {
@@ -43,15 +44,14 @@ public final class FileClassMacro extends Macro {
     //if (!(psiFile instanceof PsiJavaFile)) {
     //  return null;
     //}
-    final PsiJavaFile javaFile = JavaDataAccessors.PSI_JAVA_FILE.from(dataContext);
-    if (javaFile == null) return null;
-    PsiClass[] classes = javaFile.getClasses();
+    final PsiFile javaFile = LangDataKeys.PSI_FILE.getData(dataContext);
+    if (!(javaFile instanceof PsiJavaFile)) return null;
+    PsiClass[] classes = ((PsiJavaFile) javaFile).getClasses();
     if (classes.length == 1) {
       return classes[0].getQualifiedName();
     }
     String fileName = javaFile.getVirtualFile().getNameWithoutExtension();
-    for (int i = 0; i < classes.length; i++) {
-      PsiClass aClass = classes[i];
+    for (PsiClass aClass : classes) {
       String name = aClass.getName();
       if (fileName.equals(name)) {
         return aClass.getQualifiedName();

diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java b/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java
index 23789a9067b4ed2aecc2f9ff4afeabd87561d251..3069e3852d43575b843dd0e99a6d3bb181884fd7 100644 (file)
--- a/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java
+++ b/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java
@@ -32,7 +32,6 @@ import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.ide.util.treeView.AbstractTreeStructure;
 import com.intellij.ide.util.treeView.AbstractTreeUpdater;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.OrderEntry;
@@ -40,7 +39,10 @@ import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.*;
+import com.intellij.psi.JavaDirectoryService;
+import com.intellij.psi.PsiDirectory;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiPackage;
 import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -89,10 +91,10 @@ public final class PackageViewPane extends AbstractProjectViewPSIPane {
 
   @Override
   public Object getData(final String dataId) {
-    if (DataConstantsEx.PACKAGE_ELEMENT.equals(dataId)) {
+    if (PackageElement.DATA_KEY.is(dataId)) {
       final PackageElement packageElement = getSelectedPackageElement();
     }
-    if (DataConstants.MODULE.equals(dataId)) {
+    if (LangDataKeys.MODULE.is(dataId)) {
       final PackageElement packageElement = getSelectedPackageElement();
       if (packageElement != null) {
         return packageElement.getModule();
@@ -288,4 +290,4 @@ public final class PackageViewPane extends AbstractProjectViewPSIPane {
       return modules.toArray(new Module[modules.size()]);
     }
   }
-}
\ No newline at end of file
+}

diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageElement.java b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageElement.java
index f2a5b129c8e0b4c0412c1f59910c4a627e8891d8..a890764555429b3e036dce129a65ec49444a2054 100644 (file)
--- a/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageElement.java
+++ b/java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageElement.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.ide.projectView.impl.nodes;
 
+import com.intellij.openapi.actionSystem.DataKey;
 import com.intellij.openapi.module.Module;
 import com.intellij.psi.PsiPackage;
 
@@ -24,6 +25,8 @@ import com.intellij.psi.PsiPackage;
  * Time: 3:51:02 PM
  */
 public final class PackageElement {
+  public static final DataKey<PackageElement> DATA_KEY =  DataKey.create("package.element");
+
   private final Module myModule;
   private final PsiPackage myElement;
   private final boolean myIsLibraryElement;

diff --git a/java/java-impl/src/com/intellij/javadoc/JavadocGenerationManager.java b/java/java-impl/src/com/intellij/javadoc/JavadocGenerationManager.java
index 008a04259f3915557a3325e439f944ceeb430e32..897ab67f3cbde8e996a5fd592897a374e5978d78 100644 (file)
--- a/java/java-impl/src/com/intellij/javadoc/JavadocGenerationManager.java
+++ b/java/java-impl/src/com/intellij/javadoc/JavadocGenerationManager.java
@@ -23,8 +23,8 @@ import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.runners.ProgramRunner;
 import com.intellij.execution.util.ExecutionErrorDialog;
 import com.intellij.ide.DataManager;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.actionSystem.impl.SimpleDataContext;
 import com.intellij.openapi.components.AbstractProjectComponent;
 import com.intellij.openapi.module.Module;
@@ -57,7 +57,7 @@ public final class JavadocGenerationManager extends AbstractProjectComponent imp
   }
 
   public void generateJavadoc(final PsiDirectory directory, DataContext dataContext) {
-    Component component = (Component)dataContext.getData(DataConstants.CONTEXT_COMPONENT);
+    Component component = PlatformDataKeys.CONTEXT_COMPONENT.getData(dataContext);
     final PsiPackage aPackage = directory != null ? JavaDirectoryService.getInstance().getPackage(directory) : null;
     String packageFQName = aPackage != null ? aPackage.getQualifiedName() : null;
 
@@ -126,4 +126,4 @@ public final class JavadocGenerationManager extends AbstractProjectComponent imp
     return myConfiguration;
   }
 
-}
\ No newline at end of file
+}

diff --git a/java/java-impl/src/com/intellij/javadoc/actions/GenerateJavadocAction.java b/java/java-impl/src/com/intellij/javadoc/actions/GenerateJavadocAction.java
index 888ea53bdc7c983267403a8a4e7b3ce031367065..ba13e2366309f9996ca562351376eb12e2291a1c 100644 (file)
--- a/java/java-impl/src/com/intellij/javadoc/actions/GenerateJavadocAction.java
+++ b/java/java-impl/src/com/intellij/javadoc/actions/GenerateJavadocAction.java
@@ -33,7 +33,7 @@ public final class GenerateJavadocAction extends AnAction{
 
   public void update(AnActionEvent event){
     final Presentation presentation = event.getPresentation();
-    presentation.setEnabled(event.getDataContext().getData(DataConstants.PROJECT) != null);
+    presentation.setEnabled(PlatformDataKeys.PROJECT.getData(event.getDataContext()) != null);
   }
 
   private static PsiDirectory getDirectoryFromContext(final DataContext dataContext) {
@@ -63,4 +63,4 @@ public final class GenerateJavadocAction extends AnAction{
     return null;
   }
 
-}
\ No newline at end of file
+}

diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesHandler.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesHandler.java
index a69084c8921c91c9ce3c35278988d43719ee1c2d..67bac1d6d09e1883777809083f228e40dc7e42d2 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesHandler.java
@@ -15,13 +15,13 @@
  */
 package com.intellij.refactoring.move.moveClassesOrPackages;
 
-import com.intellij.psi.*;
-import com.intellij.psi.impl.source.jsp.jspJava.JspClass;
-import com.intellij.openapi.project.Project;
+import com.intellij.codeInsight.daemon.impl.CollectHighlightsUtil;
 import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.editor.Editor;
-import com.intellij.codeInsight.daemon.impl.CollectHighlightsUtil;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.*;
+import com.intellij.psi.impl.source.jsp.jspJava.JspClass;
 import org.jetbrains.annotations.Nullable;
 
 public class MoveClassesHandler extends MoveClassesOrPackagesHandlerBase {
@@ -54,7 +54,7 @@ public class MoveClassesHandler extends MoveClassesOrPackagesHandlerBase {
 
     if (element instanceof PsiClass && !(element instanceof PsiAnonymousClass) && element.getParent() instanceof PsiFile) {
       MoveClassesOrPackagesImpl.doMove(project, new PsiElement[]{element},
-                                       (PsiElement)dataContext.getData(DataConstantsEx.TARGET_PSI_ELEMENT), null);
+                                       LangDataKeys.TARGET_PSI_ELEMENT.getData(dataContext), null);
       return true;
     }
     return false;

diff --git a/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueHandler.java b/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueHandler.java
index 8624ac7cf6fc8fa8fdfcae9232732b65c811a05a..6eb04548bfbc7c566d1d13c267f63d806013ebc4 100644 (file)
--- a/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueHandler.java
+++ b/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueHandler.java
@@ -16,8 +16,8 @@
 package com.intellij.refactoring.wrapreturnvalue;
 
 import com.intellij.ide.util.SuperMethodWarningUtil;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.editor.CaretModel;
 import com.intellij.openapi.editor.Editor;
@@ -42,7 +42,7 @@ class WrapReturnValueHandler implements RefactoringActionHandler {
                        DataContext dataContext){
         final ScrollingModel scrollingModel = editor.getScrollingModel();
         scrollingModel.scrollToCaret(ScrollType.MAKE_VISIBLE);
-        final PsiElement element = (PsiElement) dataContext.getData(DataConstants.PSI_ELEMENT);
+        final PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataContext);
         PsiMethod selectedMethod = null;
         if(element instanceof PsiMethod){
             selectedMethod = (PsiMethod) element;

diff --git a/java/openapi/src/com/intellij/ide/palette/PaletteGroup.java b/java/openapi/src/com/intellij/ide/palette/PaletteGroup.java
index 56c4deda0b76d23779f5c5e3033ea60cb6108da5..a19c1ab8e60d1fbe7540a9a113d619097c20ad22 100644 (file)
--- a/java/openapi/src/com/intellij/ide/palette/PaletteGroup.java
+++ b/java/openapi/src/com/intellij/ide/palette/PaletteGroup.java
@@ -49,7 +49,7 @@ public interface PaletteGroup {
    * Returns the data for the specified data constant.
    *
    * @param project the project in the context of which data is requested.
-   * @param dataId  the data constant id (see {@link com.intellij.openapi.actionSystem.DataConstants}).
+   * @param dataId  the data constant id (see {@link com.intellij.openapi.actionSystem.PlatformDataKeys}).
    * @return the data item, or null if no data is available for this constant.
    */
   @Nullable Object getData(Project project, String dataId);

diff --git a/java/openapi/src/com/intellij/ide/palette/PaletteItem.java b/java/openapi/src/com/intellij/ide/palette/PaletteItem.java
index 8180cceb722c77518aeb09690cafaa4bb33efc0b..372839d672666d5c635bb374754319368cd0dcd8 100644 (file)
--- a/java/openapi/src/com/intellij/ide/palette/PaletteItem.java
+++ b/java/openapi/src/com/intellij/ide/palette/PaletteItem.java
@@ -16,14 +16,12 @@
 
 package com.intellij.ide.palette;
 
+import com.intellij.ide.dnd.DnDDragStartBean;
 import com.intellij.openapi.actionSystem.ActionGroup;
 import com.intellij.openapi.project.Project;
 import com.intellij.ui.ColoredListCellRenderer;
-import com.intellij.ide.dnd.DnDDragStartBean;
 import org.jetbrains.annotations.Nullable;
 
-import java.awt.datatransfer.Transferable;
-
 /**
  * @author yole
  */
@@ -51,7 +49,7 @@ public interface PaletteItem {
    * Returns the data for the specified data constant.
    *
    * @param project the project in the context of which data is requested.
-   * @param dataId  the data constant id (see {@link com.intellij.openapi.actionSystem.DataConstants}).
+   * @param dataId  the data constant id (see {@link com.intellij.openapi.actionSystem.PlatformDataKeys}).
    * @return the data item, or null if no data is available for this constant.
    */
   @Nullable Object getData(Project project, String dataId);

diff --git a/java/openapi/src/com/intellij/openapi/actionSystem/DataKeys.java b/java/openapi/src/com/intellij/openapi/actionSystem/DataKeys.java
index bf48dca0f1c7a587a75b52cbc2c011eaf118efba..da04094056972029ba5749ad36037a802a4e562a 100644 (file)
--- a/java/openapi/src/com/intellij/openapi/actionSystem/DataKeys.java
+++ b/java/openapi/src/com/intellij/openapi/actionSystem/DataKeys.java
@@ -31,9 +31,9 @@ public final class DataKeys extends LangDataKeys {
   }
 
   @Deprecated
-  public static final DataKey<ChangeList[]> CHANGE_LISTS = DataKey.create(DataConstants.CHANGE_LISTS);
+  public static final DataKey<ChangeList[]> CHANGE_LISTS = DataKey.create("vcs.ChangeList");
   @Deprecated
-  public static final DataKey<Change[]> CHANGES = DataKey.create(DataConstants.CHANGES);
+  public static final DataKey<Change[]> CHANGES = DataKey.create("vcs.Change");
 
 }
 

diff --git a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
index c7909d2ad700e2f720134f2fbeb679df898eef09..c1aa5428a17f4337a9db14d5e1f32ce366565bd8 100644 (file)
--- a/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
+++ b/java/testFramework/src/com/intellij/codeInsight/CodeInsightTestCase.java
@@ -555,7 +555,7 @@ public abstract class CodeInsightTestCase extends PsiTestCase {
   }
 
   public Object getData(String dataId) {
-    return dataId.equals(DataConstants.EDITOR) ? myEditor : super.getData(dataId);
+    return PlatformDataKeys.EDITOR.is(dataId) ? myEditor : super.getData(dataId);
   }
 
   protected VirtualFile getVirtualFile(@NonNls String filePath) {

diff --git a/platform/lang-api/src/com/intellij/execution/Location.java b/platform/lang-api/src/com/intellij/execution/Location.java
index 8babfe7f402bb276cac77056cc43ee8736223989..5c8afd6429551c3ac715328eecd6e4ab2bb6f26d 100644 (file)
--- a/platform/lang-api/src/com/intellij/execution/Location.java
+++ b/platform/lang-api/src/com/intellij/execution/Location.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.execution;
 
+import com.intellij.openapi.actionSystem.DataKey;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
@@ -28,7 +29,8 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Iterator;
 
 public abstract class Location<E extends PsiElement> {
-  @NonNls public static final String LOCATION = "Location";
+  public static final DataKey<Location<?>> DATA_KEY = DataKey.create("Location");
+  @Deprecated @NonNls public static final String LOCATION = DATA_KEY.getName();
 
   @NotNull public abstract E getPsiElement();
   @NotNull public abstract Project getProject();

diff --git a/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java b/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java
index cdaa7ecd26eb1e41cf5a49797f04f0ed2dd06dc0..8d9aab0641725006e2935ace0920ad99875ba871 100644 (file)
--- a/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java
+++ b/platform/lang-api/src/com/intellij/execution/configurations/RuntimeConfiguration.java
@@ -17,6 +17,7 @@
 package com.intellij.execution.configurations;
 
 import com.intellij.execution.runners.ProgramRunner;
+import com.intellij.openapi.actionSystem.DataKey;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.project.Project;
@@ -24,9 +25,9 @@ import com.intellij.openapi.util.JDOMExternalizable;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
-
 public abstract class RuntimeConfiguration extends RunConfigurationBase implements LocatableConfiguration, Cloneable, ModuleRunConfiguration {
+  public static final DataKey<RuntimeConfiguration> DATA_KEY = DataKey.create("runtimeConfiguration");
+
   protected RuntimeConfiguration(final String name, final Project project, final ConfigurationFactory factory) {
     super(project, factory, name);
   }
@@ -59,4 +60,4 @@ public abstract class RuntimeConfiguration extends RunConfigurationBase implemen
   @NonNls public String suggestedName() {
     return null;
   }
-}
\ No newline at end of file
+}

diff --git a/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java b/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java
index 287bbeec0fdb38d8163b254ec9042e84214075fb..82eb66b03cc0fcbba4283bd12b7d2bf295127cbe 100644 (file)
--- a/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java
+++ b/platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java
@@ -27,6 +27,7 @@ import com.intellij.history.LocalHistory;
 import com.intellij.history.LocalHistoryConfiguration;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.DataKey;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.options.SettingsEditor;
@@ -40,10 +41,12 @@ import org.jetbrains.annotations.Nullable;
  * @author spleaner
  */
 public abstract class GenericProgramRunner<Settings extends JDOMExternalizable> implements ProgramRunner<Settings> {
+
   /**
    * @see com.intellij.execution.ui.RunContentDescriptor#myContent
    */
-  @NonNls public static final String CONTENT_TO_REUSE = "contentToReuse";
+  public static final DataKey<RunContentDescriptor> CONTENT_TO_REUSE_DATA_KEY = DataKey.create("contentToReuse");
+  @Deprecated @NonNls public static final String CONTENT_TO_REUSE = CONTENT_TO_REUSE_DATA_KEY.getName();
 
   @Nullable
   public Settings createConfigurationData(final ConfigurationInfoProvider settingsProvider) {

diff --git a/platform/lang-api/src/com/intellij/ide/IdeView.java b/platform/lang-api/src/com/intellij/ide/IdeView.java
index 7e201996a295f7a7318d96f3047f9afe2c781a9e..7ee910f0925f104914c71c8f3e55bc5f5aa8e10f 100644 (file)
--- a/platform/lang-api/src/com/intellij/ide/IdeView.java
+++ b/platform/lang-api/src/com/intellij/ide/IdeView.java
@@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable;
  * favorites or commander).
  *
  * @since 5.1
- * @see com.intellij.openapi.actionSystem.DataConstants#IDE_VIEW
+ * @see com.intellij.openapi.actionSystem.PlatformDataKeys#IDE_VIEW
  */
 public interface IdeView {
   /**

diff --git a/platform/lang-api/src/com/intellij/ide/projectView/TreeStructureProvider.java b/platform/lang-api/src/com/intellij/ide/projectView/TreeStructureProvider.java
index b922e3eac3863a3aaae8cad71cbec573e169a057..058d0e1392efba202a760414a4a471b907b40034 100644 (file)
--- a/platform/lang-api/src/com/intellij/ide/projectView/TreeStructureProvider.java
+++ b/platform/lang-api/src/com/intellij/ide/projectView/TreeStructureProvider.java
@@ -49,7 +49,7 @@ public interface TreeStructureProvider {
    *
    * @param selected the list of nodes currently selected in the project view.
    * @param dataName the identifier of the requested data object (for example, as defined in
-   * {@link com.intellij.openapi.actionSystem.DataConstants})
+   * {@link com.intellij.openapi.actionSystem.PlatformDataKeys})
    * @return the data object, or null if no data object can be returned by this provider.
    * @see com.intellij.openapi.actionSystem.DataProvider
    */

diff --git a/platform/lang-api/src/com/intellij/openapi/actionSystem/LangDataKeys.java b/platform/lang-api/src/com/intellij/openapi/actionSystem/LangDataKeys.java
index 83bcba4adec0f749d38d9174a1c55afae16ecccc..80bb6c7ad69c556b49268121700ef0c2abb85918 100644 (file)
--- a/platform/lang-api/src/com/intellij/openapi/actionSystem/LangDataKeys.java
+++ b/platform/lang-api/src/com/intellij/openapi/actionSystem/LangDataKeys.java
@@ -18,6 +18,7 @@ package com.intellij.openapi.actionSystem;
 
 import com.intellij.ide.IdeView;
 import com.intellij.lang.Language;
+import com.intellij.openapi.module.ModifiableModuleModel;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.util.Condition;
 import com.intellij.psi.PsiElement;
@@ -27,13 +28,25 @@ import com.intellij.psi.PsiFile;
  * @author yole
  */
 public class LangDataKeys extends PlatformDataKeys {
-  public static final DataKey<Module> MODULE = DataKey.create(DataConstants.MODULE);
-  public static final DataKey<Module> MODULE_CONTEXT = DataKey.create(DataConstants.MODULE_CONTEXT);
-  public static final DataKey<Module[]> MODULE_CONTEXT_ARRAY = DataKey.create(DataConstants.MODULE_CONTEXT_ARRAY);
-  public static final DataKey<PsiElement> PSI_ELEMENT = DataKey.create(DataConstants.PSI_ELEMENT);
-  public static final DataKey<PsiFile> PSI_FILE = DataKey.create(DataConstants.PSI_FILE);
-  public static final DataKey<Language> LANGUAGE = DataKey.create(DataConstants.LANGUAGE);
-  public static final DataKey<PsiElement[]> PSI_ELEMENT_ARRAY = DataKey.create(DataConstants.PSI_ELEMENT_ARRAY);
-  public static final DataKey<IdeView> IDE_VIEW = DataKey.create(DataConstants.IDE_VIEW);
+  public static final DataKey<Module> MODULE = DataKey.create("module");
+  /**
+   * Returns module if module node is selected (in module view)
+   */
+  public static final DataKey<Module> MODULE_CONTEXT = DataKey.create("context.Module");
+  public static final DataKey<Module[]> MODULE_CONTEXT_ARRAY = DataKey.create("context.Module.Array");
+  public static final DataKey<ModifiableModuleModel> MODIFIABLE_MODULE_MODEL = DataKey.create("modifiable.module.model");
+
+  public static final DataKey<PsiElement> PSI_ELEMENT = DataKey.create("psi.Element");
+  public static final DataKey<PsiFile> PSI_FILE = DataKey.create("psi.File");
+  public static final DataKey<Language> LANGUAGE = DataKey.create("Language");
+  public static final DataKey<PsiElement[]> PSI_ELEMENT_ARRAY = DataKey.create("psi.Element.array");
+
+  /**
+   * Returns {@link com.intellij.ide.IdeView} (one of project, packages, commander or favorites view).
+   */
+  public static final DataKey<IdeView> IDE_VIEW = DataKey.create("IDEView");
   public static final DataKey<Condition<AnAction>> PRESELECT_NEW_ACTION_CONDITION = DataKey.create("newElementAction.preselect.id");
+
+  public static final DataKey<PsiElement> TARGET_PSI_ELEMENT = DataKey.create("psi.TargetElement");
+  public static final DataKey<PsiElement> PASTE_TARGET_PSI_ELEMENT = DataKey.create("psi.pasteTargetElement");
 }

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsAction.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsAction.java
index 2238bfa7717625312b8bb722019bfb2bbfbb48b7..66a1e3b4b98b5a00d1205b396fb4eadbc0937c54 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/OptimizeImportsAction.java
@@ -37,10 +37,16 @@ public class OptimizeImportsAction extends AnAction {
 
   public static void actionPerformedImpl(final DataContext dataContext) {
     final Project project = PlatformDataKeys.PROJECT.getData(dataContext);
+    if (project == null) {
+      return;
+    }
     PsiDocumentManager.getInstance(project).commitAllDocuments();
     final Editor editor = BaseCodeInsightAction.getInjectedEditor(project, PlatformDataKeys.EDITOR.getData(dataContext));
 
-    final VirtualFile[] files = (VirtualFile[])dataContext.getData(DataConstants.VIRTUAL_FILE_ARRAY);
+    final VirtualFile[] files = PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext);
+    if (files == null) {
+      return;
+    }
 
     PsiFile file = null;
     PsiDirectory dir;
@@ -59,7 +65,7 @@ public class OptimizeImportsAction extends AnAction {
     }
     else{
       Project projectContext = PlatformDataKeys.PROJECT_CONTEXT.getData(dataContext);
-      Module moduleContext = (Module)dataContext.getData(DataConstants.MODULE_CONTEXT);
+      Module moduleContext = LangDataKeys.MODULE_CONTEXT.getData(dataContext);
 
       if (projectContext != null || moduleContext != null) {
         final String text;
@@ -131,7 +137,7 @@ public class OptimizeImportsAction extends AnAction {
       return;
     }
 
-    final VirtualFile[] files = (VirtualFile[])dataContext.getData(DataConstants.VIRTUAL_FILE_ARRAY);
+    final VirtualFile[] files = PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext);
 
     final Editor editor = BaseCodeInsightAction.getInjectedEditor(project, PlatformDataKeys.EDITOR.getData(dataContext), false);
     if (editor != null){
@@ -161,8 +167,8 @@ public class OptimizeImportsAction extends AnAction {
     else if (files != null && files.length == 1) {
       // skip. Both directories and single files are supported.
     }
-    else if (dataContext.getData(DataConstants.MODULE_CONTEXT) == null &&
-             dataContext.getData(DataConstants.PROJECT_CONTEXT) == null) {
+    else if (LangDataKeys.MODULE_CONTEXT.getData(dataContext) == null &&
+             PlatformDataKeys.PROJECT_CONTEXT.getData(dataContext) == null) {
       PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataContext);
       if (element == null){
         presentation.setEnabled(false);

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
index 06d43505944644a09a7cfa5c2a864fd7c23c0fcd..7518be0a4efca9201b5f62565c880fb480174d17 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/ReformatCodeAction.java
@@ -23,8 +23,8 @@ import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.DumbAware;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.DumbService;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.vfs.ReadonlyStatusHandler;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -39,9 +39,15 @@ public class ReformatCodeAction extends AnAction implements DumbAware {
   public void actionPerformed(AnActionEvent event) {
     DataContext dataContext = event.getDataContext();
     final Project project = PlatformDataKeys.PROJECT.getData(dataContext);
+    if (project == null) {
+      return;
+    }
     PsiDocumentManager.getInstance(project).commitAllDocuments();
     final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext);
-    final VirtualFile[] files = (VirtualFile[])dataContext.getData(DataConstants.VIRTUAL_FILE_ARRAY);
+    final VirtualFile[] files = PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext);
+    if (files == null) {
+      return;
+    }
 
     PsiFile file = null;
     final PsiDirectory dir;
@@ -71,7 +77,7 @@ public class ReformatCodeAction extends AnAction implements DumbAware {
     }
     else{
       Project projectContext = PlatformDataKeys.PROJECT_CONTEXT.getData(dataContext);
-      Module moduleContext = (Module)dataContext.getData(DataConstants.MODULE_CONTEXT);
+      Module moduleContext = LangDataKeys.MODULE_CONTEXT.getData(dataContext);
 
       if (projectContext != null || moduleContext != null) {
         final String text;
@@ -172,7 +178,7 @@ public class ReformatCodeAction extends AnAction implements DumbAware {
 
     Editor editor = PlatformDataKeys.EDITOR.getData(dataContext);
 
-    final VirtualFile[] files = (VirtualFile[])dataContext.getData(DataConstants.VIRTUAL_FILE_ARRAY);
+    final VirtualFile[] files = PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext);
 
     if (editor != null){
       PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument());
@@ -211,8 +217,8 @@ public class ReformatCodeAction extends AnAction implements DumbAware {
     else if (files != null && files.length == 1) {
       // skip. Both directories and single files are supported.
     }
-    else if (dataContext.getData(DataConstants.MODULE_CONTEXT) == null &&
-             dataContext.getData(DataConstants.PROJECT_CONTEXT) == null) {
+    else if (LangDataKeys.MODULE_CONTEXT.getData(dataContext) == null &&
+             PlatformDataKeys.PROJECT_CONTEXT.getData(dataContext) == null) {
       PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataContext);
       if (element == null) {
         presentation.setEnabled(false);

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/actions/HighlightUsagesAction.java b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/actions/HighlightUsagesAction.java
index ceddf431a73c03fc3ff6ae8bfd590fcdcb8c87ce..9c775e3c0bf0703738ba317ce45c3f497f9faa0c 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInsight/highlighting/actions/HighlightUsagesAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/highlighting/actions/HighlightUsagesAction.java
@@ -21,9 +21,9 @@ import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.DumbAware;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.IndexNotReadyException;
 import com.intellij.openapi.project.DumbService;
+import com.intellij.openapi.project.IndexNotReadyException;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
 
@@ -37,8 +37,8 @@ public class HighlightUsagesAction extends AnAction implements DumbAware {
     final Presentation presentation = event.getPresentation();
     final DataContext dataContext = event.getDataContext();
 
-    presentation.setEnabled(dataContext.getData(DataConstants.PROJECT) != null &&
-                            dataContext.getData(DataConstants.EDITOR) != null);
+    presentation.setEnabled(PlatformDataKeys.PROJECT.getData(dataContext) != null &&
+                            PlatformDataKeys.EDITOR.getData(dataContext) != null);
   }
 
   public void actionPerformed(AnActionEvent e) {
@@ -65,4 +65,4 @@ public class HighlightUsagesAction extends AnAction implements DumbAware {
       null
     );
   }
-}
\ No newline at end of file
+}

diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/QuickFixAction.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/QuickFixAction.java
index 5cc7598cf2f7b7c2451c50a686ad2c62a0f8d5ac..6ffed4812658e7e0c26d13eab78aa5b38bb14dfb 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInspection/ex/QuickFixAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/QuickFixAction.java
@@ -29,7 +29,6 @@ import com.intellij.codeInspection.ui.InspectionTree;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CustomShortcutSet;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.project.Project;
@@ -54,7 +53,7 @@ public class QuickFixAction extends AnAction {
   protected InspectionTool myTool;
 
   public static InspectionResultsView getInvoker(AnActionEvent e) {
-    return (InspectionResultsView)e.getDataContext().getData(DataConstantsEx.INSPECTION_VIEW);
+    return InspectionResultsView.DATA_KEY.getData(e.getDataContext());
   }
 
   protected QuickFixAction(String text, InspectionTool tool) {

diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
index 4c78d9fee44c447b9281f428be90c23d85c3d8ce..5980a99f166a59e529cdca7e9e4f2dae56351c1d 100644 (file)
--- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
@@ -17,7 +17,6 @@
 package com.intellij.codeInspection.ui;
 
 import com.intellij.CommonBundle;
-import com.intellij.injected.editor.VirtualFileWindow;
 import com.intellij.analysis.AnalysisScope;
 import com.intellij.analysis.AnalysisUIOptions;
 import com.intellij.codeHighlighting.HighlightDisplayLevel;
@@ -31,9 +30,9 @@ import com.intellij.codeInspection.ui.actions.ExportHTMLAction;
 import com.intellij.codeInspection.ui.actions.InspectionsOptionsToolbarAction;
 import com.intellij.codeInspection.ui.actions.InvokeQuickFixAction;
 import com.intellij.ide.*;
+import com.intellij.injected.editor.VirtualFileWindow;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.colors.EditorColors;
@@ -80,6 +79,8 @@ import java.util.List;
  * @author max
  */
 public class InspectionResultsView extends JPanel implements Disposable, OccurenceNavigator, DataProvider {
+  public static final DataKey<InspectionResultsView> DATA_KEY = DataKey.create("inspectionView");
+
   private final Project myProject;
   private InspectionTree myTree;
   private final Browser myBrowser;
@@ -566,15 +567,15 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
   }
 
   public Object getData(String dataId) {
-    if (dataId.equals(DataConstants.HELP_ID)) return HELP_ID;
-    if (dataId.equals(DataConstantsEx.INSPECTION_VIEW)) return this;
+    if (PlatformDataKeys.HELP_ID.is(dataId)) return HELP_ID;
+    if (InspectionResultsView.DATA_KEY.is(dataId)) return this;
     if (myTree == null) return null;
     TreePath[] paths = myTree.getSelectionPaths();
 
     if (paths == null) return null;
 
     if (paths.length > 1) {
-      if (DataConstants.PSI_ELEMENT_ARRAY.equals(dataId)) {
+      if (LangDataKeys.PSI_ELEMENT_ARRAY.is(dataId)) {
         return collectPsiElements();
       }
       else {
@@ -608,14 +609,14 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren
         }
       }
 
-      if (DataConstants.NAVIGATABLE.equals(dataId)) {
+      if (PlatformDataKeys.NAVIGATABLE.is(dataId)) {
         return getSelectedNavigatable(problem, psiElement);
       }
-      else if (DataConstants.PSI_ELEMENT.equals(dataId)) {
+      else if (LangDataKeys.PSI_ELEMENT.is(dataId)) {
         return psiElement.isValid() ? psiElement : null;
       }
     }
-    else if (selectedNode instanceof ProblemDescriptionNode && DataConstants.NAVIGATABLE.equals(dataId)) {
+    else if (selectedNode instanceof ProblemDescriptionNode && PlatformDataKeys.NAVIGATABLE.is(dataId)) {
       return getSelectedNavigatable(((ProblemDescriptionNode)selectedNode).getDescriptor());
     }
 

diff --git a/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java b/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java
index 88cca88656749c74c06cec10c217680fbdfa1392..aaa609a2f7b8d15591fa1374434eea11d3d3841d 100644 (file)
--- a/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java
+++ b/platform/lang-impl/src/com/intellij/diagnostic/logging/LogConsoleBase.java
@@ -48,11 +48,7 @@ import java.io.*;
 import java.util.List;
 
 /**
- * Created by IntelliJ IDEA.
- * User: Eugene.Kudelevsky
- * Date: Sep 11, 2009
- * Time: 9:26:11 PM
- * To change this template use File | Settings | File Templates.
+ * @author Eugene.Kudelevsky
  */
 public abstract class LogConsoleBase extends AdditionalTabComponent implements LogConsole, LogFilterListener {
   private static final Logger LOG = Logger.getInstance("com.intellij.diagnostic.logging.LogConsoleImpl");
@@ -340,7 +336,7 @@ public abstract class LogConsoleBase extends AdditionalTabComponent implements L
 
   @Nullable
   private Editor getEditor() {
-    return myConsole != null ? (Editor)((DataProvider)myConsole).getData(DataConstants.EDITOR) : null;
+    return myConsole != null ? PlatformDataKeys.EDITOR.getData((DataProvider) myConsole) : null;
   }
 
   private synchronized void filterConsoleOutput(Condition<String> isApplicable) {

diff --git a/platform/lang-impl/src/com/intellij/execution/actions/ConfigurationContext.java b/platform/lang-impl/src/com/intellij/execution/actions/ConfigurationContext.java
index 5cc0e0137d47472b02384b3a057e69d493004f04..cf7c494deac143efe65d96ac6ecb6ae03cb6698b 100644 (file)
--- a/platform/lang-impl/src/com/intellij/execution/actions/ConfigurationContext.java
+++ b/platform/lang-impl/src/com/intellij/execution/actions/ConfigurationContext.java
@@ -22,11 +22,9 @@ import com.intellij.execution.configurations.RuntimeConfiguration;
 import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl;
 import com.intellij.execution.junit.RuntimeConfigurationProducer;
 import com.intellij.ide.DataManager;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.module.Module;
@@ -53,12 +51,13 @@ public class ConfigurationContext {
   private final Component myContextComponent;
 
   public ConfigurationContext(final DataContext dataContext) {
-    myRuntimeConfiguration = (RuntimeConfiguration)dataContext.getData(DataConstantsEx.RUNTIME_CONFIGURATION);
-    myContextComponent = (Component)dataContext.getData(DataConstants.CONTEXT_COMPONENT);
+    myRuntimeConfiguration = RuntimeConfiguration.DATA_KEY.getData(dataContext);
+    myContextComponent = PlatformDataKeys.CONTEXT_COMPONENT.getData(dataContext);
     myModule = LangDataKeys.MODULE.getData(dataContext);
-    final Object location = dataContext.getData(Location.LOCATION);
+    @SuppressWarnings({"unchecked"})
+    final Location<PsiElement> location = (Location<PsiElement>)Location.DATA_KEY.getData(dataContext);
     if (location != null) {
-      myLocation = (Location<PsiElement>)location;
+      myLocation = location;
       return;
     }
     final Project project = PlatformDataKeys.PROJECT.getData(dataContext);

diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
index ec9dcfa0b827e830a294dfa566ba66ba6ebfda3d..26296a354797cc94920fffd5bf96a2370aba4407 100644 (file)
--- a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
@@ -24,8 +24,6 @@ import com.intellij.execution.ui.ConsoleView;
 import com.intellij.execution.ui.ConsoleViewContentType;
 import com.intellij.execution.ui.ObservableConsoleView;
 import com.intellij.ide.CommonActionsManager;
-import com.intellij.ide.DataAccessor;
-import com.intellij.ide.DataAccessors;
 import com.intellij.ide.OccurenceNavigator;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
@@ -60,7 +58,6 @@ import com.intellij.openapi.keymap.KeymapManager;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Computable;
-import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.text.LineTokenizer;
@@ -75,6 +72,7 @@ import com.intellij.util.EditorPopupHandler;
 import com.intellij.util.LocalTimeCounter;
 import com.intellij.util.containers.HashMap;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 
 import javax.swing.*;
@@ -506,7 +504,7 @@ public final class ConsoleViewImpl extends JPanel implements ConsoleView, Observ
   }
 
   public Object getData(final String dataId) {
-    if (DataConstants.NAVIGATABLE.equals(dataId)){
+    if (PlatformDataKeys.NAVIGATABLE.is(dataId)){
       if (myEditor == null) {
         return null;
       }
@@ -519,10 +517,10 @@ public final class ConsoleViewImpl extends JPanel implements ConsoleView, Observ
       return openFileDescriptor;
     }
 
-    if (DataConstants.EDITOR.equals(dataId)) {
+    if (PlatformDataKeys.EDITOR.is(dataId)) {
       return myEditor;
     }
-    if (DataConstants.HELP_ID.equals(dataId)) {
+    if (PlatformDataKeys.HELP_ID.is(dataId)) {
       return myHelpId;
     }
     return null;
@@ -953,33 +951,31 @@ public final class ConsoleViewImpl extends JPanel implements ConsoleView, Observ
     }
   }
 
-  private static final DataAccessor<ConsoleViewImpl> CONSOLE = new DataAccessor<ConsoleViewImpl>() {
-    public ConsoleViewImpl getImpl(final DataContext dataContext) throws NoDataException {
-      return DataAccessors.EDITOR.getNotNull(dataContext).getUserData(CONSOLE_VIEW_IN_EDITOR_VIEW);
-    }
-  };
-
-  private static final Condition<ConsoleViewImpl> CONSOLE_IS_RUNNING = new Condition<ConsoleViewImpl>() {
-    public boolean value(final ConsoleViewImpl consoleView) {
-      return consoleView.myState.isRunning();
-    }
-  };
-
-  private static final DataAccessor<ConsoleViewImpl> RUNNINT_CONSOLE =DataAccessor.createConditionalAccessor(CONSOLE, CONSOLE_IS_RUNNING);
-
   private abstract static class ConsoleAction extends AnAction implements DumbAware {
     public void actionPerformed(final AnActionEvent e) {
       final DataContext context = e.getDataContext();
-      final ConsoleViewImpl console = RUNNINT_CONSOLE.from(context);
+      final ConsoleViewImpl console = getRunningConsole(context);
       execute(console, context);
     }
 
     protected abstract void execute(ConsoleViewImpl console, final DataContext context);
 
     public void update(final AnActionEvent e) {
-      final ConsoleViewImpl console = RUNNINT_CONSOLE.from(e.getDataContext());
+      final ConsoleViewImpl console = getRunningConsole(e.getDataContext());
       e.getPresentation().setEnabled(console != null);
     }
+
+    @Nullable
+    private static ConsoleViewImpl getRunningConsole(final DataContext context) {
+      final Editor editor = PlatformDataKeys.EDITOR.getData(context);
+      if (editor != null) {
+        final ConsoleViewImpl console = editor.getUserData(CONSOLE_VIEW_IN_EDITOR_VIEW);
+        if (console != null && console.myState.isRunning()) {
+          return console;
+        }
+      }
+      return null;
+    }
   }
 
   private static class EnterHandler extends ConsoleAction {

diff --git a/platform/lang-impl/src/com/intellij/execution/runners/RestartAction.java b/platform/lang-impl/src/com/intellij/execution/runners/RestartAction.java
index 040aa845623aff405ebfa17bf16c6b00031b190d..134513e65ff21aaf0ee46267e625055d500d55e2 100644 (file)
--- a/platform/lang-impl/src/com/intellij/execution/runners/RestartAction.java
+++ b/platform/lang-impl/src/com/intellij/execution/runners/RestartAction.java
@@ -62,12 +62,12 @@ public class RestartAction extends AnAction implements DumbAware {
       final ExecutionEnvironment old = myEnvironment;
       myRunner.execute(myExecutor, new ExecutionEnvironment(old.getRunProfile(), old.getRunnerSettings(), old.getConfigurationSettings(), new DataContext() {
         public Object getData(final String dataId) {
-          if (GenericProgramRunner.CONTENT_TO_REUSE.equals(dataId)) return myDescriptor;
+          if (GenericProgramRunner.CONTENT_TO_REUSE_DATA_KEY.is(dataId)) return myDescriptor;
           return dataContext.getData(dataId);
         }
       }));
     }
-    catch (RunCanceledByUserException e1) {
+    catch (RunCanceledByUserException ignore) {
     }
     catch (ExecutionException e1) {
       Messages.showErrorDialog(project, e1.getMessage(), ExecutionBundle.message("restart.error.message.title"));

diff --git a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
index 0d98f59dd3d34a64d1bea66bb07ff0476e06e103..eafb3e3485d5c1b853ec0d271d592c1ae28eb367 100644 (file)
--- a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
@@ -15,7 +15,10 @@
  */
 package com.intellij.execution.ui;
 
-import com.intellij.execution.*;
+import com.intellij.execution.ExecutionBundle;
+import com.intellij.execution.Executor;
+import com.intellij.execution.ExecutorRegistry;
+import com.intellij.execution.TerminateRemoteProcessDialog;
 import com.intellij.execution.process.ProcessAdapter;
 import com.intellij.execution.process.ProcessEvent;
 import com.intellij.execution.process.ProcessHandler;
@@ -23,9 +26,9 @@ import com.intellij.execution.runners.GenericProgramRunner;
 import com.intellij.ide.DataManager;
 import com.intellij.ide.impl.ContentManagerWatcher;
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.DataProvider;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.impl.LaterInvocator;
 import com.intellij.openapi.diagnostic.Logger;
@@ -45,7 +48,6 @@ import com.intellij.openapi.wm.ex.ToolWindowManagerAdapter;
 import com.intellij.openapi.wm.ex.ToolWindowManagerEx;
 import com.intellij.ui.content.*;
 import com.intellij.util.EventDispatcher;
-import com.intellij.util.IconUtil;
 import com.intellij.util.concurrency.Semaphore;
 import com.intellij.util.containers.HashMap;
 import org.jetbrains.annotations.NotNull;
@@ -132,7 +134,7 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
       public Object getData(String dataId) {
         myInsideGetData ++;
         try {
-          if(DataConstants.HELP_ID.equals(dataId)) {
+          if(PlatformDataKeys.HELP_ID.is(dataId)) {
             return executor.getHelpId();
           }
           else {
@@ -182,10 +184,8 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
         if (contentManager != null && content != null) {
           contentManager.setSelectedContent(content);
 
-          if (content != null) {
-            final ToolWindow toolWindow = ToolWindowManager.getInstance(myProject).getToolWindow(requestor.getToolWindowId());
-            toolWindow.show(null);
-          }
+          final ToolWindow toolWindow = ToolWindowManager.getInstance(myProject).getToolWindow(requestor.getToolWindowId());
+          toolWindow.show(null);
         }
       }
     });
@@ -312,7 +312,7 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
   @Nullable
   public RunContentDescriptor getReuseContent(final Executor requestor, DataContext dataContext) {
     if(ApplicationManager.getApplication().isUnitTestMode()) return null;
-    RunContentDescriptor runContentDescriptor = (RunContentDescriptor)dataContext.getData(GenericProgramRunner.CONTENT_TO_REUSE);
+    RunContentDescriptor runContentDescriptor = GenericProgramRunner.CONTENT_TO_REUSE_DATA_KEY.getData(dataContext);
 
     if(runContentDescriptor != null) return runContentDescriptor;
 
@@ -594,7 +594,7 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
                 wait(2000);
               }
             }
-            catch (InterruptedException e) {
+            catch (InterruptedException ignore) {
             }
           }
         }

diff --git a/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java b/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java
index 61f52f2ea074980dc6617126003597cc4378878e..2c25d1895ef14c616728aba182b43479f11f763b 100644 (file)
--- a/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java
+++ b/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java
@@ -26,7 +26,6 @@ import com.intellij.find.impl.FindManagerImpl;
 import com.intellij.ide.ui.LafManager;
 import com.intellij.ide.ui.UISettings;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.application.ex.ApplicationManagerEx;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.ScrollType;
 import com.intellij.openapi.editor.SelectionModel;
@@ -88,7 +87,7 @@ public class EditorSearchComponent extends JPanel implements DataProvider {
 
   @Nullable
   public Object getData(@NonNls final String dataId) {
-    if (DataConstants.EDITOR_EVEN_IF_INACTIVE.equals(dataId)) {
+    if (PlatformDataKeys.EDITOR_EVEN_IF_INACTIVE.is(dataId)) {
       return myEditor;
     }
     return null;

diff --git a/platform/lang-impl/src/com/intellij/find/actions/FindUsagesInFileAction.java b/platform/lang-impl/src/com/intellij/find/actions/FindUsagesInFileAction.java
index 21b599f96fbdc6692a9c124abe7e46c413c72f8c..18e0a0c3071de42f1f6cddc6cfdcbcb91917410d 100644 (file)
--- a/platform/lang-impl/src/com/intellij/find/actions/FindUsagesInFileAction.java
+++ b/platform/lang-impl/src/com/intellij/find/actions/FindUsagesInFileAction.java
@@ -44,7 +44,7 @@ public class FindUsagesInFileAction extends AnAction {
     PsiDocumentManager.getInstance(project).commitAllDocuments();
     Editor editor = PlatformDataKeys.EDITOR.getData(dataContext);
 
-    UsageTarget[] usageTargets = (UsageTarget[])dataContext.getData(UsageView.USAGE_TARGETS);
+    UsageTarget[] usageTargets = UsageView.USAGE_TARGETS_KEY.getData(dataContext);
     if (usageTargets != null) {
       FileEditor fileEditor = PlatformDataKeys.FILE_EDITOR.getData(dataContext);
       if (fileEditor != null) {
@@ -76,7 +76,7 @@ public class FindUsagesInFileAction extends AnAction {
 
     Editor editor = PlatformDataKeys.EDITOR.getData(dataContext);
     if (editor == null) {
-      UsageTarget[] target = (UsageTarget[])dataContext.getData(UsageView.USAGE_TARGETS);
+      UsageTarget[] target = UsageView.USAGE_TARGETS_KEY.getData(dataContext);
       return target != null && target.length > 0;
     }
     else {

diff --git a/platform/lang-impl/src/com/intellij/ide/CopyPasteDelegator.java b/platform/lang-impl/src/com/intellij/ide/CopyPasteDelegator.java
index ce61ecc3ac319388e75d3c79b1e74b72f40a4fd4..cfd449c6a4b93508e56739bcf2b2422591aa41c0 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/CopyPasteDelegator.java
+++ b/platform/lang-impl/src/com/intellij/ide/CopyPasteDelegator.java
@@ -17,8 +17,8 @@
 package com.intellij.ide;
 
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
@@ -128,7 +128,7 @@ public abstract class CopyPasteDelegator implements CopyPasteSupport {
       final PsiElement[] elements = PsiCopyPasteManager.getInstance().getElements(isCopied);
       if (elements == null) return false;
       try {
-        PsiElement target = (PsiElement)dataContext.getData(DataConstantsEx.PASTE_TARGET_PSI_ELEMENT);
+        PsiElement target = LangDataKeys.PASTE_TARGET_PSI_ELEMENT.getData(dataContext);
         if (isCopied[0]) {
           PsiDirectory targetDirectory = target instanceof PsiDirectory ? (PsiDirectory)target : null;
           if (targetDirectory == null && target instanceof PsiDirectoryContainer) {
@@ -180,7 +180,7 @@ public abstract class CopyPasteDelegator implements CopyPasteSupport {
         return false;
       }
 
-      Object target = dataContext.getData(DataConstantsEx.PASTE_TARGET_PSI_ELEMENT);
+      Object target = LangDataKeys.PASTE_TARGET_PSI_ELEMENT.getData(dataContext);
       if (target == null) {
         return false;
       }
@@ -200,4 +200,4 @@ public abstract class CopyPasteDelegator implements CopyPasteSupport {
       return true;
     }
   }
-}
\ No newline at end of file
+}

diff --git a/platform/lang-impl/src/com/intellij/ide/DataAccessors.java b/platform/lang-impl/src/com/intellij/ide/DataAccessors.java
index 5ab2b63001de67ad9f6c64fff92163d23acdd804..ecd2b61169e029f40312c71e14673e74003d3166 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/DataAccessors.java
+++ b/platform/lang-impl/src/com/intellij/ide/DataAccessors.java
@@ -16,57 +16,40 @@
 
 package com.intellij.ide;
 
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.fileEditor.FileEditorManager;
+import com.intellij.openapi.actionSystem.LangDataKeys;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.project.ex.ProjectEx;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.*;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
 
 /**
  * @author yole
  */
 public class DataAccessors {
-  public static final DataAccessor<Project> PROJECT = new DataAccessor.SimpleDataAccessor<Project>(DataConstants.PROJECT);
-  public static final DataAccessor<Module> MODULE = new DataAccessor.SimpleDataAccessor<Module>(DataConstants.MODULE);
-  public static final DataAccessor<Editor> EDITOR = new DataAccessor.SimpleDataAccessor<Editor>(DataConstants.EDITOR);
+  @Deprecated
+  public static final DataAccessor<Project> PROJECT = new DataAccessor.SimpleDataAccessor<Project>(PlatformDataKeys.PROJECT.getName());
+  @Deprecated
+  public static final DataAccessor<Module> MODULE = new DataAccessor.SimpleDataAccessor<Module>(LangDataKeys.MODULE.getName());
   public static final DataAccessor<PsiManager> PSI_MANAGER = new DataAccessor<PsiManager>() {
     public PsiManager getImpl(DataContext dataContext) throws NoDataException {
       return PsiManager.getInstance(PROJECT.getNotNull(dataContext));
     }
   };
-  public static final DataAccessor<FileEditorManager> FILE_EDITOR_MANAGER = new DataAccessor<FileEditorManager>() {
-    public FileEditorManager getImpl(DataContext dataContext) throws NoDataException {
-      return FileEditorManager.getInstance(PROJECT.getNotNull(dataContext));
-    }
-  };
   public static final DataAccessor<PsiFile> PSI_FILE = new DataAccessor<PsiFile>() {
     public PsiFile getImpl(DataContext dataContext) throws NoDataException {
       return PSI_MANAGER.getNotNull(dataContext).findFile(VIRTUAL_FILE.getNotNull(dataContext));
     }
   };
-  public static final DataAccessor<PsiElement> PSI_ELEMENT = new DataAccessor.SimpleDataAccessor<PsiElement>(DataConstants.PSI_ELEMENT);
-  public static final DataAccessor<PsiElement[]> PSI_ELEMENT_ARRAY = new DataAccessor.SimpleDataAccessor<PsiElement[]>(DataConstants.PSI_ELEMENT_ARRAY);
-  public static final DataAccessor<VirtualFile> VIRTUAL_FILE = new DataAccessor.SimpleDataAccessor<VirtualFile>(DataConstants.VIRTUAL_FILE);
-  public static final DataAccessor<VirtualFile[]> VIRTUAL_FILE_ARRAY = new DataAccessor.SimpleDataAccessor<VirtualFile[]>(DataConstants.VIRTUAL_FILE_ARRAY);
+  public static final DataAccessor<VirtualFile> VIRTUAL_FILE = new DataAccessor.SimpleDataAccessor<VirtualFile>(PlatformDataKeys.VIRTUAL_FILE.getName());
   public static final DataAccessor<VirtualFile> VIRTUAL_DIR_OR_PARENT = new DataAccessor<VirtualFile>() {
     public VirtualFile getImpl(DataContext dataContext) throws NoDataException {
       VirtualFile virtualFile = VIRTUAL_FILE.getNotNull(dataContext);
       return virtualFile.isDirectory() ? virtualFile : virtualFile.getParent();
     }
   };
-  /**
-   * @deprecated
-   */
-  public static final DataAccessor<String> PROJECT_FILE_PATH = new DataAccessor<String>() {
-    public String getImpl(DataContext dataContext) throws NoDataException {
-      Project project = PROJECT.getNotNull(dataContext);
-      return project.getProjectFilePath();
-    }
-  };
   public static final DataAccessor<VirtualFile> PROJECT_BASE_DIR = new DataAccessor<VirtualFile>() {
     public VirtualFile getImpl(DataContext dataContext) throws NoDataException {
       Project project = PROJECT.getNotNull(dataContext);
@@ -79,5 +62,7 @@ public class DataAccessors {
       return module.getModuleFilePath();
     }
   };
-  public static final DataAccessor<ProjectEx> PROJECT_EX = new DataAccessor.SubClassDataAccessor<Project, ProjectEx>(PROJECT, ProjectEx.class);
+
+  private DataAccessors() {
+  }
 }
\ No newline at end of file

diff --git a/platform/lang-impl/src/com/intellij/ide/actions/CopyElementAction.java b/platform/lang-impl/src/com/intellij/ide/actions/CopyElementAction.java
index c784b92e0ea24367ac0c3625f2de7cd3ec4f2552..15031051deb208e4de1f57f8caf0d50c217e6d6f 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/actions/CopyElementAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/CopyElementAction.java
@@ -17,7 +17,6 @@
 package com.intellij.ide.actions;
 
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
@@ -32,6 +31,9 @@ public class CopyElementAction extends AnAction {
   public void actionPerformed(AnActionEvent e) {
     final DataContext dataContext = e.getDataContext();
     final Project project = PlatformDataKeys.PROJECT.getData(dataContext);
+    if (project == null) {
+      return;
+    }
 
     CommandProcessor.getInstance().executeCommand(project, new Runnable() {
       public void run() {
@@ -41,7 +43,7 @@ public class CopyElementAction extends AnAction {
     final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext);
     PsiElement[] elements;
 
-    PsiDirectory defaultTargetDirectory = null;
+    PsiDirectory defaultTargetDirectory;
     if (editor != null) {
       PsiElement aElement = getTargetElement(editor, project);
       PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument());
@@ -52,7 +54,7 @@ public class CopyElementAction extends AnAction {
       }
       defaultTargetDirectory = file.getContainingDirectory();
     } else {
-      Object element = dataContext.getData(DataConstantsEx.TARGET_PSI_ELEMENT);
+      PsiElement element = LangDataKeys.TARGET_PSI_ELEMENT.getData(dataContext);
       defaultTargetDirectory = element instanceof PsiDirectory ? (PsiDirectory)element : null;
       elements = LangDataKeys.PSI_ELEMENT_ARRAY.getData(dataContext);
     }
@@ -90,6 +92,10 @@ public class CopyElementAction extends AnAction {
     }
 
     Project project = PlatformDataKeys.PROJECT.getData(dataContext);
+    if (project == null) {
+      return;
+
+    }
     PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument());
 
     PsiElement element = getTargetElement(editor, project);

diff --git a/platform/lang-impl/src/com/intellij/ide/actions/QuickChangeCodeStyleSchemeAction.java b/platform/lang-impl/src/com/intellij/ide/actions/QuickChangeCodeStyleSchemeAction.java
index f7d76fe8b777c306b52c80e0116c3550867dc17a..72fd2900a2e46f23291f3db6518901ae3cba5c62 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/actions/QuickChangeCodeStyleSchemeAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/QuickChangeCodeStyleSchemeAction.java
@@ -64,8 +64,11 @@ public class QuickChangeCodeStyleSchemeAction extends QuickSwitchSchemeAction {
     }
   }
 
-  private void addScheme(final DefaultActionGroup group, final CodeStyleSettingsManager manager, final CodeStyleScheme currentScheme,
-                         final CodeStyleScheme scheme, final boolean addScheme) {
+  private static void addScheme(final DefaultActionGroup group,
+                                final CodeStyleSettingsManager manager,
+                                final CodeStyleScheme currentScheme,
+                                final CodeStyleScheme scheme,
+                                final boolean addScheme) {
     group.add(new AnAction(scheme.getName(), "",
                            scheme == currentScheme && !manager.USE_PER_PROJECT_SETTINGS ? ourCurrentAction : ourNotCurrentAction) {
       public void actionPerformed(AnActionEvent e) {
@@ -85,6 +88,6 @@ public class QuickChangeCodeStyleSchemeAction extends QuickSwitchSchemeAction {
 
   public void update(AnActionEvent e) {
     super.update(e);
-    e.getPresentation().setEnabled(e.getDataContext().getData(DataConstants.PROJECT) != null);
+    e.getPresentation().setEnabled(PlatformDataKeys.PROJECT.getData(e.getDataContext()) != null);
   }
 }

diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SelectInContextImpl.java b/platform/lang-impl/src/com/intellij/ide/actions/SelectInContextImpl.java
index a1d620ff0b2ceabd252dc77b0cf1b8a76034b074..233b04226433abe0ec51a082c5049531a542b5e9 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/actions/SelectInContextImpl.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/SelectInContextImpl.java
@@ -18,7 +18,10 @@ package com.intellij.ide.actions;
 
 import com.intellij.ide.FileEditorProvider;
 import com.intellij.ide.SelectInContext;
-import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.LangDataKeys;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileEditor.*;
 import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx;
@@ -74,7 +77,7 @@ abstract class SelectInContextImpl implements SelectInContext {
       return null;
     }
 
-    SelectInContext selectInContext = (SelectInContext)dataContext.getData(SelectInContext.DATA_CONTEXT_ID);
+    SelectInContext selectInContext = SelectInContext.DATA_KEY.getData(dataContext);
     if (selectInContext == null) {
       selectInContext = createPsiContext(event);
     }
@@ -146,7 +149,7 @@ abstract class SelectInContextImpl implements SelectInContext {
       return (JComponent)source;
     }
     else {
-      return safeCast(event.getDataContext().getData(DataConstants.CONTEXT_COMPONENT), JComponent.class);
+      return safeCast(PlatformDataKeys.CONTEXT_COMPONENT.getData(event.getDataContext()), JComponent.class);
     }
   }
 
@@ -220,8 +223,11 @@ abstract class SelectInContextImpl implements SelectInContext {
     public FileEditorProvider getFileEditorProvider() {
       return new FileEditorProvider() {
         public FileEditor openFileEditor() {
-          final FileEditor[] fileEditors =
-            FileEditorManager.getInstance(getProject()).openFile(myElementToSelect.getContainingFile().getVirtualFile(), false);
+          final VirtualFile file = myElementToSelect.getContainingFile().getVirtualFile();
+          if (file == null) {
+            return null;
+          }
+          final FileEditor[] fileEditors = FileEditorManager.getInstance(getProject()).openFile(file, false);
           return fileEditors.length > 0 ? fileEditors[0] : null;
         }
       };

diff --git a/platform/lang-impl/src/com/intellij/ide/commander/CommanderPanel.java b/platform/lang-impl/src/com/intellij/ide/commander/CommanderPanel.java
index 63e2451e8fe945c4302f26721a50b51cdd0ff706..b7a4bd8b7d69526e31eb836005cf4da2fdfd07c0 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/commander/CommanderPanel.java
+++ b/platform/lang-impl/src/com/intellij/ide/commander/CommanderPanel.java
@@ -18,7 +18,10 @@ package com.intellij.ide.commander;
 
 import com.intellij.history.LocalHistory;
 import com.intellij.history.LocalHistoryAction;
-import com.intellij.ide.*;
+import com.intellij.ide.CopyPasteDelegator;
+import com.intellij.ide.DeleteProvider;
+import com.intellij.ide.IdeBundle;
+import com.intellij.ide.IdeView;
 import com.intellij.ide.projectView.ProjectViewNode;
 import com.intellij.ide.projectView.impl.ModuleGroup;
 import com.intellij.ide.projectView.impl.ProjectAbstractTreeStructureBase;
@@ -31,9 +34,7 @@ import com.intellij.ide.util.DirectoryChooserUtil;
 import com.intellij.ide.util.EditSourceUtil;
 import com.intellij.ide.util.EditorHelper;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
-import com.intellij.ide.util.treeView.smartTree.TreeElement;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.diagnostic.Logger;
@@ -117,8 +118,8 @@ public class CommanderPanel extends JPanel {
       }
     }, KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SLASH, SystemInfo.isMac ? KeyEvent.META_MASK : KeyEvent.CTRL_MASK), JComponent.WHEN_FOCUSED);
 
-    myList.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), ACTION_DRILL_DOWN);
-    myList.getInputMap(JComponent.WHEN_FOCUSED)
+    myList.getInputMap(WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), ACTION_DRILL_DOWN);
+    myList.getInputMap(WHEN_FOCUSED)
       .put(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_DOWN, SystemInfo.isMac ? KeyEvent.META_MASK : KeyEvent.CTRL_MASK), ACTION_DRILL_DOWN);
     myList.getActionMap().put(ACTION_DRILL_DOWN, new AbstractAction() {
       public void actionPerformed(final ActionEvent e) {
@@ -132,9 +133,9 @@ public class CommanderPanel extends JPanel {
         }
       }
     });
-    myList.getInputMap(JComponent.WHEN_FOCUSED)
+    myList.getInputMap(WHEN_FOCUSED)
       .put(KeyStroke.getKeyStroke(KeyEvent.VK_PAGE_UP, SystemInfo.isMac ? KeyEvent.META_MASK : KeyEvent.CTRL_MASK), ACTION_GO_UP);
-    myList.getInputMap(JComponent.WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0), ACTION_GO_UP);
+    myList.getInputMap(WHEN_FOCUSED).put(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0), ACTION_GO_UP);
     myList.getActionMap().put(ACTION_GO_UP, new AbstractAction() {
       public void actionPerformed(final ActionEvent e) {
         goUp();
@@ -351,7 +352,7 @@ public class CommanderPanel extends JPanel {
   private static Object getValueAtIndex(AbstractTreeNode node) {
     if (node == null) return null;
     Object value = node.getValue();
-    if (value instanceof TreeElement) {
+    if (value instanceof StructureViewTreeElement) {
       return ((StructureViewTreeElement)value).getValue();
     }
     return value;
@@ -419,46 +420,46 @@ public class CommanderPanel extends JPanel {
   public final Object getDataImpl(final String dataId) {
     if (myBuilder == null) return null;
     final Object selectedValue = getSelectedValue();
-    if (DataConstants.PSI_ELEMENT.equals(dataId)) {
+    if (LangDataKeys.PSI_ELEMENT.is(dataId)) {
       final PsiElement selectedElement = getSelectedElement();
       return selectedElement != null && selectedElement.isValid() ? selectedElement : null;
     }
-    if (DataConstants.PSI_ELEMENT_ARRAY.equals(dataId)) {
+    if (LangDataKeys.PSI_ELEMENT_ARRAY.is(dataId)) {
       return filterInvalidElements(getSelectedElements());
     }
-    else if (DataConstantsEx.PASTE_TARGET_PSI_ELEMENT.equals(dataId)) {
+    else if (LangDataKeys.PASTE_TARGET_PSI_ELEMENT.is(dataId)) {
       final AbstractTreeNode parentNode = myBuilder.getParentNode();
       final Object element = parentNode != null ? parentNode.getValue() : null;
       return element instanceof PsiElement && ((PsiElement)element).isValid() ? element : null;
     }
-    else if (DataConstants.NAVIGATABLE_ARRAY.equals(dataId)) {
+    else if (PlatformDataKeys.NAVIGATABLE_ARRAY.is(dataId)) {
       return getNavigatables();
     }
-    else if (DataConstants.COPY_PROVIDER.equals(dataId)) {
+    else if (PlatformDataKeys.COPY_PROVIDER.is(dataId)) {
       return myCopyPasteDelegator != null ? myCopyPasteDelegator.getCopyProvider() : null;
     }
-    else if (DataConstants.CUT_PROVIDER.equals(dataId)) {
+    else if (PlatformDataKeys.CUT_PROVIDER.is(dataId)) {
       return myCopyPasteDelegator != null ? myCopyPasteDelegator.getCutProvider() : null;
     }
-    else if (DataConstants.PASTE_PROVIDER.equals(dataId)) {
+    else if (PlatformDataKeys.PASTE_PROVIDER.is(dataId)) {
       return myCopyPasteDelegator != null ? myCopyPasteDelegator.getPasteProvider() : null;
     }
-    else if (DataConstants.IDE_VIEW.equals(dataId)) {
+    else if (LangDataKeys.IDE_VIEW.is(dataId)) {
       return myIdeView;
     }
-    else if (DataConstants.DELETE_ELEMENT_PROVIDER.equals(dataId)) {
+    else if (PlatformDataKeys.DELETE_ELEMENT_PROVIDER.is(dataId)) {
       return myDeleteElementProvider;
     }
-    else if (DataConstants.MODULE.equals(dataId)) {
+    else if (LangDataKeys.MODULE.is(dataId)) {
       return selectedValue instanceof Module ? selectedValue : null;
     }
-    else if (DataConstantsEx.MODULE_GROUP_ARRAY.equals(dataId)) {
+    else if (ModuleGroup.ARRAY_DATA_KEY.is(dataId)) {
       return selectedValue instanceof ModuleGroup ? new ModuleGroup[]{(ModuleGroup)selectedValue} : null;
     }
-    else if (DataConstantsEx.LIBRARY_GROUP_ARRAY.equals(dataId)) {
+    else if (LibraryGroupElement.ARRAY_DATA_KEY.is(dataId)) {
       return selectedValue instanceof LibraryGroupElement ? new LibraryGroupElement[]{(LibraryGroupElement)selectedValue} : null;
     }
-    else if (DataConstantsEx.NAMED_LIBRARY_ARRAY.equals(dataId)) {
+    else if (NamedLibraryElement.ARRAY_DATA_KEY.is(dataId)) {
       return selectedValue instanceof NamedLibraryElement ? new NamedLibraryElement[]{(NamedLibraryElement)selectedValue} : null;
     }
 

diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java
index 93daef04a2ca6cbe746741ba8866ce3c6faba216..846cc7cd246200377e7407af93210080d72e48cd 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java
@@ -35,7 +35,6 @@ import com.intellij.ide.util.treeView.NodeDescriptor;
 import com.intellij.ide.util.treeView.NodeRenderer;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.module.Module;
@@ -74,8 +73,12 @@ public class FavoritesTreeViewPanel extends JPanel implements DataProvider {
   private FavoritesViewTreeBuilder myBuilder;
   private final CopyPasteDelegator myCopyPasteDelegator;
   private MouseListener myTreePopupHandler;
-  @NonNls public static final String CONTEXT_FAVORITES_ROOTS = "FavoritesRoot";
-  @NonNls public static final String FAVORITES_LIST_NAME = "FavoritesListName";
+
+  public static final DataKey<FavoritesTreeNodeDescriptor[]> CONTEXT_FAVORITES_ROOTS_DATA_KEY = DataKey.create("FavoritesRoot");
+  @Deprecated public static final String CONTEXT_FAVORITES_ROOTS = CONTEXT_FAVORITES_ROOTS_DATA_KEY.getName();
+
+  public static final DataKey<String> FAVORITES_LIST_NAME_DATA_KEY = DataKey.create("FavoritesListName");
+  @Deprecated public static final String FAVORITES_LIST_NAME = FAVORITES_LIST_NAME_DATA_KEY.getName();
 
   protected Project myProject;
   private final String myHelpId;
@@ -125,7 +128,7 @@ public class FavoritesTreeViewPanel extends JPanel implements DataProvider {
             final FavoritesTreeNodeDescriptor favoritesTreeNodeDescriptor = (FavoritesTreeNodeDescriptor)userObject;
             AbstractTreeNode treeNode = favoritesTreeNodeDescriptor.getElement();
             final ItemPresentation presentation = treeNode.getPresentation();
-            String locationString = presentation != null ? presentation.getLocationString() : null;
+            String locationString = presentation.getLocationString();
             if (locationString != null && locationString.length() > 0) {
               append(" (" + locationString + ")", SimpleTextAttributes.GRAY_ATTRIBUTES);
             }
@@ -209,38 +212,38 @@ public class FavoritesTreeViewPanel extends JPanel implements DataProvider {
   }
 
   public Object getData(String dataId) {
-    if (DataConstants.PROJECT.equals(dataId)) {
+    if (PlatformDataKeys.PROJECT.is(dataId)) {
       return myProject;
     }
-    if (DataConstants.NAVIGATABLE.equals(dataId)) {
+    if (PlatformDataKeys.NAVIGATABLE.is(dataId)) {
       final FavoritesTreeNodeDescriptor[] selectedNodeDescriptors = getSelectedNodeDescriptors();
       return selectedNodeDescriptors.length == 1 ? selectedNodeDescriptors[0].getElement() : null;
     }
-    if (DataConstants.NAVIGATABLE_ARRAY.equals(dataId)) {
+    if (PlatformDataKeys.NAVIGATABLE_ARRAY.is(dataId)) {
       final List<Navigatable> selectedElements = getSelectedElements(Navigatable.class);
       return selectedElements.toArray(new Navigatable[selectedElements.size()]);
     }
 
-    if (DataConstants.CUT_PROVIDER.equals(dataId)) {
+    if (PlatformDataKeys.CUT_PROVIDER.is(dataId)) {
       return myCopyPasteDelegator.getCutProvider();
     }
-    if (DataConstants.COPY_PROVIDER.equals(dataId)) {
+    if (PlatformDataKeys.COPY_PROVIDER.is(dataId)) {
       return myCopyPasteDelegator.getCopyProvider();
     }
-    if (DataConstants.PASTE_PROVIDER.equals(dataId)) {
+    if (PlatformDataKeys.PASTE_PROVIDER.is(dataId)) {
       return myCopyPasteDelegator.getPasteProvider();
     }
-    if (DataConstants.HELP_ID.equals(dataId)) {
+    if (PlatformDataKeys.HELP_ID.is(dataId)) {
       return myHelpId;
     }
-    if (DataConstants.PSI_ELEMENT.equals(dataId)) {
+    if (LangDataKeys.PSI_ELEMENT.is(dataId)) {
       PsiElement[] elements = getSelectedPsiElements();
       if (elements.length != 1) {
         return null;
       }
       return elements[0] != null && elements[0].isValid() ? elements[0] : null;
     }
-    if (DataConstants.PSI_ELEMENT_ARRAY.equals(dataId)) {
+    if (LangDataKeys.PSI_ELEMENT_ARRAY.is(dataId)) {
       final PsiElement[] elements = getSelectedPsiElements();
       ArrayList<PsiElement> result = new ArrayList<PsiElement>();
       for (PsiElement element : elements) {
@@ -251,42 +254,42 @@ public class FavoritesTreeViewPanel extends JPanel implements DataProvider {
       return result.isEmpty() ? null : result.toArray(new PsiElement[result.size()]);
     }
 
-    if (DataConstants.IDE_VIEW.equals(dataId)) {
+    if (LangDataKeys.IDE_VIEW.is(dataId)) {
       return myIdeView;
     }
 
-    if (DataConstantsEx.TARGET_PSI_ELEMENT.equals(dataId)) {
+    if (LangDataKeys.TARGET_PSI_ELEMENT.is(dataId)) {
       return null;
     }
 
-    if (DataConstants.MODULE_CONTEXT.equals(dataId)) {
+    if (LangDataKeys.MODULE_CONTEXT.is(dataId)) {
       Module[] selected = getSelectedModules();
       return selected != null && selected.length == 1 ? selected[0] : null;
     }
-    if (DataConstants.MODULE_CONTEXT_ARRAY.equals(dataId)) {
+    if (LangDataKeys.MODULE_CONTEXT_ARRAY.is(dataId)) {
       return getSelectedModules();
     }
 
-    if (DataConstants.DELETE_ELEMENT_PROVIDER.equals(dataId)) {
+    if (PlatformDataKeys.DELETE_ELEMENT_PROVIDER.is(dataId)) {
       final Object[] elements = getSelectedNodeElements();
       return elements != null && elements.length >= 1 && elements[0] instanceof Module
              ? myDeleteModuleProvider
              : myDeletePSIElementProvider;
 
     }
-    if (DataConstantsEx.MODULE_GROUP_ARRAY.equals(dataId)) {
+    if (ModuleGroup.ARRAY_DATA_KEY.is(dataId)) {
       final List<ModuleGroup> selectedElements = getSelectedElements(ModuleGroup.class);
       return selectedElements.isEmpty() ? null : selectedElements.toArray(new ModuleGroup[selectedElements.size()]);
     }
-    if (DataConstantsEx.LIBRARY_GROUP_ARRAY.equals(dataId)) {
+    if (LibraryGroupElement.ARRAY_DATA_KEY.is(dataId)) {
       final List<LibraryGroupElement> selectedElements = getSelectedElements(LibraryGroupElement.class);
       return selectedElements.isEmpty() ? null : selectedElements.toArray(new LibraryGroupElement[selectedElements.size()]);
     }
-    if (DataConstantsEx.NAMED_LIBRARY_ARRAY.equals(dataId)) {
+    if (NamedLibraryElement.ARRAY_DATA_KEY.is(dataId)) {
       final List<NamedLibraryElement> selectedElements = getSelectedElements(NamedLibraryElement.class);
       return selectedElements.isEmpty() ? null : selectedElements.toArray(new NamedLibraryElement[selectedElements.size()]);
     }
-    if (CONTEXT_FAVORITES_ROOTS.equals(dataId)) {
+    if (CONTEXT_FAVORITES_ROOTS_DATA_KEY.is(dataId)) {
       List<FavoritesTreeNodeDescriptor> result = new ArrayList<FavoritesTreeNodeDescriptor>();
       FavoritesTreeNodeDescriptor[] selectedNodeDescriptors = getSelectedNodeDescriptors();
       for (FavoritesTreeNodeDescriptor selectedNodeDescriptor : selectedNodeDescriptors) {
@@ -297,7 +300,7 @@ public class FavoritesTreeViewPanel extends JPanel implements DataProvider {
       }
       return result.toArray(new FavoritesTreeNodeDescriptor[result.size()]);
     }
-    if (FAVORITES_LIST_NAME.equals(dataId)) {
+    if (FAVORITES_LIST_NAME_DATA_KEY.is(dataId)) {
       return myListName;
     }
     FavoritesTreeNodeDescriptor[] descriptors = getSelectedNodeDescriptors();

diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesAction.java
index 069a6063f829a4617f53b5143606527799213b82..c9a0f8cd8ed3ac9246f109cdc42913da3958f2f0 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToFavoritesAction.java
@@ -26,7 +26,6 @@ import com.intellij.ide.projectView.impl.ModuleGroup;
 import com.intellij.ide.projectView.impl.nodes.*;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.module.Module;
@@ -118,10 +117,10 @@ public class AddToFavoritesAction extends AnAction {
     Object elements = retrieveData(null, LangDataKeys.PSI_ELEMENT.getData(dataContext));
     elements = retrieveData(elements, LangDataKeys.PSI_ELEMENT_ARRAY.getData(dataContext));
     elements = retrieveData(elements, LangDataKeys.PSI_FILE.getData(dataContext));
-    elements = retrieveData(elements, dataContext.getData(DataConstantsEx.MODULE_GROUP_ARRAY));
+    elements = retrieveData(elements, ModuleGroup.ARRAY_DATA_KEY.getData(dataContext));
     elements = retrieveData(elements, LangDataKeys.MODULE_CONTEXT_ARRAY.getData(dataContext));
-    elements = retrieveData(elements, dataContext.getData(DataConstantsEx.LIBRARY_GROUP_ARRAY));
-    elements = retrieveData(elements, dataContext.getData(DataConstantsEx.NAMED_LIBRARY_ARRAY));
+    elements = retrieveData(elements, LibraryGroupElement.ARRAY_DATA_KEY.getData(dataContext));
+    elements = retrieveData(elements, NamedLibraryElement.ARRAY_DATA_KEY.getData(dataContext));
     elements = retrieveData(elements, PlatformDataKeys.VIRTUAL_FILE.getData(dataContext));
     elements = retrieveData(elements, PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(dataContext));
     return elements;

diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/DeleteAllFavoritesListsButThisAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/DeleteAllFavoritesListsButThisAction.java
index fb6085893dbca146452ac0465997962d72c6b92c..cc2634acbba23d83a06b794ef8c682a7b2b37088 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/DeleteAllFavoritesListsButThisAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/DeleteAllFavoritesListsButThisAction.java
@@ -23,8 +23,8 @@ import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.DumbAware;
+import com.intellij.openapi.project.Project;
 
 /**
  * User: anna
@@ -42,7 +42,7 @@ public class DeleteAllFavoritesListsButThisAction extends AnAction implements Du
       return;
     }
     FavoritesManager favoritesManager = FavoritesManager.getInstance(project);
-    String listName = (String)dataContext.getData(FavoritesTreeViewPanel.FAVORITES_LIST_NAME);
+    String listName = FavoritesTreeViewPanel.FAVORITES_LIST_NAME_DATA_KEY.getData(dataContext);
     String[] lists = favoritesManager.getAvailableFavoritesLists();
     for (String list : lists) {
       if (!list.equals(listName)) {
@@ -58,7 +58,7 @@ public class DeleteAllFavoritesListsButThisAction extends AnAction implements Du
       e.getPresentation().setEnabled(false);
       return;
     }
-    String listName = (String)dataContext.getData(FavoritesTreeViewPanel.FAVORITES_LIST_NAME);
+    String listName = FavoritesTreeViewPanel.FAVORITES_LIST_NAME_DATA_KEY.getData(dataContext);
     e.getPresentation().setEnabled(listName != null);
     if (listName != null) {
       e.getPresentation().setText(IdeBundle.message("action.delete.all.favorites.lists.but.this",listName));

diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/DeleteFavoritesListAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/DeleteFavoritesListAction.java
index 699bf45c822f4b278bc498f720a268f1e94c8326..4e04afe19e4566cc87f6505381cd85dc31e778cd 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/DeleteFavoritesListAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/DeleteFavoritesListAction.java
@@ -23,8 +23,8 @@ import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.DumbAware;
+import com.intellij.openapi.project.Project;
 
 /**
  * User: anna
@@ -32,7 +32,7 @@ import com.intellij.openapi.project.DumbAware;
  */
 public class DeleteFavoritesListAction extends AnAction implements DumbAware {
   public DeleteFavoritesListAction() {
-    super(IdeBundle.message("action.delete.favorites.list",""));
+    super(IdeBundle.message("action.delete.favorites.list", ""));
   }
 
   public void actionPerformed(AnActionEvent e) {
@@ -42,22 +42,24 @@ public class DeleteFavoritesListAction extends AnAction implements DumbAware {
       return;
     }
     FavoritesManager favoritesManager = FavoritesManager.getInstance(project);
-    String listName = (String)dataContext.getData(FavoritesTreeViewPanel.FAVORITES_LIST_NAME);
-    favoritesManager.removeFavoritesList(listName);
+    String listName = FavoritesTreeViewPanel.FAVORITES_LIST_NAME_DATA_KEY.getData(dataContext);
+    if (listName != null) {
+      favoritesManager.removeFavoritesList(listName);
+    }
   }
 
   public void update(AnActionEvent e) {
     final DataContext dataContext = e.getDataContext();
     Project project = PlatformDataKeys.PROJECT.getData(dataContext);
-    if (project == null){
+    if (project == null) {
       e.getPresentation().setEnabled(false);
       return;
     }
-    String listName = (String)dataContext.getData(FavoritesTreeViewPanel.FAVORITES_LIST_NAME);
+    String listName = FavoritesTreeViewPanel.FAVORITES_LIST_NAME_DATA_KEY.getData(dataContext);
     e.getPresentation().setEnabled(listName != null && !listName.equals(project.getName()));
     if (listName != null) {
-      e.getPresentation().setText(IdeBundle.message("action.delete.favorites.list",listName));
-      e.getPresentation().setDescription(IdeBundle.message("action.delete.favorites.list",listName));
+      e.getPresentation().setText(IdeBundle.message("action.delete.favorites.list", listName));
+      e.getPresentation().setDescription(IdeBundle.message("action.delete.favorites.list", listName));
     }
   }
 }

diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/DeleteFromFavoritesAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/DeleteFromFavoritesAction.java
index 2c357f19a2312ff6af25a8ed9688350fa78e6b13..ede6f68f4a7ec885dc5b848f88e01ffcdd4dc428 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/DeleteFromFavoritesAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/DeleteFromFavoritesAction.java
@@ -46,8 +46,8 @@ public class DeleteFromFavoritesAction extends AnAction implements DumbAware {
       return;
     }
     FavoritesManager favoritesManager = FavoritesManager.getInstance(project);
-    FavoritesTreeNodeDescriptor[] roots = (FavoritesTreeNodeDescriptor[])dataContext.getData(FavoritesTreeViewPanel.CONTEXT_FAVORITES_ROOTS);
-    String listName = (String)dataContext.getData(FavoritesTreeViewPanel.FAVORITES_LIST_NAME);
+    FavoritesTreeNodeDescriptor[] roots = FavoritesTreeViewPanel.CONTEXT_FAVORITES_ROOTS_DATA_KEY.getData(dataContext);
+    String listName = FavoritesTreeViewPanel.FAVORITES_LIST_NAME_DATA_KEY.getData(dataContext);
     assert roots != null;
     assert listName != null;
     for (FavoritesTreeNodeDescriptor root : roots) {
@@ -64,8 +64,8 @@ public class DeleteFromFavoritesAction extends AnAction implements DumbAware {
       e.getPresentation().setEnabled(false);
       return;
     }
-    final String listName = (String)dataContext.getData(FavoritesTreeViewPanel.FAVORITES_LIST_NAME);
-    FavoritesTreeNodeDescriptor[] roots = (FavoritesTreeNodeDescriptor[])dataContext.getData(FavoritesTreeViewPanel.CONTEXT_FAVORITES_ROOTS);
+    final String listName = FavoritesTreeViewPanel.FAVORITES_LIST_NAME_DATA_KEY.getData(dataContext);
+    FavoritesTreeNodeDescriptor[] roots = FavoritesTreeViewPanel.CONTEXT_FAVORITES_ROOTS_DATA_KEY.getData(dataContext);
     e.getPresentation().setEnabled(listName != null && roots != null && roots.length != 0);
   }
 }

diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/RenameFavoritesListAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/RenameFavoritesListAction.java
index 4e9ff70f6b5e0436e4b4e653729c5ce4041d3c5a..0c80f8a030f287d77c21bd6c386815752622e109 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/RenameFavoritesListAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/RenameFavoritesListAction.java
@@ -23,8 +23,8 @@ import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.DumbAware;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.InputValidator;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.IconLoader;
@@ -36,8 +36,8 @@ import com.intellij.util.ArrayUtil;
  */
 public class RenameFavoritesListAction extends AnAction implements DumbAware {
   public RenameFavoritesListAction() {
-    super(IdeBundle.message("action.rename.favorites.list"),
-          IdeBundle.message("action.rename.favorites.list"), IconLoader.getIcon("/actions/menu-replace.png"));
+    super(IdeBundle.message("action.rename.favorites.list"), IdeBundle.message("action.rename.favorites.list"),
+          IconLoader.getIcon("/actions/menu-replace.png"));
   }
 
   public void actionPerformed(AnActionEvent e) {
@@ -47,26 +47,25 @@ public class RenameFavoritesListAction extends AnAction implements DumbAware {
       return;
     }
     final FavoritesManager favoritesManager = FavoritesManager.getInstance(project);
-    String listName = (String)dataContext.getData(FavoritesTreeViewPanel.FAVORITES_LIST_NAME);
-    final String newName = Messages.showInputDialog(project, IdeBundle.message("prompt.input.favorites.list.new.name"),
-                                                        IdeBundle.message("title.rename.favorites.list"), Messages.getInformationIcon(), listName,
-                                                        new InputValidator() {
-                                                          public boolean checkInput(String inputString) {
-                                                            return inputString != null && inputString.trim().length() > 0;
-                                                          }
+    String listName = FavoritesTreeViewPanel.FAVORITES_LIST_NAME_DATA_KEY.getData(dataContext);
+    final String newName = Messages
+      .showInputDialog(project, IdeBundle.message("prompt.input.favorites.list.new.name"), IdeBundle.message("title.rename.favorites.list"),
+                       Messages.getInformationIcon(), listName, new InputValidator() {
+          public boolean checkInput(String inputString) {
+            return inputString != null && inputString.trim().length() > 0;
+          }
 
-                                                          public boolean canClose(String inputString) {
-                                                            String[] lists = favoritesManager.getAvailableFavoritesLists();
-                                                            final boolean isNew = ArrayUtil.find(lists, inputString.trim()) == -1;
-                                                            if (!isNew) {
-                                                              Messages.showErrorDialog(project, IdeBundle.message(
-                                                                "error.favorites.list.already.exists", inputString.trim()), IdeBundle.message(
-                                                                "title.unable.to.add.favorites.list"));
-                                                              return false;
-                                                            }
-                                                            return inputString.trim().length() > 0;
-                                                          }
-                                                        });
+          public boolean canClose(String inputString) {
+            String[] lists = favoritesManager.getAvailableFavoritesLists();
+            final boolean isNew = ArrayUtil.find(lists, inputString.trim()) == -1;
+            if (!isNew) {
+              Messages.showErrorDialog(project, IdeBundle.message("error.favorites.list.already.exists", inputString.trim()),
+                                       IdeBundle.message("title.unable.to.add.favorites.list"));
+              return false;
+            }
+            return inputString.trim().length() > 0;
+          }
+        });
 
     if (listName != null && newName != null) {
       favoritesManager.renameFavoritesList(listName, newName);
@@ -76,11 +75,11 @@ public class RenameFavoritesListAction extends AnAction implements DumbAware {
   public void update(AnActionEvent e) {
     final DataContext dataContext = e.getDataContext();
     Project project = PlatformDataKeys.PROJECT.getData(dataContext);
-    if (project == null){
+    if (project == null) {
       e.getPresentation().setEnabled(false);
       return;
     }
-    String listName = (String)dataContext.getData(FavoritesTreeViewPanel.FAVORITES_LIST_NAME);
+    String listName = FavoritesTreeViewPanel.FAVORITES_LIST_NAME_DATA_KEY.getData(dataContext);
     e.getPresentation().setEnabled(listName != null && !listName.equals(project.getName()));
   }
 }

diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/SendToFavoritesAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/SendToFavoritesAction.java
index 108f386e2e30446f2fc83be663f0e9d8cd06f156..2397b874fd3ef54e40c43d286f7abd607d2d6eb0 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/SendToFavoritesAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/SendToFavoritesAction.java
@@ -44,8 +44,8 @@ public class SendToFavoritesAction extends AnAction{
     Project project = PlatformDataKeys.PROJECT.getData(dataContext);
     final FavoritesManager favoritesManager = FavoritesManager.getInstance(project);
 
-    FavoritesTreeNodeDescriptor[] roots = (FavoritesTreeNodeDescriptor[])dataContext.getData(FavoritesTreeViewPanel.CONTEXT_FAVORITES_ROOTS);
-    String listName = (String)dataContext.getData(FavoritesTreeViewPanel.FAVORITES_LIST_NAME);
+    FavoritesTreeNodeDescriptor[] roots = FavoritesTreeViewPanel.CONTEXT_FAVORITES_ROOTS_DATA_KEY.getData(dataContext);
+    String listName = FavoritesTreeViewPanel.FAVORITES_LIST_NAME_DATA_KEY.getData(dataContext);
 
     doSend(favoritesManager, roots, listName);
   }
@@ -66,13 +66,13 @@ public class SendToFavoritesAction extends AnAction{
       e.getPresentation().setEnabled(false);
       return;
     }
-    FavoritesTreeNodeDescriptor[] roots = (FavoritesTreeNodeDescriptor[])dataContext.getData(FavoritesTreeViewPanel.CONTEXT_FAVORITES_ROOTS);
+    FavoritesTreeNodeDescriptor[] roots = FavoritesTreeViewPanel.CONTEXT_FAVORITES_ROOTS_DATA_KEY.getData(dataContext);
     if (roots == null || roots.length == 0) {
       e.getPresentation().setEnabled(false);
       return;
     }
 
-    String listName = (String)dataContext.getData(FavoritesTreeViewPanel.FAVORITES_LIST_NAME);
+    String listName = FavoritesTreeViewPanel.FAVORITES_LIST_NAME_DATA_KEY.getData(dataContext);
     e.getPresentation().setEnabled(listName != null);
   }
 }

diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/SendToFavoritesGroup.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/SendToFavoritesGroup.java
index 3d45c87ef31b088a8babfdc37542bdbe7dae9fd1..3f00e755e1fa6af14e47c4caf771fb271f17da3b 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/SendToFavoritesGroup.java
+++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/SendToFavoritesGroup.java
@@ -22,6 +22,7 @@ import com.intellij.ide.favoritesTreeView.FavoritesTreeNodeDescriptor;
 import com.intellij.ide.favoritesTreeView.FavoritesTreeViewPanel;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -32,19 +33,19 @@ import java.util.List;
  * Date: Feb 24, 2005
  */
 public class SendToFavoritesGroup extends ActionGroup{
-
+  @NotNull
   public AnAction[] getChildren(@Nullable AnActionEvent e) {
-    if (e == null) return AnAction.EMPTY_ARRAY;
+    if (e == null) return EMPTY_ARRAY;
     final Project project = PlatformDataKeys.PROJECT.getData(e.getDataContext());
     if (project == null){
-      return AnAction.EMPTY_ARRAY;
+      return EMPTY_ARRAY;
     }
     final FavoritesManager favoritesManager = FavoritesManager.getInstance(project);
     final DataContext dataContext = e.getDataContext();
-    FavoritesTreeNodeDescriptor[] roots = (FavoritesTreeNodeDescriptor[])dataContext.getData(FavoritesTreeViewPanel.CONTEXT_FAVORITES_ROOTS);
-    String listName = (String)dataContext.getData(FavoritesTreeViewPanel.FAVORITES_LIST_NAME);
+    FavoritesTreeNodeDescriptor[] roots = FavoritesTreeViewPanel.CONTEXT_FAVORITES_ROOTS_DATA_KEY.getData(dataContext);
+    String listName = FavoritesTreeViewPanel.FAVORITES_LIST_NAME_DATA_KEY.getData(dataContext);
     if (roots == null || roots.length == 0 || listName == null) {
-      return AnAction.EMPTY_ARRAY;
+      return EMPTY_ARRAY;
     }
 
     final String[] allLists = favoritesManager.getAvailableFavoritesLists();
@@ -70,8 +71,8 @@ public class SendToFavoritesGroup extends ActionGroup{
     public void actionPerformed(AnActionEvent e) {
       final DataContext dataContext = e.getDataContext();
       Project project = PlatformDataKeys.PROJECT.getData(dataContext);
-      FavoritesTreeNodeDescriptor[] roots = (FavoritesTreeNodeDescriptor[])dataContext.getData(FavoritesTreeViewPanel.CONTEXT_FAVORITES_ROOTS);
-      String listName = (String)dataContext.getData(FavoritesTreeViewPanel.FAVORITES_LIST_NAME);
+      FavoritesTreeNodeDescriptor[] roots = FavoritesTreeViewPanel.CONTEXT_FAVORITES_ROOTS_DATA_KEY.getData(dataContext);
+      String listName = FavoritesTreeViewPanel.FAVORITES_LIST_NAME_DATA_KEY.getData(dataContext);
       
       String newName = AddNewFavoritesListAction.doAddNewFavoritesList(project);
       if (newName != null) {

diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/ChangeViewTypeActionBase.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/ChangeViewTypeActionBase.java
index 33a5c77e99f611774f1d24c244210c8ba8f27f72..7aef0d2d32751c3e3c2006d5d579876b0eaa4907 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/hierarchy/ChangeViewTypeActionBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/ChangeViewTypeActionBase.java
@@ -62,6 +62,6 @@ abstract class ChangeViewTypeActionBase extends ToggleAction {
   }
 
   protected static TypeHierarchyBrowserBase getTypeHierarchyBrowser(final DataContext context) {
-    return (TypeHierarchyBrowserBase)context.getData(TypeHierarchyBrowserBase.TYPE_HIERARCHY_BROWSER_DATA_KEY);
+    return TypeHierarchyBrowserBase.DATA_KEY.getData(context);
   }
 }

diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBase.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBase.java
index bdf841406801420d37760a953ab20c1a0bf6604e..704a3c3f9077d538b5c876d23674d11465a90b52 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBase.java
@@ -19,17 +19,17 @@ package com.intellij.ide.hierarchy;
 import com.intellij.ide.actions.CloseTabToolbarAction;
 import com.intellij.ide.actions.ContextHelpAction;
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.project.Project;
 import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.SimpleToolWindowPanel;
 import com.intellij.pom.Navigatable;
 import com.intellij.psi.NavigatablePsiElement;
 import com.intellij.psi.PsiElement;
-import com.intellij.ui.content.Content;
-import com.intellij.ui.content.tabs.PinToolwindowTabAction;
 import com.intellij.ui.AutoScrollToSourceHandler;
 import com.intellij.ui.TreeSpeedSearch;
 import com.intellij.ui.TreeToolTipHandler;
+import com.intellij.ui.content.Content;
+import com.intellij.ui.content.tabs.PinToolwindowTabAction;
 import com.intellij.ui.treeStructure.Tree;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.tree.TreeUtil;
@@ -194,24 +194,24 @@ public abstract class HierarchyBrowserBase extends SimpleToolWindowPanel impleme
 
   @Nullable
   public Object getData(@NonNls final String dataId) {
-      if (DataConstants.PSI_ELEMENT.equals(dataId)) {
+      if (LangDataKeys.PSI_ELEMENT.is(dataId)) {
       final PsiElement anElement = getSelectedElement();
       return anElement != null && anElement.isValid() ? anElement : null;
     }
-    if (DataConstants.PSI_ELEMENT_ARRAY.equals(dataId)) {
+    if (LangDataKeys.PSI_ELEMENT_ARRAY.is(dataId)) {
       return getSelectedElements();
     }
-    if (DataConstants.DELETE_ELEMENT_PROVIDER.equals(dataId)) {
+    if (PlatformDataKeys.DELETE_ELEMENT_PROVIDER.is(dataId)) {
       return null;
     }
-    if (DataConstants.NAVIGATABLE.equals(dataId)) {
+    if (PlatformDataKeys.NAVIGATABLE.is(dataId)) {
       final DefaultMutableTreeNode selectedNode = getSelectedNode();
       if (selectedNode == null) return null;
       final HierarchyNodeDescriptor descriptor = getDescriptor(selectedNode);
       if (descriptor == null) return null;
       return getNavigatable(descriptor);
     }
-    if (DataConstants.NAVIGATABLE_ARRAY.equals(dataId)) {
+    if (PlatformDataKeys.NAVIGATABLE_ARRAY.is(dataId)) {
       return getNavigatables();
     }
     return null;

diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java
index ecaa852c2ac468c817a2aae54a7f104694955f72..849f76b32721ebdc1c140ba739d9487044e5ab72 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java
+++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java
@@ -55,6 +55,7 @@ import javax.swing.tree.TreeNode;
 import java.awt.*;
 import java.text.MessageFormat;
 import java.util.*;
+import java.util.List;
 
 public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implements OccurenceNavigator {
 
@@ -74,7 +75,7 @@ public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implem
 
   private boolean myCachedIsValidBase = false;
 
-  private final java.util.List<Runnable> myRunOnDisposeList = new ArrayList<Runnable>();
+  private final List<Runnable> myRunOnDisposeList = new ArrayList<Runnable>();
   private final HashMap<String, OccurenceNavigator> myOccurrenceNavigators = new HashMap<String, OccurenceNavigator>();
 
   private static final OccurenceNavigator EMPTY_NAVIGATOR = new OccurenceNavigator() {
@@ -401,7 +402,7 @@ public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implem
     if (getBrowserDataKey().equals(dataId)) {
       return this;
     }
-    else if (DataConstants.HELP_ID.equals(dataId)) {
+    else if (PlatformDataKeys.HELP_ID.is(dataId)) {
       return HELP_ID;
     }
     return super.getData(dataId);

diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/MethodHierarchyBrowserBase.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/MethodHierarchyBrowserBase.java
index 435090347d357effe692f2822379c6c26477ff4e..2602895c0b209c3d59ca9b18375bf918b8c1aaf8 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/hierarchy/MethodHierarchyBrowserBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/MethodHierarchyBrowserBase.java
@@ -34,7 +34,8 @@ public abstract class MethodHierarchyBrowserBase extends HierarchyBrowserBaseEx
   @SuppressWarnings({"UnresolvedPropertyKey"})
   public static final String METHOD_TYPE = IdeBundle.message("title.hierarchy.method");
 
-  @NonNls public static final String METHOD_HIERARCHY_BROWSER_DATA_KEY = "com.intellij.ide.hierarchy.MethodHierarchyBrowserBase";
+  public static final DataKey<MethodHierarchyBrowserBase> DATA_KEY = DataKey.create("com.intellij.ide.hierarchy.MethodHierarchyBrowserBase");
+  @Deprecated @NonNls public static final String METHOD_HIERARCHY_BROWSER_DATA_KEY = DATA_KEY.getName();
 
   public MethodHierarchyBrowserBase(final Project project, final PsiElement method) {
     super(project, method);
@@ -87,7 +88,7 @@ public abstract class MethodHierarchyBrowserBase extends HierarchyBrowserBaseEx
 
   @NotNull
   protected String getBrowserDataKey() {
-    return METHOD_HIERARCHY_BROWSER_DATA_KEY;
+    return DATA_KEY.getName();
   }
 
   @NotNull
@@ -125,7 +126,7 @@ public abstract class MethodHierarchyBrowserBase extends HierarchyBrowserBaseEx
 
   public static class BaseOnThisMethodAction extends BaseOnThisElementAction {
     public BaseOnThisMethodAction() {
-      super(IdeBundle.message("action.base.on.this.method"), IdeActions.ACTION_METHOD_HIERARCHY, METHOD_HIERARCHY_BROWSER_DATA_KEY);
+      super(IdeBundle.message("action.base.on.this.method"), IdeActions.ACTION_METHOD_HIERARCHY, DATA_KEY.getName());
     }
   }
 

diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/TypeHierarchyBrowserBase.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/TypeHierarchyBrowserBase.java
index c2ac2c194a74a7adebde1a3a4efbe2fad926c928..ae4f8b9eba5abb81631eb808e1728175f88ff382 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/hierarchy/TypeHierarchyBrowserBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/TypeHierarchyBrowserBase.java
@@ -39,7 +39,8 @@ public abstract class TypeHierarchyBrowserBase extends HierarchyBrowserBaseEx {
 
   private final MyDeleteProvider myDeleteElementProvider = new MyDeleteProvider();
 
-  public static final String TYPE_HIERARCHY_BROWSER_DATA_KEY = "com.intellij.ide.hierarchy.TypeHierarchyBrowserBase";
+  public static final DataKey<TypeHierarchyBrowserBase> DATA_KEY = DataKey.create("com.intellij.ide.hierarchy.TypeHierarchyBrowserBase");
+  @Deprecated public static final String TYPE_HIERARCHY_BROWSER_DATA_KEY = DATA_KEY.getName();
 
   public TypeHierarchyBrowserBase(final Project project, final PsiElement element) {
     super(project, element);
@@ -70,7 +71,7 @@ public abstract class TypeHierarchyBrowserBase extends HierarchyBrowserBaseEx {
 
   @NotNull
   protected String getBrowserDataKey() {
-    return TYPE_HIERARCHY_BROWSER_DATA_KEY;
+    return DATA_KEY.getName();
   }
 
   @NotNull
@@ -79,7 +80,7 @@ public abstract class TypeHierarchyBrowserBase extends HierarchyBrowserBaseEx {
   }
 
   public final Object getData(final String dataId) {
-    if (DataConstants.DELETE_ELEMENT_PROVIDER.equals(dataId)) {
+    if (PlatformDataKeys.DELETE_ELEMENT_PROVIDER.is(dataId)) {
       return myDeleteElementProvider;
     }
     return super.getData(dataId);
@@ -123,7 +124,7 @@ public abstract class TypeHierarchyBrowserBase extends HierarchyBrowserBaseEx {
   protected static class BaseOnThisTypeAction extends BaseOnThisElementAction {
 
     public BaseOnThisTypeAction() {
-      super("", IdeActions.ACTION_TYPE_HIERARCHY, TYPE_HIERARCHY_BROWSER_DATA_KEY);
+      super("", IdeActions.ACTION_TYPE_HIERARCHY, DATA_KEY.getName());
     }
 
     @Override

diff --git a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/ModuleRule.java b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/ModuleRule.java
index 991f34c4cac219ec6c4177a1ad6cf990af00f34a..50b9803f90d9aed31f6e6d11b36d662e0f0e4209 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/ModuleRule.java
+++ b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/ModuleRule.java
@@ -18,8 +18,9 @@ package com.intellij.ide.impl.dataRules;
 
 import com.intellij.ide.DataManager;
 import com.intellij.ide.impl.DataManagerImpl;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataProvider;
+import com.intellij.openapi.actionSystem.LangDataKeys;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.module.ModuleUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -31,20 +32,20 @@ import com.intellij.psi.PsiElement;
  */
 public class ModuleRule implements GetDataRule {
   public Object getData(DataProvider dataProvider) {
-    Object moduleContext = dataProvider.getData(DataConstants.MODULE_CONTEXT);
+    Object moduleContext = LangDataKeys.MODULE_CONTEXT.getData(dataProvider);
     if (moduleContext != null) {
       return moduleContext;
     }
-    Project project = (Project)dataProvider.getData(DataConstants.PROJECT);
+    Project project = PlatformDataKeys.PROJECT.getData(dataProvider);
     if (project == null) {
-      PsiElement element = (PsiElement)dataProvider.getData(DataConstants.PSI_ELEMENT);
+      PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataProvider);
       if (element == null || !element.isValid()) return null;
       project = element.getProject();
     }
 
-    VirtualFile virtualFile = (VirtualFile)dataProvider.getData(DataConstants.VIRTUAL_FILE);
+    VirtualFile virtualFile = PlatformDataKeys.VIRTUAL_FILE.getData(dataProvider);
     if (virtualFile == null) {
-      GetDataRule dataRule = ((DataManagerImpl)DataManager.getInstance()).getDataRule(DataConstants.VIRTUAL_FILE);
+      GetDataRule dataRule = ((DataManagerImpl)DataManager.getInstance()).getDataRule(PlatformDataKeys.VIRTUAL_FILE.getName());
       if (dataRule != null) {
         virtualFile = (VirtualFile)dataRule.getData(dataProvider);
       }

diff --git a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/NavigatableRule.java b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/NavigatableRule.java
index 2d604a21caf0e2727b69bb181e31f37da973d921..91daabb008c91dc3373343f732093535b7fbcfff 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/NavigatableRule.java
+++ b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/NavigatableRule.java
@@ -17,25 +17,30 @@
 package com.intellij.ide.impl.dataRules;
 
 import com.intellij.ide.util.EditSourceUtil;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataProvider;
+import com.intellij.openapi.actionSystem.LangDataKeys;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.pom.Navigatable;
 import com.intellij.psi.PsiElement;
 
 public class NavigatableRule implements GetDataRule {
   public Object getData(DataProvider dataProvider) {
-    final OpenFileDescriptor openFileDescriptor = (OpenFileDescriptor)dataProvider.getData(DataConstants.OPEN_FILE_DESCRIPTOR);
-    if (openFileDescriptor != null && openFileDescriptor.getFile().isValid()) {
-      return openFileDescriptor;
+    final Navigatable navigatable = PlatformDataKeys.NAVIGATABLE.getData(dataProvider);
+    if (navigatable != null && navigatable instanceof OpenFileDescriptor) {
+      final OpenFileDescriptor openFileDescriptor = (OpenFileDescriptor)navigatable;
+
+      if (openFileDescriptor.getFile().isValid()) {
+        return openFileDescriptor;
+      }
     }
 
-    final PsiElement element = (PsiElement)dataProvider.getData(DataConstants.PSI_ELEMENT);
+    final PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataProvider);
     if (element != null) {
       return EditSourceUtil.getDescriptor(element);
     }
 
-    final Object selection = dataProvider.getData(DataConstants.SELECTED_ITEM);
+    final Object selection = PlatformDataKeys.SELECTED_ITEM.getData(dataProvider);
     if (selection instanceof Navigatable) {
       return selection;
     }

diff --git a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/PasteTargetRule.java b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/PasteTargetRule.java
index d171a3e6734d999fb7730065f7430b9952869f87..edd827fc64b87ab2ed84928fc8811e7861be6cf8 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/PasteTargetRule.java
+++ b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/PasteTargetRule.java
@@ -16,12 +16,11 @@
 
 package com.intellij.ide.impl.dataRules;
 
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataProvider;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 
 public class PasteTargetRule implements GetDataRule {
   public Object getData(DataProvider dataProvider) {
-    Object data = dataProvider.getData(DataConstants.PSI_ELEMENT);
-    return data;
+    return LangDataKeys.PSI_ELEMENT.getData(dataProvider);
   }
 }

diff --git a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/PsiElementFromSelectionRule.java b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/PsiElementFromSelectionRule.java
index 10177a2cb6ae502003c281dec8c4598e4320c859..66290683fbdacac0caa6039b2de86f17d904f552 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/PsiElementFromSelectionRule.java
+++ b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/PsiElementFromSelectionRule.java
@@ -16,13 +16,13 @@
 
 package com.intellij.ide.impl.dataRules;
 
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataProvider;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.psi.PsiElement;
 
 public class PsiElementFromSelectionRule implements GetDataRule {
   public Object getData(DataProvider dataProvider) {
-    final Object element = dataProvider.getData(DataConstants.SELECTED_ITEM);
+    final Object element = dataProvider.getData(PlatformDataKeys.SELECTED_ITEM.getName());
     if (element instanceof PsiElement) {
       PsiElement psiElement = (PsiElement)element;
       if (psiElement.isValid()) {
@@ -32,4 +32,4 @@ public class PsiElementFromSelectionRule implements GetDataRule {
 
     return null;
   }
-}
\ No newline at end of file
+}

diff --git a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/PsiFileRule.java b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/PsiFileRule.java
index b9a969eb4c8223e16155ca48267c29737223a674..198908f7d1c18b7cdd15b89c327de6c5aaeb1ee3 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/PsiFileRule.java
+++ b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/PsiFileRule.java
@@ -16,8 +16,9 @@
 
 package com.intellij.ide.impl.dataRules;
 
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataProvider;
+import com.intellij.openapi.actionSystem.LangDataKeys;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
@@ -25,14 +26,14 @@ import com.intellij.psi.PsiManager;
 
 public class PsiFileRule implements GetDataRule {
   public Object getData(DataProvider dataProvider) {
-    final PsiElement element = (PsiElement)dataProvider.getData(DataConstants.PSI_ELEMENT);
-    if (element != null){
+    final PsiElement element = LangDataKeys.PSI_ELEMENT.getData(dataProvider);
+    if (element != null) {
       return element.getContainingFile();
     }
-    Project project = (Project)dataProvider.getData(DataConstants.PROJECT);
-    if (project != null){
-      VirtualFile vFile = (VirtualFile)dataProvider.getData(DataConstants.VIRTUAL_FILE);
-      if (vFile != null){
+    Project project = PlatformDataKeys.PROJECT.getData(dataProvider);
+    if (project != null) {
+      VirtualFile vFile = PlatformDataKeys.VIRTUAL_FILE.getData(dataProvider);
+      if (vFile != null) {
         return PsiManager.getInstance(project).findFile(vFile);
       }
     }

diff --git a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileArrayRule.java b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileArrayRule.java
index e37cb5dc93519d4fa701b45eb03816dae35ad055..f124f54e4491374910474adf0bb1b17c1d0f3cdc 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileArrayRule.java
+++ b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileArrayRule.java
@@ -16,15 +16,19 @@
 
 package com.intellij.ide.impl.dataRules;
 
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataProvider;
+import com.intellij.openapi.actionSystem.LangDataKeys;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.*;
+import com.intellij.psi.PsiDirectory;
+import com.intellij.psi.PsiDirectoryContainer;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
 import com.intellij.usages.Usage;
 import com.intellij.usages.UsageTarget;
 import com.intellij.usages.UsageView;
@@ -40,46 +44,46 @@ public class VirtualFileArrayRule implements GetDataRule {
   public Object getData(final DataProvider dataProvider) {
     // Try to detect multiselection.
 
-    Project project = (Project)dataProvider.getData(DataConstants.PROJECT_CONTEXT);
+    Project project = PlatformDataKeys.PROJECT_CONTEXT.getData(dataProvider);
     if (project != null && !project.isDisposed()) {
       return ProjectRootManager.getInstance(project).getContentRoots();
     }
 
-    Module[] selectedModules = (Module[])dataProvider.getData(DataConstants.MODULE_CONTEXT_ARRAY);
+    Module[] selectedModules = LangDataKeys.MODULE_CONTEXT_ARRAY.getData(dataProvider);
     if (selectedModules != null && selectedModules.length > 0) {
       return getFilesFromModules(selectedModules);
     }
 
-    Module selectedModule = (Module)dataProvider.getData(DataConstants.MODULE_CONTEXT);
+    Module selectedModule = LangDataKeys.MODULE_CONTEXT.getData(dataProvider);
     if (selectedModule != null && !selectedModule.isDisposed()) {
       return ModuleRootManager.getInstance(selectedModule).getContentRoots();
     }
 
-    PsiElement[] psiElements = (PsiElement[])dataProvider.getData(DataConstants.PSI_ELEMENT_ARRAY);
+    PsiElement[] psiElements = LangDataKeys.PSI_ELEMENT_ARRAY.getData(dataProvider);
     if (psiElements != null && psiElements.length != 0) {
       return getFilesFromPsiElements(psiElements);
     }
 
     // VirtualFile -> VirtualFile[]
-    VirtualFile vFile = (VirtualFile)dataProvider.getData(DataConstants.VIRTUAL_FILE);
+    VirtualFile vFile = PlatformDataKeys.VIRTUAL_FILE.getData(dataProvider);
     if (vFile != null) {
       return new VirtualFile[]{vFile};
     }
 
     //
 
-    PsiFile psiFile = (PsiFile)dataProvider.getData(DataConstants.PSI_FILE);
+    PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataProvider);
     if (psiFile != null && psiFile.getVirtualFile() != null) {
       return new VirtualFile[]{psiFile.getVirtualFile()};
     }
 
-    PsiElement elem = (PsiElement)dataProvider.getData(DataConstants.PSI_ELEMENT);
+    PsiElement elem = LangDataKeys.PSI_ELEMENT.getData(dataProvider);
     if (elem != null) {
       return getFilesFromPsiElement(elem);
     }
 
-    Usage[] usages = (Usage[])dataProvider.getData(UsageView.USAGES);
-    UsageTarget[] usageTargets = (UsageTarget[])dataProvider.getData(UsageView.USAGE_TARGETS);
+    Usage[] usages = UsageView.USAGES_KEY.getData(dataProvider);
+    UsageTarget[] usageTargets = UsageView.USAGE_TARGETS_KEY.getData(dataProvider);
     if (usages != null || usageTargets != null)  {
       return getFilesFromUsages(usages, usageTargets);
     }

diff --git a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileRule.java b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileRule.java
index e3e8fbb3a71fb3afc5bd279457d28984fec7e081..95d4eeb783495d823ba430754c63bf29b0f21d22 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileRule.java
+++ b/platform/lang-impl/src/com/intellij/ide/impl/dataRules/VirtualFileRule.java
@@ -16,8 +16,9 @@
 
 package com.intellij.ide.impl.dataRules;
 
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataProvider;
+import com.intellij.openapi.actionSystem.LangDataKeys;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
@@ -26,7 +27,7 @@ import com.intellij.psi.util.PsiUtilBase;
 public class VirtualFileRule implements GetDataRule {
   public Object getData(final DataProvider dataProvider) {
     // Try to detect multiselection.
-    PsiElement[] psiElements = (PsiElement[])dataProvider.getData(DataConstants.PSI_ELEMENT_ARRAY);
+    PsiElement[] psiElements = LangDataKeys.PSI_ELEMENT_ARRAY.getData(dataProvider);
     if (psiElements != null) {
       for (PsiElement elem : psiElements) {
         VirtualFile virtualFile = PsiUtilBase.getVirtualFile(elem);
@@ -34,16 +35,16 @@ public class VirtualFileRule implements GetDataRule {
       }
     }
 
-    VirtualFile[] virtualFiles = (VirtualFile[])dataProvider.getData(DataConstants.VIRTUAL_FILE_ARRAY);
+    VirtualFile[] virtualFiles = PlatformDataKeys.VIRTUAL_FILE_ARRAY.getData(dataProvider);
     if (virtualFiles != null && virtualFiles.length == 1) {
       return virtualFiles[0];
     }
 
-    PsiFile psiFile = (PsiFile)dataProvider.getData(DataConstants.PSI_FILE);
+    PsiFile psiFile = LangDataKeys.PSI_FILE.getData(dataProvider);
     if (psiFile != null) {
       return psiFile.getVirtualFile();
     }
-    PsiElement elem = (PsiElement)dataProvider.getData(DataConstants.PSI_ELEMENT);
+    PsiElement elem = LangDataKeys.PSI_ELEMENT.getData(dataProvider);
     if (elem == null) {
       return null;
     }

diff --git a/platform/lang-impl/src/com/intellij/ide/macro/FileDirRelativeToProjectRootMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/FileDirRelativeToProjectRootMacro.java
index 45db0fe1bb0caf4d0ff4cebcb9ab6b8aa1561418..50e67ae8e975078df1dc7b963706c61231a13b5e 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/macro/FileDirRelativeToProjectRootMacro.java
+++ b/platform/lang-impl/src/com/intellij/ide/macro/FileDirRelativeToProjectRootMacro.java
@@ -17,7 +17,6 @@
 package com.intellij.ide.macro;
 
 import com.intellij.ide.IdeBundle;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.Project;
@@ -36,16 +35,24 @@ public class FileDirRelativeToProjectRootMacro extends Macro {
 
   public String expand(final DataContext dataContext) {
     final Project project = PlatformDataKeys.PROJECT.getData(dataContext);
-    if (project == null) return null;
-    VirtualFile file = (VirtualFile)dataContext.getData(DataConstants.VIRTUAL_FILE);
-    if (file == null) return null;
+    if (project == null) {
+      return null;
+    }
+    VirtualFile file = PlatformDataKeys.VIRTUAL_FILE.getData(dataContext);
+    if (file == null) {
+      return null;
+    }
     if (!file.isDirectory()) {
       file = file.getParent();
-      if (file == null) return null;
+      if (file == null) {
+        return null;
+      }
     }
 
     final VirtualFile contentRoot = ProjectRootManager.getInstance(project).getFileIndex().getContentRootForFile(file);
-    if (contentRoot == null) return null;
+    if (contentRoot == null) {
+      return null;
+    }
     return FileUtil.getRelativePath(getIOFile(contentRoot), getIOFile(file));
   }
 }

diff --git a/platform/lang-impl/src/com/intellij/ide/macro/FileDirRelativeToSourcepathMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/FileDirRelativeToSourcepathMacro.java
index d3dcb9dbe36d90d0b6d8828119649ae09ecf9a7f..9bc235915a8e91c3c31c3877e1df0eae0e5ad844 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/macro/FileDirRelativeToSourcepathMacro.java
+++ b/platform/lang-impl/src/com/intellij/ide/macro/FileDirRelativeToSourcepathMacro.java
@@ -17,7 +17,6 @@
 package com.intellij.ide.macro;
 
 import com.intellij.ide.IdeBundle;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.Project;
@@ -36,12 +35,18 @@ public class FileDirRelativeToSourcepathMacro extends Macro {
 
   public String expand(final DataContext dataContext) {
     final Project project = PlatformDataKeys.PROJECT.getData(dataContext);
-    if (project == null) return null;
-    VirtualFile file = (VirtualFile)dataContext.getData(DataConstants.VIRTUAL_FILE);
-    if (file == null) return null;
+    if (project == null) {
+      return null;
+    }
+    VirtualFile file = PlatformDataKeys.VIRTUAL_FILE.getData(dataContext);
+    if (file == null) {
+      return null;
+    }
     if (!file.isDirectory()) {
       file = file.getParent();
-      if (file == null) return null;
+      if (file == null) {
+        return null;
+      }
     }
     final VirtualFile sourceRoot = ProjectRootManager.getInstance(project).getFileIndex().getSourceRootForFile(file);
     if (sourceRoot == null) return null;

diff --git a/platform/lang-impl/src/com/intellij/ide/macro/FileExtMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/FileExtMacro.java
index dc267fa37a136124da75d3463a96733239f906b4..a875a40fd71701f4be7ebfa95085275f46e710fd 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/macro/FileExtMacro.java
+++ b/platform/lang-impl/src/com/intellij/ide/macro/FileExtMacro.java
@@ -17,8 +17,8 @@
 package com.intellij.ide.macro;
 
 import com.intellij.ide.IdeBundle;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.vfs.VirtualFile;
 
 public final class FileExtMacro extends Macro {
@@ -31,8 +31,10 @@ public final class FileExtMacro extends Macro {
   }
 
   public String expand(DataContext dataContext) {
-    VirtualFile file = (VirtualFile)dataContext.getData(DataConstants.VIRTUAL_FILE);
-    if (file == null ) return null;
+    VirtualFile file = PlatformDataKeys.VIRTUAL_FILE.getData(dataContext);
+    if (file == null) {
+      return null;
+    }
     return file.getExtension();
   }
 }

diff --git a/platform/lang-impl/src/com/intellij/ide/macro/FileNameWithoutExtension.java b/platform/lang-impl/src/com/intellij/ide/macro/FileNameWithoutExtension.java
index cdf97136a2f0f423a521a08840b6f1096d8c6c7a..c880d25e6901980e0cd359c633d53165dc59041c 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/macro/FileNameWithoutExtension.java
+++ b/platform/lang-impl/src/com/intellij/ide/macro/FileNameWithoutExtension.java
@@ -17,8 +17,8 @@
 package com.intellij.ide.macro;
 
 import com.intellij.ide.IdeBundle;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.vfs.VirtualFile;
 
 
@@ -32,8 +32,10 @@ public final class FileNameWithoutExtension extends FileNameMacro {
   }
 
   public String expand(DataContext dataContext) {
-    VirtualFile file = (VirtualFile)dataContext.getData(DataConstants.VIRTUAL_FILE);
-    if (file == null) return null;
+    VirtualFile file = PlatformDataKeys.VIRTUAL_FILE.getData(dataContext);
+    if (file == null) {
+      return null;
+    }
     return file.getNameWithoutExtension();
   }
 }
\ No newline at end of file

diff --git a/platform/lang-impl/src/com/intellij/ide/macro/FilePathRelativeToProjectRootMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/FilePathRelativeToProjectRootMacro.java
index 357140e7504fa3709f149d626065632be8deb242..6b8cb6d5b7e46c31df52cea4984deaa6176a76fa 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/macro/FilePathRelativeToProjectRootMacro.java
+++ b/platform/lang-impl/src/com/intellij/ide/macro/FilePathRelativeToProjectRootMacro.java
@@ -17,7 +17,6 @@
 package com.intellij.ide.macro;
 
 import com.intellij.ide.IdeBundle;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.Project;
@@ -36,11 +35,17 @@ public class FilePathRelativeToProjectRootMacro extends Macro {
 
   public String expand(final DataContext dataContext) {
     final Project project = PlatformDataKeys.PROJECT.getData(dataContext);
-    if (project == null) return null;
-    VirtualFile file = (VirtualFile)dataContext.getData(DataConstants.VIRTUAL_FILE);
-    if (file == null) return null;
+    if (project == null) {
+      return null;
+    }
+    VirtualFile file = PlatformDataKeys.VIRTUAL_FILE.getData(dataContext);
+    if (file == null) {
+      return null;
+    }
     final VirtualFile contentRoot = ProjectRootManager.getInstance(project).getFileIndex().getContentRootForFile(file);
-    if (contentRoot == null) return null;
+    if (contentRoot == null) {
+      return null;
+    }
     return FileUtil.getRelativePath(getIOFile(contentRoot), getIOFile(file));
   }
 }

diff --git a/platform/lang-impl/src/com/intellij/ide/macro/FilePathRelativeToSourcepathMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/FilePathRelativeToSourcepathMacro.java
index 3b0e4d06477a213f19902c40b4969c2c9424bbba..3c72e9dff46261c4075a8b53bab4d70a3eb2b825 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/macro/FilePathRelativeToSourcepathMacro.java
+++ b/platform/lang-impl/src/com/intellij/ide/macro/FilePathRelativeToSourcepathMacro.java
@@ -17,7 +17,6 @@
 package com.intellij.ide.macro;
 
 import com.intellij.ide.IdeBundle;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.Project;
@@ -36,11 +35,17 @@ public class FilePathRelativeToSourcepathMacro extends Macro {
 
   public String expand(final DataContext dataContext) {
     final Project project = PlatformDataKeys.PROJECT.getData(dataContext);
-    if (project == null) return null;
-    VirtualFile file = (VirtualFile)dataContext.getData(DataConstants.VIRTUAL_FILE);
-    if (file == null) return null;
+    if (project == null) {
+      return null;
+    }
+    VirtualFile file = PlatformDataKeys.VIRTUAL_FILE.getData(dataContext);
+    if (file == null) {
+      return null;
+    }
     final VirtualFile sourceRoot = ProjectRootManager.getInstance(project).getFileIndex().getSourceRootForFile(file);
-    if (sourceRoot == null) return null;
+    if (sourceRoot == null) {
+      return null;
+    }
     return FileUtil.getRelativePath(getIOFile(sourceRoot), getIOFile(file));
   }
 }

diff --git a/platform/lang-impl/src/com/intellij/ide/macro/FileRelativePathMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/FileRelativePathMacro.java
index 87c605489e7189abf5e0cd4bb673a3d21bd26c15..9d8230f1ed116362f5c234188de631e00412aaec 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/macro/FileRelativePathMacro.java
+++ b/platform/lang-impl/src/com/intellij/ide/macro/FileRelativePathMacro.java
@@ -16,9 +16,10 @@
 
 package com.intellij.ide.macro;
 
-import com.intellij.ide.DataAccessors;
 import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
+import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -33,12 +34,13 @@ public class FileRelativePathMacro extends Macro {
   }
 
   public String expand(DataContext dataContext) {
-    final VirtualFile baseDir = DataAccessors.PROJECT_BASE_DIR.from(dataContext);
+    Project project = PlatformDataKeys.PROJECT.getData(dataContext);
+    final VirtualFile baseDir = project == null ? null : project.getBaseDir();
     if (baseDir == null) {
       return null;
     }
 
-    VirtualFile file = DataAccessors.VIRTUAL_FILE.from(dataContext);
+    VirtualFile file = PlatformDataKeys.VIRTUAL_FILE.getData(dataContext);
     if (file == null) return null;
     return FileUtil.getRelativePath(VfsUtil.virtualToIoFile(baseDir), VfsUtil.virtualToIoFile(file));
   }

diff --git a/platform/lang-impl/src/com/intellij/ide/macro/MacroManager.java b/platform/lang-impl/src/com/intellij/ide/macro/MacroManager.java
index 60c17cdcb0d36e52e6a5ea621cf054776023d1c7..ceeffa3c7da2e81ec4e314ef63dd46bd119cd981 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/macro/MacroManager.java
+++ b/platform/lang-impl/src/com/intellij/ide/macro/MacroManager.java
@@ -19,7 +19,6 @@ package com.intellij.ide.macro;
 import com.intellij.ide.DataManager;
 import com.intellij.ide.IdeEventQueue;
 import com.intellij.ide.impl.DataManagerImpl;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.components.ServiceManager;
@@ -58,7 +57,6 @@ public final class MacroManager {
     registerMacro(new JdkPathMacro());
     registerMacro(new PromptMacro());
     registerMacro(new SourcepathEntryMacro());
-    //registerMacro(new ProjectFilePathMacro());
     registerMacro(new ProjectFileDirMacro());
     registerMacro(new ProjectNameMacro());
     registerMacro(new ProjectPathMacro());
@@ -101,15 +99,20 @@ public final class MacroManager {
   }
 
   private static DataContext getCorrectContext(DataContext dataContext) {
-    if (dataContext.getData(DataConstants.FILE_EDITOR) != null) return dataContext;
+    if (PlatformDataKeys.FILE_EDITOR.getData(dataContext) != null) {
+      return dataContext;
+    }
     Project project = PlatformDataKeys.PROJECT.getData(dataContext);
-    if (project == null) return dataContext;
+    if (project == null) {
+      return dataContext;
+    }
     FileEditorManager editorManager = FileEditorManager.getInstance(project);
     VirtualFile[] files = editorManager.getSelectedFiles();
-    if (files.length == 0) return dataContext;
+    if (files.length == 0) {
+      return dataContext;
+    }
     FileEditor fileEditor = editorManager.getSelectedEditor(files[0]);
-    return fileEditor == null ? dataContext :
-      DataManager.getInstance().getDataContext(fileEditor.getComponent());
+    return fileEditor == null ? dataContext : DataManager.getInstance().getDataContext(fileEditor.getComponent());
   }
 
   /**

diff --git a/platform/lang-impl/src/com/intellij/ide/macro/ModulePathMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/ModulePathMacro.java
index 3d27521a17c431d47722f4314bcdc6b620369cfd..f40aaf4eb37a9df6534f78181aeb2fd248875a41 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/macro/ModulePathMacro.java
+++ b/platform/lang-impl/src/com/intellij/ide/macro/ModulePathMacro.java
@@ -16,9 +16,9 @@
 
 package com.intellij.ide.macro;
 
-import com.intellij.ide.DataAccessors;
 import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.roots.ProjectRootsTraversing;
 
@@ -32,7 +32,7 @@ public final class ModulePathMacro extends Macro {
   }
 
   public String expand(DataContext dataContext) {
-    final Module module = DataAccessors.MODULE.from(dataContext);
+    final Module module = LangDataKeys.MODULE.getData(dataContext);
     if (module == null) {
       return null;
     }

diff --git a/platform/lang-impl/src/com/intellij/ide/macro/ProjectFilePathMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/ProjectFilePathMacro.java
deleted file mode 100644 (file)
index bd5e586..0000000
--- a/platform/lang-impl/src/com/intellij/ide/macro/ProjectFilePathMacro.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2000-2009 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.intellij.ide.macro;
-
-import com.intellij.ide.DataAccessors;
-import com.intellij.ide.IdeBundle;
-import com.intellij.openapi.actionSystem.DataContext;
-
-public final class ProjectFilePathMacro extends Macro {
-  public String getName() {
-    return "ProjectFilePath";
-  }
-
-  public String getDescription() {
-    return IdeBundle.message("macro.project.file.path");
-  }
-
-  public String expand(DataContext dataContext) {
-    return DataAccessors.PROJECT_FILE_PATH.from(dataContext);
-  }
-}
\ No newline at end of file

diff --git a/platform/lang-impl/src/com/intellij/ide/macro/SourcepathEntryMacro.java b/platform/lang-impl/src/com/intellij/ide/macro/SourcepathEntryMacro.java
index 0c89c4895fceffd56e43c35fcbdc4063d638b985..18b1102979826c3e6216feb82bde0b5027aefb89 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/macro/SourcepathEntryMacro.java
+++ b/platform/lang-impl/src/com/intellij/ide/macro/SourcepathEntryMacro.java
@@ -17,7 +17,6 @@
 package com.intellij.ide.macro;
 
 import com.intellij.ide.IdeBundle;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.Project;
@@ -38,11 +37,17 @@ public final class SourcepathEntryMacro extends Macro {
 
   public String expand(final DataContext dataContext) {
     final Project project = PlatformDataKeys.PROJECT.getData(dataContext);
-    if (project == null) return null;
-    VirtualFile file = (VirtualFile)dataContext.getData(DataConstants.VIRTUAL_FILE);
-    if (file == null) return null;
+    if (project == null) {
+      return null;
+    }
+    VirtualFile file = PlatformDataKeys.VIRTUAL_FILE.getData(dataContext);
+    if (file == null) {
+      return null;
+    }
     final VirtualFile sourceRoot = ProjectRootManager.getInstance(project).getFileIndex().getSourceRootForFile(file);
-    if (sourceRoot == null) return null;
+    if (sourceRoot == null) {
+      return null;
+    }
     return getPath(sourceRoot);
   }
-}
\ No newline at end of file
+}

diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java
index a93266fcf8661c874993e1c0d4c2ca35031e4d2c..f6543b068f608933e3de2ac5963b69519cb55eae 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java
@@ -286,7 +286,7 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner {
   private void updateModel() {
     DataContext context = DataManager.getInstance().getDataContext();
 
-    if (context.getData(DataConstants.IDE_VIEW) == myIdeView || context.getData(DataConstants.PROJECT) != myProject || isNodePopupShowing()) {
+    if (LangDataKeys.IDE_VIEW.getData(context) == myIdeView || PlatformDataKeys.PROJECT.getData(context) != myProject || isNodePopupShowing()) {
       scheduleModelUpdate();
       return;
     }
@@ -617,10 +617,10 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner {
 
   @Nullable
   public Object getData(String dataId) {
-    if (dataId.equals(DataConstants.PROJECT)) {
+    if (PlatformDataKeys.PROJECT.is(dataId)) {
       return !myProject.isDisposed() ? myProject : null;
     }
-    if (dataId.equals(DataConstants.MODULE)) {
+    if (LangDataKeys.MODULE.is(dataId)) {
       final Module module = getSelectedElement(Module.class);
       if (module != null && !module.isDisposed()) return module;
       final PsiElement element = getSelectedElement(PsiElement.class);
@@ -629,7 +629,7 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner {
       }
       return null;
     }
-    if (dataId.equals(DataConstants.MODULE_CONTEXT)) {
+    if (LangDataKeys.MODULE_CONTEXT.is(dataId)) {
       final PsiDirectory directory = getSelectedElement(PsiDirectory.class);
       if (directory != null) {
         final VirtualFile dir = directory.getVirtualFile();
@@ -639,17 +639,17 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner {
       }
       return null;
     }
-    if (dataId.equals(DataConstants.PSI_ELEMENT)) {
+    if (LangDataKeys.PSI_ELEMENT.is(dataId)) {
       final PsiElement element = getSelectedElement(PsiElement.class);
       return element != null && element.isValid() ? element : null;
     }
-    if (dataId.equals(DataConstants.PSI_ELEMENT_ARRAY)) {
+    if (LangDataKeys.PSI_ELEMENT_ARRAY.is(dataId)) {
       final PsiElement element = getSelectedElement(PsiElement.class);
       return element != null && element.isValid() ? new PsiElement[]{element} : null;
     }
 
-    if (dataId.equals(DataConstants.VIRTUAL_FILE_ARRAY)) {
-      PsiElement[] psiElements = (PsiElement[])getData(DataConstants.PSI_ELEMENT_ARRAY);
+    if (PlatformDataKeys.VIRTUAL_FILE_ARRAY.is(dataId)) {
+      PsiElement[] psiElements = (PsiElement[])getData(LangDataKeys.PSI_ELEMENT_ARRAY.getName());
       if (psiElements == null) return null;
       Set<VirtualFile> files = new LinkedHashSet<VirtualFile>();
       for (PsiElement element : psiElements) {
@@ -660,23 +660,23 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner {
       return files.size() > 0 ? VfsUtil.toVirtualFileArray(files) : null;
     }
 
-    if (dataId.equals(DataConstants.CONTEXT_COMPONENT)) {
+    if (PlatformDataKeys.CONTEXT_COMPONENT.is(dataId)) {
       return this;
     }
-    if (DataConstants.CUT_PROVIDER.equals(dataId)) {
+    if (PlatformDataKeys.CUT_PROVIDER.is(dataId)) {
       return myCopyPasteDelegator.getCutProvider();
     }
-    if (DataConstants.COPY_PROVIDER.equals(dataId)) {
+    if (PlatformDataKeys.COPY_PROVIDER.is(dataId)) {
       return myCopyPasteDelegator.getCopyProvider();
     }
-    if (DataConstants.PASTE_PROVIDER.equals(dataId)) {
+    if (PlatformDataKeys.PASTE_PROVIDER.is(dataId)) {
       return myCopyPasteDelegator.getPasteProvider();
     }
-    if (DataConstants.DELETE_ELEMENT_PROVIDER.equals(dataId)) {
+    if (PlatformDataKeys.DELETE_ELEMENT_PROVIDER.is(dataId)) {
       return getSelectedElement(Module.class) != null ? myDeleteModuleProvider : new DeleteHandler.DefaultDeleteProvider();
     }
 
-    if (DataConstants.IDE_VIEW.equals(dataId)) {
+    if (LangDataKeys.IDE_VIEW.is(dataId)) {
       return myIdeView;
     }
 

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/actions/MoveModulesOutsideGroupAction.java b/platform/lang-impl/src/com/intellij/ide/projectView/actions/MoveModulesOutsideGroupAction.java
index bd0c4a27972e61fe508eab3ab697023d8ecfa3bf..da639e23a87ea2754187b16ef76896e85d82b04f 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/projectView/actions/MoveModulesOutsideGroupAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/actions/MoveModulesOutsideGroupAction.java
@@ -22,8 +22,8 @@ package com.intellij.ide.projectView.actions;
 import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.module.Module;
 
 public class MoveModulesOutsideGroupAction extends AnAction {
@@ -34,7 +34,7 @@ public class MoveModulesOutsideGroupAction extends AnAction {
 
   public void actionPerformed(AnActionEvent e) {
     final DataContext dataContext = e.getDataContext();
-    final Module[] modules = (Module[])dataContext.getData(DataConstants.MODULE_CONTEXT_ARRAY);
+    final Module[] modules = LangDataKeys.MODULE_CONTEXT_ARRAY.getData(dataContext);
     MoveModulesToGroupAction.doMove(modules, null, dataContext);
   }
 }
\ No newline at end of file

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/actions/MoveModulesToGroupAction.java b/platform/lang-impl/src/com/intellij/ide/projectView/actions/MoveModulesToGroupAction.java
index cda91de0d2052be1eb87aa57ad868470b7675f03..68616eeedefa5f09c9d881c1b07f0368079440b0 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/projectView/actions/MoveModulesToGroupAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/actions/MoveModulesToGroupAction.java
@@ -24,7 +24,6 @@ import com.intellij.ide.projectView.ProjectView;
 import com.intellij.ide.projectView.impl.AbstractProjectViewPane;
 import com.intellij.ide.projectView.impl.ModuleGroup;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
 import com.intellij.openapi.module.ModifiableModuleModel;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.impl.ModuleManagerImpl;
@@ -43,7 +42,7 @@ public class MoveModulesToGroupAction extends AnAction {
   public void update(AnActionEvent e) {
     Presentation presentation = getTemplatePresentation();
     final DataContext dataContext = e.getDataContext();
-    final Module[] modules = (Module[])dataContext.getData(DataConstants.MODULE_CONTEXT_ARRAY);
+    final Module[] modules = LangDataKeys.MODULE_CONTEXT_ARRAY.getData(dataContext);
 
     String description = IdeBundle.message("message.move.modules.to.group", whatToMove(modules), myModuleGroup.presentableText());
     presentation.setDescription(description);
@@ -55,7 +54,7 @@ public class MoveModulesToGroupAction extends AnAction {
 
   public void actionPerformed(AnActionEvent e) {
     final DataContext dataContext = e.getDataContext();
-    final Module[] modules = (Module[])dataContext.getData(DataConstants.MODULE_CONTEXT_ARRAY);
+    final Module[] modules = LangDataKeys.MODULE_CONTEXT_ARRAY.getData(dataContext);
     doMove(modules, myModuleGroup, dataContext);
   }
 
@@ -63,7 +62,7 @@ public class MoveModulesToGroupAction extends AnAction {
     Project project = modules[0].getProject();
     for (final Module module : modules) {
       ModifiableModuleModel model = dataContext != null
-                                    ? (ModifiableModuleModel)dataContext.getData(DataConstantsEx.MODIFIABLE_MODULE_MODEL)
+                                    ? LangDataKeys.MODIFIABLE_MODULE_MODEL.getData(dataContext)
                                     : null;
       if (model != null){
         model.setModuleGroupPath(module, group == null ? null : group.getGroupPath());
@@ -86,4 +85,4 @@ public class MoveModulesToGroupAction extends AnAction {
       }
     }
   }
-}
\ No newline at end of file
+}

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/actions/MoveModulesToSubGroupAction.java b/platform/lang-impl/src/com/intellij/ide/projectView/actions/MoveModulesToSubGroupAction.java
index dd2443ceaf53796926ad26b9d68903451f29002c..d44e47b603293aae1dbe73b2f51facafe046b3ed 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/projectView/actions/MoveModulesToSubGroupAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/actions/MoveModulesToSubGroupAction.java
@@ -22,8 +22,8 @@ package com.intellij.ide.projectView.actions;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.projectView.impl.ModuleGroup;
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.ui.Messages;
@@ -42,7 +42,7 @@ public class MoveModulesToSubGroupAction extends MoveModulesToGroupAction {
 
   public void actionPerformed(AnActionEvent e) {
     final DataContext dataContext = e.getDataContext();
-    final Module[] modules = (Module[])dataContext.getData(DataConstants.MODULE_CONTEXT_ARRAY);
+    final Module[] modules = LangDataKeys.MODULE_CONTEXT_ARRAY.getData(dataContext);
     final String[] newGroup;
     if (myModuleGroup != null) {
       String message = IdeBundle.message("prompt.specify.name.of.module.subgroup", myModuleGroup.presentableText(), whatToMove(modules));
@@ -59,4 +59,4 @@ public class MoveModulesToSubGroupAction extends MoveModulesToGroupAction {
 
     doMove(modules, new ModuleGroup(newGroup), dataContext);
   }
-}
\ No newline at end of file
+}

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java
index 16117dabf43cfd7a23c2ee1f67fb22dc9a56b98b..ee435d453f58efe190320ad3d85d2fc4520bd234 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java
@@ -31,10 +31,10 @@ import com.intellij.ide.projectView.impl.nodes.AbstractProjectNode;
 import com.intellij.ide.projectView.impl.nodes.ModuleGroupNode;
 import com.intellij.ide.util.treeView.*;
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.actionSystem.DataProvider;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.ExtensionPointName;
@@ -212,7 +212,7 @@ public abstract class AbstractProjectViewPane implements DataProvider, Disposabl
   }
 
   public Object getData(String dataId) {
-    if (DataConstants.NAVIGATABLE_ARRAY.equals(dataId)) {
+    if (PlatformDataKeys.NAVIGATABLE_ARRAY.is(dataId)) {
       TreePath[] paths = getSelectionPaths();
       if (paths == null) return null;
       final ArrayList<Navigatable> navigatables = new ArrayList<Navigatable>();
@@ -545,7 +545,7 @@ public abstract class AbstractProjectViewPane implements DataProvider, Disposabl
     public void dragGestureRecognized(DragGestureEvent dge) {
       if ((dge.getDragAction() & DnDConstants.ACTION_COPY_OR_MOVE) == 0) return;
       DataContext dataContext = DataManager.getInstance().getDataContext();
-      ProjectView projectView = (ProjectView)dataContext.getData(ProjectViewImpl.PROJECT_VIEW_DATA_CONSTANT);
+      ProjectView projectView = ProjectViewImpl.DATA_KEY.getData(dataContext);
       if (projectView == null) return;
 
       final AbstractProjectViewPane currentPane = projectView.getCurrentProjectViewPane();

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ModuleGroup.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ModuleGroup.java
index 1429492d9b2fcb54e05d3f67f2cb47dd0094cea6..a3b388180205b402f998d89aae56684a6144151b 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ModuleGroup.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ModuleGroup.java
@@ -19,9 +19,10 @@
  */
 package com.intellij.ide.projectView.impl;
 
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
+import com.intellij.openapi.actionSystem.DataKey;
+import com.intellij.openapi.actionSystem.LangDataKeys;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.module.ModifiableModuleModel;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
@@ -33,6 +34,8 @@ import org.jetbrains.annotations.NotNull;
 import java.util.*;
 
 public class ModuleGroup {
+  public static final DataKey<ModuleGroup[]> ARRAY_DATA_KEY = DataKey.create("moduleGroup.array");
+
   private final String[] myGroupPath;
 
   public ModuleGroup(@NotNull String[] groupPath) {
@@ -77,8 +80,7 @@ public class ModuleGroup {
   }
 
   public Collection<ModuleGroup> childGroups(DataContext dataContext) {
-    return childGroups((ModifiableModuleModel)dataContext.getData(DataConstantsEx.MODIFIABLE_MODULE_MODEL),
-                       (Project)dataContext.getData(DataConstants.PROJECT));
+    return childGroups(LangDataKeys.MODIFIABLE_MODULE_MODEL.getData(dataContext), PlatformDataKeys.PROJECT.getData(dataContext));
   }
 
   public Collection<ModuleGroup> childGroups(ModifiableModuleModel model, Project project) {

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/MoveDropTargetListener.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/MoveDropTargetListener.java
index 72dd63f40d3a8f297e19af9cce576d274899b0e7..dda8641229a56d1f22eb2c6c6f1568c484438e1e 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/MoveDropTargetListener.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/MoveDropTargetListener.java
@@ -19,7 +19,7 @@ package com.intellij.ide.projectView.impl;
 import com.intellij.ide.DataManager;
 import com.intellij.ide.projectView.impl.nodes.DropTargetNode;
 import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
+import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -311,7 +311,7 @@ class MoveDropTargetListener implements DropTargetListener {
       getActionHandler(dataContext).invoke(myProject, sourceElements, new DataContext() {
         @Nullable
         public Object getData(@NonNls String dataId) {
-          if (dataId.equals(DataConstantsEx.TARGET_PSI_ELEMENT)) {
+          if (LangDataKeys.TARGET_PSI_ELEMENT.is(dataId)) {
             return targetElement;
           }
           else {
@@ -322,7 +322,7 @@ class MoveDropTargetListener implements DropTargetListener {
     }
 
     private RefactoringActionHandler getActionHandler(final DataContext dataContext) {
-      final MoveAction.MoveProvider moveProvider = (MoveAction.MoveProvider)dataContext.getData(MoveAction.MOVE_PROVIDER);
+      final MoveAction.MoveProvider moveProvider = MoveAction.MoveProvider.DATA_KEY.getData(dataContext);
       if (moveProvider != null) {
         return moveProvider.getHandler(dataContext);
       }

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/MoveModuleToGroup.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/MoveModuleToGroup.java
index eff896acedd57ab017d6022dba1c789751b4295a..70752bf5c4595492bc7ed872afa52337114d3e25 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/MoveModuleToGroup.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/MoveModuleToGroup.java
@@ -25,6 +25,7 @@ import com.intellij.ide.projectView.actions.MoveModulesToSubGroupAction;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -42,16 +43,17 @@ public class MoveModuleToGroup extends ActionGroup {
 
   public void update(AnActionEvent e){
     final DataContext dataContext = e.getDataContext();
-    final Project project = (Project)dataContext.getData(DataConstants.PROJECT);
-    final Module[] modules = (Module[])dataContext.getData(DataConstants.MODULE_CONTEXT_ARRAY);
+    final Project project = PlatformDataKeys.PROJECT.getData(dataContext);
+    final Module[] modules = LangDataKeys.MODULE_CONTEXT_ARRAY.getData(dataContext);
     boolean active = project != null && modules != null && modules.length != 0;
     final Presentation presentation = e.getPresentation();
     presentation.setVisible(active);
     presentation.setText(myModuleGroup.presentableText());
   }
 
+  @NotNull
   public AnAction[] getChildren(@Nullable AnActionEvent e) {
-    if (e == null) return AnAction.EMPTY_ARRAY;
+    if (e == null) return EMPTY_ARRAY;
 
     List<ModuleGroup> children = new ArrayList<ModuleGroup>(myModuleGroup.childGroups(e.getDataContext()));
     Collections.sort ( children, new Comparator<ModuleGroup>() {

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/MoveModuleToGroupTopLevel.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/MoveModuleToGroupTopLevel.java
index 6377e583e3f7e6d842627eb2b0e58e950417fab6..3b529b5d33af9d7bb3adf03e929a12bd06bef222 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/MoveModuleToGroupTopLevel.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/MoveModuleToGroupTopLevel.java
@@ -22,11 +22,11 @@ package com.intellij.ide.projectView.impl;
 import com.intellij.ide.projectView.actions.MoveModulesOutsideGroupAction;
 import com.intellij.ide.projectView.actions.MoveModulesToSubGroupAction;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
 import com.intellij.openapi.module.ModifiableModuleModel;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.Project;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
@@ -34,14 +34,17 @@ import java.util.*;
 public class MoveModuleToGroupTopLevel extends ActionGroup {
   public void update(AnActionEvent e){
     final DataContext dataContext = e.getDataContext();
-    final Project project = (Project)dataContext.getData(DataConstants.PROJECT);
-    final Module[] modules = (Module[])dataContext.getData(DataConstants.MODULE_CONTEXT_ARRAY);
+    final Project project = PlatformDataKeys.PROJECT.getData(dataContext);
+    final Module[] modules = LangDataKeys.MODULE_CONTEXT_ARRAY.getData(dataContext);
     boolean active = project != null && modules != null && modules.length != 0;
     e.getPresentation().setVisible(active);
   }
 
+  @NotNull
   public AnAction[] getChildren(@Nullable AnActionEvent e) {
-    if (e == null) return AnAction.EMPTY_ARRAY;
+    if (e == null) {
+      return EMPTY_ARRAY;
+    }
     List<String> topLevelGroupNames = new ArrayList<String> (getTopLevelGroupNames(e.getDataContext()));
     Collections.sort ( topLevelGroupNames );
 
@@ -56,9 +59,9 @@ public class MoveModuleToGroupTopLevel extends ActionGroup {
   }
 
   private static Collection<String> getTopLevelGroupNames(final DataContext dataContext) {
-    final Project project = (Project)dataContext.getData(DataConstants.PROJECT);
+    final Project project =PlatformDataKeys.PROJECT.getData(dataContext);
 
-    final ModifiableModuleModel model = (ModifiableModuleModel)dataContext.getData(DataConstantsEx.MODIFIABLE_MODULE_MODEL);
+    final ModifiableModuleModel model = LangDataKeys.MODIFIABLE_MODULE_MODEL.getData(dataContext);
 
     Module[] allModules;
     if ( model != null ) {
@@ -81,4 +84,4 @@ public class MoveModuleToGroupTopLevel extends ActionGroup {
     }
     return topLevelGroupNames;
   }
-}
\ No newline at end of file
+}

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
index 18f27794c2871a67fcaace6cd8410bb380d831e5..2ae075af88a4842449948cc3ce1d6138b842d11c 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
@@ -36,7 +36,6 @@ import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.ide.util.treeView.NodeDescriptor;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
-import com.intellij.openapi.actionSystem.ex.DataConstantsEx;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.application.ex.ApplicationInfoEx;
@@ -156,7 +155,9 @@ public final class ProjectViewImpl extends ProjectView implements PersistentStat
   private final Map<String, AbstractProjectViewPane> myId2Pane = new LinkedHashMap<String, AbstractProjectViewPane>();
   private final Collection<AbstractProjectViewPane> myUninitializedPanes = new THashSet<AbstractProjectViewPane>();
 
-  static final String PROJECT_VIEW_DATA_CONSTANT = "com.intellij.ide.projectView.impl.ProjectViewImpl";
+  static final DataKey<ProjectViewImpl> DATA_KEY = DataKey.create("com.intellij.ide.projectView.impl.ProjectViewImpl");
+  @Deprecated static final String PROJECT_VIEW_DATA_CONSTANT = DATA_KEY.getName();
+
   private DefaultActionGroup myActionGroup;
   private final Runnable myTreeChangeListener;
   private String mySavedPaneId = ProjectViewPane.ID;
@@ -755,7 +756,7 @@ public final class ProjectViewImpl extends ProjectView implements PersistentStat
       }
     }
     if (title == null) {
-      final PsiElement element = (PsiElement)myDataProvider.getData(DataConstants.PSI_ELEMENT);
+      final PsiElement element = (PsiElement)myDataProvider.getData(LangDataKeys.PSI_ELEMENT.getName());
       if (element != null) {
         PsiFile file = element.getContainingFile();
         if (file != null) {
@@ -977,20 +978,20 @@ public final class ProjectViewImpl extends ProjectView implements PersistentStat
         if (paneSpecificData != null) return paneSpecificData;
       }
       
-      if (DataConstants.PSI_ELEMENT.equals(dataId)) {
+      if (LangDataKeys.PSI_ELEMENT.is(dataId)) {
         if (currentProjectViewPane == null) return null;
         final PsiElement[] elements = currentProjectViewPane.getSelectedPSIElements();
         return elements.length == 1 ? elements[0] : null;
       }
-      if (DataConstants.PSI_ELEMENT_ARRAY.equals(dataId)) {
+      if (LangDataKeys.PSI_ELEMENT_ARRAY.is(dataId)) {
         if (currentProjectViewPane == null) {
           return null;
         }
         PsiElement[] elements = currentProjectViewPane.getSelectedPSIElements();
         return elements.length == 0 ? null : elements;
       }
-      if (DataConstants.VIRTUAL_FILE_ARRAY.equals(dataId)) {
-        PsiElement[] psiElements = (PsiElement[])getData(DataConstants.PSI_ELEMENT_ARRAY);
+      if (PlatformDataKeys.VIRTUAL_FILE_ARRAY.is(dataId)) {
+        PsiElement[] psiElements = (PsiElement[])getData(LangDataKeys.PSI_ELEMENT_ARRAY.getName());
         if (psiElements == null) return null;
         Set<VirtualFile> files = new LinkedHashSet<VirtualFile>();
         for (PsiElement element : psiElements) {
@@ -1000,22 +1001,22 @@ public final class ProjectViewImpl extends ProjectView implements PersistentStat
         }
         return files.size() > 0 ? VfsUtil.toVirtualFileArray(files) : null;
       }
-      if (DataConstantsEx.TARGET_PSI_ELEMENT.equals(dataId)) {
+      if (LangDataKeys.TARGET_PSI_ELEMENT.is(dataId)) {
         return null;
       }
-      if (DataConstants.CUT_PROVIDER.equals(dataId)) {
+      if (PlatformDataKeys.CUT_PROVIDER.is(dataId)) {
         return myCopyPasteDelegator.getCutProvider();
       }
-      if (DataConstants.COPY_PROVIDER.equals(dataId)) {
+      if (PlatformDataKeys.COPY_PROVIDER.is(dataId)) {
         return myCopyPasteDelegator.getCopyProvider();
       }
-      if (DataConstants.PASTE_PROVIDER.equals(dataId)) {
+      if (PlatformDataKeys.PASTE_PROVIDER.is(dataId)) {
         return myCopyPasteDelegator.getPasteProvider();
       }
-      if (DataConstants.IDE_VIEW.equals(dataId)) {
+      if (LangDataKeys.IDE_VIEW.is(dataId)) {
         return myIdeView;
       }
-      if (DataConstants.DELETE_ELEMENT_PROVIDER.equals(dataId)) {
+      if (PlatformDataKeys.DELETE_ELEMENT_PROVIDER.is(dataId)) {
         final List<Module> modules = getSelectedElements(Module.class);
         if (!modules.isEmpty()) {
           return myDeleteModuleProvider;
@@ -1034,17 +1035,17 @@ public final class ProjectViewImpl extends ProjectView implements PersistentStat
         }
         return myDeletePSIElementProvider;
       }
-      if (DataConstants.HELP_ID.equals(dataId)) {
+      if (PlatformDataKeys.HELP_ID.is(dataId)) {
         return HelpID.PROJECT_VIEWS;
       }
-      if (PROJECT_VIEW_DATA_CONSTANT.equals(dataId)) {
+      if (ProjectViewImpl.DATA_KEY.is(dataId)) {
         return ProjectViewImpl.this;
       }
-      if (DataConstants.PROJECT_CONTEXT.equals(dataId)) {
+      if (PlatformDataKeys.PROJECT_CONTEXT.is(dataId)) {
         Object selected = getSelectedNodeElement();
         return selected instanceof Project ? selected : null;
       }
-      if (DataConstants.MODULE_CONTEXT.equals(dataId)) {
+      if (LangDataKeys.MODULE_CONTEXT.is(dataId)) {
         Object selected = getSelectedNodeElement();
         if (selected instanceof Module) {
           return !((Module)selected).isDisposed() ? selected : null;
@@ -1060,18 +1061,18 @@ public final class ProjectViewImpl extends ProjectView implements PersistentStat
         }
       }
 
-      if (DataConstants.MODULE_CONTEXT_ARRAY.equals(dataId)) {
+      if (LangDataKeys.MODULE_CONTEXT_ARRAY.is(dataId)) {
         return getSelectedModules();
       }
-      if (DataConstantsEx.MODULE_GROUP_ARRAY.equals(dataId)) {
+      if (ModuleGroup.ARRAY_DATA_KEY.is(dataId)) {
         final List<ModuleGroup> selectedElements = getSelectedElements(ModuleGroup.class);
         return selectedElements.isEmpty() ? null : selectedElements.toArray(new ModuleGroup[selectedElements.size()]);
       }
-      if (DataConstantsEx.LIBRARY_GROUP_ARRAY.equals(dataId)) {
+      if (LibraryGroupElement.ARRAY_DATA_KEY.is(dataId)) {
         final List<LibraryGroupElement> selectedElements = getSelectedElements(LibraryGroupElement.class);
         return selectedElements.isEmpty() ? null : selectedElements.toArray(new LibraryGroupElement[selectedElements.size()]);
       }
-      if (DataConstantsEx.NAMED_LIBRARY_ARRAY.equals(dataId)) {
+      if (NamedLibraryElement.ARRAY_DATA_KEY.is(dataId)) {
         final List<NamedLibraryElement> selectedElements = getSelectedElements(NamedLibraryElement.class);
         return selectedElements.isEmpty() ? null : selectedElements.toArray(new NamedLibraryElement[selectedElements.size()]);
       }

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/LibraryGroupElement.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/LibraryGroupElement.java
index 6e8b415c8118bf6342a645647b4aeedb2813ed5f..23331c1e5702bf0c6f8611ee01cb9a1d5ea36aa3 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/LibraryGroupElement.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/LibraryGroupElement.java
@@ -16,6 +16,7 @@
 
 package com.intellij.ide.projectView.impl.nodes;
 
+import com.intellij.openapi.actionSystem.DataKey;
 import com.intellij.openapi.module.Module;
 
 /**
@@ -24,6 +25,8 @@ import com.intellij.openapi.module.Module;
  * Time: 7:08:03 PM
  */
 public final class LibraryGroupElement {
+  public static final DataKey<LibraryGroupElement[]> ARRAY_DATA_KEY = DataKey.create("libraryGroup.array");
+  
   private final Module myModule;
 
   public LibraryGroupElement(Module module) {

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NamedLibraryElement.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NamedLibraryElement.java
index c95d5ef98d75109c36f24624e4affcf4605c64d2..f315552d32cfe806e69142e18e4c3b65d39d897d 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NamedLibraryElement.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NamedLibraryElement.java
@@ -16,6 +16,7 @@
 
 package com.intellij.ide.projectView.impl.nodes;
 
+import com.intellij.openapi.actionSystem.DataKey;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.roots.OrderEntry;
 import com.intellij.openapi.util.Comparing;
@@ -26,6 +27,8 @@ import com.intellij.openapi.util.Comparing;
  * Time: 7:08:30 PM
  */
 public final class NamedLibraryElement {
+  public static final DataKey<NamedLibraryElement[]> ARRAY_DATA_KEY = DataKey.create("namedLibrary.array");
+
   private final Module myContextModule;
   private final OrderEntry myEntry;
 

diff --git a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java
index 33d283c8da7dd16928c870897e6959291032e312..84474567797c6d1642c887856acf05b0f93357a8 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java
+++ b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java
@@ -34,8 +34,9 @@ import com.intellij.ide.util.DeleteHandler;
 import com.intellij.ide.util.DirectoryChooserUtil;
 import com.intellij.ide.util.EditorHelper;
 import com.intellij.openapi.Disposable;
-import com.intellij.openapi.actionSystem.DataConstants;
 import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.actionSystem.LangDataKeys;
+import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.colors.CodeInsightColors;
@@ -230,7 +231,7 @@ public class ScopeTreeViewPanel extends JPanel implements JDOMExternalizable, Di