summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-02-26 06:19:19 (EST)
committerEike Stepper2007-02-26 06:19:19 (EST)
commit2f65a9bf704ceb145a2d8e94f2f2922437eefe82 (patch)
tree0c8e410b73a7d40bb6f5c19e51c5fe93029b140f
parent8c4c0699d5d4a41dce10eaf980cd5d4833992781 (diff)
downloadcdo-2f65a9bf704ceb145a2d8e94f2f2922437eefe82.zip
cdo-2f65a9bf704ceb145a2d8e94f2f2922437eefe82.tar.gz
cdo-2f65a9bf704ceb145a2d8e94f2f2922437eefe82.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java26
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java2
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java33
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java46
16 files changed, 94 insertions, 61 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
index e58f905..439e1fe 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Category.java
@@ -73,7 +73,7 @@ public interface Category extends CDOObject
* @model type="org.eclipse.emf.cdo.tests.model1.Category" containment="true"
* @generated
*/
- EList getCategories();
+ EList<Category> getCategories();
/**
* Returns the value of the '<em><b>Products</b></em>' containment
@@ -91,6 +91,6 @@ public interface Category extends CDOObject
* @model type="org.eclipse.emf.cdo.tests.model1.Product" containment="true"
* @generated
*/
- EList getProducts();
+ EList<Product> getProducts();
} // Category
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java
index fa13476..932831c 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Company.java
@@ -47,7 +47,7 @@ public interface Company extends CDOObject
* @model type="org.eclipse.emf.cdo.tests.model1.Category" containment="true"
* @generated
*/
- EList getCategories();
+ EList<Category> getCategories();
/**
* Returns the value of the '<em><b>Suppliers</b></em>' containment
@@ -65,7 +65,7 @@ public interface Company extends CDOObject
* @model type="org.eclipse.emf.cdo.tests.model1.Supplier" containment="true"
* @generated
*/
- EList getSuppliers();
+ EList<Supplier> getSuppliers();
/**
* Returns the value of the '<em><b>Purchase Orders</b></em>' containment
@@ -85,7 +85,7 @@ public interface Company extends CDOObject
* containment="true"
* @generated
*/
- EList getPurchaseOrders();
+ EList<PurchaseOrder> getPurchaseOrders();
/**
* Returns the value of the '<em><b>Customers</b></em>' containment
@@ -103,7 +103,7 @@ public interface Company extends CDOObject
* @model type="org.eclipse.emf.cdo.tests.model1.Customer" containment="true"
* @generated
*/
- EList getCustomers();
+ EList<Customer> getCustomers();
/**
* Returns the value of the '<em><b>Sales Orders</b></em>' containment
@@ -123,6 +123,6 @@ public interface Company extends CDOObject
* containment="true"
* @generated
*/
- EList getSalesOrders();
+ EList<SalesOrder> getSalesOrders();
} // Company
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java
index 7218ff5..287d4f6 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Customer.java
@@ -75,6 +75,6 @@ public interface Customer extends CDOObject
* opposite="customer"
* @generated
*/
- EList getSalesOrders();
+ EList<SalesOrder> getSalesOrders();
} // Customer
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java
index 55fa2e8..a24004b 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/Product.java
@@ -75,6 +75,6 @@ public interface Product extends CDOObject
* opposite="product"
* @generated
*/
- EList getOrderDetails();
+ EList<OrderDetail> getOrderDetails();
} // Product
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java
index e6b7c82..ac8df21 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CategoryImpl.java
@@ -8,6 +8,7 @@ package org.eclipse.emf.cdo.tests.model1.impl;
import org.eclipse.emf.cdo.tests.model1.Category;
import org.eclipse.emf.cdo.tests.model1.Model1Package;
+import org.eclipse.emf.cdo.tests.model1.Product;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
@@ -44,6 +45,7 @@ public class CategoryImpl extends CDOObjectImpl implements Category
*
* @generated
*/
+ @Override
protected EClass eStaticClass()
{
return Model1Package.Literals.CATEGORY;
@@ -74,9 +76,9 @@ public class CategoryImpl extends CDOObjectImpl implements Category
*
* @generated
*/
- public EList getCategories()
+ public EList<Category> getCategories()
{
- return (EList)eGet(Model1Package.Literals.CATEGORY__CATEGORIES, true);
+ return (EList<Category>)eGet(Model1Package.Literals.CATEGORY__CATEGORIES, true);
}
/**
@@ -84,9 +86,9 @@ public class CategoryImpl extends CDOObjectImpl implements Category
*
* @generated
*/
- public EList getProducts()
+ public EList<Product> getProducts()
{
- return (EList)eGet(Model1Package.Literals.CATEGORY__PRODUCTS, true);
+ return (EList<Product>)eGet(Model1Package.Literals.CATEGORY__PRODUCTS, true);
}
} // CategoryImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java
index 98f3ea9..7678393 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CompanyImpl.java
@@ -6,8 +6,13 @@
*/
package org.eclipse.emf.cdo.tests.model1.impl;
+import org.eclipse.emf.cdo.tests.model1.Category;
import org.eclipse.emf.cdo.tests.model1.Company;
+import org.eclipse.emf.cdo.tests.model1.Customer;
import org.eclipse.emf.cdo.tests.model1.Model1Package;
+import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
+import org.eclipse.emf.cdo.tests.model1.SalesOrder;
+import org.eclipse.emf.cdo.tests.model1.Supplier;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
@@ -46,6 +51,7 @@ public class CompanyImpl extends CDOObjectImpl implements Company
*
* @generated
*/
+ @Override
protected EClass eStaticClass()
{
return Model1Package.Literals.COMPANY;
@@ -56,9 +62,9 @@ public class CompanyImpl extends CDOObjectImpl implements Company
*
* @generated
*/
- public EList getCategories()
+ public EList<Category> getCategories()
{
- return (EList)eGet(Model1Package.Literals.COMPANY__CATEGORIES, true);
+ return (EList<Category>)eGet(Model1Package.Literals.COMPANY__CATEGORIES, true);
}
/**
@@ -66,9 +72,9 @@ public class CompanyImpl extends CDOObjectImpl implements Company
*
* @generated
*/
- public EList getSuppliers()
+ public EList<Supplier> getSuppliers()
{
- return (EList)eGet(Model1Package.Literals.COMPANY__SUPPLIERS, true);
+ return (EList<Supplier>)eGet(Model1Package.Literals.COMPANY__SUPPLIERS, true);
}
/**
@@ -76,9 +82,9 @@ public class CompanyImpl extends CDOObjectImpl implements Company
*
* @generated
*/
- public EList getPurchaseOrders()
+ public EList<PurchaseOrder> getPurchaseOrders()
{
- return (EList)eGet(Model1Package.Literals.COMPANY__PURCHASE_ORDERS, true);
+ return (EList<PurchaseOrder>)eGet(Model1Package.Literals.COMPANY__PURCHASE_ORDERS, true);
}
/**
@@ -86,9 +92,9 @@ public class CompanyImpl extends CDOObjectImpl implements Company
*
* @generated
*/
- public EList getCustomers()
+ public EList<Customer> getCustomers()
{
- return (EList)eGet(Model1Package.Literals.COMPANY__CUSTOMERS, true);
+ return (EList<Customer>)eGet(Model1Package.Literals.COMPANY__CUSTOMERS, true);
}
/**
@@ -96,9 +102,9 @@ public class CompanyImpl extends CDOObjectImpl implements Company
*
* @generated
*/
- public EList getSalesOrders()
+ public EList<SalesOrder> getSalesOrders()
{
- return (EList)eGet(Model1Package.Literals.COMPANY__SALES_ORDERS, true);
+ return (EList<SalesOrder>)eGet(Model1Package.Literals.COMPANY__SALES_ORDERS, true);
}
} // CompanyImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java
index 6076ad6..c0df465 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/CustomerImpl.java
@@ -8,6 +8,7 @@ package org.eclipse.emf.cdo.tests.model1.impl;
import org.eclipse.emf.cdo.tests.model1.Customer;
import org.eclipse.emf.cdo.tests.model1.Model1Package;
+import org.eclipse.emf.cdo.tests.model1.SalesOrder;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
@@ -43,6 +44,7 @@ public class CustomerImpl extends CDOObjectImpl implements Customer
*
* @generated
*/
+ @Override
protected EClass eStaticClass()
{
return Model1Package.Literals.CUSTOMER;
@@ -73,9 +75,9 @@ public class CustomerImpl extends CDOObjectImpl implements Customer
*
* @generated
*/
- public EList getSalesOrders()
+ public EList<SalesOrder> getSalesOrders()
{
- return (EList)eGet(Model1Package.Literals.CUSTOMER__SALES_ORDERS, true);
+ return (EList<SalesOrder>)eGet(Model1Package.Literals.CUSTOMER__SALES_ORDERS, true);
}
} // CustomerImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java
index c5ae030..2ff4386 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1FactoryImpl.java
@@ -71,6 +71,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
*
* @generated
*/
+ @Override
public EObject create(EClass eClass)
{
switch (eClass.getClassifierID())
@@ -200,6 +201,7 @@ public class Model1FactoryImpl extends EFactoryImpl implements Model1Factory
* @deprecated
* @generated
*/
+ @Deprecated
public static Model1Package getPackage()
{
return Model1Package.eINSTANCE;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java
index 99bdae6..6b438dc 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/Model1PackageImpl.java
@@ -521,6 +521,10 @@ public class Model1PackageImpl extends EPackageImpl implements Model1Package
setNsPrefix(eNS_PREFIX);
setNsURI(eNS_URI);
+ // Create type parameters
+
+ // Set bounds for type parameters
+
// Add supertypes to classes
// Initialize classes and features; add operations and parameters
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java
index 6bcf8ae..6f51e2a 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/OrderDetailImpl.java
@@ -43,6 +43,7 @@ public class OrderDetailImpl extends CDOObjectImpl implements OrderDetail
*
* @generated
*/
+ @Override
protected EClass eStaticClass()
{
return Model1Package.Literals.ORDER_DETAIL;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java
index 8c172a7..538a6ce 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/ProductImpl.java
@@ -7,6 +7,7 @@
package org.eclipse.emf.cdo.tests.model1.impl;
import org.eclipse.emf.cdo.tests.model1.Model1Package;
+import org.eclipse.emf.cdo.tests.model1.OrderDetail;
import org.eclipse.emf.cdo.tests.model1.Product;
import org.eclipse.emf.common.util.EList;
@@ -43,6 +44,7 @@ public class ProductImpl extends CDOObjectImpl implements Product
*
* @generated
*/
+ @Override
protected EClass eStaticClass()
{
return Model1Package.Literals.PRODUCT;
@@ -73,9 +75,9 @@ public class ProductImpl extends CDOObjectImpl implements Product
*
* @generated
*/
- public EList getOrderDetails()
+ public EList<OrderDetail> getOrderDetails()
{
- return (EList)eGet(Model1Package.Literals.PRODUCT__ORDER_DETAILS, true);
+ return (EList<OrderDetail>)eGet(Model1Package.Literals.PRODUCT__ORDER_DETAILS, true);
}
} // ProductImpl
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java
index 14788db..c5f1929 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/PurchaseOrderImpl.java
@@ -45,6 +45,7 @@ public class PurchaseOrderImpl extends CDOObjectImpl implements PurchaseOrder
*
* @generated
*/
+ @Override
protected EClass eStaticClass()
{
return Model1Package.Literals.PURCHASE_ORDER;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java
index a593359..3d0cab5 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SalesOrderImpl.java
@@ -43,6 +43,7 @@ public class SalesOrderImpl extends CDOObjectImpl implements SalesOrder
*
* @generated
*/
+ @Override
protected EClass eStaticClass()
{
return Model1Package.Literals.SALES_ORDER;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java
index 5be32e2..20d30fa 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/impl/SupplierImpl.java
@@ -41,6 +41,7 @@ public class SupplierImpl extends CDOObjectImpl implements Supplier
*
* @generated
*/
+ @Override
protected EClass eStaticClass()
{
return Model1Package.Literals.SUPPLIER;
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java
index e4e5640..80b0092 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1AdapterFactory.java
@@ -61,6 +61,7 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* @return whether this factory is applicable for the type of the object.
* @generated
*/
+ @Override
public boolean isFactoryForType(Object object)
{
if (object == modelPackage)
@@ -80,49 +81,58 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
*
* @generated
*/
- protected Model1Switch modelSwitch = new Model1Switch()
+ protected Model1Switch<Adapter> modelSwitch = new Model1Switch<Adapter>()
{
- public Object caseSupplier(Supplier object)
+ @Override
+ public Adapter caseSupplier(Supplier object)
{
return createSupplierAdapter();
}
- public Object casePurchaseOrder(PurchaseOrder object)
+ @Override
+ public Adapter casePurchaseOrder(PurchaseOrder object)
{
return createPurchaseOrderAdapter();
}
- public Object caseOrderDetail(OrderDetail object)
+ @Override
+ public Adapter caseOrderDetail(OrderDetail object)
{
return createOrderDetailAdapter();
}
- public Object caseProduct(Product object)
+ @Override
+ public Adapter caseProduct(Product object)
{
return createProductAdapter();
}
- public Object caseCategory(Category object)
+ @Override
+ public Adapter caseCategory(Category object)
{
return createCategoryAdapter();
}
- public Object caseCompany(Company object)
+ @Override
+ public Adapter caseCompany(Company object)
{
return createCompanyAdapter();
}
- public Object caseCustomer(Customer object)
+ @Override
+ public Adapter caseCustomer(Customer object)
{
return createCustomerAdapter();
}
- public Object caseSalesOrder(SalesOrder object)
+ @Override
+ public Adapter caseSalesOrder(SalesOrder object)
{
return createSalesOrderAdapter();
}
- public Object defaultCase(EObject object)
+ @Override
+ public Adapter defaultCase(EObject object)
{
return createEObjectAdapter();
}
@@ -137,9 +147,10 @@ public class Model1AdapterFactory extends AdapterFactoryImpl
* @return the adapter for the <code>target</code>.
* @generated
*/
+ @Override
public Adapter createAdapter(Notifier target)
{
- return (Adapter)modelSwitch.doSwitch((EObject)target);
+ return modelSwitch.doSwitch((EObject)target);
}
/**
diff --git a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java
index c009e19..64d40b8 100644
--- a/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java
+++ b/plugins/org.eclipse.emf.cdo.tests.model1/src/org/eclipse/emf/cdo/tests/model1/util/Model1Switch.java
@@ -32,7 +32,7 @@ import java.util.List;
* @see org.eclipse.emf.cdo.tests.model1.Model1Package
* @generated
*/
-public class Model1Switch
+public class Model1Switch<T>
{
/**
* The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -64,7 +64,7 @@ public class Model1Switch
* call.
* @generated
*/
- public Object doSwitch(EObject theEObject)
+ public T doSwitch(EObject theEObject)
{
return doSwitch(theEObject.eClass(), theEObject);
}
@@ -78,7 +78,7 @@ public class Model1Switch
* call.
* @generated
*/
- protected Object doSwitch(EClass theEClass, EObject theEObject)
+ protected T doSwitch(EClass theEClass, EObject theEObject)
{
if (theEClass.eContainer() == modelPackage)
{
@@ -86,8 +86,8 @@ public class Model1Switch
}
else
{
- List eSuperTypes = theEClass.getESuperTypes();
- return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch((EClass)eSuperTypes.get(0), theEObject);
+ List<EClass> eSuperTypes = theEClass.getESuperTypes();
+ return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
}
}
@@ -100,14 +100,14 @@ public class Model1Switch
* call.
* @generated
*/
- protected Object doSwitch(int classifierID, EObject theEObject)
+ protected T doSwitch(int classifierID, EObject theEObject)
{
switch (classifierID)
{
case Model1Package.SUPPLIER:
{
Supplier supplier = (Supplier)theEObject;
- Object result = caseSupplier(supplier);
+ T result = caseSupplier(supplier);
if (result == null)
result = defaultCase(theEObject);
return result;
@@ -115,7 +115,7 @@ public class Model1Switch
case Model1Package.PURCHASE_ORDER:
{
PurchaseOrder purchaseOrder = (PurchaseOrder)theEObject;
- Object result = casePurchaseOrder(purchaseOrder);
+ T result = casePurchaseOrder(purchaseOrder);
if (result == null)
result = defaultCase(theEObject);
return result;
@@ -123,7 +123,7 @@ public class Model1Switch
case Model1Package.ORDER_DETAIL:
{
OrderDetail orderDetail = (OrderDetail)theEObject;
- Object result = caseOrderDetail(orderDetail);
+ T result = caseOrderDetail(orderDetail);
if (result == null)
result = defaultCase(theEObject);
return result;
@@ -131,7 +131,7 @@ public class Model1Switch
case Model1Package.PRODUCT:
{
Product product = (Product)theEObject;
- Object result = caseProduct(product);
+ T result = caseProduct(product);
if (result == null)
result = defaultCase(theEObject);
return result;
@@ -139,7 +139,7 @@ public class Model1Switch
case Model1Package.CATEGORY:
{
Category category = (Category)theEObject;
- Object result = caseCategory(category);
+ T result = caseCategory(category);
if (result == null)
result = defaultCase(theEObject);
return result;
@@ -147,7 +147,7 @@ public class Model1Switch
case Model1Package.COMPANY:
{
Company company = (Company)theEObject;
- Object result = caseCompany(company);
+ T result = caseCompany(company);
if (result == null)
result = defaultCase(theEObject);
return result;
@@ -155,7 +155,7 @@ public class Model1Switch
case Model1Package.CUSTOMER:
{
Customer customer = (Customer)theEObject;
- Object result = caseCustomer(customer);
+ T result = caseCustomer(customer);
if (result == null)
result = defaultCase(theEObject);
return result;
@@ -163,7 +163,7 @@ public class Model1Switch
case Model1Package.SALES_ORDER:
{
SalesOrder salesOrder = (SalesOrder)theEObject;
- Object result = caseSalesOrder(salesOrder);
+ T result = caseSalesOrder(salesOrder);
if (result == null)
result = defaultCase(theEObject);
return result;
@@ -184,7 +184,7 @@ public class Model1Switch
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
- public Object caseSupplier(Supplier object)
+ public T caseSupplier(Supplier object)
{
return null;
}
@@ -200,7 +200,7 @@ public class Model1Switch
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
- public Object casePurchaseOrder(PurchaseOrder object)
+ public T casePurchaseOrder(PurchaseOrder object)
{
return null;
}
@@ -216,7 +216,7 @@ public class Model1Switch
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
- public Object caseOrderDetail(OrderDetail object)
+ public T caseOrderDetail(OrderDetail object)
{
return null;
}
@@ -232,7 +232,7 @@ public class Model1Switch
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
- public Object caseProduct(Product object)
+ public T caseProduct(Product object)
{
return null;
}
@@ -248,7 +248,7 @@ public class Model1Switch
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
- public Object caseCategory(Category object)
+ public T caseCategory(Category object)
{
return null;
}
@@ -264,7 +264,7 @@ public class Model1Switch
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
- public Object caseCompany(Company object)
+ public T caseCompany(Company object)
{
return null;
}
@@ -280,7 +280,7 @@ public class Model1Switch
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
- public Object caseCustomer(Customer object)
+ public T caseCustomer(Customer object)
{
return null;
}
@@ -296,7 +296,7 @@ public class Model1Switch
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
- public Object caseSalesOrder(SalesOrder object)
+ public T caseSalesOrder(SalesOrder object)
{
return null;
}
@@ -313,7 +313,7 @@ public class Model1Switch
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
*/
- public Object defaultCase(EObject object)
+ public T defaultCase(EObject object)
{
return null;
}