From 3def4c0ea812c9ae8bc9fd437752110055aa2c5f Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Wed, 8 Aug 2012 19:24:33 +0400
Subject: [PATCH] copyright: filter out custom scopes not acceptable for
 settings

---
 .../util/scopeChooser/PackageSetChooserCombo.java    |  2 +-
 .../idea/copyright/ui/ProjectSettingsPanel.java      | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/PackageSetChooserCombo.java b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/PackageSetChooserCombo.java
index e7d42edb293c..c7853d3f2cb0 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/PackageSetChooserCombo.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/PackageSetChooserCombo.java
@@ -155,7 +155,7 @@ public class PackageSetChooserCombo extends ComponentWithBrowseButton<JComponent
     }
   }
 
-  private NamedScope[] createModel() {
+  protected NamedScope[] createModel() {
     final Collection<NamedScope> model = new ArrayList<NamedScope>();
     final DependencyValidationManager manager = DependencyValidationManager.getInstance(myProject);
     model.addAll(Arrays.asList(manager.getScopes()));
diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java
index 4d1534e62ea7..90fa57cd22bd 100644
--- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java
+++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java
@@ -16,6 +16,7 @@
 package com.maddyhome.idea.copyright.ui;
 
 import com.intellij.ide.DataManager;
+import com.intellij.psi.search.scope.packageSet.CustomScopesProviderEx;
 import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.ide.util.scopeChooser.PackageSetChooserCombo;
 import com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable;
@@ -345,7 +346,16 @@ public class ProjectSettingsPanel {
         }
 
         public Component getTableCellEditorComponent(final JTable table, Object value, boolean isSelected, int row, int column) {
-          myScopeChooser = new PackageSetChooserCombo(myProject, value == null ? null : ((NamedScope)value).getName(), false, false);
+          myScopeChooser = new PackageSetChooserCombo(myProject, value == null ? null : ((NamedScope)value).getName(), false, false){
+            @Override
+            protected NamedScope[] createModel() {
+              final NamedScope[] model = super.createModel();
+              final ArrayList<NamedScope> filteredScopes = new ArrayList<NamedScope>(Arrays.asList(model));
+              CustomScopesProviderEx.filterNoSettingsScopes(myProject, filteredScopes);
+              return filteredScopes.toArray(new NamedScope[filteredScopes.size()]);
+            }
+          };
+          
           ((JBComboBoxTableCellEditorComponent)myScopeChooser.getChildComponent()).setCell(table, row, column);
           return myScopeChooser;
         }