cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r560746 - in /cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne: conf/Configuration.java dataview/
Date Sun, 29 Jul 2007 15:57:52 GMT
Author: aadamchik
Date: Sun Jul 29 08:57:52 2007
New Revision: 560746

URL: http://svn.apache.org/viewvc?view=rev&rev=560746
Log:
CAY-824 Extract all DataView related code in a separate module
(removed dataview package from main Cayenne)

Removed:
    cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/dataview/
Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conf/Configuration.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conf/Configuration.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conf/Configuration.java?view=diff&rev=560746&r1=560745&r2=560746
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conf/Configuration.java
(original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.4-unpublished/src/main/java/org/apache/cayenne/conf/Configuration.java
Sun Jul 29 08:57:52 2007
@@ -19,20 +19,16 @@
 
 package org.apache.cayenne.conf;
 
-import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 import org.apache.cayenne.CayenneRuntimeException;
 import org.apache.cayenne.ConfigurationException;
 import org.apache.cayenne.access.DataDomain;
-import org.apache.cayenne.dataview.DataView;
 import org.apache.cayenne.event.EventManager;
 import org.apache.cayenne.util.CayenneMap;
 import org.apache.cayenne.util.ResourceLocator;
@@ -432,51 +428,6 @@
      */
     public Map getDataViewLocations() {
         return dataViewLocations;
-    }
-
-    /**
-     * @since 1.1
-     */
-    public boolean loadDataView(DataView dataView) throws IOException {
-        return loadDataView(dataView, Configuration.ACCEPT_ALL_DATAVIEWS);
-    }
-
-    /**
-     * @since 1.1
-     */
-    public boolean loadDataView(DataView dataView, Predicate dataViewNameFilter)
-            throws IOException {
-
-        if (dataView == null) {
-            throw new IllegalArgumentException("DataView cannot be null.");
-        }
-
-        if (dataViewLocations.size() == 0 || dataViewLocations.size() > 512) {
-            return false;
-        }
-
-        if (dataViewNameFilter == null)
-            dataViewNameFilter = Configuration.ACCEPT_ALL_DATAVIEWS;
-
-        List viewXMLSources = new ArrayList(dataViewLocations.size());
-        int index = 0;
-        for (Iterator i = dataViewLocations.entrySet().iterator(); i.hasNext(); index++)
{
-            Map.Entry entry = (Map.Entry) i.next();
-            String name = (String) entry.getKey();
-            if (!dataViewNameFilter.evaluate(name))
-                continue;
-            String location = (String) entry.getValue();
-            InputStream in = getViewConfiguration(location);
-            if (in != null)
-                viewXMLSources.add(in);
-        }
-
-        if (viewXMLSources.isEmpty())
-            return false;
-
-        dataView.load((InputStream[]) viewXMLSources
-                .toArray(new InputStream[viewXMLSources.size()]));
-        return true;
     }
 
     /**



Mime
View raw message