Changeset 888 for MetadataBeans/trunk/src/main/java/org/eobjects/metamodel/CompositeDataContextStrategy.java

Timestamp:

02/04/10 21:57:54 (2 years ago)

Author:

kasper

Message:

 

File:

• MetadataBeans/trunk/src/main/java/org/eobjects/metamodel/CompositeDataContextStrategy.java (modified) (7 diffs)

MetadataBeans/trunk/src/main/java/org/eobjects/metamodel/CompositeDataContextStrategy.java

@@ -41 +41 @@
         }
 
-        public DataSet executeQuery(Query query) throws MetaModelException {
+        public DataSet executeQuery(Query query) throws MetadataBeansException {
                 Set<DataContext> dataContexts = new HashSet<DataContext>();
                 List<FromItem> items = query.getFromClause().getItems();
                 for (FromItem item : items) {
-                        List<FromItem> tableFromItems = MetaModelHelper
+                        List<FromItem> tableFromItems = MetadataBeansHelper
                                         .getTableFromItems(item);
                         for (FromItem fromItem : tableFromItems) {
@@ -56 +56 @@
 
                 if (dataContexts.isEmpty()) {
-                        throw new MetaModelException(
+                        throw new MetadataBeansException(
                                         "No suiting delegate DataContext to execute query: "
                                                         + query);
@@ -76 +76 @@
 
                                 @Override
-                                protected String getMainSchemaName() throws MetaModelException {
+                                protected String getMainSchemaName() throws MetadataBeansException {
                                         throw new UnsupportedOperationException(
                                                         "Use CompositeDataContextStrategy for exploring the schema");
@@ -83 +83 @@
                                 @Override
                                 protected MutableSchema getMainSchema()
-                                                throws MetaModelException {
+                                                throws MetadataBeansException {
                                         throw new UnsupportedOperationException(
                                                         "Use CompositeDataContextStrategy for exploring the schema");
@@ -112 +112 @@
         }
 
-        public String getDefaultSchemaName() throws MetaModelException {
+        public String getDefaultSchemaName() throws MetadataBeansException {
                 for (DataContext dc : _delegates) {
                         Schema schema = dc.getDefaultSchema();
@@ -122 +122 @@
         }
 
-        public Schema getSchemaByName(String name) throws MetaModelException {
+        public Schema getSchemaByName(String name) throws MetadataBeansException {
                 CompositeSchema compositeSchema = _compositeSchemas.get(name);
                 if (compositeSchema != null) {
@@ -149 +149 @@
         }
 
-        public String[] getSchemaNames() throws MetaModelException {
+        public String[] getSchemaNames() throws MetadataBeansException {
                 Set<String> set = new HashSet<String>();
                 for (DataContext dc : _delegates) {