From 976fe5321db7b0bcece15b05d032c76e01dd6705 Mon Sep 17 00:00:00 2001
From: "Denis.Zhdanov" <denzhdanov@gmail.com>
Date: Sat, 1 Sep 2012 22:03:10 +0400
Subject: [PATCH] IDEA-90860 Reformat Code breaks Copyright/Header

Test fixes
---
 .../testData/psi/formatter/java/DoubleCast.java           | 1 -
 .../testData/psi/formatter/java/DoubleCast_after.java     | 1 -
 java/java-tests/testData/psi/formatter/java/IfElse.java   | 1 -
 .../testData/psi/formatter/java/IfElse_after.java         | 1 -
 java/java-tests/testData/psi/formatter/java/Label.java    | 1 -
 .../testData/psi/formatter/java/Label_after1.java         | 1 -
 java/java-tests/testData/psi/formatter/java/New.java      | 1 -
 .../java-tests/testData/psi/formatter/java/New_after.java | 1 -
 java/java-tests/testData/psi/formatter/java/SCR548.java   | 1 -
 .../testData/psi/formatter/java/SCR548_after.java         | 1 -
 .../psi/formatter/java/AbstractJavaFormatterTest.java     | 3 ++-
 .../plugins/relaxNG/compact/formatting/RncBlock.java      | 8 ++++++--
 12 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/java/java-tests/testData/psi/formatter/java/DoubleCast.java b/java/java-tests/testData/psi/formatter/java/DoubleCast.java
index 88eee70341dc..613c86e586ea 100644
--- a/java/java-tests/testData/psi/formatter/java/DoubleCast.java
+++ b/java/java-tests/testData/psi/formatter/java/DoubleCast.java
@@ -1,4 +1,3 @@
-
 class C {
     {
         String q = (String) ( (String)"abc" );
diff --git a/java/java-tests/testData/psi/formatter/java/DoubleCast_after.java b/java/java-tests/testData/psi/formatter/java/DoubleCast_after.java
index 6e8ca73ea416..970953d74bd2 100644
--- a/java/java-tests/testData/psi/formatter/java/DoubleCast_after.java
+++ b/java/java-tests/testData/psi/formatter/java/DoubleCast_after.java
@@ -1,4 +1,3 @@
-
 class C {
     {
         String q = (String) ((String) "abc");
diff --git a/java/java-tests/testData/psi/formatter/java/IfElse.java b/java/java-tests/testData/psi/formatter/java/IfElse.java
index 37ab11b2edd6..c902e9691f5e 100644
--- a/java/java-tests/testData/psi/formatter/java/IfElse.java
+++ b/java/java-tests/testData/psi/formatter/java/IfElse.java
@@ -1,4 +1,3 @@
-
 public class Foo {
     public void foo(boolean a, int x,
                     int y, int z) {
diff --git a/java/java-tests/testData/psi/formatter/java/IfElse_after.java b/java/java-tests/testData/psi/formatter/java/IfElse_after.java
index 30731341d60c..ef5e4db6a143 100644
--- a/java/java-tests/testData/psi/formatter/java/IfElse_after.java
+++ b/java/java-tests/testData/psi/formatter/java/IfElse_after.java
@@ -1,4 +1,3 @@
-
 public class Foo {
     public void foo(boolean a, int x,
                     int y, int z) {
diff --git a/java/java-tests/testData/psi/formatter/java/Label.java b/java/java-tests/testData/psi/formatter/java/Label.java
index 449be9cb87fb..4178d65da10d 100644
--- a/java/java-tests/testData/psi/formatter/java/Label.java
+++ b/java/java-tests/testData/psi/formatter/java/Label.java
@@ -1,4 +1,3 @@
-
 class X {
     void Y() {
         z: for (int i = 0; i < 24; i++) {}
diff --git a/java/java-tests/testData/psi/formatter/java/Label_after1.java b/java/java-tests/testData/psi/formatter/java/Label_after1.java
index 9155482cecd1..806eda7279b1 100644
--- a/java/java-tests/testData/psi/formatter/java/Label_after1.java
+++ b/java/java-tests/testData/psi/formatter/java/Label_after1.java
@@ -1,4 +1,3 @@
-
 class X {
     void Y() {
 z:
diff --git a/java/java-tests/testData/psi/formatter/java/New.java b/java/java-tests/testData/psi/formatter/java/New.java
index 0ccb3aa7a0a0..67969abbf08a 100644
--- a/java/java-tests/testData/psi/formatter/java/New.java
+++ b/java/java-tests/testData/psi/formatter/java/New.java
@@ -1,4 +1,3 @@
-
 public class C {
     C ourC =
             new C(
diff --git a/java/java-tests/testData/psi/formatter/java/New_after.java b/java/java-tests/testData/psi/formatter/java/New_after.java
index 6c78e475928e..7fcaeb6b2818 100644
--- a/java/java-tests/testData/psi/formatter/java/New_after.java
+++ b/java/java-tests/testData/psi/formatter/java/New_after.java
@@ -1,4 +1,3 @@
-
 public class C {
     C ourC =
             new C(
diff --git a/java/java-tests/testData/psi/formatter/java/SCR548.java b/java/java-tests/testData/psi/formatter/java/SCR548.java
index b3d85fb810da..2acbed2cbc1b 100644
--- a/java/java-tests/testData/psi/formatter/java/SCR548.java
+++ b/java/java-tests/testData/psi/formatter/java/SCR548.java
@@ -1,4 +1,3 @@
-
 class Foo {
   public void foo(){
     return _status == EnhancedMemberOrderStatus.EDITING
diff --git a/java/java-tests/testData/psi/formatter/java/SCR548_after.java b/java/java-tests/testData/psi/formatter/java/SCR548_after.java
index 63faf41c679c..27063125fabb 100644
--- a/java/java-tests/testData/psi/formatter/java/SCR548_after.java
+++ b/java/java-tests/testData/psi/formatter/java/SCR548_after.java
@@ -1,4 +1,3 @@
-
 class Foo {
     public void foo() {
         return _status == EnhancedMemberOrderStatus.EDITING
diff --git a/java/java-tests/testSrc/com/intellij/psi/formatter/java/AbstractJavaFormatterTest.java b/java/java-tests/testSrc/com/intellij/psi/formatter/java/AbstractJavaFormatterTest.java
index 1175aa9c2832..d9856335c7c3 100644
--- a/java/java-tests/testSrc/com/intellij/psi/formatter/java/AbstractJavaFormatterTest.java
+++ b/java/java-tests/testSrc/com/intellij/psi/formatter/java/AbstractJavaFormatterTest.java
@@ -16,6 +16,7 @@
 package com.intellij.psi.formatter.java;
 
 import com.intellij.JavaTestUtil;
+import com.intellij.codeInsight.actions.ReformatCodeProcessor;
 import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;
@@ -153,7 +154,7 @@ public abstract class AbstractJavaFormatterTest extends LightIdeaTestCase {
           }
         });
       }
-    }, "", "");
+    }, action == Action.REFORMAT ? ReformatCodeProcessor.COMMAND_NAME : "", "");
 
 
     if (document == null) {
diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/formatting/RncBlock.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/formatting/RncBlock.java
index 414ffeea2995..5b466ed87413 100644
--- a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/formatting/RncBlock.java
+++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/formatting/RncBlock.java
@@ -90,6 +90,9 @@ class RncBlock implements Block {
 
   @Nullable
   public Spacing getSpacing(Block child1, @NotNull Block child2) {
+    if (child1 == null) {
+      return null;
+    }
     final ASTNode lnode = ((RncBlock)child1).myNode;
     final PsiElement lpsi = lnode.getPsi();
     final PsiElement rpsi = ((RncBlock)child2).myNode.getPsi();
@@ -98,8 +101,9 @@ class RncBlock implements Block {
       return makeNewline();
     }
     if ((lpsi instanceof RncDecl || lpsi instanceof RncDefine ||
-            lnode.getElementType() == RncElementTypes.START) &&
-            (rpsi instanceof RncDefine || rpsi instanceof RncGrammar)) {
+         lnode.getElementType() == RncElementTypes.START) &&
+        (rpsi instanceof RncDefine || rpsi instanceof RncGrammar))
+    {
       return makeNewline();
     }
     return null;