You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/11/10 11:47:40 UTC

svn commit: r473309 - /lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/metadata/usecases/Metadata.java

Author: andreas
Date: Fri Nov 10 02:47:40 2006
New Revision: 473309

URL: http://svn.apache.org/viewvc?view=rev&rev=473309
Log:
Removed unnecessary null check for meta data namespace URIs

Modified:
    lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/metadata/usecases/Metadata.java

Modified: lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/metadata/usecases/Metadata.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/metadata/usecases/Metadata.java?view=diff&rev=473309&r1=473308&r2=473309
==============================================================================
--- lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/metadata/usecases/Metadata.java (original)
+++ lenya/trunk/src/modules-core/sitemanagement/java/src/org/apache/lenya/cms/metadata/usecases/Metadata.java Fri Nov 10 02:47:40 2006
@@ -128,29 +128,27 @@
         super.doExecute();
 
         // we need a reverse lookup to get the correct ns index:
-        Map num2namespace = (Map)getParameter("namespaces");
+        Map num2namespace = (Map) getParameter("namespaces");
         Map namespace2num = new HashMap();
-        
+
         Iterator iter = num2namespace.keySet().iterator();
         while (iter.hasNext()) {
-            String key = (String)iter.next();
+            String key = (String) iter.next();
             namespace2num.put(num2namespace.get(key), key);
         }
-        
+
         Document document = getSourceDocument();
         String[] namespaces = document.getMetaDataNamespaceUris();
 
         for (int nsIndex = 0; nsIndex < namespaces.length; nsIndex++) {
             MetaData meta = document.getMetaData(namespaces[nsIndex]);
-            String orgNsIndex = (String)namespace2num.get(namespaces[nsIndex]);
+            String orgNsIndex = (String) namespace2num.get(namespaces[nsIndex]);
 
-            if (orgNsIndex != null) {
-                String[] keys = meta.getPossibleKeys();
-                for (int keyIndex = 0; keyIndex < keys.length; keyIndex++) {
-                    String value = getParameterAsString("ns" + orgNsIndex + "." + keys[keyIndex]);
-                    if (value != null) {
-                        meta.setValue(keys[keyIndex], value);
-                    }
+            String[] keys = meta.getPossibleKeys();
+            for (int keyIndex = 0; keyIndex < keys.length; keyIndex++) {
+                String value = getParameterAsString("ns" + orgNsIndex + "." + keys[keyIndex]);
+                if (value != null) {
+                    meta.setValue(keys[keyIndex], value);
                 }
             }
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org