Merge remote-tracking branch 'origin/master'

platform/lang-api/src/com/intellij/codeInspection/InspectionProfileEntry.java

@@ -247,16 +247,12 @@ public abstract class InspectionProfileEntry {
    * Override this method to return a html inspection description. Otherwise it will be loaded from resources using ID.
    *
    * @return hard-code inspection description.
-   * @deprecated this won't work for inspections configured via {@link InspectionEP}
    */
   @Nullable
   public String getStaticDescription() {
     return null;
   }
 
-  /**
-   * @deprecated this won't work for inspections configured via {@link InspectionEP}
-   */
   @Nullable
   public String getDescriptionFileName() {
     return null;

platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionToolWrapper.java

@@ -159,7 +159,7 @@ public abstract class InspectionToolWrapper<T extends InspectionProfileEntry, E
 
   @Nullable
   public String getStaticDescription() {
-    return myEP == null ? getTool().getStaticDescription() : null;
+    return getTool().getStaticDescription();
   }
 
   @Override

platform/platform-api/src/com/intellij/openapi/util/DimensionService.java

@@ -78,7 +78,7 @@ public class DimensionService implements PersistentStateComponent<Element>, Appl
    * @return point stored under the specified <code>key</code>. The method returns
    * <code>null</code> if there is no stored value under the <code>key</code>. If point
    * is outside of current screen bounds then the method returns <code>null</code>. It
-   * properly works in multimonitor configuration.
+   * properly works in multi-monitor configuration.
    * @exception java.lang.IllegalArgumentException if <code>key</code> is <code>null</code>.
    * @param key a String key to perform a query for.
    */

platform/platform-impl/src/com/intellij/openapi/vfs/impl/jar/JarHandler.java

@@ -22,6 +22,7 @@ package com.intellij.openapi.vfs.impl.jar;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.application.PathManager;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.ui.Messages;
@@ -43,6 +44,8 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 public class JarHandler extends JarHandlerBase implements FileSystemInterface {
+  private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.impl.jar.JarHandler");
+
   @NonNls private static final String JARS_FOLDER = "jars";
 
   private final JarFileSystemImpl myFileSystem;
@@ -112,17 +115,17 @@ public class JarHandler extends JarHandlerBase implements FileSystemInterface {
       FileUtil.copy(original, mirror);
     }
     catch (final IOException e) {
-      final String path1 = original.getPath();
-      final String path2 = mirror.getPath();
+      LOG.warn(e);
+      final String path = original.getPath();
+      final String message = VfsBundle.message("jar.copy.error.message", path, mirror.getPath(), e.getMessage());
       ApplicationManager.getApplication().invokeLater(new Runnable() {
         @Override
         public void run() {
-          Messages.showErrorDialog(VfsBundle.message("jar.copy.error.message", path1, path2, e.getMessage()),
-                                   VfsBundle.message("jar.copy.error.title"));
+          Messages.showErrorDialog(message, VfsBundle.message("jar.copy.error.title"));
         }
       }, ModalityState.NON_MODAL);
 
-      myFileSystem.setNoCopyJarForPath(path1);
+      myFileSystem.setNoCopyJarForPath(path);
       return original;
     }
 

platform/platform-resources-en/src/messages/VfsBundle.properties

@@ -5,7 +5,7 @@ file.read.error=Cannot read from file {0}.
 file.write.error=Cannot write to file {0}.
 file.delete.root.error=Cannot delete root file {0}.
 jar.copy.progress=Copying {0}...
-jar.copy.error.message=Cannot copy {0} to {1}.\n{2}.
+jar.copy.error.message=Cannot copy {0} to {1}.\nReason: {2}.
 jar.copy.error.title=Error Copying File
 jar.modification.not.supported.error=Cannot modify jar or zip file {0}
 file.synchronize.progress=Synchronizing files...

platform/platform-resources/src/idea/Keymap_Emacs.xml

@@ -268,6 +268,9 @@
     <action id="NextProjectWindow">
       <keyboard-shortcut first-keystroke="control X" second-keystroke="control O"/>
     </action>
+    <action id="CommentByLineComment">
+      <keyboard-shortcut first-keystroke="alt SEMICOLON"/>
+    </action>
     
     <!--Disabled shortcuts-->
     <action id="CollapseAllRegions"/>
@@ -279,6 +282,7 @@
     <action id="IntroduceField"/>
     <action id="RecentFiles"/>
     <action id="EditorTab"/>
+    <action id="EditorDeleteLine"/>
     <action id="PreviousProjectWindow"/>
     <action id="Vcs.ShowMessageHistory"/>
     <action id="GotoImplementation"/>

plugins/InspectionGadgets/testsrc/com/siyeh/ig/cloneable/CloneDeclaresCloneNotSupportedInspectionTest.java

@@ -0,0 +1,10 @@
+package com.siyeh.ig.cloneable;
+
+import com.siyeh.ig.IGInspectionTestCase;
+
+public class CloneDeclaresCloneNotSupportedInspectionTest extends IGInspectionTestCase {
+
+  public void test() throws Exception {
+    doTest("com/siyeh/igtest/cloneable/clone_declares_clone_not_supported", new CloneDeclaresCloneNotSupportedInspection());
+  }
+}