/*
 * Copyright (c) 2003-2004, KNOPFLERFISH project
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following
 * conditions are met:
 *
 * - Redistributions of source code must retain the above copyright
 *   notice, this list of conditions and the following disclaimer.
 *
 * - Redistributions in binary form must reproduce the above
 *   copyright notice, this list of conditions and the following
 *   disclaimer in the documentation and/or other materials
 *   provided with the distribution.
 *
 * - Neither the name of the KNOPFLERFISH project nor the names of its
 *   contributors may be used to endorse or promote products derived
 *   from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
 * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
 * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 * OF THE POSSIBILITY OF SUCH DAMAGE.
 */

package org.knopflerfish.framework;

import java.util.Dictionary;

import org.osgi.framework.*;

public class FilterImpl implements Filter {

  private String filter = null;
  private LDAPExpr ldap;


  protected FilterImpl(String filter) throws InvalidSyntaxException {
    ldap = new LDAPExpr(filter);
  }


  public boolean match(ServiceReference reference) {
    return ldap.evaluate(((ServiceReferenceImpl)reference).getProperties());
  }


  public boolean match(Dictionary dictionary) {
    return ldap.evaluate(new PropertiesDictionary(dictionary));
  }


  public String toString() {
    if (filter == null) {
      filter = ldap.toString();
    }
    return filter;
  }


  public boolean equals(Object obj) {
    return toString().equals(obj.toString());
  }


  public int hashCode() {
    return toString().hashCode();
  }
}

@@ -1662,16 +1662,44 @@
 tionary;
+%0Aimport java.util.Hashtable;
 %0A%0Aimport
@@ -1984,24 +1984,78 @@
 eference) %7B%0A
+    if(reference instanceof ServiceReferenceImpl) %7B%0A  
     return l
@@ -2115,24 +2115,276 @@
 perties());%0A
+    %7D else %7B%0A      Hashtable props = new Hashtable();%0A      String%5B%5D keys = reference.getPropertyKeys();%0A      for(int i = 0; i %3C keys.length; i++) %7B%0A%09props.put(keys%5Bi%5D, reference.getProperty(keys%5Bi%5D));%0A      %7D%0A      return ldap.evaluate(props);%0A    %7D%0A
   %7D%0A%0A%0A  publ

fix for possible custom ServiceReference impls