commit 6369ee33a586747e604ab42b12f4428d5008ba1f
author Stuart McCulloch <mcculls@apache.org> Mon Jan 28 04:58:46 2008 +0000
committer Stuart McCulloch <mcculls@apache.org> Mon Jan 28 04:58:46 2008 +0000
tree c254e27960e0efcc001a65fe8d61109738ef64a3
parent bd328cba67bf7376581ff554b24580288aeb4107

FindBugs: remove no-op method, use entrySet iterator for better performance, and fix potential NPE

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@615726 13f79535-47bb-0310-9956-ffa450edef68

maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ExtractBindexInfo.java

diff --git a/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ExtractBindexInfo.java b/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ExtractBindexInfo.java
index d83770a..bff99cf 100644
--- a/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ExtractBindexInfo.java
+++ b/maven-obr-plugin/src/main/java/org/apache/felix/obr/plugin/ExtractBindexInfo.java
@@ -94,20 +94,6 @@
 
 
     /**
-     * transform logical operator in xml syntax.
-     * @param filter string which contains logical operator
-     * @return string in correct xml syntax
-     */
-    private String parseFilter( String filter )
-    {
-        filter.replaceAll( "&", "&amp" );
-        filter.replaceAll( ">=", "&gt" );
-
-        return filter;
-    }
-
-
-    /**
      * extract capabilities from bindex information.
      * @return bundle capabilities List
      */
@@ -125,11 +111,12 @@
             if ( !( ci.getName().compareTo( "bundle" ) == 0 ) )
             {
                 Map properties = ci.getProperties();
-                for ( Iterator k = properties.keySet().iterator(); k.hasNext(); )
+                for ( Iterator e = properties.entrySet().iterator(); e.hasNext(); )
                 {
                     PElement p = new PElement();
-                    String key = ( String ) k.next();
-                    List values = ( List ) properties.get( key );
+                    Map.Entry entry = ( Map.Entry ) e.next();
+                    String key = ( String ) entry.getKey();
+                    List values = ( List ) entry.getValue();
                     for ( Iterator v = values.iterator(); v.hasNext(); )
                     {
                         Object value = v.next();
@@ -149,7 +136,7 @@
                         }
                         else
                         {
-                            if ( value.getClass() == VersionRange.class )
+                            if ( value instanceof VersionRange )
                             {
                                 type = "version";
                             }
@@ -187,7 +174,7 @@
             require.setMultiple( String.valueOf( ci.isMultiple() ) );
             require.setOptional( String.valueOf( ci.isOptional() ) );
             require.setName( ci.getName() );
-            require.setFilter( parseFilter( ci.getFilter() ) );
+            require.setFilter( ci.getFilter() );
             require.setValue( ci.getComment() );
             list.add( require );
         }