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

more consistency with other setters

Browse Source
This commit is contained in:
Alexey Kudravtsev
2018-08-29 18:22:42 +03:00
parent 21124e7fce
commit de01504005
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/projectView/PackagesTreeStructureTest.java
+2 -2
View File
@@ -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
platform/lang-impl/src/com/intellij/ide/projectView/ProjectView.java
+2 -2
View File
@@ -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}
platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
+4 -4
View File
@@ -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);
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/configurers/MavenIdeaPluginConfigurer.java
+1 -1
View File
@@ -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");