rollback fixes for DoNotSaveDefaultsTest, they break 'Show Usages'

platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java

@@ -240,7 +240,7 @@ public class ShowUsagesAction extends AnAction implements PopupAction {
     }
 
     Disposer.register(usageView, () -> {
-      showUsagesSettings.loadUsageViewSettings(usageViewSettings);
+      showUsagesSettings.loadState(usageViewSettings);
       usageViewSettings.loadState(savedGlobalSettings);
     });
 
@@ -679,13 +679,13 @@ public class ShowUsagesAction extends AnAction implements PopupAction {
     DefaultActionGroup toolbar = new DefaultActionGroup();
     usageView.addFilteringActions(toolbar);
 
-    toolbar.add(UsageGroupingRuleProviderImpl.createGroupByFileStructureAction(usageView));
+    toolbar.add(UsageGroupingRuleProviderImpl.createGroupByFileStructureAction(usageView)); 
     ActionToolbar actionToolbar = ActionManager.getInstance().createActionToolbar(ActionPlaces.USAGE_VIEW_TOOLBAR, toolbar, true);
     actionToolbar.setReservePlaceAutoPopupIcon(false);
     final JComponent toolBar = actionToolbar.getComponent();
     toolBar.setOpaque(false);
     builder.setSettingButton(toolBar);
-    builder.setCancelKeyEnabled(false);
+    builder.setCancelKeyEnabled(false); 
 
     popup[0] = builder.createPopup();
     JComponent content = popup[0].getContent();
@@ -1168,7 +1168,7 @@ public class ShowUsagesAction extends AnAction implements PopupAction {
     public int getRowHeight() {
       return super.getRowHeight() + 2 * MARGIN;
     }
-
+    
     @NotNull
     @Override
     public Component prepareRenderer(@NotNull TableCellRenderer renderer, int row, int column) {

platform/usageView/src/com/intellij/usages/ShowUsagesSettings.java

@@ -14,21 +14,17 @@ import org.jetbrains.annotations.Nullable;
     @Storage("usageView.xml")
   }
 )
-public class ShowUsagesSettings implements PersistentStateComponent<ShowUsagesSettings.MyUsageViewSettings> {
-  private final MyUsageViewSettings myState = new MyUsageViewSettings();
-
+public class ShowUsagesSettings implements PersistentStateComponent<UsageViewSettings> {
+  private final UsageViewSettings myState = new UsageViewSettings();
+  
   @Nullable
   @Override
-  public MyUsageViewSettings getState() {
+  public UsageViewSettings getState() {
     return myState;
   }
 
   @Override
-  public void loadState(MyUsageViewSettings state) {
-    XmlSerializerUtil.copyBean(state, myState);
-  }
-
-  public void loadUsageViewSettings(UsageViewSettings state) {
+  public void loadState(UsageViewSettings state) {
     XmlSerializerUtil.copyBean(state, myState);
   }
 
@@ -36,13 +32,11 @@ public class ShowUsagesSettings implements PersistentStateComponent<ShowUsagesSe
     return ServiceManager.getService(ShowUsagesSettings.class);
   }
 
-  static class MyUsageViewSettings extends UsageViewSettings {
-    public MyUsageViewSettings() {
-      GROUP_BY_FILE_STRUCTURE = false;
-      GROUP_BY_MODULE = false;
-      GROUP_BY_PACKAGE = false;
-      GROUP_BY_USAGE_TYPE = false;
-      GROUP_BY_SCOPE = false;
-    }
+  public ShowUsagesSettings() {
+    myState.GROUP_BY_FILE_STRUCTURE = false;
+    myState.GROUP_BY_MODULE = false;
+    myState.GROUP_BY_PACKAGE = false;
+    myState.GROUP_BY_USAGE_TYPE = false;
+    myState.GROUP_BY_SCOPE = false;
   }
 }