svn commit: r520931 - /lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeMetaData.java

Author: andreas
Date: Wed Mar 21 09:12:24 2007
New Revision: 520931

URL: http://svn.apache.org/viewvc?view=rev&rev=520931
Log:
[refactoring] extracted method

Modified:
    
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeMetaData.java

Modified: 
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeMetaData.java
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeMetaData.java?view=diff&rev=520931&r1=520930&r2=520931
==============================================================================
--- 
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeMetaData.java
 (original)
+++ 
lenya/trunk/src/modules/sourcerepository/java/src/org/apache/lenya/cms/repository/SourceNodeMetaData.java
 Wed Mar 21 09:12:24 2007
@@ -124,12 +124,7 @@
         Element[] elements = getElementSet().getElements();
         for (int i = 0; i < elements.length; i++) {
             if (elements[i].getActionOnCopy() == Element.ONCOPY_COPY) {
-                String key = elements[i].getName();
-                removeAllValues(key);
-                String[] values = other.getValues(key);
-                for (int j = 0; j < values.length; j++) {
-                    addValue(key, values[j]);
-                }
+                replaceBy(other, elements[i]);
             } else if (elements[i].getActionOnCopy() == Element.ONCOPY_DELETE) 
{
                 String key = elements[i].getName();
                 removeAllValues(key);
@@ -137,15 +132,19 @@
         }
     }
 
+    protected void replaceBy(MetaData other, Element element) throws 
MetaDataException {
+        String key = element.getName();
+        removeAllValues(key);
+        String[] values = other.getValues(key);
+        for (int j = 0; j < values.length; j++) {
+            addValue(key, values[j]);
+        }
+    }
+
     public void forcedReplaceBy(MetaData other) throws MetaDataException {
         Element[] elements = getElementSet().getElements();
         for (int i = 0; i < elements.length; i++) {
-            String key = elements[i].getName();
-            removeAllValues(key);
-            String[] values = other.getValues(key);
-            for (int j = 0; j < values.length; j++) {
-                addValue(key, values[j]);
-            }
+            replaceBy(other, elements[i]);
         }
     }