From 3543901bd6540435b557a7bbc8450b3f4ec6e113 Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Tue, 5 May 2009 11:36:54 +0000
Subject: formatting

---
 .../emf/cdo/formatchecker/CopyOfFormatChecker.java | 847 +++++++++++++++++++++
 .../emf/cdo/formatchecker/FormatChecker.java       | 795 +++++++++++++------
 2 files changed, 1392 insertions(+), 250 deletions(-)
 create mode 100644 releng/org.eclipse.emf.cdo.formatchecker/src/org/eclipse/emf/cdo/formatchecker/CopyOfFormatChecker.java

(limited to 'releng/org.eclipse.emf.cdo.formatchecker')

diff --git a/releng/org.eclipse.emf.cdo.formatchecker/src/org/eclipse/emf/cdo/formatchecker/CopyOfFormatChecker.java b/releng/org.eclipse.emf.cdo.formatchecker/src/org/eclipse/emf/cdo/formatchecker/CopyOfFormatChecker.java
new file mode 100644
index 0000000000..97fc919647
--- /dev/null
+++ b/releng/org.eclipse.emf.cdo.formatchecker/src/org/eclipse/emf/cdo/formatchecker/CopyOfFormatChecker.java
@@ -0,0 +1,847 @@
+/**
+ * Copyright (c) 2004 - 2009 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.formatchecker;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * @author Eike Stepper
+ */
+public class CopyOfFormatChecker
+{
+  private static Map<String, List<Integer>> complaints = new HashMap<String, List<Integer>>();
+
+  public static void main(String[] args) throws IOException
+  {
+    File folder = new File(args.length == 0 ? "/develop/ws/cdo" : args[0]);
+    recurse(folder);
+
+    ignore("base.BaseClass", 1);
+    ignore("base.BaseFactory", 1);
+    ignore("base.BasePackage", 2);
+    ignore("base.impl.BaseClassImpl", 1);
+    ignore("base.impl.BaseFactoryImpl", 2);
+    ignore("base.impl.BasePackageImpl", 3);
+    ignore("base.util.BaseAdapterFactory", 3);
+    ignore("base.util.BaseSwitch", 3);
+    ignore("derived.DerivedClass", 1);
+    ignore("derived.DerivedFactory", 1);
+    ignore("derived.DerivedPackage", 2);
+    ignore("derived.impl.DerivedClassImpl", 1);
+    ignore("derived.impl.DerivedFactoryImpl", 2);
+    ignore("derived.impl.DerivedPackageImpl", 3);
+    ignore("derived.util.DerivedAdapterFactory", 3);
+    ignore("derived.util.DerivedSwitch", 4);
+    ignore("interface_.IInterface", 1);
+    ignore("interface_.InterfaceFactory", 1);
+    ignore("interface_.InterfacePackage", 2);
+    ignore("interface_.impl.InterfaceFactoryImpl", 2);
+    ignore("interface_.impl.InterfacePackageImpl", 3);
+    ignore("interface_.util.InterfaceAdapterFactory", 3);
+    ignore("interface_.util.InterfaceSwitch", 3);
+    ignore("org.eclipse.emf.cdo.common.CDOFetchRule", 1);
+    ignore("org.eclipse.emf.cdo.common.model.CDOPackageInfo", 1);
+    ignore("org.eclipse.emf.cdo.defs.CDOAuditDef", 1);
+    ignore("org.eclipse.emf.cdo.defs.CDODefsFactory", 1);
+    ignore("org.eclipse.emf.cdo.defs.CDODefsPackage", 2);
+    ignore("org.eclipse.emf.cdo.defs.CDOPackageRegistryDef", 1);
+    ignore("org.eclipse.emf.cdo.defs.CDOResourceDef", 1);
+    ignore("org.eclipse.emf.cdo.defs.CDOSessionDef", 1);
+    ignore("org.eclipse.emf.cdo.defs.CDOTransactionDef", 2);
+    ignore("org.eclipse.emf.cdo.defs.CDOViewDef", 1);
+    ignore("org.eclipse.emf.cdo.defs.EDynamicPackageDef", 1);
+    ignore("org.eclipse.emf.cdo.defs.EPackageDef", 1);
+    ignore("org.eclipse.emf.cdo.defs.FailOverStrategyDef", 1);
+    ignore("org.eclipse.emf.cdo.defs.ResourceMode", 4);
+    ignore("org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef", 1);
+    ignore("org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl", 5);
+    ignore("org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl", 1);
+    ignore("org.eclipse.emf.cdo.defs.impl.CDODefsFactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl", 1);
+    ignore("org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl", 9);
+    ignore("org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl", 8);
+    ignore("org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl", 10);
+    ignore("org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl", 2);
+    ignore("org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl", 5);
+    ignore("org.eclipse.emf.cdo.defs.impl.EPackageDefImpl", 5);
+    ignore("org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl", 6);
+    ignore("org.eclipse.emf.cdo.defs.util.CDODefsAdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.defs.util.CDODefsSwitch", 2);
+    ignore("org.eclipse.emf.cdo.defs.util.CDODefsUtil", 3);
+    ignore("org.eclipse.emf.cdo.emodel.CDOAnnotation", 1);
+    ignore("org.eclipse.emf.cdo.emodel.CDOModelElement", 1);
+    ignore("org.eclipse.emf.cdo.emodel.CDONamedElement", 1);
+    ignore("org.eclipse.emf.cdo.emodel.EmodelFactory", 1);
+    ignore("org.eclipse.emf.cdo.emodel.EmodelPackage", 2);
+    ignore("org.eclipse.emf.cdo.emodel.impl.CDOAnnotationImpl", 1);
+    ignore("org.eclipse.emf.cdo.emodel.impl.CDOModelElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.emodel.impl.CDONamedElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.emodel.impl.EmodelFactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.emodel.impl.EmodelPackageImpl", 2);
+    ignore("org.eclipse.emf.cdo.emodel.provider.CDOAnnotationItemProvider", 4);
+    ignore("org.eclipse.emf.cdo.emodel.provider.CDOModelElementItemProvider", 5);
+    ignore("org.eclipse.emf.cdo.emodel.provider.CDONamedElementItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.emodel.provider.EmodelEditPlugin", 1);
+    ignore("org.eclipse.emf.cdo.emodel.provider.EmodelItemProviderAdapterFactory", 1);
+    ignore("org.eclipse.emf.cdo.emodel.util.EmodelAdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.emodel.util.EmodelSwitch", 2);
+    ignore("org.eclipse.emf.cdo.eresource.CDOResource", 1);
+    ignore("org.eclipse.emf.cdo.eresource.CDOResourceFolder", 1);
+    ignore("org.eclipse.emf.cdo.eresource.CDOResourceNode", 1);
+    ignore("org.eclipse.emf.cdo.eresource.EresourceFactory", 1);
+    ignore("org.eclipse.emf.cdo.eresource.EresourcePackage", 2);
+    ignore("org.eclipse.emf.cdo.eresource.impl.EresourceFactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl", 3);
+    ignore("org.eclipse.emf.cdo.eresource.provider.CDOResourceFolderItemProvider", 5);
+    ignore("org.eclipse.emf.cdo.eresource.provider.CDOResourceItemProvider", 4);
+    ignore("org.eclipse.emf.cdo.eresource.provider.CDOResourceNodeItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.eresource.provider.EresourceEditPlugin", 1);
+    ignore("org.eclipse.emf.cdo.eresource.provider.EresourceItemProviderAdapterFactory", 2);
+    ignore("org.eclipse.emf.cdo.eresource.util.EresourceAdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.eresource.util.EresourceSwitch", 7);
+    ignore("org.eclipse.emf.cdo.internal.common.model.CDOTypeImpl", 2);
+    ignore("org.eclipse.emf.cdo.internal.common.revision.delta.CDORevisionDeltaImpl", 1);
+    ignore("org.eclipse.emf.cdo.internal.server.protocol.CommitTransactionPhase1Indication", 1);
+    ignore("org.eclipse.emf.cdo.internal.ui.dialogs.RollbackTransactionDialog", 1);
+    ignore("org.eclipse.emf.cdo.internal.ui.editor.CDOEditor", 13);
+    ignore("org.eclipse.emf.cdo.internal.ui.editor.PluginDelegator", 1);
+    ignore("org.eclipse.emf.cdo.internal.ui.filters.CDOObjectFilter", 1);
+    ignore("org.eclipse.emf.cdo.server.ITransaction", 1);
+    ignore("org.eclipse.emf.cdo.server.db.mapping.IClassMapping", 1);
+    ignore("org.eclipse.emf.cdo.server.db.mapping.IClassMappingAuditSupport", 1);
+    ignore("org.eclipse.emf.cdo.server.db.mapping.ITypeMapping", 1);
+    ignore("org.eclipse.emf.cdo.server.file.FileStoreAccessor", 1);
+    ignore("org.eclipse.emf.cdo.server.internal.db.DBStore", 1);
+    ignore("org.eclipse.emf.cdo.server.internal.db.mapping.AbstractMappingStrategy", 1);
+    ignore("org.eclipse.emf.cdo.server.internal.db.mapping.horizontal.HorizontalNonAuditClassMapping", 1);
+    ignore("org.eclipse.emf.cdo.server.internal.db.mapping.horizontal.NonAuditListTableMapping", 2);
+    ignore("org.eclipse.emf.cdo.server.internal.db.mapping.horizontal.ObjectTypeCache", 1);
+    ignore("org.eclipse.emf.cdo.server.internal.hibernate.HibernateEPackage", 1);
+    ignore("org.eclipse.emf.cdo.server.internal.hibernate.HibernateStoreAccessor", 1);
+    ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOContainerIDGetter", 1);
+    ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOContainerIDSetter", 1);
+    ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOContainingFeatureIDGetter", 1);
+    ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOContainingFeatureNameGetter", 1);
+    ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOResourceIDGetter", 1);
+    ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.CDOResourceIDSetter", 1);
+    ignore("org.eclipse.emf.cdo.server.internal.hibernate.tuplizer.WrappedHibernateList", 1);
+    ignore("org.eclipse.emf.cdo.session.CDOSessionInvalidationEvent", 1);
+    ignore("org.eclipse.emf.cdo.tests.AttributeTest", 2);
+    ignore("org.eclipse.emf.cdo.tests.ChangeSubscriptionTest", 6);
+    ignore("org.eclipse.emf.cdo.tests.ChunkingTest", 1);
+    ignore("org.eclipse.emf.cdo.tests.ComplexTest", 2);
+    ignore("org.eclipse.emf.cdo.tests.ConflictResolverTest", 1);
+    ignore("org.eclipse.emf.cdo.tests.ContainmentTest", 2);
+    ignore("org.eclipse.emf.cdo.tests.ExternalReferenceTest", 1);
+    ignore("org.eclipse.emf.cdo.tests.FetchRuleAnalyzerTest", 1);
+    ignore("org.eclipse.emf.cdo.tests.InvalidationTest", 1);
+    ignore("org.eclipse.emf.cdo.tests.LockingManagerTest", 1);
+    ignore("org.eclipse.emf.cdo.tests.ResourceTest", 1);
+    ignore("org.eclipse.emf.cdo.tests.RevisionHolderTest", 1);
+    ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_250910_Test", 2);
+    ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_251263_Test", 1);
+    ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_251544_Test", 1);
+    ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_256141_Test", 1);
+    ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_258850_Test", 1);
+    ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_259695_Test", 1);
+    ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_260756_Test", 1);
+    ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_260764_Test", 2);
+    ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_261218_Test", 1);
+    ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_265114_Test", 2);
+    ignore("org.eclipse.emf.cdo.tests.bugzilla.Bugzilla_273233_Test", 1);
+    ignore("org.eclipse.emf.cdo.tests.db.verifier.DBStoreVerifier", 1);
+    ignore("org.eclipse.emf.cdo.tests.defs.CDOViewDefImplTest", 1);
+    ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesFactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl", 3);
+    ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesFactory", 1);
+    ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage", 2);
+    ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.util.model4interfacesAdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.util.model4interfacesSwitch", 16);
+    ignore("org.eclipse.emf.cdo.tests.mango.MangoFactory", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.MangoPackage", 2);
+    ignore("org.eclipse.emf.cdo.tests.mango.Parameter", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.ParameterPassing", 4);
+    ignore("org.eclipse.emf.cdo.tests.mango.Value", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.ValueList", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.impl.MangoFactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.impl.ParameterImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.impl.ValueImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.impl.ValueListImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.provider.MangoEditPlugin", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.provider.MangoItemProviderAdapterFactory", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.provider.ParameterItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.mango.provider.ValueItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.mango.provider.ValueListItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.mango.util.MangoAdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.tests.mango.util.MangoSwitch", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.Address", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.Category", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.Company", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.Customer", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.Model1Factory", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.Model1Package", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.Order", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.OrderAddress", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.OrderDetail", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.Product1", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.PurchaseOrder", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.SalesOrder", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.Supplier", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.VAT", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.CategoryCreateCommand", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.CustomerCreateCommand", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.OrderAddressCreateCommand", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.OrderDetailCreateCommand", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.Product1CreateCommand", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.PurchaseOrderCreateCommand", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.SalesOrderCreateCommand", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.SupplierCreateCommand", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CategoryEditPart", 18);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CategoryNameEditPart", 19);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CategoryProducts2EditPart", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CategoryProductsEditPart", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CompanyEditPart", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CustomerEditPart", 18);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CustomerNameEditPart", 19);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderAddressEditPart", 18);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderAddressNameEditPart", 19);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderDetailEditPart", 18);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderDetailPriceEditPart", 19);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderOrderDetails2EditPart", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderOrderDetailsEditPart", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.Product1EditPart", 18);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.Product1NameEditPart", 19);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.PurchaseOrderDateEditPart", 19);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.PurchaseOrderEditPart", 18);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SalesOrderCustomerEditPart", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SalesOrderEditPart", 18);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SalesOrderIdEditPart", 19);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SupplierEditPart", 18);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SupplierNameEditPart", 19);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CategoryCanonicalEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CategoryItemSemanticEditPolicy", 6);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CategoryProducts2ItemSemanticEditPolicy", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CategoryProductsItemSemanticEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CompanyItemSemanticEditPolicy", 17);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CustomerCanonicalEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CustomerItemSemanticEditPolicy", 6);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.Model1BaseItemSemanticEditPolicy", 30);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderAddressCanonicalEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderAddressItemSemanticEditPolicy", 8);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderDetailCanonicalEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderDetailItemSemanticEditPolicy", 8);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderOrderDetails2ItemSemanticEditPolicy", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderOrderDetailsItemSemanticEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.Product1CanonicalEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.Product1ItemSemanticEditPolicy", 8);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.PurchaseOrderCanonicalEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.PurchaseOrderItemSemanticEditPolicy", 8);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SalesOrderCanonicalEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SalesOrderCustomerItemSemanticEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SalesOrderItemSemanticEditPolicy", 8);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SupplierCanonicalEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SupplierItemSemanticEditPolicy", 6);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1AbstractNavigatorItem", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1DomainNavigatorContentProvider", 15);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1DomainNavigatorItem", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1DomainNavigatorLabelProvider", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorActionProvider", 9);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorContentProvider", 45);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorGroup", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorItem", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorLabelProvider", 17);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorLinkHelper", 11);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorSorter", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DiagramEditor", 16);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DiagramEditorUtil", 19);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DiagramUpdateCommand", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DiagramUpdater", 26);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DocumentProvider", 61);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DomainModelElementTester", 14);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1LinkDescriptor", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1LoadResourceAction", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1MatchingStrategy", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1NodeDescriptor", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1UriEditorInputTester", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1VisualIDRegistry", 40);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.ModelElementSelectionPage", 6);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.providers.ElementInitializers", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.providers.Model1ElementTypes", 13);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.providers.Model1ParserProvider", 17);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.sheet.Model1PropertySection", 13);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.sheet.Model1SheetLabelProvider", 7);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.AddressImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.Model1FactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.OrderImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.Product1Impl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.AddressItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.CategoryItemProvider", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.CompanyItemProvider", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.CustomerItemProvider", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.Model1EditPlugin", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.Model1ItemProviderAdapterFactory", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.OrderAddressItemProvider", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.OrderDetailItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.OrderItemProvider", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.Product1ItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.PurchaseOrderItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.SalesOrderItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.SupplierItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.util.Model1AdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.util.Model1Switch", 2);
+    ignore("org.eclipse.emf.cdo.tests.model2.Model2Factory", 1);
+    ignore("org.eclipse.emf.cdo.tests.model2.Model2Package", 2);
+    ignore("org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder", 1);
+    ignore("org.eclipse.emf.cdo.tests.model2.Task", 1);
+    ignore("org.eclipse.emf.cdo.tests.model2.TaskContainer", 1);
+    ignore("org.eclipse.emf.cdo.tests.model2.impl.Model2FactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model2.impl.SpecialPurchaseOrderImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model2.impl.TaskContainerImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model2.impl.TaskImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model2.provider.Model2EditPlugin", 1);
+    ignore("org.eclipse.emf.cdo.tests.model2.provider.Model2ItemProviderAdapterFactory", 2);
+    ignore("org.eclipse.emf.cdo.tests.model2.provider.SpecialPurchaseOrderItemProvider", 5);
+    ignore("org.eclipse.emf.cdo.tests.model2.provider.TaskContainerItemProvider", 5);
+    ignore("org.eclipse.emf.cdo.tests.model2.provider.TaskItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.model2.util.Model2AdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.tests.model2.util.Model2Switch", 2);
+    ignore("org.eclipse.emf.cdo.tests.model3.Class1", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.MetaRef", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.Model3Factory", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.Model3Package", 2);
+    ignore("org.eclipse.emf.cdo.tests.model3.impl.Class1Impl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.impl.MetaRefImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.impl.Model3FactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.Class2", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.SubpackageFactory", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage", 2);
+    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.impl.Class2Impl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.impl.SubpackageFactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.impl.SubpackagePackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.util.SubpackageAdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.util.SubpackageSwitch", 2);
+    ignore("org.eclipse.emf.cdo.tests.model3.util.Model3AdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.tests.model3.util.Model3Switch", 2);
+    ignore("org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.GenRefMapNonContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.GenRefMultiContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.GenRefMultiNUNonContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.GenRefSingleContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.GenRefSingleNonContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.MultiContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.RefMultiContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.RefMultiContainedNPL", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.RefMultiNonContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedNPL", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.RefSingleContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.RefSingleContainedNPL", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.RefSingleNonContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.RefSingleNonContainedNPL", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.SingleContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ContainedElementNoOppositeImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.GenRefMapNonContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiNUNonContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiNonContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.GenRefSingleContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.GenRefSingleNonContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplContainedElementNPLImpl", 3);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainedElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerNPLImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainedElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainerImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainerNPLImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainedElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainerImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainerNPLImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainedElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainerImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainerNPLImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.MultiContainedElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.MultiNonContainedElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.RefMultiContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.RefMultiContainedNPLImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.RefMultiNonContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.RefMultiNonContainedNPLImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.RefSingleContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.RefSingleContainedNPLImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.RefSingleNonContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.RefSingleNonContainedNPLImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.SingleContainedElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.SingleNonContainedElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.StringToEObjectImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.model4FactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.model4Factory", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.model4Package", 2);
+    ignore("org.eclipse.emf.cdo.tests.model4.util.model4AdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.tests.model4.util.model4Switch", 2);
+    ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplContainedElementNPLValidator", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplMultiRefContainerNPLValidator", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplMultiRefContainerValidator", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplMultiRefNonContainerNPLValidator", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplMultiRefNonContainerValidator", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplSingleRefContainerNPLValidator", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplSingleRefContainerValidator", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplSingleRefNonContainerNPLValidator", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplSingleRefNonContainerValidator", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.INamedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesFactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesFactory", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage", 2);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.util.model4interfacesAdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.util.model4interfacesSwitch", 2);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfBoolean", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfChar", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfDate", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfDouble", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfFloat", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfInt", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfInteger", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfLong", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfShort", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfString", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.Model5Factory", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.Model5Package", 2);
+    ignore("org.eclipse.emf.cdo.tests.model5.TestFeatureMap", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.DoctorImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfBooleanImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfCharImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfDateImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfDoubleImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfFloatImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntegerImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfLongImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfShortImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfStringImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.ManagerImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.Model5FactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.TestFeatureMapImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.util.Model5AdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.tests.model5.util.Model5Switch", 2);
+    ignore("org.eclipse.emf.cdo.ui.defs.CDOEditorDef", 1);
+    ignore("org.eclipse.emf.cdo.ui.defs.CDOUIDefsFactory", 1);
+    ignore("org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage", 2);
+    ignore("org.eclipse.emf.cdo.ui.defs.EditorDef", 1);
+    ignore("org.eclipse.emf.cdo.ui.defs.impl.CDOEditorDefImpl", 9);
+    ignore("org.eclipse.emf.cdo.ui.defs.impl.CDOUIDefsFactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.ui.defs.impl.CDOUIDefsPackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.ui.defs.util.CDOUIDefsAdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.ui.defs.util.CDOUIDefsSwitch", 2);
+    ignore("org.eclipse.emf.cdo.ui.ide.RepositoryContentProvider", 1);
+    ignore("org.eclipse.emf.internal.cdo.CDOObjectImpl", 2);
+    ignore("org.eclipse.emf.internal.cdo.CDOObjectWrapper", 1);
+    ignore("org.eclipse.emf.internal.cdo.net4j.protocol.CDOClientIndication", 1);
+    ignore("org.eclipse.emf.internal.cdo.net4j.protocol.CommitTransactionRequest", 1);
+    ignore("org.eclipse.emf.internal.cdo.net4j.protocol.RemoteSessionNotificationIndication", 1);
+    ignore("org.eclipse.emf.internal.cdo.transaction.CDOXASavepointImpl", 1);
+    ignore("org.eclipse.emf.internal.cdo.view.CDOViewImpl", 2);
+    ignore("org.eclipse.emf.spi.cdo.CDOElementProxy", 1);
+    ignore("org.eclipse.net4j.buddies.IBuddyCollaboration", 1);
+    ignore("org.eclipse.net4j.defs.AcceptorDef", 1);
+    ignore("org.eclipse.net4j.defs.BufferPoolDef", 2);
+    ignore("org.eclipse.net4j.defs.BufferProviderDef", 2);
+    ignore("org.eclipse.net4j.defs.ClientProtocolFactoryDef", 2);
+    ignore("org.eclipse.net4j.defs.ConnectorDef", 1);
+    ignore("org.eclipse.net4j.defs.HTTPConnectorDef", 1);
+    ignore("org.eclipse.net4j.defs.JVMAcceptorDef", 1);
+    ignore("org.eclipse.net4j.defs.JVMConnectorDef", 1);
+    ignore("org.eclipse.net4j.defs.Net4jDefsFactory", 1);
+    ignore("org.eclipse.net4j.defs.Net4jDefsPackage", 2);
+    ignore("org.eclipse.net4j.defs.ProtocolProviderDef", 2);
+    ignore("org.eclipse.net4j.defs.ServerProtocolFactoryDef", 2);
+    ignore("org.eclipse.net4j.defs.TCPAcceptorDef", 1);
+    ignore("org.eclipse.net4j.defs.TCPConnectorDef", 1);
+    ignore("org.eclipse.net4j.defs.TCPSelectorDef", 2);
+    ignore("org.eclipse.net4j.defs.impl.AcceptorDefImpl", 11);
+    ignore("org.eclipse.net4j.defs.impl.BufferProviderDefImpl", 1);
+    ignore("org.eclipse.net4j.defs.impl.ClientProtocolFactoryDefImpl", 1);
+    ignore("org.eclipse.net4j.defs.impl.ConnectorDefImpl", 12);
+    ignore("org.eclipse.net4j.defs.impl.JVMConnectorDefImpl", 5);
+    ignore("org.eclipse.net4j.defs.impl.Net4jDefsFactoryImpl", 2);
+    ignore("org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl", 1);
+    ignore("org.eclipse.net4j.defs.impl.ProtocolProviderDefImpl", 1);
+    ignore("org.eclipse.net4j.defs.impl.ServerProtocolFactoryDefImpl", 1);
+    ignore("org.eclipse.net4j.defs.util.Net4jDefsAdapterFactory", 3);
+    ignore("org.eclipse.net4j.defs.util.Net4jDefsSwitch", 2);
+    ignore("org.eclipse.net4j.internal.tcp.TCPAcceptorFactory", 1);
+    ignore("org.eclipse.net4j.signal.Request", 1);
+    ignore("org.eclipse.net4j.tests.defs.TCPConnectorDefImplTest", 1);
+    ignore("org.eclipse.net4j.ui.defs.Net4JUIDefsFactory", 1);
+    ignore("org.eclipse.net4j.ui.defs.Net4JUIDefsPackage", 2);
+    ignore("org.eclipse.net4j.ui.defs.impl.Net4JUIDefsPackageImpl", 1);
+    ignore("org.eclipse.net4j.ui.defs.util.Net4JUIDefsAdapterFactory", 3);
+    ignore("org.eclipse.net4j.ui.defs.util.Net4JUIDefsSwitch", 2);
+    ignore("org.eclipse.net4j.util.collection.MoveableArrayList", 1);
+    ignore("org.eclipse.net4j.util.defs.ChallengeNegotiatorDef", 1);
+    ignore("org.eclipse.net4j.util.defs.CredentialsProviderDef", 1);
+    ignore("org.eclipse.net4j.util.defs.DefContainer", 1);
+    ignore("org.eclipse.net4j.util.defs.DefException", 2);
+    ignore("org.eclipse.net4j.util.defs.NegotiatorDef", 2);
+    ignore("org.eclipse.net4j.util.defs.Net4jUtilDefsFactory", 1);
+    ignore("org.eclipse.net4j.util.defs.Net4jUtilDefsPackage", 2);
+    ignore("org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef", 1);
+    ignore("org.eclipse.net4j.util.defs.RandomizerDef", 1);
+    ignore("org.eclipse.net4j.util.defs.ResponseNegotiatorDef", 1);
+    ignore("org.eclipse.net4j.util.defs.User", 1);
+    ignore("org.eclipse.net4j.util.defs.UserManagerDef", 1);
+    ignore("org.eclipse.net4j.util.defs.impl.ChallengeNegotiatorDefImpl", 8);
+    ignore("org.eclipse.net4j.util.defs.impl.CredentialsProviderDefImpl", 5);
+    ignore("org.eclipse.net4j.util.defs.impl.DefContainerImpl", 8);
+    ignore("org.eclipse.net4j.util.defs.impl.DefImpl", 6);
+    ignore("org.eclipse.net4j.util.defs.impl.ExecutorServiceDefImpl", 1);
+    ignore("org.eclipse.net4j.util.defs.impl.NegotiatorDefImpl", 1);
+    ignore("org.eclipse.net4j.util.defs.impl.Net4jUtilDefsFactoryImpl", 2);
+    ignore("org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl", 1);
+    ignore("org.eclipse.net4j.util.defs.impl.PasswordCredentialsProviderDefImpl", 6);
+    ignore("org.eclipse.net4j.util.defs.impl.RandomizerDefImpl", 8);
+    ignore("org.eclipse.net4j.util.defs.impl.ResponseNegotiatorDefImpl", 6);
+    ignore("org.eclipse.net4j.util.defs.impl.ThreadPoolDefImpl", 2);
+    ignore("org.eclipse.net4j.util.defs.impl.UserImpl", 5);
+    ignore("org.eclipse.net4j.util.defs.impl.UserManagerDefImpl", 7);
+    ignore("org.eclipse.net4j.util.defs.util.Net4jUtilDefsAdapterFactory", 3);
+    ignore("org.eclipse.net4j.util.defs.util.Net4jUtilDefsSwitch", 2);
+    ignore("org.eclipse.net4j.util.om.trace.RemoteTraceServer", 1);
+    ignore("org.eclipse.net4j.util.tests.defs.DefsFactory", 1);
+    ignore("org.eclipse.net4j.util.tests.defs.DefsPackage", 2);
+    ignore("org.eclipse.net4j.util.tests.defs.TestDef", 1);
+    ignore("org.eclipse.net4j.util.tests.defs.TestDefsFactory", 1);
+    ignore("org.eclipse.net4j.util.tests.defs.TestDefsPackage", 2);
+    ignore("org.eclipse.net4j.util.tests.defs.impl.DefsFactoryImpl", 2);
+    ignore("org.eclipse.net4j.util.tests.defs.impl.DefsPackageImpl", 3);
+    ignore("org.eclipse.net4j.util.tests.defs.impl.TestDefImpl", 6);
+    ignore("org.eclipse.net4j.util.tests.defs.impl.TestDefsFactoryImpl", 2);
+    ignore("org.eclipse.net4j.util.tests.defs.impl.TestDefsPackageImpl", 3);
+    ignore("org.eclipse.net4j.util.tests.defs.util.DefsAdapterFactory", 3);
+    ignore("org.eclipse.net4j.util.tests.defs.util.DefsSwitch", 4);
+    ignore("org.eclipse.net4j.util.tests.defs.util.TestDefsAdapterFactory", 3);
+    ignore("org.eclipse.net4j.util.tests.defs.util.TestDefsSwitch", 4);
+    ignore("org.eclipse.net4j.util.ui.views.ContainerItemProvider", 1);
+    ignore("org.gastro.business.BusinessDay", 1);
+    ignore("org.gastro.business.BusinessFactory", 1);
+    ignore("org.gastro.business.BusinessPackage", 2);
+    ignore("org.gastro.business.Order", 1);
+    ignore("org.gastro.business.OrderDetail", 1);
+    ignore("org.gastro.business.OrderState", 4);
+    ignore("org.gastro.business.Waiter", 1);
+    ignore("org.gastro.business.impl.BusinessDayImpl", 1);
+    ignore("org.gastro.business.impl.BusinessFactoryImpl", 2);
+    ignore("org.gastro.business.impl.BusinessPackageImpl", 1);
+    ignore("org.gastro.business.impl.OrderImpl", 1);
+    ignore("org.gastro.business.impl.WaiterImpl", 1);
+    ignore("org.gastro.business.provider.BusinessDayItemProvider", 4);
+    ignore("org.gastro.business.provider.BusinessEditPlugin", 1);
+    ignore("org.gastro.business.provider.BusinessItemProviderAdapterFactory", 1);
+    ignore("org.gastro.business.provider.OrderDetailItemProvider", 3);
+    ignore("org.gastro.business.provider.OrderItemProvider", 4);
+    ignore("org.gastro.business.provider.WaiterItemProvider", 3);
+    ignore("org.gastro.business.util.BusinessAdapterFactory", 3);
+    ignore("org.gastro.business.util.BusinessSwitch", 2);
+    ignore("org.gastro.inventory.Department", 1);
+    ignore("org.gastro.inventory.Employee", 1);
+    ignore("org.gastro.inventory.Ingredient", 1);
+    ignore("org.gastro.inventory.InventoryFactory", 1);
+    ignore("org.gastro.inventory.InventoryPackage", 2);
+    ignore("org.gastro.inventory.MenuCard", 1);
+    ignore("org.gastro.inventory.Offering", 1);
+    ignore("org.gastro.inventory.Recipe", 1);
+    ignore("org.gastro.inventory.Restaurant", 1);
+    ignore("org.gastro.inventory.Section", 1);
+    ignore("org.gastro.inventory.Station", 1);
+    ignore("org.gastro.inventory.Stock", 1);
+    ignore("org.gastro.inventory.StockProduct", 1);
+    ignore("org.gastro.inventory.Table", 1);
+    ignore("org.gastro.inventory.impl.DepartmentImpl", 1);
+    ignore("org.gastro.inventory.impl.EmployeeImpl", 1);
+    ignore("org.gastro.inventory.impl.IngredientImpl", 1);
+    ignore("org.gastro.inventory.impl.InventoryFactoryImpl", 2);
+    ignore("org.gastro.inventory.impl.InventoryPackageImpl", 1);
+    ignore("org.gastro.inventory.impl.MenuCardImpl", 1);
+    ignore("org.gastro.inventory.impl.OfferingImpl", 1);
+    ignore("org.gastro.inventory.impl.ProductImpl", 1);
+    ignore("org.gastro.inventory.impl.RecipeImpl", 1);
+    ignore("org.gastro.inventory.impl.RestaurantImpl", 1);
+    ignore("org.gastro.inventory.impl.SectionImpl", 1);
+    ignore("org.gastro.inventory.impl.StationImpl", 1);
+    ignore("org.gastro.inventory.impl.StockImpl", 1);
+    ignore("org.gastro.inventory.impl.StockProductImpl", 1);
+    ignore("org.gastro.inventory.impl.TableImpl", 1);
+    ignore("org.gastro.inventory.provider.DepartmentItemProvider", 5);
+    ignore("org.gastro.inventory.provider.EmployeeItemProvider", 3);
+    ignore("org.gastro.inventory.provider.IngredientItemProvider", 3);
+    ignore("org.gastro.inventory.provider.InventoryEditPlugin", 1);
+    ignore("org.gastro.inventory.provider.InventoryItemProviderAdapterFactory", 1);
+    ignore("org.gastro.inventory.provider.MenuCardItemProvider", 4);
+    ignore("org.gastro.inventory.provider.OfferingItemProvider", 3);
+    ignore("org.gastro.inventory.provider.ProductItemProvider", 3);
+    ignore("org.gastro.inventory.provider.RecipeItemProvider", 4);
+    ignore("org.gastro.inventory.provider.RestaurantItemProvider", 4);
+    ignore("org.gastro.inventory.provider.SectionItemProvider", 4);
+    ignore("org.gastro.inventory.provider.StationItemProvider", 3);
+    ignore("org.gastro.inventory.provider.StockItemProvider", 4);
+    ignore("org.gastro.inventory.provider.StockProductItemProvider", 3);
+    ignore("org.gastro.inventory.provider.TableItemProvider", 3);
+    ignore("org.gastro.inventory.util.InventoryAdapterFactory", 3);
+    ignore("org.gastro.inventory.util.InventorySwitch", 2);
+    ignore("reference.Reference", 1);
+    ignore("reference.ReferenceFactory", 1);
+    ignore("reference.ReferencePackage", 2);
+    ignore("reference.impl.ReferenceFactoryImpl", 2);
+    ignore("reference.impl.ReferenceImpl", 1);
+    ignore("reference.impl.ReferencePackageImpl", 3);
+    ignore("reference.util.ReferenceAdapterFactory", 3);
+    ignore("reference.util.ReferenceSwitch", 3);
+
+    report();
+  }
+
+  private static void recurse(File folder) throws IOException
+  {
+    for (File file : folder.listFiles())
+    {
+      String name = file.getName();
+      if (file.isDirectory())
+      {
+        if (!name.startsWith("."))
+        {
+          if (new File(file, ".project").exists() && !new File(file, "copyright.txt").exists())
+          {
+            continue;
+          }
+
+          recurse(file);
+        }
+      }
+      else
+      {
+        if (name.endsWith(".java"))
+        {
+          processJava(file);
+        }
+      }
+    }
+  }
+
+  private static void processJava(File file) throws IOException
+  {
+    // System.out.println(file.getAbsolutePath());
+    String name = file.getName();
+    name = name.substring(0, name.length() - ".java".length());
+
+    InputStream stream = new FileInputStream(file);
+    BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
+
+    try
+    {
+      String packageName = null;
+      String last = "";
+      String line;
+      int i = 0;
+      while ((line = reader.readLine()) != null)
+      {
+        ++i;
+        if (packageName == null)
+        {
+          if (line.startsWith("package "))
+          {
+            packageName = line.substring("package ".length()); // Remove prefix "package "
+            packageName = packageName.substring(0, packageName.length() - 1); // Remove suffix ";"
+            packageName = packageName.trim();
+            name = packageName + "." + name;
+            continue;
+          }
+        }
+
+        String type = type(line);
+        if (last.equals("{"))
+        {
+          if (type.equals("empty"))
+          {
+            complain(name, i);
+          }
+        }
+        else if (last.equals("}"))
+        {
+          if (!(type.equals("empty") || type.equals("}") || type.equals("stmt")))
+          {
+            complain(name, i);
+          }
+        }
+        else if (last.equals("empty"))
+        {
+          if (type.equals("empty")||type.equals("}"))
+          {
+            complain(name, i);
+          }
+        }
+
+        last = type;
+      }
+    }
+    finally
+    {
+      stream.close();
+    }
+  }
+
+  private static String type(String line)
+  {
+    line = line.trim();
+    int i = line.indexOf("//");
+    if (i != -1)
+    {
+      line = line.substring(0, i).trim();
+      if (line.equals(""))
+      {
+        return "";
+      }
+    }
+
+    if (line.equals(""))
+    {
+      return "empty";
+    }
+
+    if (line.equals("{"))
+    {
+      return "{";
+    }
+
+    if (line.startsWith("}"))
+    {
+      return "}";
+    }
+
+    if (line.equals("else") || line.equals("default") || line.startsWith("case ") || line.startsWith("else if (")
+        || line.startsWith("catch (") || line.equals("finally"))
+    {
+      return "stmt";
+    }
+
+    return "";
+  }
+
+  private static void complain(String name, int i)
+  {
+    List<Integer> list = complaints.get(name);
+    if (list == null)
+    {
+      list = new ArrayList<Integer>();
+      complaints.put(name, list);
+    }
+
+    list.add(i);
+  }
+
+  private static void ignore(String name, int count)
+  {
+    List<Integer> list = complaints.get(name);
+    int found = list == null ? 0 : list.size();
+    if (found == count)
+    {
+      complaints.remove(name);
+    }
+  }
+
+  private static void report()
+  {
+    if (complaints.isEmpty())
+    {
+      System.out.println("No violations found.");
+      return;
+    }
+
+    List<Entry<String, List<Integer>>> list = new ArrayList<Entry<String, List<Integer>>>(complaints.entrySet());
+    Collections.sort(list, new Comparator<Entry<String, List<Integer>>>()
+    {
+      public int compare(Entry<String, List<Integer>> o1, Entry<String, List<Integer>> o2)
+      {
+        return o1.getKey().compareTo(o2.getKey());
+      }
+    });
+
+    for (Entry<String, List<Integer>> entry : list)
+    {
+      String name = entry.getKey();
+      for (int i : entry.getValue())
+      {
+        int dot = name.lastIndexOf('.');
+        String file = dot == -1 ? name : name.substring(dot + 1);
+        System.err.println(name + ".$(" + file + ".java:" + i + ")");
+      }
+    }
+
+    try
+    {
+      Thread.sleep(50);
+    }
+    catch (InterruptedException ex)
+    {
+      return;
+    }
+
+    System.out.println();
+    System.out.println();
+    System.out.println();
+    for (Entry<String, List<Integer>> entry : list)
+    {
+      System.out.println("ignore(\"" + entry.getKey() + "\", " + entry.getValue().size() + ");");
+    }
+  }
+}
diff --git a/releng/org.eclipse.emf.cdo.formatchecker/src/org/eclipse/emf/cdo/formatchecker/FormatChecker.java b/releng/org.eclipse.emf.cdo.formatchecker/src/org/eclipse/emf/cdo/formatchecker/FormatChecker.java
index 3f89f3c89b..000ec9a466 100644
--- a/releng/org.eclipse.emf.cdo.formatchecker/src/org/eclipse/emf/cdo/formatchecker/FormatChecker.java
+++ b/releng/org.eclipse.emf.cdo.formatchecker/src/org/eclipse/emf/cdo/formatchecker/FormatChecker.java
@@ -36,136 +36,214 @@ public class FormatChecker
     File folder = new File(args.length == 0 ? "/develop/ws/cdo" : args[0]);
     recurse(folder);
 
-    ignore("base.impl.BaseFactoryImpl", 1);
-    ignore("base.impl.BasePackageImpl", 2);
-    ignore("base.util.BaseAdapterFactory", 2);
-    ignore("base.util.BaseSwitch", 2);
+    ignore("base.BaseClass", 1);
+    ignore("base.BaseFactory", 1);
+    ignore("base.BasePackage", 2);
+    ignore("base.impl.BaseClassImpl", 1);
+    ignore("base.impl.BaseFactoryImpl", 2);
+    ignore("base.impl.BasePackageImpl", 3);
+    ignore("base.util.BaseAdapterFactory", 3);
+    ignore("base.util.BaseSwitch", 3);
     ignore("com.swtdesigner.ResourceManager", 48);
     ignore("com.swtdesigner.SWTResourceManager", 40);
-    ignore("derived.impl.DerivedFactoryImpl", 1);
-    ignore("derived.impl.DerivedPackageImpl", 2);
-    ignore("derived.util.DerivedAdapterFactory", 2);
-    ignore("derived.util.DerivedSwitch", 3);
-    ignore("interface_.impl.InterfaceFactoryImpl", 1);
-    ignore("interface_.impl.InterfacePackageImpl", 2);
-    ignore("interface_.util.InterfaceAdapterFactory", 2);
-    ignore("interface_.util.InterfaceSwitch", 2);
-    ignore("org.eclipse.emf.cdo.defs.CDOTransactionDef", 1);
-    ignore("org.eclipse.emf.cdo.defs.ResourceMode", 3);
-    ignore("org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl", 4);
-    ignore("org.eclipse.emf.cdo.defs.impl.CDODefsFactoryImpl", 1);
-    ignore("org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl", 8);
-    ignore("org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl", 6);
-    ignore("org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl", 9);
-    ignore("org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl", 1);
+    ignore("derived.DerivedClass", 1);
+    ignore("derived.DerivedFactory", 1);
+    ignore("derived.DerivedPackage", 2);
+    ignore("derived.impl.DerivedClassImpl", 1);
+    ignore("derived.impl.DerivedFactoryImpl", 2);
+    ignore("derived.impl.DerivedPackageImpl", 3);
+    ignore("derived.util.DerivedAdapterFactory", 3);
+    ignore("derived.util.DerivedSwitch", 4);
+    ignore("interface_.IInterface", 1);
+    ignore("interface_.InterfaceFactory", 1);
+    ignore("interface_.InterfacePackage", 2);
+    ignore("interface_.impl.InterfaceFactoryImpl", 2);
+    ignore("interface_.impl.InterfacePackageImpl", 3);
+    ignore("interface_.util.InterfaceAdapterFactory", 3);
+    ignore("interface_.util.InterfaceSwitch", 3);
+    ignore("org.eclipse.emf.cdo.defs.CDOAuditDef", 1);
+    ignore("org.eclipse.emf.cdo.defs.CDODefsFactory", 1);
+    ignore("org.eclipse.emf.cdo.defs.CDODefsPackage", 2);
+    ignore("org.eclipse.emf.cdo.defs.CDOPackageRegistryDef", 1);
+    ignore("org.eclipse.emf.cdo.defs.CDOResourceDef", 1);
+    ignore("org.eclipse.emf.cdo.defs.CDOSessionDef", 1);
+    ignore("org.eclipse.emf.cdo.defs.CDOTransactionDef", 2);
+    ignore("org.eclipse.emf.cdo.defs.CDOViewDef", 1);
+    ignore("org.eclipse.emf.cdo.defs.EDynamicPackageDef", 1);
+    ignore("org.eclipse.emf.cdo.defs.EPackageDef", 1);
+    ignore("org.eclipse.emf.cdo.defs.FailOverStrategyDef", 1);
+    ignore("org.eclipse.emf.cdo.defs.ResourceMode", 4);
+    ignore("org.eclipse.emf.cdo.defs.RetryFailOverStrategyDef", 1);
+    ignore("org.eclipse.emf.cdo.defs.impl.CDOAuditDefImpl", 5);
+    ignore("org.eclipse.emf.cdo.defs.impl.CDOClientProtocolFactoryDefImpl", 1);
+    ignore("org.eclipse.emf.cdo.defs.impl.CDODefsFactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.defs.impl.CDODefsPackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.defs.impl.CDOEagerPackageRegistryDefImpl", 1);
+    ignore("org.eclipse.emf.cdo.defs.impl.CDOPackageRegistryDefImpl", 9);
+    ignore("org.eclipse.emf.cdo.defs.impl.CDOResourceDefImpl", 8);
+    ignore("org.eclipse.emf.cdo.defs.impl.CDOSessionDefImpl", 10);
+    ignore("org.eclipse.emf.cdo.defs.impl.CDOTransactionDefImpl", 2);
     ignore("org.eclipse.emf.cdo.defs.impl.CDOViewDefImpl", 6);
-    ignore("org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl", 4);
-    ignore("org.eclipse.emf.cdo.defs.impl.EPackageDefImpl", 4);
-    ignore("org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl", 5);
+    ignore("org.eclipse.emf.cdo.defs.impl.EDynamicPackageDefImpl", 5);
+    ignore("org.eclipse.emf.cdo.defs.impl.EPackageDefImpl", 5);
+    ignore("org.eclipse.emf.cdo.defs.impl.FailOverStrategyDefImpl", 6);
     ignore("org.eclipse.emf.cdo.defs.impl.RetryFailOverStrategyDefImpl", 5);
-    ignore("org.eclipse.emf.cdo.defs.util.CDODefsAdapterFactory", 2);
-    ignore("org.eclipse.emf.cdo.defs.util.CDODefsSwitch", 1);
-    ignore("org.eclipse.emf.cdo.defs.util.CDODefsUtil", 2);
-    ignore("org.eclipse.emf.cdo.emodel.impl.EmodelFactoryImpl", 1);
-    ignore("org.eclipse.emf.cdo.emodel.impl.EmodelPackageImpl", 1);
-    ignore("org.eclipse.emf.cdo.emodel.provider.CDOAnnotationItemProvider", 3);
-    ignore("org.eclipse.emf.cdo.emodel.provider.CDOModelElementItemProvider", 3);
-    ignore("org.eclipse.emf.cdo.emodel.provider.CDONamedElementItemProvider", 2);
-    ignore("org.eclipse.emf.cdo.emodel.util.EmodelAdapterFactory", 2);
-    ignore("org.eclipse.emf.cdo.emodel.util.EmodelSwitch", 1);
+    ignore("org.eclipse.emf.cdo.defs.util.CDODefsAdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.defs.util.CDODefsSwitch", 2);
+    ignore("org.eclipse.emf.cdo.defs.util.CDODefsUtil", 3);
+    ignore("org.eclipse.emf.cdo.emodel.CDOAnnotation", 1);
+    ignore("org.eclipse.emf.cdo.emodel.CDOModelElement", 1);
+    ignore("org.eclipse.emf.cdo.emodel.CDONamedElement", 1);
+    ignore("org.eclipse.emf.cdo.emodel.EmodelFactory", 1);
+    ignore("org.eclipse.emf.cdo.emodel.EmodelPackage", 2);
+    ignore("org.eclipse.emf.cdo.emodel.impl.CDOAnnotationImpl", 1);
+    ignore("org.eclipse.emf.cdo.emodel.impl.CDOModelElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.emodel.impl.CDONamedElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.emodel.impl.EmodelFactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.emodel.impl.EmodelPackageImpl", 2);
+    ignore("org.eclipse.emf.cdo.emodel.provider.CDOAnnotationItemProvider", 4);
+    ignore("org.eclipse.emf.cdo.emodel.provider.CDOModelElementItemProvider", 5);
+    ignore("org.eclipse.emf.cdo.emodel.provider.CDONamedElementItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.emodel.provider.EmodelEditPlugin", 1);
+    ignore("org.eclipse.emf.cdo.emodel.provider.EmodelItemProviderAdapterFactory", 1);
+    ignore("org.eclipse.emf.cdo.emodel.util.EmodelAdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.emodel.util.EmodelSwitch", 2);
     ignore("org.eclipse.emf.cdo.emodel.util.EmodelValidator", 2);
-    ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesFactoryImpl", 1);
-    ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl", 2);
-    ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.util.model4interfacesAdapterFactory", 2);
-    ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.util.model4interfacesSwitch", 15);
-    ignore("org.eclipse.emf.cdo.tests.mango.ParameterPassing", 3);
-    ignore("org.eclipse.emf.cdo.tests.mango.impl.MangoFactoryImpl", 1);
-    ignore("org.eclipse.emf.cdo.tests.mango.provider.ParameterItemProvider", 2);
-    ignore("org.eclipse.emf.cdo.tests.mango.provider.ValueItemProvider", 2);
-    ignore("org.eclipse.emf.cdo.tests.mango.provider.ValueListItemProvider", 2);
-    ignore("org.eclipse.emf.cdo.tests.mango.util.MangoAdapterFactory", 2);
-    ignore("org.eclipse.emf.cdo.tests.mango.util.MangoSwitch", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.VAT", 3);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.CategoryCreateCommand", 2);
+    ignore("org.eclipse.emf.cdo.eresource.CDOResource", 1);
+    ignore("org.eclipse.emf.cdo.eresource.CDOResourceFolder", 1);
+    ignore("org.eclipse.emf.cdo.eresource.CDOResourceNode", 1);
+    ignore("org.eclipse.emf.cdo.eresource.EresourceFactory", 1);
+    ignore("org.eclipse.emf.cdo.eresource.EresourcePackage", 2);
+    ignore("org.eclipse.emf.cdo.eresource.impl.EresourceFactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl", 3);
+    ignore("org.eclipse.emf.cdo.eresource.provider.CDOResourceFolderItemProvider", 5);
+    ignore("org.eclipse.emf.cdo.eresource.provider.CDOResourceItemProvider", 4);
+    ignore("org.eclipse.emf.cdo.eresource.provider.CDOResourceNodeItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.eresource.provider.EresourceEditPlugin", 1);
+    ignore("org.eclipse.emf.cdo.eresource.provider.EresourceItemProviderAdapterFactory", 2);
+    ignore("org.eclipse.emf.cdo.eresource.util.EresourceAdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.eresource.util.EresourceSwitch", 7);
+    ignore("org.eclipse.emf.cdo.internal.ui.editor.CDOActionBarContributor", 5);
+    ignore("org.eclipse.emf.cdo.internal.ui.editor.CDOEditor", 12);
+    ignore("org.eclipse.emf.cdo.internal.ui.editor.PluginDelegator", 1);
+    ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesFactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.impl.model4interfacesPackageImpl", 3);
+    ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesFactory", 1);
+    ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.model4interfacesPackage", 2);
+    ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.util.model4interfacesAdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.tests.legacy.model4interfaces.util.model4interfacesSwitch", 16);
+    ignore("org.eclipse.emf.cdo.tests.mango.MangoFactory", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.MangoPackage", 2);
+    ignore("org.eclipse.emf.cdo.tests.mango.Parameter", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.ParameterPassing", 4);
+    ignore("org.eclipse.emf.cdo.tests.mango.Value", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.ValueList", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.impl.MangoFactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.mango.impl.MangoPackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.impl.ParameterImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.impl.ValueImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.impl.ValueListImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.provider.MangoEditPlugin", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.provider.MangoItemProviderAdapterFactory", 1);
+    ignore("org.eclipse.emf.cdo.tests.mango.provider.ParameterItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.mango.provider.ValueItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.mango.provider.ValueListItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.mango.util.MangoAdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.tests.mango.util.MangoSwitch", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.Address", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.Category", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.Company", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.Customer", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.Model1Factory", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.Model1Package", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.Order", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.OrderAddress", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.OrderDetail", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.Product1", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.PurchaseOrder", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.SalesOrder", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.Supplier", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.VAT", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.CategoryCreateCommand", 3);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.CategoryProducts2CreateCommand", 7);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.CategoryProducts2ReorientCommand", 9);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.CategoryProductsCreateCommand", 7);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.CategoryProductsReorientCommand", 9);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.CustomerCreateCommand", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.CustomerCreateCommand", 3);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.Model1ReorientConnectionViewCommand", 2);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.OrderAddressCreateCommand", 3);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.OrderDetailCreateCommand", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.OrderAddressCreateCommand", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.OrderDetailCreateCommand", 3);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.OrderOrderDetails2CreateCommand", 7);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.OrderOrderDetails2ReorientCommand", 9);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.OrderOrderDetailsCreateCommand", 7);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.OrderOrderDetailsReorientCommand", 9);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.Product1CreateCommand", 3);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.PurchaseOrderCreateCommand", 2);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.SalesOrderCreateCommand", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.Product1CreateCommand", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.PurchaseOrderCreateCommand", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.SalesOrderCreateCommand", 4);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.SalesOrderCustomerCreateCommand", 7);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.SalesOrderCustomerReorientCommand", 9);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.SupplierCreateCommand", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.commands.SupplierCreateCommand", 3);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.helpers.Model1BaseEditHelper", 3);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CategoryEditPart", 15);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CategoryNameEditPart", 18);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CategoryProducts2EditPart", 3);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CategoryProductsEditPart", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CompanyEditPart", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CustomerEditPart", 15);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CustomerNameEditPart", 18);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CategoryEditPart", 18);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CategoryNameEditPart", 19);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CategoryProducts2EditPart", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CategoryProductsEditPart", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CompanyEditPart", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CustomerEditPart", 18);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.CustomerNameEditPart", 19);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.Model1EditPartFactory", 6);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderAddressEditPart", 15);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderAddressNameEditPart", 18);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderDetailEditPart", 15);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderDetailPriceEditPart", 18);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderOrderDetails2EditPart", 3);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderOrderDetailsEditPart", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.Product1EditPart", 15);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.Product1NameEditPart", 18);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.PurchaseOrderDateEditPart", 18);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.PurchaseOrderEditPart", 15);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SalesOrderCustomerEditPart", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SalesOrderEditPart", 15);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SalesOrderIdEditPart", 18);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SupplierEditPart", 15);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SupplierNameEditPart", 18);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CategoryCanonicalEditPolicy", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CategoryItemSemanticEditPolicy", 5);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CategoryProducts2ItemSemanticEditPolicy", 2);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CategoryProductsItemSemanticEditPolicy", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderAddressEditPart", 18);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderAddressNameEditPart", 19);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderDetailEditPart", 18);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderDetailPriceEditPart", 19);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderOrderDetails2EditPart", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.OrderOrderDetailsEditPart", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.Product1EditPart", 18);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.Product1NameEditPart", 19);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.PurchaseOrderDateEditPart", 19);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.PurchaseOrderEditPart", 18);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SalesOrderCustomerEditPart", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SalesOrderEditPart", 18);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SalesOrderIdEditPart", 19);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SupplierEditPart", 18);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.parts.SupplierNameEditPart", 19);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CategoryCanonicalEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CategoryItemSemanticEditPolicy", 6);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CategoryProducts2ItemSemanticEditPolicy", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CategoryProductsItemSemanticEditPolicy", 2);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CompanyCanonicalEditPolicy", 32);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CompanyItemSemanticEditPolicy", 15);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CustomerCanonicalEditPolicy", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CustomerItemSemanticEditPolicy", 5);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.Model1BaseItemSemanticEditPolicy", 29);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CompanyItemSemanticEditPolicy", 17);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CustomerCanonicalEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.CustomerItemSemanticEditPolicy", 6);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.Model1BaseItemSemanticEditPolicy", 30);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.Model1TextNonResizableEditPolicy", 4);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.Model1TextSelectionEditPolicy", 4);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderAddressCanonicalEditPolicy", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderAddressItemSemanticEditPolicy", 7);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderDetailCanonicalEditPolicy", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderDetailItemSemanticEditPolicy", 7);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderOrderDetails2ItemSemanticEditPolicy", 2);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderOrderDetailsItemSemanticEditPolicy", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.Product1CanonicalEditPolicy", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.Product1ItemSemanticEditPolicy", 7);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.PurchaseOrderCanonicalEditPolicy", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.PurchaseOrderItemSemanticEditPolicy", 7);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SalesOrderCanonicalEditPolicy", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SalesOrderCustomerItemSemanticEditPolicy", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SalesOrderItemSemanticEditPolicy", 7);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SupplierCanonicalEditPolicy", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SupplierItemSemanticEditPolicy", 5);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1AbstractNavigatorItem", 4);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1DomainNavigatorContentProvider", 14);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1DomainNavigatorItem", 4);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1DomainNavigatorLabelProvider", 3);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorActionProvider", 7);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorContentProvider", 44);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorGroup", 2);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorItem", 4);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorLabelProvider", 8);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorLinkHelper", 10);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorSorter", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderAddressCanonicalEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderAddressItemSemanticEditPolicy", 8);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderDetailCanonicalEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderDetailItemSemanticEditPolicy", 8);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderOrderDetails2ItemSemanticEditPolicy", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.OrderOrderDetailsItemSemanticEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.Product1CanonicalEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.Product1ItemSemanticEditPolicy", 8);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.PurchaseOrderCanonicalEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.PurchaseOrderItemSemanticEditPolicy", 8);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SalesOrderCanonicalEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SalesOrderCustomerItemSemanticEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SalesOrderItemSemanticEditPolicy", 8);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SupplierCanonicalEditPolicy", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.edit.policies.SupplierItemSemanticEditPolicy", 6);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1AbstractNavigatorItem", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1DomainNavigatorContentProvider", 15);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1DomainNavigatorItem", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1DomainNavigatorLabelProvider", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorActionProvider", 9);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorContentProvider", 45);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorGroup", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorItem", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorLabelProvider", 17);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorLinkHelper", 11);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.navigator.Model1NavigatorSorter", 3);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.parsers.AbstractParser", 14);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.parsers.CompositeParser", 1);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.parsers.MessageFormatParser", 8);
@@ -175,38 +253,38 @@ public class FormatChecker
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1CreationWizard", 7);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1CreationWizardPage", 5);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DiagramActionBarContributor", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DiagramEditor", 15);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DiagramEditor", 16);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DiagramEditorPlugin", 8);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DiagramEditorUtil", 18);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DiagramUpdateCommand", 3);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DiagramUpdater", 25);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DocumentProvider", 56);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DomainModelElementTester", 13);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DiagramEditorUtil", 19);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DiagramUpdateCommand", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DiagramUpdater", 26);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DocumentProvider", 61);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1DomainModelElementTester", 14);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1InitDiagramFileAction", 4);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1LinkDescriptor", 3);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1LoadResourceAction", 2);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1MatchingStrategy", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1LinkDescriptor", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1LoadResourceAction", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1MatchingStrategy", 4);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1NewDiagramFileWizard", 8);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1NodeDescriptor", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1NodeDescriptor", 3);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1PaletteFactory", 3);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1UriEditorInputTester", 2);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1VisualIDRegistry", 39);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.ModelElementSelectionPage", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1UriEditorInputTester", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.Model1VisualIDRegistry", 40);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.part.ModelElementSelectionPage", 6);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.preferences.DiagramAppearancePreferencePage", 1);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.preferences.DiagramConnectionsPreferencePage", 1);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.preferences.DiagramGeneralPreferencePage", 1);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.preferences.DiagramPreferenceInitializer", 1);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.preferences.DiagramPrintingPreferencePage", 1);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.preferences.DiagramRulersAndGridPreferencePage", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.providers.ElementInitializers", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.providers.ElementInitializers", 2);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.providers.Model1EditPartProvider", 8);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.providers.Model1ElementTypes", 12);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.providers.Model1ElementTypes", 13);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.providers.Model1IconProvider", 2);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.providers.Model1ModelingAssistantProvider", 39);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.providers.Model1ParserProvider", 16);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.providers.Model1ParserProvider", 17);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.providers.Model1ViewProvider", 25);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.sheet.Model1PropertySection", 12);
-    ignore("org.eclipse.emf.cdo.tests.model1.diagram.sheet.Model1SheetLabelProvider", 6);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.sheet.Model1PropertySection", 13);
+    ignore("org.eclipse.emf.cdo.tests.model1.diagram.sheet.Model1SheetLabelProvider", 7);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.view.factories.CategoryNameViewFactory", 1);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.view.factories.CategoryProducts2ViewFactory", 2);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.view.factories.CategoryProductsViewFactory", 2);
@@ -229,139 +307,356 @@ public class FormatChecker
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.view.factories.SalesOrderViewFactory", 4);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.view.factories.SupplierNameViewFactory", 1);
     ignore("org.eclipse.emf.cdo.tests.model1.diagram.view.factories.SupplierViewFactory", 4);
-    ignore("org.eclipse.emf.cdo.tests.model1.impl.Model1FactoryImpl", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl", 4);
-    ignore("org.eclipse.emf.cdo.tests.model1.provider.AddressItemProvider", 2);
-    ignore("org.eclipse.emf.cdo.tests.model1.provider.CategoryItemProvider", 3);
-    ignore("org.eclipse.emf.cdo.tests.model1.provider.CompanyItemProvider", 3);
-    ignore("org.eclipse.emf.cdo.tests.model1.provider.CustomerItemProvider", 1);
-    ignore("org.eclipse.emf.cdo.tests.model1.provider.OrderAddressItemProvider", 3);
-    ignore("org.eclipse.emf.cdo.tests.model1.provider.OrderDetailItemProvider", 2);
-    ignore("org.eclipse.emf.cdo.tests.model1.provider.OrderItemProvider", 3);
-    ignore("org.eclipse.emf.cdo.tests.model1.provider.Product1ItemProvider", 2);
-    ignore("org.eclipse.emf.cdo.tests.model1.provider.PurchaseOrderItemProvider", 2);
-    ignore("org.eclipse.emf.cdo.tests.model1.provider.SalesOrderItemProvider", 2);
-    ignore("org.eclipse.emf.cdo.tests.model1.provider.SupplierItemProvider", 2);
-    ignore("org.eclipse.emf.cdo.tests.model1.util.Model1AdapterFactory", 2);
-    ignore("org.eclipse.emf.cdo.tests.model1.util.Model1Switch", 1);
-    ignore("org.eclipse.emf.cdo.tests.model2.impl.Model2FactoryImpl", 1);
-    ignore("org.eclipse.emf.cdo.tests.model2.provider.SpecialPurchaseOrderItemProvider", 4);
-    ignore("org.eclipse.emf.cdo.tests.model2.provider.TaskContainerItemProvider", 3);
-    ignore("org.eclipse.emf.cdo.tests.model2.provider.TaskItemProvider", 2);
-    ignore("org.eclipse.emf.cdo.tests.model2.util.Model2AdapterFactory", 2);
-    ignore("org.eclipse.emf.cdo.tests.model2.util.Model2Switch", 1);
-    ignore("org.eclipse.emf.cdo.tests.model3.impl.Model3FactoryImpl", 1);
-    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.impl.SubpackageFactoryImpl", 1);
-    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.util.SubpackageAdapterFactory", 2);
-    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.util.SubpackageSwitch", 1);
-    ignore("org.eclipse.emf.cdo.tests.model3.util.Model3AdapterFactory", 2);
-    ignore("org.eclipse.emf.cdo.tests.model3.util.Model3Switch", 1);
-    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplContainedElementNPLImpl", 2);
-    ignore("org.eclipse.emf.cdo.tests.model4.impl.StringToEObjectImpl", 1);
-    ignore("org.eclipse.emf.cdo.tests.model4.impl.model4FactoryImpl", 1);
-    ignore("org.eclipse.emf.cdo.tests.model4.util.model4AdapterFactory", 2);
-    ignore("org.eclipse.emf.cdo.tests.model4.util.model4Switch", 1);
-    ignore("org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesFactoryImpl", 1);
-    ignore("org.eclipse.emf.cdo.tests.model4interfaces.util.model4interfacesAdapterFactory", 2);
-    ignore("org.eclipse.emf.cdo.tests.model4interfaces.util.model4interfacesSwitch", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.AddressImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.CategoryImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.CompanyImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.CustomerImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.Model1FactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.Model1PackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.OrderAddressImpl", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.OrderDetailImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.OrderImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.Product1Impl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.PurchaseOrderImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.SalesOrderImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.impl.SupplierImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.AddressItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.CategoryItemProvider", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.CompanyItemProvider", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.CustomerItemProvider", 2);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.Model1EditPlugin", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.Model1ItemProviderAdapterFactory", 1);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.OrderAddressItemProvider", 4);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.OrderDetailItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.OrderItemProvider", 5);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.Product1ItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.PurchaseOrderItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.SalesOrderItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.provider.SupplierItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.util.Model1AdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.tests.model1.util.Model1Switch", 2);
+    ignore("org.eclipse.emf.cdo.tests.model2.Model2Factory", 1);
+    ignore("org.eclipse.emf.cdo.tests.model2.Model2Package", 2);
+    ignore("org.eclipse.emf.cdo.tests.model2.SpecialPurchaseOrder", 1);
+    ignore("org.eclipse.emf.cdo.tests.model2.Task", 1);
+    ignore("org.eclipse.emf.cdo.tests.model2.TaskContainer", 1);
+    ignore("org.eclipse.emf.cdo.tests.model2.impl.Model2FactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.model2.impl.Model2PackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model2.impl.SpecialPurchaseOrderImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model2.impl.TaskContainerImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model2.impl.TaskImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model2.provider.Model2EditPlugin", 1);
+    ignore("org.eclipse.emf.cdo.tests.model2.provider.Model2ItemProviderAdapterFactory", 2);
+    ignore("org.eclipse.emf.cdo.tests.model2.provider.SpecialPurchaseOrderItemProvider", 5);
+    ignore("org.eclipse.emf.cdo.tests.model2.provider.TaskContainerItemProvider", 5);
+    ignore("org.eclipse.emf.cdo.tests.model2.provider.TaskItemProvider", 3);
+    ignore("org.eclipse.emf.cdo.tests.model2.util.Model2AdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.tests.model2.util.Model2Switch", 2);
+    ignore("org.eclipse.emf.cdo.tests.model3.Class1", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.MetaRef", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.Model3Factory", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.Model3Package", 2);
+    ignore("org.eclipse.emf.cdo.tests.model3.impl.Class1Impl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.impl.MetaRefImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.impl.Model3FactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.model3.impl.Model3PackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.Class2", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.SubpackageFactory", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.SubpackagePackage", 2);
+    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.impl.Class2Impl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.impl.SubpackageFactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.impl.SubpackagePackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.util.SubpackageAdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.tests.model3.subpackage.util.SubpackageSwitch", 2);
+    ignore("org.eclipse.emf.cdo.tests.model3.util.Model3AdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.tests.model3.util.Model3Switch", 2);
+    ignore("org.eclipse.emf.cdo.tests.model4.ContainedElementNoOpposite", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.GenRefMapNonContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.GenRefMultiContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.GenRefMultiNUNonContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.GenRefMultiNonContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.GenRefSingleContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.GenRefSingleNonContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.ImplMultiRefContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.ImplMultiRefNonContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.ImplSingleRefContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.ImplSingleRefNonContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.MultiContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.MultiNonContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.RefMultiContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.RefMultiContainedNPL", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.RefMultiNonContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.RefMultiNonContainedNPL", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.RefSingleContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.RefSingleContainedNPL", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.RefSingleNonContained", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.RefSingleNonContainedNPL", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.SingleContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.SingleNonContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ContainedElementNoOppositeImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.GenRefMapNonContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiNUNonContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.GenRefMultiNonContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.GenRefSingleContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.GenRefSingleNonContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplContainedElementNPLImpl", 3);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainedElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefContainerNPLImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainedElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainerImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplMultiRefNonContainerNPLImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainedElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainerImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefContainerNPLImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainedElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainerImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.ImplSingleRefNonContainerNPLImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.MultiContainedElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.MultiNonContainedElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.RefMultiContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.RefMultiContainedNPLImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.RefMultiNonContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.RefMultiNonContainedNPLImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.RefSingleContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.RefSingleContainedNPLImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.RefSingleNonContainedImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.RefSingleNonContainedNPLImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.SingleContainedElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.SingleNonContainedElementImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.StringToEObjectImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.model4FactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.model4.impl.model4PackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.model4Factory", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.model4Package", 2);
+    ignore("org.eclipse.emf.cdo.tests.model4.util.model4AdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.tests.model4.util.model4Switch", 2);
+    ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplContainedElementNPLValidator", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplMultiRefContainerNPLValidator", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplMultiRefContainerValidator", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplMultiRefNonContainerNPLValidator", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplMultiRefNonContainerValidator", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplSingleRefContainerNPLValidator", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplSingleRefContainerValidator", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplSingleRefNonContainerNPLValidator", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4.validation.ImplSingleRefNonContainerValidator", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainer", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefContainerNPL", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainer", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.IMultiRefNonContainerNPL", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.INamedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainer", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefContainerNPL", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainedElement", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainer", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.ISingleRefNonContainerNPL", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesFactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.impl.model4interfacesPackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesFactory", 1);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.model4interfacesPackage", 2);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.util.model4interfacesAdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.tests.model4interfaces.util.model4interfacesSwitch", 2);
     ignore("org.eclipse.emf.cdo.tests.model5.Doctor", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfBoolean", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfChar", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfDate", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfDouble", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfFloat", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfInt", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfInteger", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfLong", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfShort", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.GenListOfString", 1);
     ignore("org.eclipse.emf.cdo.tests.model5.Manager", 1);
-    ignore("org.eclipse.emf.cdo.tests.model5.impl.Model5FactoryImpl", 1);
-    ignore("org.eclipse.emf.cdo.tests.model5.util.Model5AdapterFactory", 2);
-    ignore("org.eclipse.emf.cdo.tests.model5.util.Model5Switch", 1);
-    ignore("org.eclipse.emf.cdo.eresource.impl.EresourceFactoryImpl", 1);
-    ignore("org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl", 2);
-    ignore("org.eclipse.emf.cdo.eresource.impl.EresourceFactoryImpl", 1);
-    ignore("org.eclipse.emf.cdo.eresource.impl.EresourcePackageImpl", 2);
-    ignore("org.eclipse.emf.cdo.eresource.provider.CDOResourceFolderItemProvider", 3);
-    ignore("org.eclipse.emf.cdo.eresource.provider.CDOResourceItemProvider", 3);
-    ignore("org.eclipse.emf.cdo.eresource.provider.CDOResourceNodeItemProvider", 2);
-    ignore("org.eclipse.emf.cdo.eresource.provider.EresourceItemProviderAdapterFactory", 1);
-    ignore("org.eclipse.emf.cdo.eresource.util.EresourceAdapterFactory", 2);
-    ignore("org.eclipse.emf.cdo.eresource.util.EresourceSwitch", 6);
-    ignore("org.eclipse.emf.cdo.internal.ui.editor.CDOActionBarContributor", 5);
-    ignore("org.eclipse.emf.cdo.internal.ui.editor.CDOEditor", 11);
-    ignore("org.eclipse.emf.cdo.ui.defs.impl.CDOEditorDefImpl", 8);
-    ignore("org.eclipse.emf.cdo.ui.defs.impl.CDOUIDefsFactoryImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.Model5Factory", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.Model5Package", 2);
+    ignore("org.eclipse.emf.cdo.tests.model5.TestFeatureMap", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.DoctorImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfBooleanImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfCharImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfDateImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfDoubleImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfFloatImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfIntegerImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfLongImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfShortImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.GenListOfStringImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.ManagerImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.Model5FactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.Model5PackageImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.impl.TestFeatureMapImpl", 1);
+    ignore("org.eclipse.emf.cdo.tests.model5.util.Model5AdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.tests.model5.util.Model5Switch", 2);
+    ignore("org.eclipse.emf.cdo.ui.defs.CDOEditorDef", 1);
+    ignore("org.eclipse.emf.cdo.ui.defs.CDOUIDefsFactory", 1);
+    ignore("org.eclipse.emf.cdo.ui.defs.CDOUIDefsPackage", 2);
+    ignore("org.eclipse.emf.cdo.ui.defs.EditorDef", 1);
+    ignore("org.eclipse.emf.cdo.ui.defs.impl.CDOEditorDefImpl", 9);
+    ignore("org.eclipse.emf.cdo.ui.defs.impl.CDOUIDefsFactoryImpl", 2);
+    ignore("org.eclipse.emf.cdo.ui.defs.impl.CDOUIDefsPackageImpl", 1);
     ignore("org.eclipse.emf.cdo.ui.defs.impl.EditorDefImpl", 4);
-    ignore("org.eclipse.emf.cdo.ui.defs.util.CDOUIDefsAdapterFactory", 2);
-    ignore("org.eclipse.emf.cdo.ui.defs.util.CDOUIDefsSwitch", 1);
-    ignore("org.eclipse.net4j.defs.BufferPoolDef", 1);
-    ignore("org.eclipse.net4j.defs.BufferProviderDef", 1);
-    ignore("org.eclipse.net4j.defs.ClientProtocolFactoryDef", 1);
-    ignore("org.eclipse.net4j.defs.ProtocolProviderDef", 1);
-    ignore("org.eclipse.net4j.defs.ServerProtocolFactoryDef", 1);
-    ignore("org.eclipse.net4j.defs.TCPSelectorDef", 1);
-    ignore("org.eclipse.net4j.defs.impl.AcceptorDefImpl", 10);
-    ignore("org.eclipse.net4j.defs.impl.ConnectorDefImpl", 10);
+    ignore("org.eclipse.emf.cdo.ui.defs.util.CDOUIDefsAdapterFactory", 3);
+    ignore("org.eclipse.emf.cdo.ui.defs.util.CDOUIDefsSwitch", 2);
+    ignore("org.eclipse.net4j.defs.AcceptorDef", 1);
+    ignore("org.eclipse.net4j.defs.BufferPoolDef", 2);
+    ignore("org.eclipse.net4j.defs.BufferProviderDef", 2);
+    ignore("org.eclipse.net4j.defs.ClientProtocolFactoryDef", 2);
+    ignore("org.eclipse.net4j.defs.ConnectorDef", 1);
+    ignore("org.eclipse.net4j.defs.HTTPConnectorDef", 1);
+    ignore("org.eclipse.net4j.defs.JVMAcceptorDef", 1);
+    ignore("org.eclipse.net4j.defs.JVMConnectorDef", 1);
+    ignore("org.eclipse.net4j.defs.Net4jDefsFactory", 1);
+    ignore("org.eclipse.net4j.defs.Net4jDefsPackage", 2);
+    ignore("org.eclipse.net4j.defs.ProtocolProviderDef", 2);
+    ignore("org.eclipse.net4j.defs.ServerProtocolFactoryDef", 2);
+    ignore("org.eclipse.net4j.defs.TCPAcceptorDef", 1);
+    ignore("org.eclipse.net4j.defs.TCPConnectorDef", 1);
+    ignore("org.eclipse.net4j.defs.TCPSelectorDef", 2);
+    ignore("org.eclipse.net4j.defs.impl.AcceptorDefImpl", 11);
+    ignore("org.eclipse.net4j.defs.impl.BufferProviderDefImpl", 1);
+    ignore("org.eclipse.net4j.defs.impl.ClientProtocolFactoryDefImpl", 1);
+    ignore("org.eclipse.net4j.defs.impl.ConnectorDefImpl", 12);
     ignore("org.eclipse.net4j.defs.impl.HTTPConnectorDefImpl", 4);
     ignore("org.eclipse.net4j.defs.impl.JVMAcceptorDefImpl", 4);
-    ignore("org.eclipse.net4j.defs.impl.JVMConnectorDefImpl", 4);
-    ignore("org.eclipse.net4j.defs.impl.Net4jDefsFactoryImpl", 1);
+    ignore("org.eclipse.net4j.defs.impl.JVMConnectorDefImpl", 5);
+    ignore("org.eclipse.net4j.defs.impl.Net4jDefsFactoryImpl", 2);
+    ignore("org.eclipse.net4j.defs.impl.Net4jDefsPackageImpl", 1);
+    ignore("org.eclipse.net4j.defs.impl.ProtocolProviderDefImpl", 1);
+    ignore("org.eclipse.net4j.defs.impl.ServerProtocolFactoryDefImpl", 1);
     ignore("org.eclipse.net4j.defs.impl.TCPAcceptorDefImpl", 5);
     ignore("org.eclipse.net4j.defs.impl.TCPConnectorDefImpl", 5);
-    ignore("org.eclipse.net4j.defs.util.Net4jDefsAdapterFactory", 2);
-    ignore("org.eclipse.net4j.defs.util.Net4jDefsSwitch", 1);
+    ignore("org.eclipse.net4j.defs.util.Net4jDefsAdapterFactory", 3);
+    ignore("org.eclipse.net4j.defs.util.Net4jDefsSwitch", 2);
     ignore("org.eclipse.net4j.defs.util.Net4jDefsUtil", 1);
-    ignore("org.eclipse.net4j.spi.db.DBSchema", 1);
+    ignore("org.eclipse.net4j.ui.defs.Net4JUIDefsFactory", 1);
+    ignore("org.eclipse.net4j.ui.defs.Net4JUIDefsPackage", 2);
     ignore("org.eclipse.net4j.ui.defs.impl.Net4JUIDefsFactoryImpl", 1);
-    ignore("org.eclipse.net4j.ui.defs.util.Net4JUIDefsAdapterFactory", 2);
-    ignore("org.eclipse.net4j.ui.defs.util.Net4JUIDefsSwitch", 1);
-    ignore("org.eclipse.net4j.util.defs.DefException", 1);
-    ignore("org.eclipse.net4j.util.defs.NegotiatorDef", 1);
-    ignore("org.eclipse.net4j.util.defs.impl.ChallengeNegotiatorDefImpl", 7);
-    ignore("org.eclipse.net4j.util.defs.impl.CredentialsProviderDefImpl", 4);
-    ignore("org.eclipse.net4j.util.defs.impl.DefContainerImpl", 7);
-    ignore("org.eclipse.net4j.util.defs.impl.DefImpl", 5);
-    ignore("org.eclipse.net4j.util.defs.impl.Net4jUtilDefsFactoryImpl", 1);
-    ignore("org.eclipse.net4j.util.defs.impl.PasswordCredentialsProviderDefImpl", 5);
-    ignore("org.eclipse.net4j.util.defs.impl.RandomizerDefImpl", 7);
-    ignore("org.eclipse.net4j.util.defs.impl.ResponseNegotiatorDefImpl", 5);
-    ignore("org.eclipse.net4j.util.defs.impl.ThreadPoolDefImpl", 1);
-    ignore("org.eclipse.net4j.util.defs.impl.UserImpl", 4);
-    ignore("org.eclipse.net4j.util.defs.impl.UserManagerDefImpl", 5);
-    ignore("org.eclipse.net4j.util.defs.util.Net4jUtilDefsAdapterFactory", 2);
-    ignore("org.eclipse.net4j.util.defs.util.Net4jUtilDefsSwitch", 1);
-    ignore("org.eclipse.net4j.util.io.ExtendedIOUtil", 1);
-    ignore("org.eclipse.net4j.util.tests.defs.impl.DefsFactoryImpl", 1);
-    ignore("org.eclipse.net4j.util.tests.defs.impl.DefsPackageImpl", 2);
-    ignore("org.eclipse.net4j.util.tests.defs.impl.TestDefImpl", 5);
-    ignore("org.eclipse.net4j.util.tests.defs.impl.TestDefsFactoryImpl", 1);
-    ignore("org.eclipse.net4j.util.tests.defs.impl.TestDefsPackageImpl", 2);
-    ignore("org.eclipse.net4j.util.tests.defs.util.DefsAdapterFactory", 2);
-    ignore("org.eclipse.net4j.util.tests.defs.util.DefsSwitch", 3);
-    ignore("org.eclipse.net4j.util.tests.defs.util.TestDefsAdapterFactory", 2);
-    ignore("org.eclipse.net4j.util.tests.defs.util.TestDefsSwitch", 3);
+    ignore("org.eclipse.net4j.ui.defs.impl.Net4JUIDefsPackageImpl", 1);
+    ignore("org.eclipse.net4j.ui.defs.util.Net4JUIDefsAdapterFactory", 3);
+    ignore("org.eclipse.net4j.ui.defs.util.Net4JUIDefsSwitch", 2);
+    ignore("org.eclipse.net4j.util.defs.ChallengeNegotiatorDef", 1);
+    ignore("org.eclipse.net4j.util.defs.CredentialsProviderDef", 1);
+    ignore("org.eclipse.net4j.util.defs.DefContainer", 1);
+    ignore("org.eclipse.net4j.util.defs.DefException", 2);
+    ignore("org.eclipse.net4j.util.defs.NegotiatorDef", 2);
+    ignore("org.eclipse.net4j.util.defs.Net4jUtilDefsFactory", 1);
+    ignore("org.eclipse.net4j.util.defs.Net4jUtilDefsPackage", 2);
+    ignore("org.eclipse.net4j.util.defs.PasswordCredentialsProviderDef", 1);
+    ignore("org.eclipse.net4j.util.defs.RandomizerDef", 1);
+    ignore("org.eclipse.net4j.util.defs.ResponseNegotiatorDef", 1);
+    ignore("org.eclipse.net4j.util.defs.User", 1);
+    ignore("org.eclipse.net4j.util.defs.UserManagerDef", 1);
+    ignore("org.eclipse.net4j.util.defs.impl.ChallengeNegotiatorDefImpl", 8);
+    ignore("org.eclipse.net4j.util.defs.impl.CredentialsProviderDefImpl", 5);
+    ignore("org.eclipse.net4j.util.defs.impl.DefContainerImpl", 8);
+    ignore("org.eclipse.net4j.util.defs.impl.DefImpl", 6);
+    ignore("org.eclipse.net4j.util.defs.impl.ExecutorServiceDefImpl", 1);
+    ignore("org.eclipse.net4j.util.defs.impl.NegotiatorDefImpl", 1);
+    ignore("org.eclipse.net4j.util.defs.impl.Net4jUtilDefsFactoryImpl", 2);
+    ignore("org.eclipse.net4j.util.defs.impl.Net4jUtilDefsPackageImpl", 1);
+    ignore("org.eclipse.net4j.util.defs.impl.PasswordCredentialsProviderDefImpl", 6);
+    ignore("org.eclipse.net4j.util.defs.impl.RandomizerDefImpl", 8);
+    ignore("org.eclipse.net4j.util.defs.impl.ResponseNegotiatorDefImpl", 6);
+    ignore("org.eclipse.net4j.util.defs.impl.ThreadPoolDefImpl", 2);
+    ignore("org.eclipse.net4j.util.defs.impl.UserImpl", 5);
+    ignore("org.eclipse.net4j.util.defs.impl.UserManagerDefImpl", 7);
+    ignore("org.eclipse.net4j.util.defs.util.Net4jUtilDefsAdapterFactory", 3);
+    ignore("org.eclipse.net4j.util.defs.util.Net4jUtilDefsSwitch", 2);
+    ignore("org.eclipse.net4j.util.tests.defs.DefsFactory", 1);
+    ignore("org.eclipse.net4j.util.tests.defs.DefsPackage", 2);
+    ignore("org.eclipse.net4j.util.tests.defs.TestDef", 1);
+    ignore("org.eclipse.net4j.util.tests.defs.TestDefsFactory", 1);
+    ignore("org.eclipse.net4j.util.tests.defs.TestDefsPackage", 2);
+    ignore("org.eclipse.net4j.util.tests.defs.impl.DefsFactoryImpl", 2);
+    ignore("org.eclipse.net4j.util.tests.defs.impl.DefsPackageImpl", 3);
+    ignore("org.eclipse.net4j.util.tests.defs.impl.TestDefImpl", 6);
+    ignore("org.eclipse.net4j.util.tests.defs.impl.TestDefsFactoryImpl", 2);
+    ignore("org.eclipse.net4j.util.tests.defs.impl.TestDefsPackageImpl", 3);
+    ignore("org.eclipse.net4j.util.tests.defs.util.DefsAdapterFactory", 3);
+    ignore("org.eclipse.net4j.util.tests.defs.util.DefsSwitch", 4);
+    ignore("org.eclipse.net4j.util.tests.defs.util.TestDefsAdapterFactory", 3);
+    ignore("org.eclipse.net4j.util.tests.defs.util.TestDefsSwitch", 4);
     ignore("org.eclipse.net4j.util.ui.proposals.RegExContentProposalProvider", 10);
     ignore("org.eclipse.net4j.util.ui.proposals.RegExMessages", 2);
-    ignore("org.gastro.business.OrderState", 3);
-    ignore("org.gastro.business.impl.BusinessFactoryImpl", 1);
-    ignore("org.gastro.business.provider.BusinessDayItemProvider", 3);
-    ignore("org.gastro.business.provider.OrderDetailItemProvider", 2);
-    ignore("org.gastro.business.provider.OrderItemProvider", 3);
-    ignore("org.gastro.business.provider.WaiterItemProvider", 2);
-    ignore("org.gastro.business.util.BusinessAdapterFactory", 2);
-    ignore("org.gastro.business.util.BusinessSwitch", 1);
-    ignore("org.gastro.inventory.impl.InventoryFactoryImpl", 1);
-    ignore("org.gastro.inventory.provider.DepartmentItemProvider", 3);
-    ignore("org.gastro.inventory.provider.EmployeeItemProvider", 2);
-    ignore("org.gastro.inventory.provider.IngredientItemProvider", 2);
-    ignore("org.gastro.inventory.provider.MenuCardItemProvider", 3);
-    ignore("org.gastro.inventory.provider.OfferingItemProvider", 2);
-    ignore("org.gastro.inventory.provider.ProductItemProvider", 2);
-    ignore("org.gastro.inventory.provider.RecipeItemProvider", 3);
-    ignore("org.gastro.inventory.provider.RestaurantItemProvider", 3);
-    ignore("org.gastro.inventory.provider.SectionItemProvider", 3);
-    ignore("org.gastro.inventory.provider.StationItemProvider", 2);
-    ignore("org.gastro.inventory.provider.StockItemProvider", 3);
-    ignore("org.gastro.inventory.provider.StockProductItemProvider", 2);
-    ignore("org.gastro.inventory.provider.TableItemProvider", 2);
-    ignore("org.gastro.inventory.util.InventoryAdapterFactory", 2);
-    ignore("org.gastro.inventory.util.InventorySwitch", 1);
-    ignore("reference.impl.ReferenceFactoryImpl", 1);
-    ignore("reference.impl.ReferencePackageImpl", 2);
-    ignore("reference.util.ReferenceAdapterFactory", 2);
-    ignore("reference.util.ReferenceSwitch", 2);
+    ignore("org.gastro.business.BusinessDay", 1);
+    ignore("org.gastro.business.BusinessFactory", 1);
+    ignore("org.gastro.business.BusinessPackage", 2);
+    ignore("org.gastro.business.Order", 1);
+    ignore("org.gastro.business.OrderDetail", 1);
+    ignore("org.gastro.business.OrderState", 4);
+    ignore("org.gastro.business.Waiter", 1);
+    ignore("org.gastro.business.impl.BusinessDayImpl", 1);
+    ignore("org.gastro.business.impl.BusinessFactoryImpl", 2);
+    ignore("org.gastro.business.impl.BusinessPackageImpl", 1);
+    ignore("org.gastro.business.impl.OrderImpl", 1);
+    ignore("org.gastro.business.impl.WaiterImpl", 1);
+    ignore("org.gastro.business.provider.BusinessDayItemProvider", 4);
+    ignore("org.gastro.business.provider.BusinessEditPlugin", 1);
+    ignore("org.gastro.business.provider.BusinessItemProviderAdapterFactory", 1);
+    ignore("org.gastro.business.provider.OrderDetailItemProvider", 3);
+    ignore("org.gastro.business.provider.OrderItemProvider", 4);
+    ignore("org.gastro.business.provider.WaiterItemProvider", 3);
+    ignore("org.gastro.business.util.BusinessAdapterFactory", 3);
+    ignore("org.gastro.business.util.BusinessSwitch", 2);
+    ignore("org.gastro.inventory.Department", 1);
+    ignore("org.gastro.inventory.Employee", 1);
+    ignore("org.gastro.inventory.Ingredient", 1);
+    ignore("org.gastro.inventory.InventoryFactory", 1);
+    ignore("org.gastro.inventory.InventoryPackage", 2);
+    ignore("org.gastro.inventory.MenuCard", 1);
+    ignore("org.gastro.inventory.Offering", 1);
+    ignore("org.gastro.inventory.Recipe", 1);
+    ignore("org.gastro.inventory.Restaurant", 1);
+    ignore("org.gastro.inventory.Section", 1);
+    ignore("org.gastro.inventory.Station", 1);
+    ignore("org.gastro.inventory.Stock", 1);
+    ignore("org.gastro.inventory.StockProduct", 1);
+    ignore("org.gastro.inventory.Table", 1);
+    ignore("org.gastro.inventory.impl.DepartmentImpl", 1);
+    ignore("org.gastro.inventory.impl.EmployeeImpl", 1);
+    ignore("org.gastro.inventory.impl.IngredientImpl", 1);
+    ignore("org.gastro.inventory.impl.InventoryFactoryImpl", 2);
+    ignore("org.gastro.inventory.impl.InventoryPackageImpl", 1);
+    ignore("org.gastro.inventory.impl.MenuCardImpl", 1);
+    ignore("org.gastro.inventory.impl.OfferingImpl", 1);
+    ignore("org.gastro.inventory.impl.ProductImpl", 1);
+    ignore("org.gastro.inventory.impl.RecipeImpl", 1);
+    ignore("org.gastro.inventory.impl.RestaurantImpl", 1);
+    ignore("org.gastro.inventory.impl.SectionImpl", 1);
+    ignore("org.gastro.inventory.impl.StationImpl", 1);
+    ignore("org.gastro.inventory.impl.StockImpl", 1);
+    ignore("org.gastro.inventory.impl.StockProductImpl", 1);
+    ignore("org.gastro.inventory.impl.TableImpl", 1);
+    ignore("org.gastro.inventory.provider.DepartmentItemProvider", 5);
+    ignore("org.gastro.inventory.provider.EmployeeItemProvider", 3);
+    ignore("org.gastro.inventory.provider.IngredientItemProvider", 3);
+    ignore("org.gastro.inventory.provider.InventoryEditPlugin", 1);
+    ignore("org.gastro.inventory.provider.InventoryItemProviderAdapterFactory", 1);
+    ignore("org.gastro.inventory.provider.MenuCardItemProvider", 4);
+    ignore("org.gastro.inventory.provider.OfferingItemProvider", 3);
+    ignore("org.gastro.inventory.provider.ProductItemProvider", 3);
+    ignore("org.gastro.inventory.provider.RecipeItemProvider", 4);
+    ignore("org.gastro.inventory.provider.RestaurantItemProvider", 4);
+    ignore("org.gastro.inventory.provider.SectionItemProvider", 4);
+    ignore("org.gastro.inventory.provider.StationItemProvider", 3);
+    ignore("org.gastro.inventory.provider.StockItemProvider", 4);
+    ignore("org.gastro.inventory.provider.StockProductItemProvider", 3);
+    ignore("org.gastro.inventory.provider.TableItemProvider", 3);
+    ignore("org.gastro.inventory.util.InventoryAdapterFactory", 3);
+    ignore("org.gastro.inventory.util.InventorySwitch", 2);
+    ignore("reference.Reference", 1);
+    ignore("reference.ReferenceFactory", 1);
+    ignore("reference.ReferencePackage", 2);
+    ignore("reference.impl.ReferenceFactoryImpl", 2);
+    ignore("reference.impl.ReferenceImpl", 1);
+    ignore("reference.impl.ReferencePackageImpl", 3);
+    ignore("reference.util.ReferenceAdapterFactory", 3);
+    ignore("reference.util.ReferenceSwitch", 3);
     ignore("templates.MenuCardTemplate", 1);
 
     report();
@@ -441,7 +736,7 @@ public class FormatChecker
         }
         else if (last.equals("empty"))
         {
-          if (type.equals("empty"))
+          if (type.equals("empty")||type.equals("}"))
           {
             complain(name, i);
           }
-- 
cgit v1.2.3