# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /Users/samuel/Documents/Java/NetBeans/main-golden/java.editor/src
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: org/netbeans/modules/editor/java/ExcludeCompletion.java
--- org/netbeans/modules/editor/java/ExcludeCompletion.java Base (BASE)
+++ org/netbeans/modules/editor/java/ExcludeCompletion.java Locally New
@@ -0,0 +1,143 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License.  When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Samuel Halliday
+ *
+ * Portions Copyrighted 2009 Sun Microsystems, Inc.
+ */
+package org.netbeans.modules.editor.java;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+/**
+ * A whitelist/blacklist of excluded classes and packages for the Java completer.
+ * Requested in RFE #125060.
+ *
+ * @author Samuel Halliday
+ */
+final class ExcludeCompletion {
+
+    private final Collection<String> exclude = new ArrayList<String>();
+    private final Collection<String> include = new ArrayList<String>();
+    private final ReadWriteLock lock = new ReentrantReadWriteLock();
+
+    /** */
+    public ExcludeCompletion() {
+    }
+
+    /**
+     * @param fqn Fully Qualified Name
+     * @return
+     */
+    public boolean isExcluded(final CharSequence fqn) {
+        //#122334: do not propose imports from the default package
+        if (fqn == null || fqn.length() == 0) {
+            return true;
+        }
+
+        String s = fqn.toString();
+        lock.readLock().lock();
+        try {
+            if (!include.isEmpty()) {
+                for (String entry : include) {
+                    if (entry.length() > fqn.length()) {
+                        if (entry.startsWith(s)) {
+                            return false;
+                        }
+                    } else if (s.startsWith(entry)) {
+                        return false;
+                    }
+                }
+            }
+
+            if (!exclude.isEmpty()) {
+                for (String entry : exclude) {
+                    if (entry.endsWith(".") && fqn.equals(entry.substring(0, entry.length() - 1))) // NOI18N
+                    // exclude packages names (no trailing fullstop)
+                    {
+                        return true;
+                    }
+                    if (entry.length() > fqn.length()) // fqn not long enough to filter yet
+                    {
+                        continue;
+                    }
+                    if (s.startsWith(entry)) {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        } finally {
+            lock.readLock().unlock();
+        }
+    }
+
+    /**
+     * @param blacklist comma separated list of fqns
+     */
+    public void updateBlacklist(String blacklist) {
+        update(exclude, blacklist);
+    }
+
+    /**
+     * @param whitelist comma separated list of fqns
+     */
+    public void updateWhitelist(String whitelist) {
+        update(include, whitelist);
+    }
+
+    private void update(Collection<String> existing, String updated) {
+        lock.writeLock().lock();
+        try {
+            existing.clear();
+            if (updated == null || updated.length() == 0) {
+                return;
+            }
+            String[] entries = updated.split(","); //NOI18N
+            for (String entry : entries) {
+                if (entry != null && entry.length() != 0) {
+                    existing.add(entry);
+                }
+            }
+        } finally {
+            lock.writeLock().unlock();
+        }
+    }
+}
\ No newline at end of file
Index: org/netbeans/modules/editor/java/JavaCompletionProvider.java
--- org/netbeans/modules/editor/java/JavaCompletionProvider.java Base (BASE)
+++ org/netbeans/modules/editor/java/JavaCompletionProvider.java Locally Modified (Based On LOCAL)
@@ -2422,10 +2422,12 @@
                                     (Utilities.isShowDeprecatedMembers() || !elements.isDeprecated(e)) &&
                                     tu.isAccessible(scope, e, t);
                         case METHOD:
-                            return startsWith(env, e.getSimpleName().toString(), prefix) &&
+                            String sn = e.getSimpleName().toString();
+                            return startsWith(env, sn, prefix) &&
                                     (Utilities.isShowDeprecatedMembers() || !elements.isDeprecated(e)) &&
                                     (!isStatic || e.getModifiers().contains(STATIC)) &&
-                                    tu.isAccessible(scope, e, t);
+                                    tu.isAccessible(scope, e, t) &&
+                                    !Utilities.isExcluded(Utilities.getElementName(e.getEnclosingElement(), true) + "." + sn); //NOI18N
                     }
                     return false;
                 }
@@ -2606,11 +2608,13 @@
                                     isOfKindAndType(asMemberOf(e, t, types), e, kinds, baseType, scope, trees, types) &&
                                     tu.isAccessible(scope, e, t);
                         case METHOD:
-                            return startsWith(env, e.getSimpleName().toString(), prefix) &&
+                            String sn = e.getSimpleName().toString();
+                            return startsWith(env, sn, prefix) &&
                                     (Utilities.isShowDeprecatedMembers() || !elements.isDeprecated(e)) &&
                                     isOfKindAndType(((ExecutableType)asMemberOf(e, t, types)).getReturnType(), e, kinds, baseType, scope, trees, types) &&
                                     (isSuperCall && e.getModifiers().contains(PROTECTED) || tu.isAccessible(scope, e, isSuperCall && enclType != null ? enclType : t)) &&
-                                    (!isStatic || e.getModifiers().contains(STATIC));
+                                    (!isStatic || e.getModifiers().contains(STATIC)) &&
+                                    !Utilities.isExcluded(Utilities.getElementName(e.getEnclosingElement(), true) + "." + sn); //NOI18N
                         case CLASS:
                         case ENUM:
                         case INTERFACE:
@@ -2730,7 +2734,7 @@
             if (fqnPrefix == null)
                 fqnPrefix = EMPTY;
             for (String pkgName : env.getController().getClasspathInfo().getClassIndex().getPackageNames(fqnPrefix, true,EnumSet.allOf(ClassIndex.SearchScope.class)))
-                if (pkgName.length() > 0)
+                if (!Utilities.isExcluded(pkgName))
                     results.add(JavaCompletionItem.createPackageItem(pkgName, anchorOffset, inPkgStmt));
         }
         
Index: org/netbeans/modules/editor/java/LazyTypeCompletionItem.java
--- org/netbeans/modules/editor/java/LazyTypeCompletionItem.java Base (BASE)
+++ org/netbeans/modules/editor/java/LazyTypeCompletionItem.java Locally Modified (Based On LOCAL)
@@ -117,7 +117,7 @@
                             TypeElement e = handle.resolve(controller);
                             Elements elements = controller.getElements();
                             if (e != null && (Utilities.isShowDeprecatedMembers() || !elements.isDeprecated(e)) && controller.getTrees().isAccessible(scope, e)) {
-                                if (isOfKind(e, kinds) && (!isInDefaultPackage(e) || isInDefaultPackage(scope.getEnclosingClass())))
+                                if (isOfKind(e, kinds) && (!isInDefaultPackage(e) || isInDefaultPackage(scope.getEnclosingClass())) && !Utilities.isExcluded(e.getQualifiedName()))
                                     delegate = JavaCompletionItem.createTypeItem(e, (DeclaredType)e.asType(), substitutionOffset, true, controller.getElements().isDeprecated(e), insideNew, false);
                             }
                         }
Index: org/netbeans/modules/editor/java/Utilities.java
--- org/netbeans/modules/editor/java/Utilities.java Base (BASE)
+++ org/netbeans/modules/editor/java/Utilities.java Locally Modified (Based On LOCAL)
@@ -113,25 +113,34 @@
                 showDeprecatedMembers = preferences.getBoolean(SimpleValueNames.SHOW_DEPRECATED_MEMBERS, true);
             }
             if (settingName == null || CodeCompletionPanel.GUESS_METHOD_ARGUMENTS.equals(settingName)) {
-                guessMethodArguments = preferences.getBoolean(CodeCompletionPanel.GUESS_METHOD_ARGUMENTS, true);
+                guessMethodArguments = preferences.getBoolean(CodeCompletionPanel.GUESS_METHOD_ARGUMENTS, CodeCompletionPanel.GUESS_METHOD_ARGUMENTS_DEFAULT);
             }
             if (settingName == null || CodeCompletionPanel.JAVA_AUTO_POPUP_ON_IDENTIFIER_PART.equals(settingName)) {
-                autoPopupOnJavaIdentifierPart = preferences.getBoolean(CodeCompletionPanel.JAVA_AUTO_POPUP_ON_IDENTIFIER_PART, false);
+                autoPopupOnJavaIdentifierPart = preferences.getBoolean(CodeCompletionPanel.JAVA_AUTO_POPUP_ON_IDENTIFIER_PART, CodeCompletionPanel.JAVA_AUTO_POPUP_ON_IDENTIFIER_PART_DEFAULT);
             }
             if (settingName == null || CodeCompletionPanel.JAVA_AUTO_COMPLETION_TRIGGERS.equals(settingName)) {
-                javaCompletionAutoPopupTriggers = preferences.get(CodeCompletionPanel.JAVA_AUTO_COMPLETION_TRIGGERS, "."); //NOI18N
+                javaCompletionAutoPopupTriggers = preferences.get(CodeCompletionPanel.JAVA_AUTO_COMPLETION_TRIGGERS, CodeCompletionPanel.JAVA_AUTO_COMPLETION_TRIGGERS_DEFAULT);
             }
             if (settingName == null || CodeCompletionPanel.JAVA_COMPLETION_SELECTORS.equals(settingName)) {
-                javaCompletionSelectors = preferences.get(CodeCompletionPanel.JAVA_COMPLETION_SELECTORS, ".,;:([+-="); //NOI18N
+                javaCompletionSelectors = preferences.get(CodeCompletionPanel.JAVA_COMPLETION_SELECTORS, CodeCompletionPanel.JAVA_COMPLETION_SELECTORS_DEFAULT);
             }
             if (settingName == null || CodeCompletionPanel.JAVADOC_AUTO_COMPLETION_TRIGGERS.equals(settingName)) {
-                javadocCompletionAutoPopupTriggers = preferences.get(CodeCompletionPanel.JAVADOC_AUTO_COMPLETION_TRIGGERS, ".#@"); //NOI18N
+                javadocCompletionAutoPopupTriggers = preferences.get(CodeCompletionPanel.JAVADOC_AUTO_COMPLETION_TRIGGERS, CodeCompletionPanel.JAVADOC_AUTO_COMPLETION_TRIGGERS_DEFAULT);
             }
+            if (settingName == null || CodeCompletionPanel.JAVA_COMPLETION_BLACKLIST.equals(settingName)) {
+                String blacklist = preferences.get(CodeCompletionPanel.JAVA_COMPLETION_BLACKLIST, CodeCompletionPanel.JAVA_COMPLETION_BLACKLIST_DEFAULT);
+                excluder.updateBlacklist(blacklist);
         }
+            if (settingName == null || CodeCompletionPanel.JAVA_COMPLETION_WHITELIST.equals(settingName)) {
+                String whitelist = preferences.get(CodeCompletionPanel.JAVA_COMPLETION_WHITELIST, CodeCompletionPanel.JAVA_COMPLETION_WHITELIST_DEFAULT);
+                excluder.updateWhitelist(whitelist);
+            }
+        }
     };
     
     private static String cachedPrefix = null;
     private static Pattern cachedPattern = null;
+    private static volatile ExcludeCompletion excluder = null;
     
     public static boolean startsWith(String theString, String prefix) {
         if (theString == null || theString.length() == 0 || ERROR.equals(theString))
@@ -215,9 +224,19 @@
         return javadocCompletionAutoPopupTriggers;
     }
 
+    /**
+     * @param fqn Fully Qualified Name
+     * @return
+     */
+    public static boolean isExcluded(CharSequence fqn){
+        lazyInit();
+        return excluder.isExcluded(fqn);
+    }
+
     private static void lazyInit() {
         if (!inited) {
             inited = true;
+            excluder = new ExcludeCompletion();
             preferences = MimeLookup.getLookup(JavaKit.JAVA_MIME_TYPE).lookup(Preferences.class);
             preferences.addPreferenceChangeListener(WeakListeners.create(PreferenceChangeListener.class, preferencesTracker, preferences));
             preferencesTracker.preferenceChange(null);
Index: org/netbeans/modules/java/editor/imports/ComputeImports.java
--- org/netbeans/modules/java/editor/imports/ComputeImports.java Base (BASE)
+++ org/netbeans/modules/java/editor/imports/ComputeImports.java Locally Modified (Based On LOCAL)
@@ -72,6 +72,7 @@
 import org.netbeans.api.java.source.ClassIndex.NameKind;
 import org.netbeans.api.java.source.ElementHandle;
 import org.netbeans.api.java.source.support.CancellableTreePathScanner;
+import org.netbeans.modules.editor.java.Utilities;
 import org.netbeans.modules.java.editor.javadoc.JavadocImports;
 import org.openide.util.Union2;
 
@@ -146,7 +147,8 @@
                 }
                 
                 //#122334: do not propose imports from the default package:
-                if (info.getElements().getPackageOf(te).getQualifiedName().length() != 0) {
+                if (info.getElements().getPackageOf(te).getQualifiedName().length() == 0 &&
+                        !Utilities.isExcluded(te.getQualifiedName())) {
                     classes.add(te);
                 }
             }
Index: org/netbeans/modules/java/editor/options/CodeCompletionPanel.form
--- org/netbeans/modules/java/editor/options/CodeCompletionPanel.form Base (BASE)
+++ org/netbeans/modules/java/editor/options/CodeCompletionPanel.form Locally Modified (Based On LOCAL)
@@ -1,7 +1,180 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<Form version="1.4" maxVersion="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+<Form version="1.5" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+  <NonVisualComponents>
+    <Container class="javax.swing.JFrame" name="javaCompletionExcluderFrame">
   <Properties>
+        <Property name="title" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/netbeans/modules/java/editor/options/Bundle.properties" key="CodeCompletionPanel.javaCompletionExcluderFrame.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+        <Property name="alwaysOnTop" type="boolean" value="true"/>
+        <Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
+          <Dimension value="[409, 233]"/>
+        </Property>
+        <Property name="undecorated" type="boolean" value="true"/>
+      </Properties>
+
+      <Layout>
+        <DimensionLayout dim="0">
+          <Group type="103" groupAlignment="0" attributes="0">
+              <Group type="102" alignment="1" attributes="0">
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Component id="javaCompletionExcluderTab" min="-2" pref="298" max="-2" attributes="0"/>
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="0" max="-2" attributes="0">
+                      <Component id="javaCompletionExcluderCloseButton" min="0" pref="0" max="32767" attributes="1"/>
+                      <Component id="javaCompletionExcluderRemoveButton" alignment="0" max="32767" attributes="1"/>
+                      <Component id="javaCompletionExcluderAddButton" alignment="0" max="32767" attributes="1"/>
+                  </Group>
+                  <EmptySpace pref="10" max="32767" attributes="0"/>
+              </Group>
+          </Group>
+        </DimensionLayout>
+        <DimensionLayout dim="1">
+          <Group type="103" groupAlignment="0" attributes="0">
+              <Group type="102" attributes="0">
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <Group type="102" attributes="0">
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="javaCompletionExcluderTab" min="-2" pref="221" max="-2" attributes="0"/>
+                      </Group>
+                      <Group type="102" alignment="0" attributes="0">
+                          <EmptySpace min="-2" pref="59" max="-2" attributes="0"/>
+                          <Component id="javaCompletionExcluderAddButton" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="javaCompletionExcluderRemoveButton" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace min="-2" pref="63" max="-2" attributes="0"/>
+                          <Component id="javaCompletionExcluderCloseButton" min="-2" max="-2" attributes="0"/>
+                      </Group>
+                  </Group>
+                  <EmptySpace max="32767" attributes="0"/>
+              </Group>
+          </Group>
+        </DimensionLayout>
+      </Layout>
+      <SubComponents>
+        <Container class="javax.swing.JTabbedPane" name="javaCompletionExcluderTab">
+
+          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout"/>
+          <SubComponents>
+            <Container class="javax.swing.JScrollPane" name="javaCompletionExcludeScrollPane">
+              <AuxValues>
+                <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
+              </AuxValues>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
+                  <JTabbedPaneConstraints tabName="&lt;CodeCompletionPanel.javaCompletionExcludeScrollPane.TabConstraints.tabTitle&gt;">
+                    <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                      <ResourceString bundle="org/netbeans/modules/java/editor/options/Bundle.properties" key="CodeCompletionPanel.javaCompletionExcludeScrollPane.TabConstraints.tabTitle" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                    </Property>
+                  </JTabbedPaneConstraints>
+                </Constraint>
+              </Constraints>
+
+              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+              <SubComponents>
+                <Component class="javax.swing.JTable" name="javaCompletionExcludeTable">
+                  <Properties>
+                    <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
+                      <Table columnCount="1" rowCount="0">
+                        <Column editable="true" title="Fully Qualified Name prefix" type="java.lang.String"/>
+                      </Table>
+                    </Property>
+                    <Property name="columnModel" type="javax.swing.table.TableColumnModel" editor="org.netbeans.modules.form.editors2.TableColumnModelEditor">
+                      <TableColumnModel selectionModel="0">
+                        <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
+                          <Title editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                            <ResourceString bundle="org/netbeans/modules/java/editor/options/Bundle.properties" key="CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title0" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                          </Title>
+                          <Editor/>
+                          <Renderer/>
+                        </Column>
+                      </TableColumnModel>
+                    </Property>
+                    <Property name="tableHeader" type="javax.swing.table.JTableHeader" editor="org.netbeans.modules.form.editors2.JTableHeaderEditor">
+                      <TableHeader reorderingAllowed="false" resizingAllowed="true"/>
+                    </Property>
+                  </Properties>
+                </Component>
+              </SubComponents>
+            </Container>
+            <Container class="javax.swing.JScrollPane" name="javaCompletionIncludeScrollPane">
+              <AuxValues>
+                <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
+              </AuxValues>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
+                  <JTabbedPaneConstraints tabName="&lt;CodeCompletionPanel.javaCompletionIncludeScrollPane.TabConstraints.tabTitle&gt;">
+                    <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                      <ResourceString bundle="org/netbeans/modules/java/editor/options/Bundle.properties" key="CodeCompletionPanel.javaCompletionIncludeScrollPane.TabConstraints.tabTitle" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                    </Property>
+                  </JTabbedPaneConstraints>
+                </Constraint>
+              </Constraints>
+
+              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
+              <SubComponents>
+                <Component class="javax.swing.JTable" name="javaCompletionIncludeTable">
+                  <Properties>
+                    <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
+                      <Table columnCount="1" rowCount="0">
+                        <Column editable="true" title="Fully Qualified Name prefix" type="java.lang.String"/>
+                      </Table>
+                    </Property>
+                    <Property name="columnModel" type="javax.swing.table.TableColumnModel" editor="org.netbeans.modules.form.editors2.TableColumnModelEditor">
+                      <TableColumnModel selectionModel="0">
+                        <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
+                          <Title editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                            <ResourceString bundle="org/netbeans/modules/java/editor/options/Bundle.properties" key="CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title0" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+                          </Title>
+                          <Editor/>
+                          <Renderer/>
+                        </Column>
+                      </TableColumnModel>
+                    </Property>
+                    <Property name="tableHeader" type="javax.swing.table.JTableHeader" editor="org.netbeans.modules.form.editors2.JTableHeaderEditor">
+                      <TableHeader reorderingAllowed="false" resizingAllowed="true"/>
+                    </Property>
+                  </Properties>
+                </Component>
+              </SubComponents>
+            </Container>
+          </SubComponents>
+        </Container>
+        <Component class="javax.swing.JButton" name="javaCompletionExcluderAddButton">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/netbeans/modules/java/editor/options/Bundle.properties" key="CodeCompletionPanel.javaCompletionExcluderAddButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="javaCompletionExcluderAddButtonActionPerformed"/>
+          </Events>
+        </Component>
+        <Component class="javax.swing.JButton" name="javaCompletionExcluderRemoveButton">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/netbeans/modules/java/editor/options/Bundle.properties" key="CodeCompletionPanel.javaCompletionExcluderRemoveButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="javaCompletionExcluderRemoveButtonActionPerformed"/>
+          </Events>
+        </Component>
+        <Component class="javax.swing.JButton" name="javaCompletionExcluderCloseButton">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/netbeans/modules/java/editor/options/Bundle.properties" key="CodeCompletionPanel.javaCompletionExcluderCloseButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="javaCompletionExcluderCloseButtonActionPerformed"/>
+          </Events>
+        </Component>
+      </SubComponents>
+    </Container>
+  </NonVisualComponents>
+  <Properties>
     <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
       <Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
         <EmptyBorder bottom="0" left="0" right="0" top="0"/>
@@ -23,37 +196,82 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
+          <Component id="javaCompletionPane" alignment="0" max="32767" attributes="0"/>
+      </Group>
+    </DimensionLayout>
+    <DimensionLayout dim="1">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Component id="javaCompletionPane" alignment="0" max="32767" attributes="0"/>
+      </Group>
+    </DimensionLayout>
+  </Layout>
+  <SubComponents>
+    <Container class="javax.swing.JPanel" name="javaCompletionPane">
+
+      <Layout>
+        <DimensionLayout dim="0">
+          <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="jSeparator1" alignment="0" pref="362" max="32767" attributes="0"/>
-                  <Component id="guessMethodArguments" min="-2" max="-2" attributes="0"/>
+                      <Component id="jSeparator1" pref="511" max="32767" attributes="0"/>
                   <Group type="102" alignment="0" attributes="0">
+                          <Component id="javadocAutoCompletionTriggersLabel" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace max="-2" attributes="0"/>
+                          <Component id="javadocAutoCompletionTriggersField" min="-2" pref="86" max="-2" attributes="1"/>
+                      </Group>
+                  </Group>
+                  <EmptySpace max="-2" attributes="0"/>
+              </Group>
+              <Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
+                  <Group type="102" alignment="0" attributes="0">
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Group type="103" groupAlignment="0" attributes="0">
+                          <Component id="guessMethodArguments" alignment="0" min="-2" max="-2" attributes="0"/>
+                          <Group type="102" alignment="0" attributes="0">
                       <Component id="javaAutoCompletionTriggersLabel" min="-2" max="-2" attributes="1"/>
                       <EmptySpace min="-2" pref="34" max="-2" attributes="0"/>
                       <Component id="javaAutoCompletionTriggersField" min="-2" pref="86" max="-2" attributes="1"/>
                   </Group>
                   <Component id="javaAutoPopupOnIdentifierPart" alignment="0" min="-2" max="-2" attributes="1"/>
                   <Group type="102" alignment="0" attributes="0">
-                      <Component id="javaCompletionSelectorsLabel" min="-2" max="-2" attributes="1"/>
+                              <Group type="103" groupAlignment="1" attributes="0">
+                                  <Component id="javaCompletionExcluderLabel" alignment="1" min="-2" max="-2" attributes="0"/>
+                                  <Component id="javaCompletionSelectorsLabel" alignment="1" min="-2" max="-2" attributes="1"/>
+                              </Group>
+                              <Group type="103" groupAlignment="0" attributes="0">
+                                  <Group type="102" attributes="0">
                       <EmptySpace min="-2" pref="30" max="-2" attributes="0"/>
                       <Component id="javaCompletionSelectorsField" min="-2" pref="86" max="-2" attributes="1"/>
                   </Group>
-                  <Group type="102" alignment="0" attributes="0">
-                      <Component id="javadocAutoCompletionTriggersLabel" min="-2" max="-2" attributes="0"/>
-                      <EmptySpace max="-2" attributes="0"/>
-                      <Component id="javadocAutoCompletionTriggersField" min="-2" pref="86" max="-2" attributes="1"/>
+                                  <Group type="102" alignment="1" attributes="0">
+                                      <EmptySpace min="-2" pref="23" max="-2" attributes="0"/>
+                                      <Component id="javaCompletionExcluderButton" min="-2" pref="93" max="-2" attributes="0"/>
                   </Group>
               </Group>
-              <EmptySpace max="-2" attributes="0"/>
           </Group>
       </Group>
+                      <EmptySpace pref="25" max="32767" attributes="0"/>
+                  </Group>
+              </Group>
+          </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Group type="102" attributes="0">
+              <Group type="102" alignment="0" attributes="0">
+                  <EmptySpace min="-2" pref="171" max="-2" attributes="0"/>
+                  <Component id="jSeparator1" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace type="separate" max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="javadocAutoCompletionTriggersLabel" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="javadocAutoCompletionTriggersField" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace pref="23" max="32767" attributes="0"/>
+              </Group>
+              <Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
+                  <Group type="102" alignment="0" attributes="0">
               <EmptySpace max="-2" attributes="0"/>
-              <Component id="guessMethodArguments" min="-2" max="-2" attributes="0"/>
+                      <Component id="guessMethodArguments" min="-2" pref="23" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
                   <Component id="javaAutoCompletionTriggersLabel" alignment="3" min="-2" max="-2" attributes="0"/>
@@ -66,16 +284,15 @@
                   <Component id="javaCompletionSelectorsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                   <Component id="javaCompletionSelectorsField" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace type="separate" max="-2" attributes="0"/>
-              <Component id="jSeparator1" min="-2" max="-2" attributes="0"/>
-              <EmptySpace type="separate" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
-                  <Component id="javadocAutoCompletionTriggersLabel" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="javadocAutoCompletionTriggersField" alignment="3" min="-2" max="-2" attributes="0"/>
+                          <Component id="javaCompletionExcluderButton" alignment="3" min="-2" max="-2" attributes="0"/>
+                          <Component id="javaCompletionExcluderLabel" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
-              <EmptySpace pref="30" max="32767" attributes="0"/>
+                      <EmptySpace pref="91" max="32767" attributes="0"/>
           </Group>
       </Group>
+          </Group>
     </DimensionLayout>
   </Layout>
   <SubComponents>
@@ -84,9 +301,6 @@
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/netbeans/modules/java/editor/options/Bundle.properties" key="LBL_GuessMethodArgs" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
-        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-          <Border info="null"/>
-        </Property>
       </Properties>
       <Events>
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="guessMethodArgumentsActionPerformed"/>
@@ -97,9 +311,6 @@
         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
           <ResourceString bundle="org/netbeans/modules/java/editor/options/Bundle.properties" key="LBL_AutoPopupOnIdentifierPartBox" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
         </Property>
-        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
-          <Border info="null"/>
-        </Property>
       </Properties>
       <Events>
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="javaAutoPopupOnIdentifierPartActionPerformed"/>
@@ -151,5 +362,24 @@
     </Component>
     <Component class="javax.swing.JSeparator" name="jSeparator1">
     </Component>
+        <Component class="javax.swing.JLabel" name="javaCompletionExcluderLabel">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/netbeans/modules/java/editor/options/Bundle.properties" key="CodeCompletionPanel.javaCompletionExcluderLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JButton" name="javaCompletionExcluderButton">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="org/netbeans/modules/java/editor/options/Bundle.properties" key="CodeCompletionPanel.javaCompletionExcluderButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="javaCompletionExcluderButtonActionPerformed"/>
+          </Events>
+        </Component>
   </SubComponents>
+    </Container>
+  </SubComponents>
 </Form>
Index: org/netbeans/modules/java/editor/options/CodeCompletionPanel.java
--- org/netbeans/modules/java/editor/options/CodeCompletionPanel.java Base (BASE)
+++ org/netbeans/modules/java/editor/options/CodeCompletionPanel.java Locally Modified (Based On LOCAL)
@@ -38,13 +38,21 @@
  * Version 2 license, then the option applies only if the new code is
  * made subject to such option by the copyright holder.
  */
-
 package org.netbeans.modules.java.editor.options;
 
+import java.awt.Component;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.TreeSet;
+import java.util.Vector;
 import java.util.prefs.Preferences;
 import javax.swing.JComponent;
+import javax.swing.JTable;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
+import javax.swing.table.DefaultTableModel;
 import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
 import org.openide.util.HelpCtx;
 
@@ -52,25 +60,49 @@
  *
  * @author Dusan Balek
  */
-public class CodeCompletionPanel extends javax.swing.JPanel implements DocumentListener {
+public class CodeCompletionPanel extends javax.swing.JPanel implements DocumentListener, TableModelListener {
 
     public static final String JAVA_AUTO_POPUP_ON_IDENTIFIER_PART = "javaAutoPopupOnIdentifierPart"; //NOI18N
+    public static final boolean JAVA_AUTO_POPUP_ON_IDENTIFIER_PART_DEFAULT = false;
     public static final String JAVA_AUTO_COMPLETION_TRIGGERS = "javaAutoCompletionTriggers"; //NOI18N
+    public static final String JAVA_AUTO_COMPLETION_TRIGGERS_DEFAULT = "."; //NOI18N
     public static final String JAVA_COMPLETION_SELECTORS = "javaCompletionSelectors"; //NOI18N
+    public static final String JAVA_COMPLETION_SELECTORS_DEFAULT = ".,;:([+-="; //NOI18N
     public static final String JAVADOC_AUTO_COMPLETION_TRIGGERS = "javadocAutoCompletionTriggers"; //NOI18N
+    public static final String JAVADOC_AUTO_COMPLETION_TRIGGERS_DEFAULT = ".#@"; //NOI18N
     public static final String GUESS_METHOD_ARGUMENTS = "guessMethodArguments"; //NOI18N
+    public static final boolean GUESS_METHOD_ARGUMENTS_DEFAULT = true;
+    public static final String JAVA_COMPLETION_WHITELIST = "javaCompletionWhitelist"; //NOI18N
+    public static final String JAVA_COMPLETION_WHITELIST_DEFAULT = ""; //NOI18N
+    public static final String JAVA_COMPLETION_BLACKLIST = "javaCompletionBlacklist"; //NOI18N
+    public static final String JAVA_COMPLETION_BLACKLIST_DEFAULT = ""; //NOI18N
 
-    private Preferences preferences;
+    private final Preferences preferences;
 
+    private void initExcluderTable(JTable table, String pref) {
+        String[] entries = pref.split(","); //NOI18N
+        DefaultTableModel model = (DefaultTableModel) table.getModel();
+        for (String entry : entries) {
+            if (entry.length() > 0) {
+                model.addRow(new String[]{entry});
+            }
+        }
+        model.addTableModelListener(this);
+    }
+
     /** Creates new form FmtTabsIndents */
     public CodeCompletionPanel(Preferences p) {
         initComponents();
         preferences = p;
-        guessMethodArguments.setSelected(preferences.getBoolean(GUESS_METHOD_ARGUMENTS, true));
-        javaAutoPopupOnIdentifierPart.setSelected(preferences.getBoolean(JAVA_AUTO_POPUP_ON_IDENTIFIER_PART, false));
-        javaAutoCompletionTriggersField.setText(preferences.get(JAVA_AUTO_COMPLETION_TRIGGERS, ".")); //NOI18N
-        javaCompletionSelectorsField.setText(preferences.get(JAVA_COMPLETION_SELECTORS, ".,;:([+-=")); //NOI18N
-        javadocAutoCompletionTriggersField.setText(preferences.get(JAVADOC_AUTO_COMPLETION_TRIGGERS, ".#@")); //NOI18N
+        guessMethodArguments.setSelected(preferences.getBoolean(GUESS_METHOD_ARGUMENTS, GUESS_METHOD_ARGUMENTS_DEFAULT));
+        javaAutoPopupOnIdentifierPart.setSelected(preferences.getBoolean(JAVA_AUTO_POPUP_ON_IDENTIFIER_PART, JAVA_AUTO_POPUP_ON_IDENTIFIER_PART_DEFAULT));
+        javaAutoCompletionTriggersField.setText(preferences.get(JAVA_AUTO_COMPLETION_TRIGGERS, JAVA_AUTO_COMPLETION_TRIGGERS_DEFAULT));
+        javaCompletionSelectorsField.setText(preferences.get(JAVA_COMPLETION_SELECTORS, JAVA_COMPLETION_SELECTORS_DEFAULT));
+        javadocAutoCompletionTriggersField.setText(preferences.get(JAVADOC_AUTO_COMPLETION_TRIGGERS, JAVADOC_AUTO_COMPLETION_TRIGGERS_DEFAULT));
+        String blacklist = preferences.get(JAVA_COMPLETION_BLACKLIST, JAVA_COMPLETION_BLACKLIST_DEFAULT);
+        initExcluderTable(javaCompletionExcludeTable, blacklist);
+        String whitelist = preferences.get(JAVA_COMPLETION_WHITELIST, JAVA_COMPLETION_WHITELIST);
+        initExcluderTable(javaCompletionIncludeTable, whitelist);
         javaAutoCompletionTriggersField.getDocument().addDocumentListener(this);
         javaCompletionSelectorsField.getDocument().addDocumentListener(this);
         javadocAutoCompletionTriggersField.getDocument().addDocumentListener(this);
@@ -97,6 +129,57 @@
         update(e);
     }
 
+    // allows common excluder buttons to know which table to act on
+    private JTable getSelectedExcluderTable() {
+        Component selected = javaCompletionExcluderTab.getSelectedComponent();
+        if (selected == javaCompletionExcludeScrollPane) {
+            return javaCompletionExcludeTable;
+        } else if (selected == javaCompletionIncludeScrollPane) {
+            return javaCompletionIncludeTable;
+        } else {
+            throw new RuntimeException(selected.getName());
+        }
+    }
+
+    // listen to changes in the excluder lists, and do sanity checking on input
+    public void tableChanged(TableModelEvent e) {
+        DefaultTableModel model = (DefaultTableModel) e.getSource();
+        String pref;
+        if (model == javaCompletionExcludeTable.getModel()) {
+            pref = JAVA_COMPLETION_BLACKLIST;
+        } else if (model == javaCompletionIncludeTable.getModel()) {
+            pref = JAVA_COMPLETION_WHITELIST;
+        } else {
+            throw new RuntimeException();
+        }
+        @SuppressWarnings("unchecked")
+        Vector<Vector<String>> data = model.getDataVector();
+        Collection<String> entries = new TreeSet<String>();
+        for (Vector<String> row : data) {
+            String entry = row.elementAt(0);
+            if (entry == null) {
+                continue;
+            }
+            entry = entry.trim();
+            if (entry.length() == 0) {
+                continue;
+            }
+            // this could be checked by a custom editor on input
+            if (!entry.matches("[$\\w._]*")) { //NOI18N
+                continue;
+            }
+            entries.add(entry);
+        }
+        StringBuilder builder = new StringBuilder();
+        for (String entry : entries) {
+            if (builder.length() > 0) {
+                builder.append(","); //NOI18N
+            }
+            builder.append(entry);
+        }
+        preferences.put(pref, builder.toString());
+    }
+
     /** This method is called from within the constructor to
      * initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is
@@ -105,6 +188,16 @@
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
+        javaCompletionExcluderFrame = new javax.swing.JFrame();
+        javaCompletionExcluderTab = new javax.swing.JTabbedPane();
+        javaCompletionExcludeScrollPane = new javax.swing.JScrollPane();
+        javaCompletionExcludeTable = new javax.swing.JTable();
+        javaCompletionIncludeScrollPane = new javax.swing.JScrollPane();
+        javaCompletionIncludeTable = new javax.swing.JTable();
+        javaCompletionExcluderAddButton = new javax.swing.JButton();
+        javaCompletionExcluderRemoveButton = new javax.swing.JButton();
+        javaCompletionExcluderCloseButton = new javax.swing.JButton();
+        javaCompletionPane = new javax.swing.JPanel();
         guessMethodArguments = new javax.swing.JCheckBox();
         javaAutoPopupOnIdentifierPart = new javax.swing.JCheckBox();
         javaAutoCompletionTriggersLabel = new javax.swing.JLabel();
@@ -114,11 +207,113 @@
         javadocAutoCompletionTriggersLabel = new javax.swing.JLabel();
         javadocAutoCompletionTriggersField = new javax.swing.JTextField();
         jSeparator1 = new javax.swing.JSeparator();
+        javaCompletionExcluderLabel = new javax.swing.JLabel();
+        javaCompletionExcluderButton = new javax.swing.JButton();
 
+        javaCompletionExcluderFrame.setTitle(org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionExcluderFrame.title")); // NOI18N
+        javaCompletionExcluderFrame.setAlwaysOnTop(true);
+        javaCompletionExcluderFrame.setMinimumSize(new java.awt.Dimension(409, 233));
+        javaCompletionExcluderFrame.setUndecorated(true);
+
+        javaCompletionExcludeTable.setModel(new javax.swing.table.DefaultTableModel(
+            new Object [][] {
+
+            },
+            new String [] {
+                "Fully Qualified Name prefix"
+            }
+        ) {
+            Class[] types = new Class [] {
+                java.lang.String.class
+            };
+
+            public Class getColumnClass(int columnIndex) {
+                return types [columnIndex];
+            }
+        });
+        javaCompletionExcludeTable.getTableHeader().setReorderingAllowed(false);
+        javaCompletionExcludeScrollPane.setViewportView(javaCompletionExcludeTable);
+        javaCompletionExcludeTable.getColumnModel().getColumn(0).setHeaderValue(org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title0")); // NOI18N
+
+        javaCompletionExcluderTab.addTab(org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionExcludeScrollPane.TabConstraints.tabTitle"), javaCompletionExcludeScrollPane); // NOI18N
+
+        javaCompletionIncludeTable.setModel(new javax.swing.table.DefaultTableModel(
+            new Object [][] {
+
+            },
+            new String [] {
+                "Fully Qualified Name prefix"
+            }
+        ) {
+            Class[] types = new Class [] {
+                java.lang.String.class
+            };
+
+            public Class getColumnClass(int columnIndex) {
+                return types [columnIndex];
+            }
+        });
+        javaCompletionIncludeTable.getTableHeader().setReorderingAllowed(false);
+        javaCompletionIncludeScrollPane.setViewportView(javaCompletionIncludeTable);
+        javaCompletionIncludeTable.getColumnModel().getColumn(0).setHeaderValue(org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title0")); // NOI18N
+
+        javaCompletionExcluderTab.addTab(org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionIncludeScrollPane.TabConstraints.tabTitle"), javaCompletionIncludeScrollPane); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(javaCompletionExcluderAddButton, org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionExcluderAddButton.text")); // NOI18N
+        javaCompletionExcluderAddButton.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                javaCompletionExcluderAddButtonActionPerformed(evt);
+            }
+        });
+
+        org.openide.awt.Mnemonics.setLocalizedText(javaCompletionExcluderRemoveButton, org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionExcluderRemoveButton.text")); // NOI18N
+        javaCompletionExcluderRemoveButton.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                javaCompletionExcluderRemoveButtonActionPerformed(evt);
+            }
+        });
+
+        org.openide.awt.Mnemonics.setLocalizedText(javaCompletionExcluderCloseButton, org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionExcluderCloseButton.text")); // NOI18N
+        javaCompletionExcluderCloseButton.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                javaCompletionExcluderCloseButtonActionPerformed(evt);
+            }
+        });
+
+        org.jdesktop.layout.GroupLayout javaCompletionExcluderFrameLayout = new org.jdesktop.layout.GroupLayout(javaCompletionExcluderFrame.getContentPane());
+        javaCompletionExcluderFrame.getContentPane().setLayout(javaCompletionExcluderFrameLayout);
+        javaCompletionExcluderFrameLayout.setHorizontalGroup(
+            javaCompletionExcluderFrameLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(org.jdesktop.layout.GroupLayout.TRAILING, javaCompletionExcluderFrameLayout.createSequentialGroup()
+                .addContainerGap()
+                .add(javaCompletionExcluderTab, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 298, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                .add(javaCompletionExcluderFrameLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
+                    .add(javaCompletionExcluderCloseButton, 0, 0, Short.MAX_VALUE)
+                    .add(javaCompletionExcluderRemoveButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .add(javaCompletionExcluderAddButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                .addContainerGap(10, Short.MAX_VALUE))
+        );
+        javaCompletionExcluderFrameLayout.setVerticalGroup(
+            javaCompletionExcluderFrameLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(javaCompletionExcluderFrameLayout.createSequentialGroup()
+                .add(javaCompletionExcluderFrameLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(javaCompletionExcluderFrameLayout.createSequentialGroup()
+                        .addContainerGap()
+                        .add(javaCompletionExcluderTab, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 221, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                    .add(javaCompletionExcluderFrameLayout.createSequentialGroup()
+                        .add(59, 59, 59)
+                        .add(javaCompletionExcluderAddButton)
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(javaCompletionExcluderRemoveButton)
+                        .add(63, 63, 63)
+                        .add(javaCompletionExcluderCloseButton)))
+                .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+        );
+
         setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
 
         org.openide.awt.Mnemonics.setLocalizedText(guessMethodArguments, org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "LBL_GuessMethodArgs")); // NOI18N
-        guessMethodArguments.setBorder(null);
         guessMethodArguments.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 guessMethodArgumentsActionPerformed(evt);
@@ -126,7 +321,6 @@
         });
 
         org.openide.awt.Mnemonics.setLocalizedText(javaAutoPopupOnIdentifierPart, org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "LBL_AutoPopupOnIdentifierPartBox")); // NOI18N
-        javaAutoPopupOnIdentifierPart.setBorder(null);
         javaAutoPopupOnIdentifierPart.addActionListener(new java.awt.event.ActionListener() {
             public void actionPerformed(java.awt.event.ActionEvent evt) {
                 javaAutoPopupOnIdentifierPartActionPerformed(evt);
@@ -146,53 +340,92 @@
 
         javadocAutoCompletionTriggersField.setText(org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javadocAutoCompletionTriggersField.text")); // NOI18N
 
-        org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
-        this.setLayout(layout);
-        layout.setHorizontalGroup(
-            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
+        org.openide.awt.Mnemonics.setLocalizedText(javaCompletionExcluderLabel, org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionExcluderLabel.text")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(javaCompletionExcluderButton, org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionExcluderButton.text")); // NOI18N
+        javaCompletionExcluderButton.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                javaCompletionExcluderButtonActionPerformed(evt);
+            }
+        });
+
+        org.jdesktop.layout.GroupLayout javaCompletionPaneLayout = new org.jdesktop.layout.GroupLayout(javaCompletionPane);
+        javaCompletionPane.setLayout(javaCompletionPaneLayout);
+        javaCompletionPaneLayout.setHorizontalGroup(
+            javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(javaCompletionPaneLayout.createSequentialGroup()
                 .addContainerGap()
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(jSeparator1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 362, Short.MAX_VALUE)
+                .add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(jSeparator1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 337, Short.MAX_VALUE)
+                    .add(javaCompletionPaneLayout.createSequentialGroup()
+                        .add(javadocAutoCompletionTriggersLabel)
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(javadocAutoCompletionTriggersField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 86, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
+                .addContainerGap())
+            .add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                .add(javaCompletionPaneLayout.createSequentialGroup()
+                    .addContainerGap()
+                    .add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                     .add(guessMethodArguments)
-                    .add(layout.createSequentialGroup()
+                        .add(javaCompletionPaneLayout.createSequentialGroup()
                         .add(javaAutoCompletionTriggersLabel)
                         .add(34, 34, 34)
                         .add(javaAutoCompletionTriggersField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 86, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                     .add(javaAutoPopupOnIdentifierPart)
-                    .add(layout.createSequentialGroup()
-                        .add(javaCompletionSelectorsLabel)
+                        .add(javaCompletionPaneLayout.createSequentialGroup()
+                            .add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
+                                .add(javaCompletionExcluderLabel)
+                                .add(javaCompletionSelectorsLabel))
+                            .add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                                .add(javaCompletionPaneLayout.createSequentialGroup()
                         .add(30, 30, 30)
                         .add(javaCompletionSelectorsField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 86, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                    .add(layout.createSequentialGroup()
-                        .add(javadocAutoCompletionTriggersLabel)
-                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(javadocAutoCompletionTriggersField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 86, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
-                .addContainerGap())
+                                .add(org.jdesktop.layout.GroupLayout.TRAILING, javaCompletionPaneLayout.createSequentialGroup()
+                                    .add(23, 23, 23)
+                                    .add(javaCompletionExcluderButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 93, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))))
+                    .addContainerGap(25, Short.MAX_VALUE)))
         );
-        layout.setVerticalGroup(
-            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
+        javaCompletionPaneLayout.setVerticalGroup(
+            javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(javaCompletionPaneLayout.createSequentialGroup()
+                .add(171, 171, 171)
+                .add(jSeparator1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .add(18, 18, 18)
+                .add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(javadocAutoCompletionTriggersLabel)
+                    .add(javadocAutoCompletionTriggersField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(23, Short.MAX_VALUE))
+            .add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                .add(javaCompletionPaneLayout.createSequentialGroup()
                 .addContainerGap()
-                .add(guessMethodArguments)
+                    .add(guessMethodArguments, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 23, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                     .add(javaAutoCompletionTriggersLabel)
                     .add(javaAutoCompletionTriggersField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(javaAutoPopupOnIdentifierPart)
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                     .add(javaCompletionSelectorsLabel)
                     .add(javaCompletionSelectorsField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .add(18, 18, 18)
-                .add(jSeparator1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                .add(18, 18, 18)
-                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(javadocAutoCompletionTriggersLabel)
-                    .add(javadocAutoCompletionTriggersField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addContainerGap(30, Short.MAX_VALUE))
+                    .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                    .add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                        .add(javaCompletionExcluderButton)
+                        .add(javaCompletionExcluderLabel))
+                    .addContainerGap(91, Short.MAX_VALUE)))
         );
+
+        org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+        this.setLayout(layout);
+        layout.setHorizontalGroup(
+            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(javaCompletionPane, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+        );
+        layout.setVerticalGroup(
+            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(javaCompletionPane, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+        );
     }// </editor-fold>//GEN-END:initComponents
 
     private void javaAutoPopupOnIdentifierPartActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_javaAutoPopupOnIdentifierPartActionPerformed
@@ -203,6 +436,40 @@
         preferences.putBoolean(GUESS_METHOD_ARGUMENTS, guessMethodArguments.isSelected());
 }//GEN-LAST:event_guessMethodArgumentsActionPerformed
 
+	private void javaCompletionExcluderButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_javaCompletionExcluderButtonActionPerformed
+        if (javaCompletionExcluderFrame.isVisible())
+            return;
+        javaCompletionExcluderFrame.pack();
+        javaCompletionExcluderFrame.setLocationRelativeTo(this);
+        javaCompletionExcluderFrame.setVisible(true);
+}//GEN-LAST:event_javaCompletionExcluderButtonActionPerformed
+
+	private void javaCompletionExcluderAddButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_javaCompletionExcluderAddButtonActionPerformed
+        JTable table = getSelectedExcluderTable();
+        DefaultTableModel model = (DefaultTableModel) table.getModel();
+        int rows = model.getRowCount();
+        model.setRowCount(rows + 1);
+        table.editCellAt(rows, 0);
+        table.requestFocus();
+}//GEN-LAST:event_javaCompletionExcluderAddButtonActionPerformed
+
+    private void javaCompletionExcluderRemoveButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_javaCompletionExcluderRemoveButtonActionPerformed
+        JTable table = getSelectedExcluderTable();
+        int[] rows = table.getSelectedRows();
+        if (rows.length == 0)
+            return;
+        // remove rows in descending order: row numbers change when a row is removed
+        Arrays.sort(rows);
+        DefaultTableModel model = (DefaultTableModel) table.getModel();
+        for (int row = rows.length - 1 ; row >=0 ; row--) {
+            model.removeRow(row);
+        }
+}//GEN-LAST:event_javaCompletionExcluderRemoveButtonActionPerformed
+
+    private void javaCompletionExcluderCloseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_javaCompletionExcluderCloseButtonActionPerformed
+        javaCompletionExcluderFrame.setVisible(false);
+    }//GEN-LAST:event_javaCompletionExcluderCloseButtonActionPerformed
+
     private void update(DocumentEvent e) {
         if (e.getDocument() == javaAutoCompletionTriggersField.getDocument())
             preferences.put(JAVA_AUTO_COMPLETION_TRIGGERS, javaAutoCompletionTriggersField.getText());
@@ -218,6 +485,18 @@
     private javax.swing.JTextField javaAutoCompletionTriggersField;
     private javax.swing.JLabel javaAutoCompletionTriggersLabel;
     private javax.swing.JCheckBox javaAutoPopupOnIdentifierPart;
+    private javax.swing.JScrollPane javaCompletionExcludeScrollPane;
+    private javax.swing.JTable javaCompletionExcludeTable;
+    private javax.swing.JButton javaCompletionExcluderAddButton;
+    private javax.swing.JButton javaCompletionExcluderButton;
+    private javax.swing.JButton javaCompletionExcluderCloseButton;
+    private javax.swing.JFrame javaCompletionExcluderFrame;
+    private javax.swing.JLabel javaCompletionExcluderLabel;
+    private javax.swing.JButton javaCompletionExcluderRemoveButton;
+    private javax.swing.JTabbedPane javaCompletionExcluderTab;
+    private javax.swing.JScrollPane javaCompletionIncludeScrollPane;
+    private javax.swing.JTable javaCompletionIncludeTable;
+    private javax.swing.JPanel javaCompletionPane;
     private javax.swing.JTextField javaCompletionSelectorsField;
     private javax.swing.JLabel javaCompletionSelectorsLabel;
     private javax.swing.JTextField javadocAutoCompletionTriggersField;
@@ -226,7 +505,7 @@
     
     private static class CodeCompletionPreferencesCusromizer implements PreferencesCustomizer {
 
-        private Preferences preferences;
+        private final Preferences preferences;
 
         private CodeCompletionPreferencesCusromizer(Preferences p) {
             preferences = p;