Attachment #79570 for bug #125060

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 125060
Collapse All | Expand All




                                    (Utilities.isShowDeprecatedMembers() || !elements.isDeprecated(e)) &&
                                    tu.isAccessible(scope, e, t);
                        case METHOD:
                            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) &&
                                    !Utilities.isExcluded(Utilities.getElementName(e.getEnclosingElement(), true) + "." + sn); //NOI18N
                    }
                    return false;
                }

                                    isOfKindAndType(asMemberOf(e, t, types), e, kinds, baseType, scope, trees, types) &&
                                    tu.isAccessible(scope, e, t);
                        case METHOD:
                            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)) &&
                                    !Utilities.isExcluded(Utilities.getElementName(e.getEnclosingElement(), true) + "." + sn); //NOI18N
                        case CLASS:
                        case ENUM:
                        case INTERFACE:

            if (fqnPrefix == null)
                fqnPrefix = EMPTY;
            for (String pkgName : env.getController().getClasspathInfo().getClassIndex().getPackageNames(fqnPrefix, true,EnumSet.allOf(ClassIndex.SearchScope.class)))
                if (pkgName.length() > 0 && !Utilities.isExcluded(pkgName + ".")) //NOI18N
                    results.add(JavaCompletionItem.createPackageItem(pkgName, anchorOffset, inPkgStmt));
        }
        

Lines 117-123 Link Here

(-)a/java.editor/src/org/netbeans/modules/editor/java/LazyTypeCompletionItem.java (-1 / +1 lines)
117	TypeElement e = handle.resolve(controller);	117	TypeElement e = handle.resolve(controller);
118	Elements elements = controller.getElements();	118	Elements elements = controller.getElements();
119	if (e != null && (Utilities.isShowDeprecatedMembers() \|\| !elements.isDeprecated(e)) && controller.getTrees().isAccessible(scope, e)) {	119	if (e != null && (Utilities.isShowDeprecatedMembers() \|\| !elements.isDeprecated(e)) && controller.getTrees().isAccessible(scope, e)) {
120	if (isOfKind(e, kinds) && (!isInDefaultPackage(e) \|\| isInDefaultPackage(scope.getEnclosingClass())))	120	if (isOfKind(e, kinds) && (!isInDefaultPackage(e) \|\| isInDefaultPackage(scope.getEnclosingClass())) && !Utilities.isExcluded(e.getQualifiedName()))
121	delegate = JavaCompletionItem.createTypeItem(e, (DeclaredType)e.asType(), substitutionOffset, true, controller.getElements().isDeprecated(e), insideNew, false);	121	delegate = JavaCompletionItem.createTypeItem(e, (DeclaredType)e.asType(), substitutionOffset, true, controller.getElements().isDeprecated(e), insideNew, false);
122	}	122	}
123	}	123	}




import com.sun.source.util.Trees;

import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.prefs.PreferenceChangeEvent;
import java.util.prefs.PreferenceChangeListener;
import java.util.prefs.Preferences;

                showDeprecatedMembers = preferences.getBoolean(SimpleValueNames.SHOW_DEPRECATED_MEMBERS, true);
            }
            if (settingName == null || CodeCompletionPanel.GUESS_METHOD_ARGUMENTS.equals(settingName)) {
                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, 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, CodeCompletionPanel.JAVA_AUTO_COMPLETION_TRIGGERS_DEFAULT);
            }
            if (settingName == null || CodeCompletionPanel.JAVA_COMPLETION_SELECTORS.equals(settingName)) {
                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, 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);
                updateExcluder(exclude, blacklist);
            }
            if (settingName == null || CodeCompletionPanel.JAVA_COMPLETION_WHITELIST.equals(settingName)) {
                String whitelist = preferences.get(CodeCompletionPanel.JAVA_COMPLETION_WHITELIST, CodeCompletionPanel.JAVA_COMPLETION_WHITELIST_DEFAULT);
                updateExcluder(include, whitelist);
            }
        }
    };

        return javadocCompletionAutoPopupTriggers;
    }

    static private volatile AtomicReference<Collection<String>> exclude;
    static private volatile AtomicReference<Collection<String>> include;

    private static void updateExcluder(AtomicReference<Collection<String>> existing, String updated) {
        Collection<String> nue = new LinkedList<String>();
        if (updated == null || updated.length() == 0) {
            existing.set(nue);
            return;
        }
        String[] entries = updated.split(","); //NOI18N
        for (String entry : entries) {
            if (entry != null && entry.length() != 0) {
                nue.add(entry);
            }
        }
        existing.set(nue);
    }

    /**
     * @param fqn Fully Qualified Name (including method names). Packages names are expected to
     * end in a trailing "."
     * @return
     */
    public static boolean isExcluded(final CharSequence fqn) {
        if (fqn == null || fqn.length() == 0 || fqn.equals(".")) { //NOI18N
            return true;
        }
        lazyInit();
        String s = fqn.toString();
        if (!include.get().isEmpty()) {
            for (String entry : include.get()) {
                if (entry.length() > fqn.length()) {
                    if (entry.startsWith(s)) {
                        return false;
                    }
                } else if (s.startsWith(entry)) {
                    return false;
                }
            }
        }

        if (!exclude.get().isEmpty()) {
            for (String entry : exclude.get()) {
                if (entry.length() <= fqn.length() && s.startsWith(entry)) {
                    return true;
                }
            }
        }

        return false;
    }

    private static void lazyInit() {
        if (!inited) {
            inited = true;
            Collection<String> empty = Collections.emptySet();
            exclude = new AtomicReference<Collection<String>>(empty);
            include = new AtomicReference<Collection<String>>(empty);
            preferences = MimeLookup.getLookup(JavaKit.JAVA_MIME_TYPE).lookup(Preferences.class);
            preferences.addPreferenceChangeListener(WeakListeners.create(PreferenceChangeListener.class, preferencesTracker, preferences));
            preferencesTracker.preferenceChange(null);

Lines 72-77 Link Here

(-)a/java.editor/src/org/netbeans/modules/java/editor/imports/ComputeImports.java (-1 / +3 lines)
72	import org.netbeans.api.java.source.ClassIndex.NameKind;	72	import org.netbeans.api.java.source.ClassIndex.NameKind;
73	import org.netbeans.api.java.source.ElementHandle;	73	import org.netbeans.api.java.source.ElementHandle;
74	import org.netbeans.api.java.source.support.CancellableTreePathScanner;	74	import org.netbeans.api.java.source.support.CancellableTreePathScanner;
		75	import org.netbeans.modules.editor.java.Utilities;
75	import org.netbeans.modules.java.editor.javadoc.JavadocImports;	76	import org.netbeans.modules.java.editor.javadoc.JavadocImports;
76	import org.openide.util.Union2;	77	import org.openide.util.Union2;
77		78
Lines 146-152 Link Here
146	}	147	}
147		148
148	//#122334: do not propose imports from the default package:	149	//#122334: do not propose imports from the default package:
149	if (info.getElements().getPackageOf(te).getQualifiedName().length() != 0) {	150	if (info.getElements().getPackageOf(te).getQualifiedName().length() != 0 &&
		151	!Utilities.isExcluded(te.getQualifiedName())) {
150	classes.add(te);	152	classes.add(te);
151	}	153	}
152	}	154	}

Lines 603-609 Link Here

(-)a/java.editor/src/org/netbeans/modules/java/editor/javadoc/JavadocCompletionQuery.java (-1 / +1 lines)
603	}	603	}
604		604
605	for (String pkgName : jdctx.javac.getClasspathInfo().getClassIndex().getPackageNames(pkgPrefix, true, EnumSet.allOf(ClassIndex.SearchScope.class)))	605	for (String pkgName : jdctx.javac.getClasspathInfo().getClassIndex().getPackageNames(pkgPrefix, true, EnumSet.allOf(ClassIndex.SearchScope.class)))
606	if (pkgName.length() > 0)	606	if (pkgName.length() > 0 && !Utilities.isExcluded(pkgName + "."))
607	items.add(JavaCompletionItem.createPackageItem(pkgName, substitutionOffset, false));	607	items.add(JavaCompletionItem.createPackageItem(pkgName, substitutionOffset, false));
608	}	608	}
609		609




LBL_JavaCompletionLabel=Java Code Completion
LBL_GuessMethodParameters=jCheckBox1
LBL_GuessMethodArgs=&Guess Filled Method Arguments
CodeCompletionPanel.javaCompletionExcluderLabel.text=Packages/classes:
CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title3=Title 4
CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title2=Title 3
CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title1=Title 2
CodeCompletionPanel.javaCompletionExcluderButton.text=Exclude
CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title3_1=Title 4
CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title2_1=Title 3
CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title1_1=Title 2
CodeCompletionPanel.javaCompletionExcludeScrollPane.TabConstraints.tabTitle=Exclude
CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title0=Fully Qualified Name prefix
CodeCompletionPanel.javaCompletionExcluderAddButton.text=Add
CodeCompletionPanel.javaCompletionIncludeScrollPane.TabConstraints.tabTitle=Include
CodeCompletionPanel.javaCompletionExcluderRemoveButton.text=Remove
CodeCompletionPanel.javaCompletionExcluderFrame.title=Java Completion Excluder
CodeCompletionPanel.javaCompletionExcluderCloseButton.text=Close




<?xml version="1.0" encoding="UTF-8" ?>

<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="Exclude">
                    <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="Include">
                    <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">

  <Layout>
    <DimensionLayout dim="0">
      <Group type="103" groupAlignment="0" attributes="0">
          <Component id="javaCompletionPane" alignment="0" max="32767" 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"/>
                  <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"/>
                      <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>
              </Group>
              <EmptySpace max="-2" attributes="0"/>
          </Group>
      </Group>
    </DimensionLayout>
    <DimensionLayout dim="1">
      <Group type="103" groupAlignment="0" attributes="0">
          <Component id="javaCompletionPane" alignment="0" max="32767" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="guessMethodArguments" min="-2" 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"/>
                  <Component id="javaAutoCompletionTriggersField" alignment="3" min="-2" max="-2" attributes="0"/>
              </Group>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="javaAutoPopupOnIdentifierPart" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
              <Group type="103" groupAlignment="3" attributes="0">
                  <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"/>
              <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="30" max="32767" attributes="0"/>
          </Group>
      </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" 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">
                              <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="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>
                          </Group>
                      </Group>
                      <EmptySpace pref="199" max="32767" attributes="0"/>
                  </Group>
              </Group>
          </Group>
        </DimensionLayout>
        <DimensionLayout dim="1">
          <Group type="103" groupAlignment="0" 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" 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"/>
                          <Component id="javaAutoCompletionTriggersField" alignment="3" min="-2" max="-2" attributes="0"/>
                      </Group>
                      <EmptySpace max="-2" attributes="0"/>
                      <Component id="javaAutoPopupOnIdentifierPart" min="-2" max="-2" attributes="0"/>
                      <EmptySpace max="-2" attributes="0"/>
                      <Group type="103" groupAlignment="3" attributes="0">
                          <Component id="javaCompletionSelectorsLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                          <Component id="javaCompletionSelectorsField" alignment="3" min="-2" max="-2" attributes="0"/>
                      </Group>
                      <EmptySpace max="-2" attributes="0"/>
                      <Group type="103" groupAlignment="3" 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="91" max="32767" attributes="0"/>
                  </Group>
              </Group>
          </Group>
        </DimensionLayout>
      </Layout>
      <SubComponents>
        <Component class="javax.swing.JCheckBox" name="guessMethodArguments">
          <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="LBL_GuessMethodArgs" 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="guessMethodArgumentsActionPerformed"/>
          </Events>
        </Component>
        <Component class="javax.swing.JCheckBox" name="javaAutoPopupOnIdentifierPart">
          <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="LBL_AutoPopupOnIdentifierPartBox" 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="javaAutoPopupOnIdentifierPartActionPerformed"/>
          </Events>
        </Component>
        <Component class="javax.swing.JLabel" name="javaAutoCompletionTriggersLabel">
          <Properties>
            <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
              <ComponentRef name="javaAutoCompletionTriggersField"/>
            </Property>
            <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_JavaAutoCompletionTriggers" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
            </Property>
          </Properties>
        </Component>
        <Component class="javax.swing.JTextField" name="javaAutoCompletionTriggersField">
          <Properties>
            <Property name="alignmentX" type="float" value="1.0"/>
          </Properties>
        </Component>
        <Component class="javax.swing.JLabel" name="javaCompletionSelectorsLabel">
          <Properties>
            <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
              <ComponentRef name="javaCompletionSelectorsField"/>
            </Property>
            <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_JavaCompletionSelectors" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
            </Property>
          </Properties>
        </Component>
        <Component class="javax.swing.JTextField" name="javaCompletionSelectorsField">
        </Component>
        <Component class="javax.swing.JLabel" name="javadocAutoCompletionTriggersLabel">
          <Properties>
            <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
              <ComponentRef name="javadocAutoCompletionTriggersField"/>
            </Property>
            <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_JavadocAutoCompletionTriggers" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
            </Property>
          </Properties>
        </Component>
        <Component class="javax.swing.JTextField" name="javadocAutoCompletionTriggersField">
          <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.javadocAutoCompletionTriggersField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
            </Property>
          </Properties>
        </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>

Lines 38-50 Link Here

(-)a/java.editor/src/org/netbeans/modules/java/editor/options/CodeCompletionPanel.java (-39 / +321 lines)
38	* Version 2 license, then the option applies only if the new code is	38	* Version 2 license, then the option applies only if the new code is
39	* made subject to such option by the copyright holder.	39	* made subject to such option by the copyright holder.
40	*/	40	*/
41
42	package org.netbeans.modules.java.editor.options;	41	package org.netbeans.modules.java.editor.options;
43		42
		43	import java.awt.Component;
		44	import java.util.Arrays;
		45	import java.util.Collection;
		46	import java.util.TreeSet;
		47	import java.util.Vector;
44	import java.util.prefs.Preferences;	48	import java.util.prefs.Preferences;
45	import javax.swing.JComponent;	49	import javax.swing.JComponent;
		50	import javax.swing.JTable;
46	import javax.swing.event.DocumentEvent;	51	import javax.swing.event.DocumentEvent;
47	import javax.swing.event.DocumentListener;	52	import javax.swing.event.DocumentListener;
		53	import javax.swing.event.TableModelEvent;
		54	import javax.swing.event.TableModelListener;
		55	import javax.swing.table.DefaultTableModel;
48	import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;	56	import org.netbeans.modules.options.editor.spi.PreferencesCustomizer;
49	import org.openide.util.HelpCtx;	57	import org.openide.util.HelpCtx;
50		58
Lines 52-76 Link Here
52	*	60	*
53	* @author Dusan Balek	61	* @author Dusan Balek
54	*/	62	*/
55	public class CodeCompletionPanel extends javax.swing.JPanel implements DocumentListener {	63	public class CodeCompletionPanel extends javax.swing.JPanel implements DocumentListener, TableModelListener {
56		64
57	public static final String JAVA_AUTO_POPUP_ON_IDENTIFIER_PART = "javaAutoPopupOnIdentifierPart"; //NOI18N	65	public static final String JAVA_AUTO_POPUP_ON_IDENTIFIER_PART = "javaAutoPopupOnIdentifierPart"; //NOI18N
		66	public static final boolean JAVA_AUTO_POPUP_ON_IDENTIFIER_PART_DEFAULT = false;
58	public static final String JAVA_AUTO_COMPLETION_TRIGGERS = "javaAutoCompletionTriggers"; //NOI18N	67	public static final String JAVA_AUTO_COMPLETION_TRIGGERS = "javaAutoCompletionTriggers"; //NOI18N
		68	public static final String JAVA_AUTO_COMPLETION_TRIGGERS_DEFAULT = "."; //NOI18N
59	public static final String JAVA_COMPLETION_SELECTORS = "javaCompletionSelectors"; //NOI18N	69	public static final String JAVA_COMPLETION_SELECTORS = "javaCompletionSelectors"; //NOI18N
		70	public static final String JAVA_COMPLETION_SELECTORS_DEFAULT = ".,;:([+-="; //NOI18N
60	public static final String JAVADOC_AUTO_COMPLETION_TRIGGERS = "javadocAutoCompletionTriggers"; //NOI18N	71	public static final String JAVADOC_AUTO_COMPLETION_TRIGGERS = "javadocAutoCompletionTriggers"; //NOI18N
		72	public static final String JAVADOC_AUTO_COMPLETION_TRIGGERS_DEFAULT = ".#@"; //NOI18N
61	public static final String GUESS_METHOD_ARGUMENTS = "guessMethodArguments"; //NOI18N	73	public static final String GUESS_METHOD_ARGUMENTS = "guessMethodArguments"; //NOI18N
		74	public static final boolean GUESS_METHOD_ARGUMENTS_DEFAULT = true;
		75	public static final String JAVA_COMPLETION_WHITELIST = "javaCompletionWhitelist"; //NOI18N
		76	public static final String JAVA_COMPLETION_WHITELIST_DEFAULT = ""; //NOI18N
		77	public static final String JAVA_COMPLETION_BLACKLIST = "javaCompletionBlacklist"; //NOI18N
		78	public static final String JAVA_COMPLETION_BLACKLIST_DEFAULT = ""; //NOI18N
62		79
63	private Preferences preferences;	80	private final Preferences preferences;
		81
		82	private void initExcluderTable(JTable table, String pref) {
		83	String[] entries = pref.split(","); //NOI18N
		84	DefaultTableModel model = (DefaultTableModel) table.getModel();
		85	for (String entry : entries) {
		86	if (entry.length() > 0) {
		87	model.addRow(new String[]{entry});
		88	}
		89	}
		90	model.addTableModelListener(this);
		91	}
64		92
65	/** Creates new form FmtTabsIndents */	93	/** Creates new form FmtTabsIndents */
66	public CodeCompletionPanel(Preferences p) {	94	public CodeCompletionPanel(Preferences p) {
67	initComponents();	95	initComponents();
68	preferences = p;	96	preferences = p;
69	guessMethodArguments.setSelected(preferences.getBoolean(GUESS_METHOD_ARGUMENTS, true));	97	guessMethodArguments.setSelected(preferences.getBoolean(GUESS_METHOD_ARGUMENTS, GUESS_METHOD_ARGUMENTS_DEFAULT));
70	javaAutoPopupOnIdentifierPart.setSelected(preferences.getBoolean(JAVA_AUTO_POPUP_ON_IDENTIFIER_PART, false));	98	javaAutoPopupOnIdentifierPart.setSelected(preferences.getBoolean(JAVA_AUTO_POPUP_ON_IDENTIFIER_PART, JAVA_AUTO_POPUP_ON_IDENTIFIER_PART_DEFAULT));
71	javaAutoCompletionTriggersField.setText(preferences.get(JAVA_AUTO_COMPLETION_TRIGGERS, ".")); //NOI18N	99	javaAutoCompletionTriggersField.setText(preferences.get(JAVA_AUTO_COMPLETION_TRIGGERS, JAVA_AUTO_COMPLETION_TRIGGERS_DEFAULT));
72	javaCompletionSelectorsField.setText(preferences.get(JAVA_COMPLETION_SELECTORS, ".,;:([+-=")); //NOI18N	100	javaCompletionSelectorsField.setText(preferences.get(JAVA_COMPLETION_SELECTORS, JAVA_COMPLETION_SELECTORS_DEFAULT));
73	javadocAutoCompletionTriggersField.setText(preferences.get(JAVADOC_AUTO_COMPLETION_TRIGGERS, ".#@")); //NOI18N	101	javadocAutoCompletionTriggersField.setText(preferences.get(JAVADOC_AUTO_COMPLETION_TRIGGERS, JAVADOC_AUTO_COMPLETION_TRIGGERS_DEFAULT));
		102	String blacklist = preferences.get(JAVA_COMPLETION_BLACKLIST, JAVA_COMPLETION_BLACKLIST_DEFAULT);
		103	initExcluderTable(javaCompletionExcludeTable, blacklist);
		104	String whitelist = preferences.get(JAVA_COMPLETION_WHITELIST, JAVA_COMPLETION_WHITELIST_DEFAULT);
		105	initExcluderTable(javaCompletionIncludeTable, whitelist);
74	javaAutoCompletionTriggersField.getDocument().addDocumentListener(this);	106	javaAutoCompletionTriggersField.getDocument().addDocumentListener(this);
75	javaCompletionSelectorsField.getDocument().addDocumentListener(this);	107	javaCompletionSelectorsField.getDocument().addDocumentListener(this);
76	javadocAutoCompletionTriggersField.getDocument().addDocumentListener(this);	108	javadocAutoCompletionTriggersField.getDocument().addDocumentListener(this);
Lines 97-102 Link Here
97	update(e);	129	update(e);
98	}	130	}
99		131
		132	// allows common excluder buttons to know which table to act on
		133	private JTable getSelectedExcluderTable() {
		134	Component selected = javaCompletionExcluderTab.getSelectedComponent();
		135	if (selected == javaCompletionExcludeScrollPane) {
		136	return javaCompletionExcludeTable;
		137	} else if (selected == javaCompletionIncludeScrollPane) {
		138	return javaCompletionIncludeTable;
		139	} else {
		140	throw new RuntimeException(selected.getName());
		141	}
		142	}
		143
		144	// listen to changes in the excluder lists, and do sanity checking on input
		145	public void tableChanged(TableModelEvent e) {
		146	DefaultTableModel model = (DefaultTableModel) e.getSource();
		147	String pref;
		148	if (model == javaCompletionExcludeTable.getModel()) {
		149	pref = JAVA_COMPLETION_BLACKLIST;
		150	} else if (model == javaCompletionIncludeTable.getModel()) {
		151	pref = JAVA_COMPLETION_WHITELIST;
		152	} else {
		153	throw new RuntimeException();
		154	}
		155	@SuppressWarnings("unchecked")
		156	Vector<Vector<String>> data = model.getDataVector();
		157	Collection<String> entries = new TreeSet<String>();
		158	for (Vector<String> row : data) {
		159	String entry = row.elementAt(0);
		160	if (entry == null) {
		161	continue;
		162	}
		163	// users can enter wildcards, which is the same as the raw prefix
		164	if (entry.contains("*"))
		165	entry = entry.replaceAll("\\*", "");
		166	entry = entry.trim();
		167	if (entry.length() == 0) {
		168	continue;
		169	}
		170	// this could be checked by a custom editor on input
		171	if (!entry.matches("[$\\w._]*")) { //NOI18N
		172	continue;
		173	}
		174	entries.add(entry);
		175	}
		176	StringBuilder builder = new StringBuilder();
		177	for (String entry : entries) {
		178	if (builder.length() > 0) {
		179	builder.append(","); //NOI18N
		180	}
		181	builder.append(entry);
		182	}
		183	preferences.put(pref, builder.toString());
		184	}
		185
100	/** This method is called from within the constructor to	186	/** This method is called from within the constructor to
101	* initialize the form.	187	* initialize the form.
102	* WARNING: Do NOT modify this code. The content of this method is	188	* WARNING: Do NOT modify this code. The content of this method is
Lines 105-110 Link Here
105	// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents	191	// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
106	private void initComponents() {	192	private void initComponents() {
107		193
		194	javaCompletionExcluderFrame = new javax.swing.JFrame();
		195	javaCompletionExcluderTab = new javax.swing.JTabbedPane();
		196	javaCompletionExcludeScrollPane = new javax.swing.JScrollPane();
		197	javaCompletionExcludeTable = new javax.swing.JTable();
		198	javaCompletionIncludeScrollPane = new javax.swing.JScrollPane();
		199	javaCompletionIncludeTable = new javax.swing.JTable();
		200	javaCompletionExcluderAddButton = new javax.swing.JButton();
		201	javaCompletionExcluderRemoveButton = new javax.swing.JButton();
		202	javaCompletionExcluderCloseButton = new javax.swing.JButton();
		203	javaCompletionPane = new javax.swing.JPanel();
108	guessMethodArguments = new javax.swing.JCheckBox();	204	guessMethodArguments = new javax.swing.JCheckBox();
109	javaAutoPopupOnIdentifierPart = new javax.swing.JCheckBox();	205	javaAutoPopupOnIdentifierPart = new javax.swing.JCheckBox();
110	javaAutoCompletionTriggersLabel = new javax.swing.JLabel();	206	javaAutoCompletionTriggersLabel = new javax.swing.JLabel();
Lines 114-124 Link Here
114	javadocAutoCompletionTriggersLabel = new javax.swing.JLabel();	210	javadocAutoCompletionTriggersLabel = new javax.swing.JLabel();
115	javadocAutoCompletionTriggersField = new javax.swing.JTextField();	211	javadocAutoCompletionTriggersField = new javax.swing.JTextField();
116	jSeparator1 = new javax.swing.JSeparator();	212	jSeparator1 = new javax.swing.JSeparator();
		213	javaCompletionExcluderLabel = new javax.swing.JLabel();
		214	javaCompletionExcluderButton = new javax.swing.JButton();
		215
		216	javaCompletionExcluderFrame.setTitle(org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionExcluderFrame.title")); // NOI18N
		217	javaCompletionExcluderFrame.setAlwaysOnTop(true);
		218	javaCompletionExcluderFrame.setMinimumSize(new java.awt.Dimension(409, 233));
		219	javaCompletionExcluderFrame.setUndecorated(true);
		220
		221	javaCompletionExcludeTable.setModel(new javax.swing.table.DefaultTableModel(
		222	new Object [][] {
		223
		224	},
		225	new String [] {
		226	"Fully Qualified Name prefix"
		227	}
		228	) {
		229	Class[] types = new Class [] {
		230	java.lang.String.class
		231	};
		232
		233	public Class getColumnClass(int columnIndex) {
		234	return types [columnIndex];
		235	}
		236	});
		237	javaCompletionExcludeTable.getTableHeader().setReorderingAllowed(false);
		238	javaCompletionExcludeScrollPane.setViewportView(javaCompletionExcludeTable);
		239	javaCompletionExcludeTable.getColumnModel().getColumn(0).setHeaderValue(org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title0")); // NOI18N
		240
		241	javaCompletionExcluderTab.addTab(org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionExcludeScrollPane.TabConstraints.tabTitle"), javaCompletionExcludeScrollPane); // NOI18N
		242
		243	javaCompletionIncludeTable.setModel(new javax.swing.table.DefaultTableModel(
		244	new Object [][] {
		245
		246	},
		247	new String [] {
		248	"Fully Qualified Name prefix"
		249	}
		250	) {
		251	Class[] types = new Class [] {
		252	java.lang.String.class
		253	};
		254
		255	public Class getColumnClass(int columnIndex) {
		256	return types [columnIndex];
		257	}
		258	});
		259	javaCompletionIncludeTable.getTableHeader().setReorderingAllowed(false);
		260	javaCompletionIncludeScrollPane.setViewportView(javaCompletionIncludeTable);
		261	javaCompletionIncludeTable.getColumnModel().getColumn(0).setHeaderValue(org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title0")); // NOI18N
		262
		263	javaCompletionExcluderTab.addTab(org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionIncludeScrollPane.TabConstraints.tabTitle"), javaCompletionIncludeScrollPane); // NOI18N
		264
		265	org.openide.awt.Mnemonics.setLocalizedText(javaCompletionExcluderAddButton, org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionExcluderAddButton.text")); // NOI18N
		266	javaCompletionExcluderAddButton.addActionListener(new java.awt.event.ActionListener() {
		267	public void actionPerformed(java.awt.event.ActionEvent evt) {
		268	javaCompletionExcluderAddButtonActionPerformed(evt);
		269	}
		270	});
		271
		272	org.openide.awt.Mnemonics.setLocalizedText(javaCompletionExcluderRemoveButton, org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionExcluderRemoveButton.text")); // NOI18N
		273	javaCompletionExcluderRemoveButton.addActionListener(new java.awt.event.ActionListener() {
		274	public void actionPerformed(java.awt.event.ActionEvent evt) {
		275	javaCompletionExcluderRemoveButtonActionPerformed(evt);
		276	}
277	});
278
279	org.openide.awt.Mnemonics.setLocalizedText(javaCompletionExcluderCloseButton, org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionExcluderCloseButton.text")); // NOI18N
280	javaCompletionExcluderCloseButton.addActionListener(new java.awt.event.ActionListener() {
281	public void actionPerformed(java.awt.event.ActionEvent evt) {
282	javaCompletionExcluderCloseButtonActionPerformed(evt);
283	}
284	});
285
286	org.jdesktop.layout.GroupLayout javaCompletionExcluderFrameLayout = new org.jdesktop.layout.GroupLayout(javaCompletionExcluderFrame.getContentPane());
287	javaCompletionExcluderFrame.getContentPane().setLayout(javaCompletionExcluderFrameLayout);
288	javaCompletionExcluderFrameLayout.setHorizontalGroup(
289	javaCompletionExcluderFrameLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
290	.add(org.jdesktop.layout.GroupLayout.TRAILING, javaCompletionExcluderFrameLayout.createSequentialGroup()
291	.addContainerGap()
292	.add(javaCompletionExcluderTab, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 298, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
293	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
294	.add(javaCompletionExcluderFrameLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
295	.add(javaCompletionExcluderCloseButton, 0, 0, Short.MAX_VALUE)
296	.add(javaCompletionExcluderRemoveButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
297	.add(javaCompletionExcluderAddButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
298	.addContainerGap(10, Short.MAX_VALUE))
299	);
300	javaCompletionExcluderFrameLayout.setVerticalGroup(
301	javaCompletionExcluderFrameLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
302	.add(javaCompletionExcluderFrameLayout.createSequentialGroup()
303	.add(javaCompletionExcluderFrameLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
304	.add(javaCompletionExcluderFrameLayout.createSequentialGroup()
305	.addContainerGap()
306	.add(javaCompletionExcluderTab, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 221, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
307	.add(javaCompletionExcluderFrameLayout.createSequentialGroup()
308	.add(59, 59, 59)
309	.add(javaCompletionExcluderAddButton)
310	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
311	.add(javaCompletionExcluderRemoveButton)
312	.add(63, 63, 63)
313	.add(javaCompletionExcluderCloseButton)))
314	.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
315	);
117		316
118	setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));	317	setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
119		318
120	org.openide.awt.Mnemonics.setLocalizedText(guessMethodArguments, org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "LBL_GuessMethodArgs")); // NOI18N	319	org.openide.awt.Mnemonics.setLocalizedText(guessMethodArguments, org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "LBL_GuessMethodArgs")); // NOI18N
121	guessMethodArguments.setBorder(null);
122	guessMethodArguments.addActionListener(new java.awt.event.ActionListener() {	320	guessMethodArguments.addActionListener(new java.awt.event.ActionListener() {
123	public void actionPerformed(java.awt.event.ActionEvent evt) {	321	public void actionPerformed(java.awt.event.ActionEvent evt) {
124	guessMethodArgumentsActionPerformed(evt);	322	guessMethodArgumentsActionPerformed(evt);
Lines 126-132 Link Here
126	});	324	});
127		325
128	org.openide.awt.Mnemonics.setLocalizedText(javaAutoPopupOnIdentifierPart, org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "LBL_AutoPopupOnIdentifierPartBox")); // NOI18N	326	org.openide.awt.Mnemonics.setLocalizedText(javaAutoPopupOnIdentifierPart, org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "LBL_AutoPopupOnIdentifierPartBox")); // NOI18N
129	javaAutoPopupOnIdentifierPart.setBorder(null);
130	javaAutoPopupOnIdentifierPart.addActionListener(new java.awt.event.ActionListener() {	327	javaAutoPopupOnIdentifierPart.addActionListener(new java.awt.event.ActionListener() {
131	public void actionPerformed(java.awt.event.ActionEvent evt) {	328	public void actionPerformed(java.awt.event.ActionEvent evt) {
132	javaAutoPopupOnIdentifierPartActionPerformed(evt);	329	javaAutoPopupOnIdentifierPartActionPerformed(evt);
Lines 146-197 Link Here
146		343
147	javadocAutoCompletionTriggersField.setText(org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javadocAutoCompletionTriggersField.text")); // NOI18N	344	javadocAutoCompletionTriggersField.setText(org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javadocAutoCompletionTriggersField.text")); // NOI18N
148		345
149	org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);	346	org.openide.awt.Mnemonics.setLocalizedText(javaCompletionExcluderLabel, org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionExcluderLabel.text")); // NOI18N
150	this.setLayout(layout);	347
151	layout.setHorizontalGroup(	348	org.openide.awt.Mnemonics.setLocalizedText(javaCompletionExcluderButton, org.openide.util.NbBundle.getMessage(CodeCompletionPanel.class, "CodeCompletionPanel.javaCompletionExcluderButton.text")); // NOI18N
152	layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)	349	javaCompletionExcluderButton.addActionListener(new java.awt.event.ActionListener() {
153	.add(layout.createSequentialGroup()	350	public void actionPerformed(java.awt.event.ActionEvent evt) {
		351	javaCompletionExcluderButtonActionPerformed(evt);
		352	}
		353	});
		354
		355	org.jdesktop.layout.GroupLayout javaCompletionPaneLayout = new org.jdesktop.layout.GroupLayout(javaCompletionPane);
		356	javaCompletionPane.setLayout(javaCompletionPaneLayout);
		357	javaCompletionPaneLayout.setHorizontalGroup(
		358	javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
		359	.add(javaCompletionPaneLayout.createSequentialGroup()
154	.addContainerGap()	360	.addContainerGap()
155	.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)	361	.add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
156	.add(jSeparator1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 362, Short.MAX_VALUE)	362	.add(jSeparator1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 337, Short.MAX_VALUE)
		363	.add(javaCompletionPaneLayout.createSequentialGroup()
		364	.add(javadocAutoCompletionTriggersLabel)
		365	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
		366	.add(javadocAutoCompletionTriggersField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 86, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
		367	.addContainerGap())
		368	.add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
		369	.add(javaCompletionPaneLayout.createSequentialGroup()
		370	.addContainerGap()
		371	.add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
157	.add(guessMethodArguments)	372	.add(guessMethodArguments)
158	.add(layout.createSequentialGroup()	373	.add(javaCompletionPaneLayout.createSequentialGroup()
159	.add(javaAutoCompletionTriggersLabel)	374	.add(javaAutoCompletionTriggersLabel)
160	.add(34, 34, 34)	375	.add(34, 34, 34)
161	.add(javaAutoCompletionTriggersField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 86, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))	376	.add(javaAutoCompletionTriggersField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 86, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
162	.add(javaAutoPopupOnIdentifierPart)	377	.add(javaAutoPopupOnIdentifierPart)
163	.add(layout.createSequentialGroup()	378	.add(javaCompletionPaneLayout.createSequentialGroup()
164	.add(javaCompletionSelectorsLabel)	379	.add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
		380	.add(javaCompletionExcluderLabel)
		381	.add(javaCompletionSelectorsLabel))
		382	.add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
		383	.add(javaCompletionPaneLayout.createSequentialGroup()
165	.add(30, 30, 30)	384	.add(30, 30, 30)
166	.add(javaCompletionSelectorsField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 86, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))	385	.add(javaCompletionSelectorsField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 86, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
167	.add(layout.createSequentialGroup()	386	.add(org.jdesktop.layout.GroupLayout.TRAILING, javaCompletionPaneLayout.createSequentialGroup()
168	.add(javadocAutoCompletionTriggersLabel)	387	.add(23, 23, 23)
169	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)	388	.add(javaCompletionExcluderButton, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 93, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))))
170	.add(javadocAutoCompletionTriggersField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 86, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))	389	.addContainerGap(25, Short.MAX_VALUE)))
171	.addContainerGap())
172	);	390	);
173	layout.setVerticalGroup(	391	javaCompletionPaneLayout.setVerticalGroup(
174	layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)	392	javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
175	.add(layout.createSequentialGroup()	393	.add(javaCompletionPaneLayout.createSequentialGroup()
		394	.add(171, 171, 171)
		395	.add(jSeparator1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
		396	.add(18, 18, 18)
		397	.add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
		398	.add(javadocAutoCompletionTriggersLabel)
		399	.add(javadocAutoCompletionTriggersField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
		400	.addContainerGap(23, Short.MAX_VALUE))
		401	.add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
		402	.add(javaCompletionPaneLayout.createSequentialGroup()
176	.addContainerGap()	403	.addContainerGap()
177	.add(guessMethodArguments)	404	.add(guessMethodArguments, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 23, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
178	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)	405	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
179	.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)	406	.add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
180	.add(javaAutoCompletionTriggersLabel)	407	.add(javaAutoCompletionTriggersLabel)
181	.add(javaAutoCompletionTriggersField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))	408	.add(javaAutoCompletionTriggersField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
182	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)	409	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
183	.add(javaAutoPopupOnIdentifierPart)	410	.add(javaAutoPopupOnIdentifierPart)
184	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)	411	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
185	.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)	412	.add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
186	.add(javaCompletionSelectorsLabel)	413	.add(javaCompletionSelectorsLabel)
187	.add(javaCompletionSelectorsField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))	414	.add(javaCompletionSelectorsField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
188	.add(18, 18, 18)	415	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
189	.add(jSeparator1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)	416	.add(javaCompletionPaneLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
190	.add(18, 18, 18)	417	.add(javaCompletionExcluderButton)
191	.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)	418	.add(javaCompletionExcluderLabel))
192	.add(javadocAutoCompletionTriggersLabel)	419	.addContainerGap(91, Short.MAX_VALUE)))
193	.add(javadocAutoCompletionTriggersField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))	420	);
194	.addContainerGap(30, Short.MAX_VALUE))	421
		422	org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
		423	this.setLayout(layout);
		424	layout.setHorizontalGroup(
		425	layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
		426	.add(javaCompletionPane, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
		427	);
		428	layout.setVerticalGroup(
		429	layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
		430	.add(javaCompletionPane, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
195	);	431	);
196	}// </editor-fold>//GEN-END:initComponents	432	}// </editor-fold>//GEN-END:initComponents
197		433
Lines 202-207 Link Here
202	private void guessMethodArgumentsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_guessMethodArgumentsActionPerformed	438	private void guessMethodArgumentsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_guessMethodArgumentsActionPerformed
203	preferences.putBoolean(GUESS_METHOD_ARGUMENTS, guessMethodArguments.isSelected());	439	preferences.putBoolean(GUESS_METHOD_ARGUMENTS, guessMethodArguments.isSelected());
204	}//GEN-LAST:event_guessMethodArgumentsActionPerformed	440	}//GEN-LAST:event_guessMethodArgumentsActionPerformed
		441
		442	private void javaCompletionExcluderButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_javaCompletionExcluderButtonActionPerformed
		443	if (javaCompletionExcluderFrame.isVisible())
		444	return;
		445	javaCompletionExcluderFrame.pack();
		446	javaCompletionExcluderFrame.setLocationRelativeTo(this);
		447	javaCompletionExcluderFrame.setVisible(true);
		448	}//GEN-LAST:event_javaCompletionExcluderButtonActionPerformed
		449
		450	private void javaCompletionExcluderAddButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_javaCompletionExcluderAddButtonActionPerformed
		451	JTable table = getSelectedExcluderTable();
		452	DefaultTableModel model = (DefaultTableModel) table.getModel();
		453	int rows = model.getRowCount();
		454	model.setRowCount(rows + 1);
		455	table.editCellAt(rows, 0);
		456	table.requestFocus();
		457	}//GEN-LAST:event_javaCompletionExcluderAddButtonActionPerformed
		458
		459	private void javaCompletionExcluderRemoveButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_javaCompletionExcluderRemoveButtonActionPerformed
		460	JTable table = getSelectedExcluderTable();
		461	int[] rows = table.getSelectedRows();
		462	if (rows.length == 0)
		463	return;
		464	// remove rows in descending order: row numbers change when a row is removed
		465	Arrays.sort(rows);
		466	DefaultTableModel model = (DefaultTableModel) table.getModel();
		467	for (int row = rows.length - 1; row >= 0; row--) {
		468	model.removeRow(rows[row]);
		469	}
		470	}//GEN-LAST:event_javaCompletionExcluderRemoveButtonActionPerformed
		471
		472	private void javaCompletionExcluderCloseButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_javaCompletionExcluderCloseButtonActionPerformed
		473	javaCompletionExcluderFrame.setVisible(false);
		474	}//GEN-LAST:event_javaCompletionExcluderCloseButtonActionPerformed
205		475
206	private void update(DocumentEvent e) {	476	private void update(DocumentEvent e) {
207	if (e.getDocument() == javaAutoCompletionTriggersField.getDocument())	477	if (e.getDocument() == javaAutoCompletionTriggersField.getDocument())
Lines 218-223 Link Here
218	private javax.swing.JTextField javaAutoCompletionTriggersField;	488	private javax.swing.JTextField javaAutoCompletionTriggersField;
219	private javax.swing.JLabel javaAutoCompletionTriggersLabel;	489	private javax.swing.JLabel javaAutoCompletionTriggersLabel;
220	private javax.swing.JCheckBox javaAutoPopupOnIdentifierPart;	490	private javax.swing.JCheckBox javaAutoPopupOnIdentifierPart;
		491	private javax.swing.JScrollPane javaCompletionExcludeScrollPane;
		492	private javax.swing.JTable javaCompletionExcludeTable;
		493	private javax.swing.JButton javaCompletionExcluderAddButton;
		494	private javax.swing.JButton javaCompletionExcluderButton;
		495	private javax.swing.JButton javaCompletionExcluderCloseButton;
		496	private javax.swing.JFrame javaCompletionExcluderFrame;
		497	private javax.swing.JLabel javaCompletionExcluderLabel;
		498	private javax.swing.JButton javaCompletionExcluderRemoveButton;
		499	private javax.swing.JTabbedPane javaCompletionExcluderTab;
		500	private javax.swing.JScrollPane javaCompletionIncludeScrollPane;
		501	private javax.swing.JTable javaCompletionIncludeTable;
		502	private javax.swing.JPanel javaCompletionPane;
221	private javax.swing.JTextField javaCompletionSelectorsField;	503	private javax.swing.JTextField javaCompletionSelectorsField;
222	private javax.swing.JLabel javaCompletionSelectorsLabel;	504	private javax.swing.JLabel javaCompletionSelectorsLabel;
223	private javax.swing.JTextField javadocAutoCompletionTriggersField;	505	private javax.swing.JTextField javadocAutoCompletionTriggersField;
Lines 226-232 Link Here
226		508
227	private static class CodeCompletionPreferencesCusromizer implements PreferencesCustomizer {	509	private static class CodeCompletionPreferencesCusromizer implements PreferencesCustomizer {
228		510
229	private Preferences preferences;	511	private final Preferences preferences;
230		512
231	private CodeCompletionPreferencesCusromizer(Preferences p) {	513	private CodeCompletionPreferencesCusromizer(Preferences p) {
232	preferences = p;	514	preferences = p;

Return to bug 125060

Lines 2422-2431 Link Here

(-)a/java.editor/src/org/netbeans/modules/editor/java/JavaCompletionProvider.java (-7 / +11 lines)
2422	(Utilities.isShowDeprecatedMembers() \|\| !elements.isDeprecated(e)) &&	2422	(Utilities.isShowDeprecatedMembers() \|\| !elements.isDeprecated(e)) &&
2423	tu.isAccessible(scope, e, t);	2423	tu.isAccessible(scope, e, t);
2424	case METHOD:	2424	case METHOD:
2425	return startsWith(env, e.getSimpleName().toString(), prefix) &&	2425	String sn = e.getSimpleName().toString();
2426	(Utilities.isShowDeprecatedMembers() \|\| !elements.isDeprecated(e)) &&	2426	return startsWith(env, sn, prefix) &&
2427	(!isStatic \|\| e.getModifiers().contains(STATIC)) &&	2427	(Utilities.isShowDeprecatedMembers() \|\| !elements.isDeprecated(e)) &&
2428	tu.isAccessible(scope, e, t);	2428	(!isStatic \|\| e.getModifiers().contains(STATIC)) &&
		2429	tu.isAccessible(scope, e, t) &&
		2430	!Utilities.isExcluded(Utilities.getElementName(e.getEnclosingElement(), true) + "." + sn); //NOI18N
2429	}	2431	}
2430	return false;	2432	return false;
2431	}	2433	}
Lines 2606-2616 Link Here
2606	isOfKindAndType(asMemberOf(e, t, types), e, kinds, baseType, scope, trees, types) &&	2608	isOfKindAndType(asMemberOf(e, t, types), e, kinds, baseType, scope, trees, types) &&
2607	tu.isAccessible(scope, e, t);	2609	tu.isAccessible(scope, e, t);
2608	case METHOD:	2610	case METHOD:
2609	return startsWith(env, e.getSimpleName().toString(), prefix) &&	2611	String sn = e.getSimpleName().toString();
		2612	return startsWith(env, sn, prefix) &&
2610	(Utilities.isShowDeprecatedMembers() \|\| !elements.isDeprecated(e)) &&	2613	(Utilities.isShowDeprecatedMembers() \|\| !elements.isDeprecated(e)) &&
2611	isOfKindAndType(((ExecutableType)asMemberOf(e, t, types)).getReturnType(), e, kinds, baseType, scope, trees, types) &&	2614	isOfKindAndType(((ExecutableType)asMemberOf(e, t, types)).getReturnType(), e, kinds, baseType, scope, trees, types) &&
2612	(isSuperCall && e.getModifiers().contains(PROTECTED) \|\| tu.isAccessible(scope, e, isSuperCall && enclType != null ? enclType : t)) &&	2615	(isSuperCall && e.getModifiers().contains(PROTECTED) \|\| tu.isAccessible(scope, e, isSuperCall && enclType != null ? enclType : t)) &&
2613	(!isStatic \|\| e.getModifiers().contains(STATIC));	2616	(!isStatic \|\| e.getModifiers().contains(STATIC)) &&
		2617	!Utilities.isExcluded(Utilities.getElementName(e.getEnclosingElement(), true) + "." + sn); //NOI18N
2614	case CLASS:	2618	case CLASS:
2615	case ENUM:	2619	case ENUM:
2616	case INTERFACE:	2620	case INTERFACE:
Lines 2730-2736 Link Here
2730	if (fqnPrefix == null)	2734	if (fqnPrefix == null)
2731	fqnPrefix = EMPTY;	2735	fqnPrefix = EMPTY;
2732	for (String pkgName : env.getController().getClasspathInfo().getClassIndex().getPackageNames(fqnPrefix, true,EnumSet.allOf(ClassIndex.SearchScope.class)))	2736	for (String pkgName : env.getController().getClasspathInfo().getClassIndex().getPackageNames(fqnPrefix, true,EnumSet.allOf(ClassIndex.SearchScope.class)))
2733	if (pkgName.length() > 0)	2737	if (pkgName.length() > 0 && !Utilities.isExcluded(pkgName + ".")) //NOI18N
2734	results.add(JavaCompletionItem.createPackageItem(pkgName, anchorOffset, inPkgStmt));	2738	results.add(JavaCompletionItem.createPackageItem(pkgName, anchorOffset, inPkgStmt));
2735	}	2739	}
2736		2740

Lines 56-61 Link Here

(-)a/java.editor/src/org/netbeans/modules/editor/java/Utilities.java (-5 / +69 lines)
56	import com.sun.source.util.Trees;	56	import com.sun.source.util.Trees;
57		57
58	import java.util.*;	58	import java.util.*;
		59	import java.util.concurrent.atomic.AtomicReference;
59	import java.util.prefs.PreferenceChangeEvent;	60	import java.util.prefs.PreferenceChangeEvent;
60	import java.util.prefs.PreferenceChangeListener;	61	import java.util.prefs.PreferenceChangeListener;
61	import java.util.prefs.Preferences;	62	import java.util.prefs.Preferences;
Lines 113-131 Link Here
113	showDeprecatedMembers = preferences.getBoolean(SimpleValueNames.SHOW_DEPRECATED_MEMBERS, true);	114	showDeprecatedMembers = preferences.getBoolean(SimpleValueNames.SHOW_DEPRECATED_MEMBERS, true);
114	}	115	}
115	if (settingName == null \|\| CodeCompletionPanel.GUESS_METHOD_ARGUMENTS.equals(settingName)) {	116	if (settingName == null \|\| CodeCompletionPanel.GUESS_METHOD_ARGUMENTS.equals(settingName)) {
116	guessMethodArguments = preferences.getBoolean(CodeCompletionPanel.GUESS_METHOD_ARGUMENTS, true);	117	guessMethodArguments = preferences.getBoolean(CodeCompletionPanel.GUESS_METHOD_ARGUMENTS, CodeCompletionPanel.GUESS_METHOD_ARGUMENTS_DEFAULT);
117	}	118	}
118	if (settingName == null \|\| CodeCompletionPanel.JAVA_AUTO_POPUP_ON_IDENTIFIER_PART.equals(settingName)) {	119	if (settingName == null \|\| CodeCompletionPanel.JAVA_AUTO_POPUP_ON_IDENTIFIER_PART.equals(settingName)) {
119	autoPopupOnJavaIdentifierPart = preferences.getBoolean(CodeCompletionPanel.JAVA_AUTO_POPUP_ON_IDENTIFIER_PART, false);	120	autoPopupOnJavaIdentifierPart = preferences.getBoolean(CodeCompletionPanel.JAVA_AUTO_POPUP_ON_IDENTIFIER_PART, CodeCompletionPanel.JAVA_AUTO_POPUP_ON_IDENTIFIER_PART_DEFAULT);
120	}	121	}
121	if (settingName == null \|\| CodeCompletionPanel.JAVA_AUTO_COMPLETION_TRIGGERS.equals(settingName)) {	122	if (settingName == null \|\| CodeCompletionPanel.JAVA_AUTO_COMPLETION_TRIGGERS.equals(settingName)) {
122	javaCompletionAutoPopupTriggers = preferences.get(CodeCompletionPanel.JAVA_AUTO_COMPLETION_TRIGGERS, "."); //NOI18N	123	javaCompletionAutoPopupTriggers = preferences.get(CodeCompletionPanel.JAVA_AUTO_COMPLETION_TRIGGERS, CodeCompletionPanel.JAVA_AUTO_COMPLETION_TRIGGERS_DEFAULT);
123	}	124	}
124	if (settingName == null \|\| CodeCompletionPanel.JAVA_COMPLETION_SELECTORS.equals(settingName)) {	125	if (settingName == null \|\| CodeCompletionPanel.JAVA_COMPLETION_SELECTORS.equals(settingName)) {
125	javaCompletionSelectors = preferences.get(CodeCompletionPanel.JAVA_COMPLETION_SELECTORS, ".,;:([+-="); //NOI18N	126	javaCompletionSelectors = preferences.get(CodeCompletionPanel.JAVA_COMPLETION_SELECTORS, CodeCompletionPanel.JAVA_COMPLETION_SELECTORS_DEFAULT);
126	}	127	}
127	if (settingName == null \|\| CodeCompletionPanel.JAVADOC_AUTO_COMPLETION_TRIGGERS.equals(settingName)) {	128	if (settingName == null \|\| CodeCompletionPanel.JAVADOC_AUTO_COMPLETION_TRIGGERS.equals(settingName)) {
128	javadocCompletionAutoPopupTriggers = preferences.get(CodeCompletionPanel.JAVADOC_AUTO_COMPLETION_TRIGGERS, ".#@"); //NOI18N	129	javadocCompletionAutoPopupTriggers = preferences.get(CodeCompletionPanel.JAVADOC_AUTO_COMPLETION_TRIGGERS, CodeCompletionPanel.JAVADOC_AUTO_COMPLETION_TRIGGERS_DEFAULT);
		130	}
		131	if (settingName == null \|\| CodeCompletionPanel.JAVA_COMPLETION_BLACKLIST.equals(settingName)) {
		132	String blacklist = preferences.get(CodeCompletionPanel.JAVA_COMPLETION_BLACKLIST, CodeCompletionPanel.JAVA_COMPLETION_BLACKLIST_DEFAULT);
		133	updateExcluder(exclude, blacklist);
		134	}
		135	if (settingName == null \|\| CodeCompletionPanel.JAVA_COMPLETION_WHITELIST.equals(settingName)) {
		136	String whitelist = preferences.get(CodeCompletionPanel.JAVA_COMPLETION_WHITELIST, CodeCompletionPanel.JAVA_COMPLETION_WHITELIST_DEFAULT);
		137	updateExcluder(include, whitelist);
129	}	138	}
130	}	139	}
131	};	140	};
Lines 215-223 Link Here
215	return javadocCompletionAutoPopupTriggers;	224	return javadocCompletionAutoPopupTriggers;
216	}	225	}
217		226
		227	static private volatile AtomicReference<Collection<String>> exclude;
		228	static private volatile AtomicReference<Collection<String>> include;
		229
		230	private static void updateExcluder(AtomicReference<Collection<String>> existing, String updated) {
		231	Collection<String> nue = new LinkedList<String>();
		232	if (updated == null \|\| updated.length() == 0) {
		233	existing.set(nue);
		234	return;
		235	}
		236	String[] entries = updated.split(","); //NOI18N
		237	for (String entry : entries) {
		238	if (entry != null && entry.length() != 0) {
		239	nue.add(entry);
		240	}
		241	}
		242	existing.set(nue);
		243	}
		244
		245	/**
		246	* @param fqn Fully Qualified Name (including method names). Packages names are expected to
		247	* end in a trailing "."
		248	* @return
		249	*/
		250	public static boolean isExcluded(final CharSequence fqn) {
		251	if (fqn == null \|\| fqn.length() == 0 \|\| fqn.equals(".")) { //NOI18N
		252	return true;
		253	}
		254	lazyInit();
		255	String s = fqn.toString();
		256	if (!include.get().isEmpty()) {
		257	for (String entry : include.get()) {
		258	if (entry.length() > fqn.length()) {
		259	if (entry.startsWith(s)) {
		260	return false;
		261	}
		262	} else if (s.startsWith(entry)) {
		263	return false;
		264	}
		265	}
		266	}
		267
		268	if (!exclude.get().isEmpty()) {
		269	for (String entry : exclude.get()) {
		270	if (entry.length() <= fqn.length() && s.startsWith(entry)) {
		271	return true;
		272	}
		273	}
		274	}
		275
		276	return false;
		277	}
		278
218	private static void lazyInit() {	279	private static void lazyInit() {
219	if (!inited) {	280	if (!inited) {
220	inited = true;	281	inited = true;
		282	Collection<String> empty = Collections.emptySet();
		283	exclude = new AtomicReference<Collection<String>>(empty);
		284	include = new AtomicReference<Collection<String>>(empty);
221	preferences = MimeLookup.getLookup(JavaKit.JAVA_MIME_TYPE).lookup(Preferences.class);	285	preferences = MimeLookup.getLookup(JavaKit.JAVA_MIME_TYPE).lookup(Preferences.class);
222	preferences.addPreferenceChangeListener(WeakListeners.create(PreferenceChangeListener.class, preferencesTracker, preferences));	286	preferences.addPreferenceChangeListener(WeakListeners.create(PreferenceChangeListener.class, preferencesTracker, preferences));
223	preferencesTracker.preferenceChange(null);	287	preferencesTracker.preferenceChange(null);

Lines 116-118 Link Here

(-)a/java.editor/src/org/netbeans/modules/java/editor/options/Bundle.properties (+15 lines)
116	LBL_JavaCompletionLabel=Java Code Completion	116	LBL_JavaCompletionLabel=Java Code Completion
117	LBL_GuessMethodParameters=jCheckBox1	117	LBL_GuessMethodParameters=jCheckBox1
118	LBL_GuessMethodArgs=&Guess Filled Method Arguments	118	LBL_GuessMethodArgs=&Guess Filled Method Arguments
		119	CodeCompletionPanel.javaCompletionExcluderLabel.text=Packages/classes:
		120	CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title3=Title 4
		121	CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title2=Title 3
		122	CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title1=Title 2
		123	CodeCompletionPanel.javaCompletionExcluderButton.text=Exclude
		124	CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title3_1=Title 4
		125	CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title2_1=Title 3
		126	CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title1_1=Title 2
		127	CodeCompletionPanel.javaCompletionExcludeScrollPane.TabConstraints.tabTitle=Exclude
		128	CodeCompletionPanel.javaCompletionExcludeTable.columnModel.title0=Fully Qualified Name prefix
		129	CodeCompletionPanel.javaCompletionExcluderAddButton.text=Add
		130	CodeCompletionPanel.javaCompletionIncludeScrollPane.TabConstraints.tabTitle=Include
		131	CodeCompletionPanel.javaCompletionExcluderRemoveButton.text=Remove
		132	CodeCompletionPanel.javaCompletionExcluderFrame.title=Java Completion Excluder
		133	CodeCompletionPanel.javaCompletionExcluderCloseButton.text=Close