Changes in Search API merged_model_j2ee_after_merge_trunk_1
authoryaroslavskiy@netbeans.org
Fri, 01 Jun 2007 13:09:41 +0000
changeset 5592941b3facbc8
parent 558 a6f9f2519df5
child 560 0b28de0b4dc3
Changes in Search API
bpel.search/src/org/netbeans/modules/bpel/search/impl/model/Element.java
bpel.search/src/org/netbeans/modules/bpel/search/impl/ui/Search.java
bpel.search/src/org/netbeans/modules/bpel/search/impl/ui/Tree.java
     1.1 --- a/bpel.search/src/org/netbeans/modules/bpel/search/impl/model/Element.java	Fri Jun 01 13:04:15 2007 +0000
     1.2 +++ b/bpel.search/src/org/netbeans/modules/bpel/search/impl/model/Element.java	Fri Jun 01 13:09:41 2007 +0000
     1.3 @@ -36,7 +36,7 @@
     1.4  
     1.5    Element(Component component) {
     1.6      super(
     1.7 -      getText(component),
     1.8 +      getName(component),
     1.9        getToolTip(component),
    1.10        getIcon(component),
    1.11        getParent(component)); 
    1.12 @@ -75,12 +75,12 @@
    1.13      return myComponent.hashCode();
    1.14    }
    1.15  
    1.16 -  private static String getText(Component component) {
    1.17 +  private static String getName(Component component) {
    1.18      return RefactorUtil.getName(component);
    1.19    }
    1.20  
    1.21    private static String getToolTip(Component component) {
    1.22 -    return getText(component);
    1.23 +    return getName(component);
    1.24    }
    1.25  
    1.26    private static SearchElement getParent(Component component) {
     2.1 --- a/bpel.search/src/org/netbeans/modules/bpel/search/impl/ui/Search.java	Fri Jun 01 13:04:15 2007 +0000
     2.2 +++ b/bpel.search/src/org/netbeans/modules/bpel/search/impl/ui/Search.java	Fri Jun 01 13:09:41 2007 +0000
     2.3 @@ -64,7 +64,8 @@
     2.4    }
     2.5  
     2.6    @Override
     2.7 -  protected void updated() {
     2.8 +  protected void updated()
     2.9 +  {
    2.10      setItems(myTarget, myTargets);
    2.11    }
    2.12  
     3.1 --- a/bpel.search/src/org/netbeans/modules/bpel/search/impl/ui/Tree.java	Fri Jun 01 13:04:15 2007 +0000
     3.2 +++ b/bpel.search/src/org/netbeans/modules/bpel/search/impl/ui/Tree.java	Fri Jun 01 13:09:41 2007 +0000
     3.3 @@ -81,7 +81,7 @@
     3.4    public void searchFound(SearchEvent event) {
     3.5      SearchElement element = event.getSearchElement();
     3.6  //out("Found: " + element);
     3.7 -//out("       " + element.getText());
     3.8 +//out("       " + element.getName());
     3.9      addElement(myRoot, element, getElements(element));
    3.10      myFoundCount++;
    3.11    }
    3.12 @@ -639,7 +639,7 @@
    3.13          tree, value, select, expanded, leaf, row, focus);
    3.14        SearchElement element =
    3.15          (SearchElement) ((DefaultMutableTreeNode) value).getUserObject();
    3.16 -      setText(element.getText());
    3.17 +      setText(element.getName());
    3.18        setToolTipText(element.getToolTip());
    3.19        setIcon(element.getIcon());
    3.20        return this;