From 6ca672f67f4aecb37dfa72af7aa5271d2042d2c9 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Thu, 28 Feb 2013 17:00:52 +0400
Subject: [PATCH] [vcs] VcsConfiguration: fix spelling

This will change the xml tag, which will reset the
setting to its default value, but it is not critical for this
particular setting.
---
 .../openapi/vcs/VcsConfiguration.java         |  2 +-
 .../changes/ChangesFragmentedDiffPanel.java   | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
index fcb14d8e850e..5c751d9d2233 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
@@ -77,7 +77,7 @@ public final class VcsConfiguration implements PersistentStateComponent<Element>
   public boolean SHOW_ONLY_CHANGED_IN_SELECTION_DIFF = true;
   public boolean CHECK_COMMIT_MESSAGE_SPELLING = true;
   public String DEFAULT_PATCH_EXTENSION = PATCH;
-  public boolean SHORT_DIFF_HORISONTALLY = true;
+  public boolean SHORT_DIFF_HORIZONTALLY = true;
   public int SHORT_DIFF_EXTRA_LINES = 2;
   public boolean SOFT_WRAPS_IN_SHORT_DIFF = true;
   public IgnoreSpaceEnum SHORT_DIFF_IGNORE_SPACE = IgnoreSpaceEnum.NO;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java
index 4f6f1b9f4b63..cb8ddfdd54c3 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java
@@ -149,7 +149,7 @@ public class ChangesFragmentedDiffPanel implements Disposable {
     final JPanel oneMore = new JPanel(new BorderLayout());
     oneMore.add(wrapperDiffs, BorderLayout.NORTH);
 
-    myCurrentHorizontal = myConfiguration.SHORT_DIFF_HORISONTALLY;
+    myCurrentHorizontal = myConfiguration.SHORT_DIFF_HORIZONTALLY;
     myHorizontal = createPanel(true);
     myVertical = createPanel(false);
 
@@ -618,29 +618,29 @@ public class ChangesFragmentedDiffPanel implements Disposable {
       myUsual = new AnAction("Top | Bottom", "", AllIcons.General.Mdot_empty) {
         @Override
         public void actionPerformed(AnActionEvent e) {
-          boolean was = myConfiguration.SHORT_DIFF_HORISONTALLY;
-          myConfiguration.SHORT_DIFF_HORISONTALLY = false;
+          boolean was = myConfiguration.SHORT_DIFF_HORIZONTALLY;
+          myConfiguration.SHORT_DIFF_HORIZONTALLY = false;
           ensurePresentation();
         }
 
         @Override
         public void update(AnActionEvent e) {
           super.update(e);
-          e.getPresentation().setIcon(myConfiguration.SHORT_DIFF_HORISONTALLY ? AllIcons.General.Mdot_empty : AllIcons.General.Mdot);
+          e.getPresentation().setIcon(myConfiguration.SHORT_DIFF_HORIZONTALLY ? AllIcons.General.Mdot_empty : AllIcons.General.Mdot);
         }
       };
       myNumbered = new AnAction("Left | Right", "", AllIcons.General.Mdot_empty) {
         @Override
         public void actionPerformed(AnActionEvent e) {
-          boolean was = myConfiguration.SHORT_DIFF_HORISONTALLY;
-          myConfiguration.SHORT_DIFF_HORISONTALLY = true;
+          boolean was = myConfiguration.SHORT_DIFF_HORIZONTALLY;
+          myConfiguration.SHORT_DIFF_HORIZONTALLY = true;
           ensurePresentation();
         }
 
         @Override
         public void update(AnActionEvent e) {
           super.update(e);
-          e.getPresentation().setIcon(myConfiguration.SHORT_DIFF_HORISONTALLY ? AllIcons.General.Mdot : AllIcons.General.Mdot_empty);
+          e.getPresentation().setIcon(myConfiguration.SHORT_DIFF_HORIZONTALLY ? AllIcons.General.Mdot : AllIcons.General.Mdot_empty);
         }
       };
       mySoftWrapsAction = new MyUseSoftWrapsAction(myConfiguration.SOFT_WRAPS_IN_SHORT_DIFF);
@@ -685,7 +685,7 @@ public class ChangesFragmentedDiffPanel implements Disposable {
   }*/
 
   private void ensurePresentation() {
-    if (myCurrentHorizontal != myConfiguration.SHORT_DIFF_HORISONTALLY) {
+    if (myCurrentHorizontal != myConfiguration.SHORT_DIFF_HORIZONTALLY) {
       final DiffPanel panel = getCurrentPanel();
 
       myPanel.removeAll();
@@ -694,13 +694,13 @@ public class ChangesFragmentedDiffPanel implements Disposable {
       myPanel.revalidate();
       myPanel.repaint();
 
-      myCurrentHorizontal = myConfiguration.SHORT_DIFF_HORISONTALLY;
+      myCurrentHorizontal = myConfiguration.SHORT_DIFF_HORIZONTALLY;
     }
   }
 
   private DiffPanel getCurrentPanel() {
     DiffPanel panel;
-    if (myConfiguration.SHORT_DIFF_HORISONTALLY) {
+    if (myConfiguration.SHORT_DIFF_HORIZONTALLY) {
       panel = myHorizontal;
     } else {
       panel = myVertical;