MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[vcs] VcsConfiguration: fix spelling

Browse Source 
This will change the xml tag, which will reset the
setting to its default value, but it is not critical for this
particular setting.
This commit is contained in:
Kirill Likhodedov
2013-02-28 18:00:16 +04:00
parent aafae0d929
commit 6ca672f67f
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
+1 -1
View File
@@ -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;
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java
+10 -10
View File
@@ -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;