commit dfdd2931254edde04b2109931c08e188f37cf0fe
author Eike Stepper <stepper@esc-net.de> Fri Apr 13 15:56:20 2018 +0200
committer Eike Stepper <stepper@esc-net.de> Fri Apr 13 15:56:20 2018 +0200
tree 26b202b8616f3d8f36a29f37defa2d4160f7d392
parent 0bcf6ad1707430639cd95d484e516c28e6ad9263

[Releng] Add Ant task to migrate GenModels

plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/messages/messages.properties

diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/messages/messages.properties b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/messages/messages.properties
index 01dc7a3..360f563 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/messages/messages.properties
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/messages/messages.properties
@@ -16,6 +16,9 @@
 CDOImporterWizard_2=Specify one or more '.ecore' or '.emof' URIs, try to load them, and choose a file name for the generator model
 CDOImporterWizard_3=Specify one or more '.ecore' or '.emof' URIs and try to load them
 CDOImporterWizard_4=EcorePackages
+CDOMigratorUtil.1=Set Boolean Flags Field =
+CDOMigratorUtil.2=Set Boolean Flags Reserved Bits =
+CDOMigratorUtil.3=Set Packed Enums =
 CDOMigratorUtil.4=Set Feature Delegation =
 CDOMigratorUtil.6=Set Root Extends Class =
 CDOMigratorUtil.8=Set Root Extends Interface =

plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOMigratorUtil.java

diff --git a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOMigratorUtil.java b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOMigratorUtil.java
index dc072fb..52483d9 100644
--- a/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOMigratorUtil.java
+++ b/plugins/org.eclipse.emf.cdo.migrator/src/org/eclipse/emf/cdo/internal/migrator/CDOMigratorUtil.java
@@ -53,13 +53,13 @@
   public static GenModel getGenModel(String path)
   {
     ResourceSet resourceSet = new ResourceSetImpl();
-  
+
     Map<String, Object> map = resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap();
     map.put("*", new XMIResourceFactoryImpl()); //$NON-NLS-1$
-  
+
     URI uri = URI.createPlatformResourceURI(path, false);
     Resource resource = resourceSet.getResource(uri, true);
-  
+
     EList<EObject> contents = resource.getContents();
     if (!contents.isEmpty())
     {
@@ -69,7 +69,7 @@
         return (GenModel)object;
       }
     }
-  
+
     return null;
   }
 
@@ -91,6 +91,27 @@
       builder.append("\n"); //$NON-NLS-1$
     }
 
+    if (genModel.getBooleanFlagsField() != null)
+    {
+      genModel.setBooleanFlagsField(null);
+      builder.append(Messages.getString("CDOMigratorUtil.1")); //$NON-NLS-1$
+      builder.append(" null\n"); //$NON-NLS-1$
+    }
+
+    if (genModel.getBooleanFlagsReservedBits() != -1)
+    {
+      genModel.setBooleanFlagsReservedBits(-1);
+      builder.append(Messages.getString("CDOMigratorUtil.2")); //$NON-NLS-1$
+      builder.append(" -1\n"); //$NON-NLS-1$
+    }
+
+    if (genModel.isPackedEnums())
+    {
+      genModel.setPackedEnums(false);
+      builder.append(Messages.getString("CDOMigratorUtil.3")); //$NON-NLS-1$
+      builder.append(" false\n"); //$NON-NLS-1$
+    }
+
     if (!ROOT_EXTENDS_CLASS.equals(genModel.getRootExtendsClass()))
     {
       genModel.setRootExtendsClass(ROOT_EXTENDS_CLASS);