diff --git a/java/java-tests/testSrc/com/intellij/projectView/PackagesTreeStructureTest.java b/java/java-tests/testSrc/com/intellij/projectView/PackagesTreeStructureTest.java
index 950b85c34a87..a8a072022f3b 100644
--- a/java/java-tests/testSrc/com/intellij/projectView/PackagesTreeStructureTest.java
+++ b/java/java-tests/testSrc/com/intellij/projectView/PackagesTreeStructureTest.java
@@ -211,8 +211,8 @@ public class PackagesTreeStructureTest extends TestSourceBasedTestCase {
     projectView.setShowLibraryContents(PackageViewPane.ID, showLibraryContents);
 
     projectView.setFlattenPackages(flattenPackages, PackageViewPane.ID);
-    projectView.setAbbreviatePackageNames(abbreviatePackageNames, PackageViewPane.ID);
-    projectView.setHideEmptyPackages(true, PackageViewPane.ID);
+    projectView.setAbbreviatePackageNames(PackageViewPane.ID, abbreviatePackageNames);
+    projectView.setHideEmptyPackages(PackageViewPane.ID, true);
 
     PackageViewPane packageViewPane = new PackageViewPane(myProject) {
       @NotNull
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 ba0e64d81b01..bc4b1e44149b 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/ProjectView.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/ProjectView.java
@@ -76,7 +76,7 @@ public abstract class ProjectView {
 
   public abstract boolean isHideEmptyMiddlePackages(String paneId);
 
-  public abstract void setHideEmptyPackages(boolean hideEmptyPackages, @NotNull String paneId);
+  public abstract void setHideEmptyPackages(@NotNull String paneId, boolean hideEmptyPackages);
 
   public boolean isCompactDirectories(String paneId) {
     return false;
@@ -113,7 +113,7 @@ public abstract class ProjectView {
 
   public abstract boolean isAbbreviatePackageNames(String paneId);
 
-  public abstract void setAbbreviatePackageNames(boolean abbreviatePackageNames, @NotNull String paneId);
+  public abstract void setAbbreviatePackageNames(@NotNull String paneId, boolean abbreviatePackageNames);
 
   /**
    * e.g. {@link com.intellij.ide.projectView.impl.ProjectViewPane#ID}
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 6bc28fe834f7..77e8bbe2ef1e 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
@@ -507,7 +507,7 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo
 
     getContentManager().addContentManagerListener(new ContentManagerAdapter() {
       @Override
-      public void selectionChanged(ContentManagerEvent event) {
+      public void selectionChanged(@NotNull ContentManagerEvent event) {
         if (event.getOperation() == ContentManagerEvent.ContentOperation.add) {
           viewSelectionChanged();
         }
@@ -623,7 +623,7 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo
         @Override
         public void setSelected(AnActionEvent event, boolean flag) {
           if (isGlobalOptions()) {
-            setAbbreviatePackageNames(flag, myCurrentViewId);
+            setAbbreviatePackageNames(myCurrentViewId, flag);
           }
           setPaneOption(myOptionsMap, flag, myCurrentViewId, true);
         }
@@ -1709,7 +1709,7 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo
   }
 
   @Override
-  public void setHideEmptyPackages(boolean hideEmptyPackages, @NotNull String paneId) {
+  public void setHideEmptyPackages(@NotNull String paneId, boolean hideEmptyPackages) {
     if (isGlobalOptions()) {
       getGlobalOptions().setHideEmptyPackages(hideEmptyPackages);
       for (String pane : myHideEmptyPackages.keySet()) {
@@ -1738,7 +1738,7 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo
   }
 
   @Override
-  public void setAbbreviatePackageNames(boolean abbreviatePackageNames, @NotNull String paneId) {
+  public void setAbbreviatePackageNames(@NotNull String paneId, boolean abbreviatePackageNames) {
     if (isGlobalOptions()) {
       getGlobalOptions().setAbbreviatePackages(abbreviatePackageNames);
     }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/configurers/MavenIdeaPluginConfigurer.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/configurers/MavenIdeaPluginConfigurer.java
index f15be1d7f6ff..7a7e2d9da5df 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/configurers/MavenIdeaPluginConfigurer.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/configurers/MavenIdeaPluginConfigurer.java
@@ -77,7 +77,7 @@ public class MavenIdeaPluginConfigurer extends MavenModuleConfigurer {
 
     String hideEmptyPackages = cfg.getChildTextTrim("hideEmptyPackages");
     if (!StringUtil.isEmptyOrSpaces(hideEmptyPackages)) {
-      ProjectView.getInstance(project).setHideEmptyPackages(Boolean.parseBoolean(hideEmptyPackages), ProjectViewPane.ID);
+      ProjectView.getInstance(project).setHideEmptyPackages(ProjectViewPane.ID, Boolean.parseBoolean(hideEmptyPackages));
     }
 
     String optimizeImportsBeforeCommit = cfg.getChildTextTrim("optimizeImportsBeforeCommit");