Merge changes Ic434bf4a,I05a3fb18,I47a3783d,I8234bbfd
authorTony Tkacik <ttkacik@cisco.com>
Thu, 20 Nov 2014 09:05:53 +0000 (09:05 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 20 Nov 2014 09:05:53 +0000 (09:05 +0000)
* changes:
  Fix checkstyle warnings in netconf-cli
  Fix checkstyle warnings ietf-netconf-monitoring
  Fix checkstyle warnings for netconf-testtool
  Fix checkstyle warnings for config-netconf-connector

1  2 
opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/Activator.java

@@@ -19,17 -23,12 +23,12 @@@ import org.osgi.util.tracker.ServiceTra
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
- import java.util.Dictionary;
- import java.util.Hashtable;
- import static com.google.common.base.Preconditions.checkState;
  public class Activator implements BundleActivator {
  
-     private static final Logger logger = LoggerFactory.getLogger(Activator.class);
+     private static final Logger LOG = LoggerFactory.getLogger(Activator.class);
  
      private BundleContext context;
 -    private ServiceRegistration osgiRegistration;
 +    private ServiceRegistration<?> osgiRegistration;
      private ConfigRegistryLookupThread configRegistryLookup = null;
  
      @Override

©2013 OpenDaylight, A Linux Foundation Collaborative Project. All Rights Reserved.
OpenDaylight is a registered trademark of The OpenDaylight Project, Inc.
Linux Foundation and OpenDaylight are registered trademarks of the Linux Foundation.
Linux is a registered trademark of Linus Torvalds.