From 96e389b058880463bcd9084e453fb441573402f0 Mon Sep 17 00:00:00 2001 From: Stanislav Dombrovsky Date: Mon, 30 Oct 2017 20:05:56 +0300 Subject: [PATCH 1/2] OC-12825 Project view: "Xcode order" in AppCode instead of "Manual order" --- .../src/com/intellij/ide/projectView/ProjectView.java | 4 +++- .../com/intellij/ide/projectView/impl/ProjectViewImpl.java | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/ProjectView.java b/platform/lang-impl/src/com/intellij/ide/projectView/ProjectView.java index d0b8446056bf..041407a8ff49 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/ProjectView.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/ProjectView.java @@ -112,7 +112,9 @@ public abstract class ProjectView { public abstract boolean isManualOrder(String paneId); public abstract void setManualOrder(@NotNull String paneId, final boolean enabled); - + + public abstract String getManualOrderOptionText(); + public abstract boolean isSortByType(String paneId); public abstract void setSortByType(@NotNull String paneId, final boolean sortByType); 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 1540d0d80bdb..8ef695edbd5d 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java @@ -1922,6 +1922,11 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo pane.installComparator(); } + @Override + public String getManualOrderOptionText() { + return IdeBundle.message("action.manual.order"); + } + @Override public boolean isSortByType(String paneId) { return getPaneOptionValue(mySortByType, paneId, ourSortByTypeDefaults); @@ -1936,7 +1941,7 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo private class ManualOrderAction extends ToggleAction implements DumbAware { private ManualOrderAction() { - super(IdeBundle.message("action.manual.order"), IdeBundle.message("action.manual.order"), AllIcons.ObjectBrowser.Sorted); + super(getManualOrderOptionText(), getManualOrderOptionText(), AllIcons.ObjectBrowser.Sorted); } @Override From 0484384506c98f7ff21d9693a62ad19d6517798d Mon Sep 17 00:00:00 2001 From: Stanislav Dombrovsky Date: Tue, 31 Oct 2017 12:29:27 +0300 Subject: [PATCH 2/2] OC-12825 Project view: "Xcode order" in AppCode instead of "Manual order" [fixes according to review] --- .../src/com/intellij/ide/projectView/ProjectView.java | 2 -- .../src/com/intellij/ide/projectView/impl/ProjectViewImpl.java | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/ProjectView.java b/platform/lang-impl/src/com/intellij/ide/projectView/ProjectView.java index 041407a8ff49..80a69dac46c6 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/ProjectView.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/ProjectView.java @@ -113,8 +113,6 @@ public abstract class ProjectView { public abstract boolean isManualOrder(String paneId); public abstract void setManualOrder(@NotNull String paneId, final boolean enabled); - public abstract String getManualOrderOptionText(); - public abstract boolean isSortByType(String paneId); public abstract void setSortByType(@NotNull String paneId, final boolean sortByType); 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 8ef695edbd5d..68de580e2ef9 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java @@ -1922,8 +1922,7 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo pane.installComparator(); } - @Override - public String getManualOrderOptionText() { + protected String getManualOrderOptionText() { return IdeBundle.message("action.manual.order"); }