Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [cross-project-issues-dev] Using the Build Model Editor

Hi,

I've ceated and attached a patch to the releng.build.model. With this patch I added the missing enum literals and can now open helios.build without errors.

Cheers
/Eike

----
http://thegordian.blogspot.com
http://twitter.com/eikestepper


Am 06.06.2010 16:06, schrieb David M Williams:

> Is that a sign that the helios.build model (instance) is invalid or that
> the amalgamation build (meta) model is not uptodate?


The later. This was introduced with the fix for bug 312011 (to add more platforms to verify, and have in content metadata).
https://bugs.eclipse.org/bugs/show_bug.cgi?id=312011

Since we are moving toward the b3.aggregator, the old model was not updated
to accommodate more platforms.

You can still use the editor with a little twist. What I do is first open the helios.build file with a text editor
and remove all the "new" platforms and leave only a subset:

  <configs/>
  <configs arch="x86_64"/>
  <configs os="linux" ws="gtk" archiveFormat="tar"/>
  <configs os="linux" ws="gtk" arch="ppc" archiveFormat="tar"/>

(You need to have 'four' in this list, as there's another part of the file that refers to "config:3".)

The editor will then open and you can edit what you like. If changes are made to helios.build that have to be checked in,
then you need to use care to restore the configs list to what it was initially, again "by hand".
 
Hope this helps you accomplish what you need.

Thanks,




From: Eike Stepper <stepper@xxxxxxxxxx>
To: Cross project issues <cross-project-issues-dev@xxxxxxxxxxx>
Date: 06/06/2010 01:41 AM
Subject: [cross-project-issues-dev] Using the Build Model Editor
Sent by: cross-project-issues-dev-bounces@xxxxxxxxxxx





Hi,

I'd like to use the Build Model Editor from Amalgamation. Is it true
that I have to build it from CVS?

For now I've built it locally and I can open an EMF editor for my build
contribution file. That's cool if I only want to change the properties
of existing features.

But if I want to *add* features to the helios.build file it would be
nice to use the editor on that file. Unfortunately it opens with an
error message and lets me create these error markers:

Description    Resource    Path    Location    Type
IllegalValueException: Value 'aix' is not legal.
(platform:/resource/org.eclipse.helios.build/helios.build, 16, 64)    
helios.build    /org.eclipse.helios.build    line 16, column 64    Problem
IllegalValueException: Value 'hpux' is not legal.
(platform:/resource/org.eclipse.helios.build/helios.build, 15, 69)    
helios.build    /org.eclipse.helios.build    line 15, column 69    Problem
IllegalValueException: Value 'ia64_32' is not legal.
(platform:/resource/org.eclipse.helios.build/helios.build, 15, 69)    
helios.build    /org.eclipse.helios.build    line 15, column 69    Problem
IllegalValueException: Value 'motif' is not legal.
(platform:/resource/org.eclipse.helios.build/helios.build, 15, 69)    
helios.build    /org.eclipse.helios.build    line 15, column 69    Problem
IllegalValueException: Value 'motif' is not legal.
(platform:/resource/org.eclipse.helios.build/helios.build, 16, 64)    
helios.build    /org.eclipse.helios.build    line 16, column 64    Problem
IllegalValueException: Value 'motif' is not legal.
(platform:/resource/org.eclipse.helios.build/helios.build, 7, 55)    
helios.build    /org.eclipse.helios.build    line 7, column 55    Problem
IllegalValueException: Value 'ppc64' is not legal.
(platform:/resource/org.eclipse.helios.build/helios.build, 10, 66)    
helios.build    /org.eclipse.helios.build    line 10, column 66    Problem
IllegalValueException: Value 's390' is not legal.
(platform:/resource/org.eclipse.helios.build/helios.build, 11, 65)    
helios.build    /org.eclipse.helios.build    line 11, column 65    Problem
IllegalValueException: Value 's390x' is not legal.
(platform:/resource/org.eclipse.helios.build/helios.build, 12, 66)    
helios.build    /org.eclipse.helios.build    line 12, column 66    Problem
IllegalValueException: Value 'solaris' is not legal.
(platform:/resource/org.eclipse.helios.build/helios.build, 13, 68)    
helios.build    /org.eclipse.helios.build    line 13, column 68    Problem
IllegalValueException: Value 'solaris' is not legal.
(platform:/resource/org.eclipse.helios.build/helios.build, 14, 55)    
helios.build    /org.eclipse.helios.build    line 14, column 55    Problem
IllegalValueException: Value 'sparc' is not legal.
(platform:/resource/org.eclipse.helios.build/helios.build, 13, 68)    
helios.build    /org.eclipse.helios.build    line 13, column 68    Problem

Is that a sign that the helios.build model (instance) is invalid or that
the amalgamation build (meta) model is not uptodate?

Cheers
/Eike

----
http://thegordian.blogspot.com
http://twitter.com/eikestepper


_______________________________________________
cross-project-issues-dev mailing list
cross-project-issues-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev


_______________________________________________ cross-project-issues-dev mailing list cross-project-issues-dev@xxxxxxxxxxx https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev

### Eclipse Workspace Patch 1.0
#P org.eclipse.amalgam.releng.build.model
Index: src/org/eclipse/amalgam/releng/build/ARCH.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/ARCH.java,v
retrieving revision 1.2
diff -u -r1.2 ARCH.java
--- src/org/eclipse/amalgam/releng/build/ARCH.java	13 Mar 2009 11:09:27 -0000	1.2
+++ src/org/eclipse/amalgam/releng/build/ARCH.java	6 Jun 2010 14:35:25 -0000
@@ -30,215 +30,345 @@
  */
 public enum ARCH implements Enumerator {
 	/**
-	 * The '<em><b>X86</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>X86</b></em>' literal object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #X86_VALUE
-	 * @generated
-	 * @ordered
-	 */
+   * @see #X86_VALUE
+   * @generated
+   * @ordered
+   */
 	X86(0, "x86", "x86"),
 
 	/**
-	 * The '<em><b>Ppc</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Ppc</b></em>' literal object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #PPC_VALUE
-	 * @generated
-	 * @ordered
-	 */
+   * @see #PPC_VALUE
+   * @generated
+   * @ordered
+   */
 	PPC(1, "ppc", "ppc"), /**
-	 * The '<em><b>X86 64</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>X86 64</b></em>' literal object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #X86_64_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	X86_64(2, "x86_64", "x86_64");
+   * @see #X86_64_VALUE
+   * @generated
+   * @ordered
+   */
+	X86_64(2, "x86_64", "x86_64"), /**
+   * The '<em><b>Ia64 32</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #IA64_32_VALUE
+   * @generated
+   * @ordered
+   */
+  IA64_32(3, "ia64_32", "ia64_32"), /**
+   * The '<em><b>Ppc64</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #PPC64_VALUE
+   * @generated
+   * @ordered
+   */
+  PPC64(4, "ppc64", "ppc64"), /**
+   * The '<em><b>S390</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #S390_VALUE
+   * @generated
+   * @ordered
+   */
+  S390(5, "s390", "s390"), /**
+   * The '<em><b>S39 0x</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #S390X_VALUE
+   * @generated
+   * @ordered
+   */
+  S390X(6, "s390x", "s390x"), /**
+   * The '<em><b>Sparc</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #SPARC_VALUE
+   * @generated
+   * @ordered
+   */
+  SPARC(6, "sparc", "sparc");
 
 	/**
-	 * The '<em><b>X86</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>X86</b></em>' literal value.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>X86</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #X86
-	 * @model name="x86"
-	 * @generated
-	 * @ordered
-	 */
+   * @see #X86
+   * @model name="x86"
+   * @generated
+   * @ordered
+   */
 	public static final int X86_VALUE = 0;
 
 	/**
-	 * The '<em><b>Ppc</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Ppc</b></em>' literal value.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Ppc</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #PPC
-	 * @model name="ppc"
-	 * @generated
-	 * @ordered
-	 */
+   * @see #PPC
+   * @model name="ppc"
+   * @generated
+   * @ordered
+   */
 	public static final int PPC_VALUE = 1;
 
 	/**
-	 * The '<em><b>X86 64</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>X86 64</b></em>' literal value.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>X86 64</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #X86_64
-	 * @model name="x86_64"
-	 * @generated
-	 * @ordered
-	 */
+   * @see #X86_64
+   * @model name="x86_64"
+   * @generated
+   * @ordered
+   */
 	public static final int X86_64_VALUE = 2;
 
 	/**
-	 * An array of all the '<em><b>ARCH</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Ia64 32</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>Ia64 32</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #IA64_32
+   * @model name="ia64_32"
+   * @generated
+   * @ordered
+   */
+  public static final int IA64_32_VALUE = 3;
+
+  /**
+   * The '<em><b>Ppc64</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>Ppc64</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #PPC64
+   * @model name="ppc64"
+   * @generated
+   * @ordered
+   */
+  public static final int PPC64_VALUE = 4;
+
+  /**
+   * The '<em><b>S390</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>S390</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #S390
+   * @model name="s390"
+   * @generated
+   * @ordered
+   */
+  public static final int S390_VALUE = 5;
+
+  /**
+   * The '<em><b>S39 0x</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>S39 0x</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #S390X
+   * @model name="s390x"
+   * @generated
+   * @ordered
+   */
+  public static final int S390X_VALUE = 6;
+
+  /**
+   * The '<em><b>Sparc</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>Sparc</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #SPARC
+   * @model name="sparc"
+   * @generated
+   * @ordered
+   */
+  public static final int SPARC_VALUE = 6;
+
+  /**
+   * An array of all the '<em><b>ARCH</b></em>' enumerators.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private static final ARCH[] VALUES_ARRAY =
-		new ARCH[] {
-			X86,
-			PPC,
-			X86_64,
-		};
+		new ARCH[]
+    {
+      X86,
+      PPC,
+      X86_64,
+      IA64_32,
+      PPC64,
+      S390,
+      S390X,
+      SPARC,
+    };
 
 	/**
-	 * A public read-only list of all the '<em><b>ARCH</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
+   * A public read-only list of all the '<em><b>ARCH</b></em>' enumerators.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static final List<ARCH> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>ARCH</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
+   * Returns the '<em><b>ARCH</b></em>' literal with the specified literal value.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static ARCH get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ARCH result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      ARCH result = VALUES_ARRAY[i];
+      if (result.toString().equals(literal))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
 
 	/**
-	 * Returns the '<em><b>ARCH</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
+   * Returns the '<em><b>ARCH</b></em>' literal with the specified name.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static ARCH getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ARCH result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      ARCH result = VALUES_ARRAY[i];
+      if (result.getName().equals(name))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
 
 	/**
-	 * Returns the '<em><b>ARCH</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
+   * Returns the '<em><b>ARCH</b></em>' literal with the specified integer value.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static ARCH get(int value) {
-		switch (value) {
-			case X86_VALUE: return X86;
-			case PPC_VALUE: return PPC;
-			case X86_64_VALUE: return X86_64;
-		}
-		return null;
-	}
+    switch (value)
+    {
+      case X86_VALUE: return X86;
+      case PPC_VALUE: return PPC;
+      case X86_64_VALUE: return X86_64;
+      case IA64_32_VALUE: return IA64_32;
+      case PPC64_VALUE: return PPC64;
+      case S390_VALUE: return S390;
+      case S390X_VALUE: return S390X;
+    }
+    return null;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
+   * Only this class can construct instances.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private ARCH(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
+    this.value = value;
+    this.name = name;
+    this.literal = literal;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public int getValue() {
-	  return value;
-	}
+    return value;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getName() {
-	  return name;
-	}
+    return name;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getLiteral() {
-	  return literal;
-	}
+    return literal;
+  }
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
+   * Returns the literal value of the enumerator, which is its string representation.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String toString() {
-		return literal;
-	}
+    return literal;
+  }
 	
 } //ARCH
Index: src/org/eclipse/amalgam/releng/build/ArchiveFormat.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/ArchiveFormat.java,v
retrieving revision 1.1
diff -u -r1.1 ArchiveFormat.java
--- src/org/eclipse/amalgam/releng/build/ArchiveFormat.java	24 Nov 2008 20:36:44 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/ArchiveFormat.java	6 Jun 2010 14:35:25 -0000
@@ -30,189 +30,195 @@
  */
 public enum ArchiveFormat implements Enumerator {
 	/**
-	 * The '<em><b>Zip</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Zip</b></em>' literal object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #ZIP_VALUE
-	 * @generated
-	 * @ordered
-	 */
+   * @see #ZIP_VALUE
+   * @generated
+   * @ordered
+   */
 	ZIP(0, "zip", "zip"),
 
 	/**
-	 * The '<em><b>Tar</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Tar</b></em>' literal object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #TAR_VALUE
-	 * @generated
-	 * @ordered
-	 */
+   * @see #TAR_VALUE
+   * @generated
+   * @ordered
+   */
 	TAR(0, "tar", "tar");
 
 	/**
-	 * The '<em><b>Zip</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Zip</b></em>' literal value.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Zip</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #ZIP
-	 * @model name="zip"
-	 * @generated
-	 * @ordered
-	 */
+   * @see #ZIP
+   * @model name="zip"
+   * @generated
+   * @ordered
+   */
 	public static final int ZIP_VALUE = 0;
 
 	/**
-	 * The '<em><b>Tar</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Tar</b></em>' literal value.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Tar</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #TAR
-	 * @model name="tar"
-	 * @generated
-	 * @ordered
-	 */
+   * @see #TAR
+   * @model name="tar"
+   * @generated
+   * @ordered
+   */
 	public static final int TAR_VALUE = 0;
 
 	/**
-	 * An array of all the '<em><b>Archive Format</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
+   * An array of all the '<em><b>Archive Format</b></em>' enumerators.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private static final ArchiveFormat[] VALUES_ARRAY =
-		new ArchiveFormat[] {
-			ZIP,
-			TAR,
-		};
+		new ArchiveFormat[]
+    {
+      ZIP,
+      TAR,
+    };
 
 	/**
-	 * A public read-only list of all the '<em><b>Archive Format</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
+   * A public read-only list of all the '<em><b>Archive Format</b></em>' enumerators.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static final List<ArchiveFormat> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Archive Format</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
+   * Returns the '<em><b>Archive Format</b></em>' literal with the specified literal value.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static ArchiveFormat get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ArchiveFormat result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      ArchiveFormat result = VALUES_ARRAY[i];
+      if (result.toString().equals(literal))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
 
 	/**
-	 * Returns the '<em><b>Archive Format</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
+   * Returns the '<em><b>Archive Format</b></em>' literal with the specified name.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static ArchiveFormat getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ArchiveFormat result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      ArchiveFormat result = VALUES_ARRAY[i];
+      if (result.getName().equals(name))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
 
 	/**
-	 * Returns the '<em><b>Archive Format</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
+   * Returns the '<em><b>Archive Format</b></em>' literal with the specified integer value.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static ArchiveFormat get(int value) {
-		switch (value) {
-			case ZIP_VALUE: return ZIP;
-		}
-		return null;
-	}
+    switch (value)
+    {
+      case ZIP_VALUE: return ZIP;
+    }
+    return null;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
+   * Only this class can construct instances.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private ArchiveFormat(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
+    this.value = value;
+    this.name = name;
+    this.literal = literal;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public int getValue() {
-	  return value;
-	}
+    return value;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getName() {
-	  return name;
-	}
+    return name;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getLiteral() {
-	  return literal;
-	}
+    return literal;
+  }
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
+   * Returns the literal value of the enumerator, which is its string representation.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String toString() {
-		return literal;
-	}
+    return literal;
+  }
 	
 } //ArchiveFormat
Index: src/org/eclipse/amalgam/releng/build/Build.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/Build.java,v
retrieving revision 1.7
diff -u -r1.7 Build.java
--- src/org/eclipse/amalgam/releng/build/Build.java	13 Mar 2009 11:09:27 -0000	1.7
+++ src/org/eclipse/amalgam/releng/build/Build.java	6 Jun 2010 14:35:26 -0000
@@ -57,503 +57,503 @@
  */
 public interface Build extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.amalgam.releng.build.BuildType}.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Type</b></em>' attribute.
+   * The literals are from the enumeration {@link org.eclipse.amalgam.releng.build.BuildType}.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.amalgam.releng.build.BuildType
-	 * @see #setType(BuildType)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Type()
-	 * @model required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Type</em>' attribute.
+   * @see org.eclipse.amalgam.releng.build.BuildType
+   * @see #setType(BuildType)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Type()
+   * @model required="true"
+   * @generated
+   */
 	BuildType getType();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getType <em>Type</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.amalgam.releng.build.BuildType
-	 * @see #getType()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Type</em>' attribute.
+   * @see org.eclipse.amalgam.releng.build.BuildType
+   * @see #getType()
+   * @generated
+   */
 	void setType(BuildType value);
 
 	/**
-	 * Returns the value of the '<em><b>Build Root</b></em>' attribute.
-	 * The default value is <code>"${user.home}/build"</code>.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Build Root</b></em>' attribute.
+   * The default value is <code>"${user.home}/build"</code>.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Build Root</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Build Root</em>' attribute.
-	 * @see #setBuildRoot(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_BuildRoot()
-	 * @model default="${user.home}/build"
-	 * @generated
-	 */
+   * @return the value of the '<em>Build Root</em>' attribute.
+   * @see #setBuildRoot(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_BuildRoot()
+   * @model default="${user.home}/build"
+   * @generated
+   */
 	String getBuildRoot();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getBuildRoot <em>Build Root</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getBuildRoot <em>Build Root</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Build Root</em>' attribute.
-	 * @see #getBuildRoot()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Build Root</em>' attribute.
+   * @see #getBuildRoot()
+   * @generated
+   */
 	void setBuildRoot(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Platforms</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.amalgam.releng.build.Platform}.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Platforms</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.amalgam.releng.build.Platform}.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Platforms</em>' containment reference list isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Platforms</em>' containment reference list.
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Platforms()
-	 * @model containment="true" resolveProxies="true" required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Platforms</em>' containment reference list.
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Platforms()
+   * @model containment="true" resolveProxies="true" required="true"
+   * @generated
+   */
 	EList<Platform> getPlatforms();
 
 	/**
-	 * Returns the value of the '<em><b>Configs</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.amalgam.releng.build.Config}.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Configs</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.amalgam.releng.build.Config}.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Configs</em>' containment reference list isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Configs</em>' containment reference list.
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Configs()
-	 * @model containment="true" resolveProxies="true" required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Configs</em>' containment reference list.
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Configs()
+   * @model containment="true" resolveProxies="true" required="true"
+   * @generated
+   */
 	EList<Config> getConfigs();
 
 	/**
-	 * Returns the value of the '<em><b>Map</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Map</b></em>' containment reference.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Map</em>' containment reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Map</em>' containment reference.
-	 * @see #setMap(Map)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Map()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Map</em>' containment reference.
+   * @see #setMap(Map)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Map()
+   * @model containment="true" resolveProxies="true"
+   * @generated
+   */
 	Map getMap();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getMap <em>Map</em>}' containment reference.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getMap <em>Map</em>}' containment reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Map</em>' containment reference.
-	 * @see #getMap()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Map</em>' containment reference.
+   * @see #getMap()
+   * @generated
+   */
 	void setMap(Map value);
 
 	/**
-	 * Returns the value of the '<em><b>Fetch Tag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Fetch Tag</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Fetch Tag</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Fetch Tag</em>' attribute.
-	 * @see #setFetchTag(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_FetchTag()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Fetch Tag</em>' attribute.
+   * @see #setFetchTag(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_FetchTag()
+   * @model
+   * @generated
+   */
 	String getFetchTag();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getFetchTag <em>Fetch Tag</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getFetchTag <em>Fetch Tag</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fetch Tag</em>' attribute.
-	 * @see #getFetchTag()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Fetch Tag</em>' attribute.
+   * @see #getFetchTag()
+   * @generated
+   */
 	void setFetchTag(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Categories</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.amalgam.releng.build.Category}.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Categories</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.amalgam.releng.build.Category}.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Categories</em>' containment reference list isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Categories</em>' containment reference list.
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Categories()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Categories</em>' containment reference list.
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Categories()
+   * @model containment="true" resolveProxies="true"
+   * @generated
+   */
 	EList<Category> getCategories();
 
 	/**
-	 * Returns the value of the '<em><b>Contributions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.amalgam.releng.build.Contribution}.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Contributions</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.amalgam.releng.build.Contribution}.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Contributions</em>' containment reference list isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Contributions</em>' containment reference list.
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Contributions()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Contributions</em>' containment reference list.
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Contributions()
+   * @model containment="true" resolveProxies="true"
+   * @generated
+   */
 	EList<Contribution> getContributions();
 
 	/**
-	 * Returns the value of the '<em><b>Product</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Product</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Product</em>' reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Product</em>' reference.
-	 * @see #setProduct(Product)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Product()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Product</em>' reference.
+   * @see #setProduct(Product)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Product()
+   * @model
+   * @generated
+   */
 	Product getProduct();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getProduct <em>Product</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getProduct <em>Product</em>}' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Product</em>' reference.
-	 * @see #getProduct()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Product</em>' reference.
+   * @see #getProduct()
+   * @generated
+   */
 	void setProduct(Product value);
 
 	/**
-	 * Returns the value of the '<em><b>Label</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Label</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Label</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Label</em>' attribute.
-	 * @see #setLabel(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Label()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Label</em>' attribute.
+   * @see #setLabel(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Label()
+   * @model
+   * @generated
+   */
 	String getLabel();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getLabel <em>Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getLabel <em>Label</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Label</em>' attribute.
-	 * @see #getLabel()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Label</em>' attribute.
+   * @see #getLabel()
+   * @generated
+   */
 	void setLabel(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Base</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Base</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Base</em>' reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Base</em>' reference.
-	 * @see #setBase(Platform)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Base()
-	 * @model required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Base</em>' reference.
+   * @see #setBase(Platform)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Base()
+   * @model required="true"
+   * @generated
+   */
 	Platform getBase();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getBase <em>Base</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getBase <em>Base</em>}' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base</em>' reference.
-	 * @see #getBase()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Base</em>' reference.
+   * @see #getBase()
+   * @generated
+   */
 	void setBase(Platform value);
 
 	/**
-	 * Returns the value of the '<em><b>Builder</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Builder</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Builder</em>' reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Builder</em>' reference.
-	 * @see #setBuilder(Platform)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Builder()
-	 * @model required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Builder</em>' reference.
+   * @see #setBuilder(Platform)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Builder()
+   * @model required="true"
+   * @generated
+   */
 	Platform getBuilder();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getBuilder <em>Builder</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getBuilder <em>Builder</em>}' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Builder</em>' reference.
-	 * @see #getBuilder()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Builder</em>' reference.
+   * @see #getBuilder()
+   * @generated
+   */
 	void setBuilder(Platform value);
 
 	/**
-	 * Returns the value of the '<em><b>Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Date</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Date</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Date</em>' attribute.
-	 * @see #setDate(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Date()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Date</em>' attribute.
+   * @see #setDate(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Date()
+   * @model
+   * @generated
+   */
 	String getDate();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getDate <em>Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getDate <em>Date</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Date</em>' attribute.
-	 * @see #getDate()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Date</em>' attribute.
+   * @see #getDate()
+   * @generated
+   */
 	void setDate(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Time</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Time</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Time</em>' attribute.
-	 * @see #setTime(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Time()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Time</em>' attribute.
+   * @see #setTime(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Time()
+   * @model
+   * @generated
+   */
 	String getTime();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getTime <em>Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getTime <em>Time</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Time</em>' attribute.
-	 * @see #getTime()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Time</em>' attribute.
+   * @see #getTime()
+   * @generated
+   */
 	void setTime(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Compiler</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Compiler</b></em>' containment reference.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Compiler</em>' containment reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Compiler</em>' containment reference.
-	 * @see #setCompiler(Compiler)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Compiler()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
-	Compiler getCompiler();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getCompiler <em>Compiler</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Compiler</em>' containment reference.
-	 * @see #getCompiler()
-	 * @generated
-	 */
-	void setCompiler(Compiler value);
-
-	/**
-	 * Returns the value of the '<em><b>Launch VM</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * @return the value of the '<em>Compiler</em>' containment reference.
+   * @see #setCompiler(org.eclipse.amalgam.releng.build.Compiler)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Compiler()
+   * @model containment="true" resolveProxies="true"
+   * @generated
+   */
+	org.eclipse.amalgam.releng.build.Compiler getCompiler();
+
+	/**
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getCompiler <em>Compiler</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Compiler</em>' containment reference.
+   * @see #getCompiler()
+   * @generated
+   */
+  void setCompiler(org.eclipse.amalgam.releng.build.Compiler value);
+
+  /**
+   * Returns the value of the '<em><b>Launch VM</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Launch VM</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Launch VM</em>' attribute.
-	 * @see #setLaunchVM(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_LaunchVM()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Launch VM</em>' attribute.
+   * @see #setLaunchVM(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_LaunchVM()
+   * @model
+   * @generated
+   */
 	String getLaunchVM();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getLaunchVM <em>Launch VM</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getLaunchVM <em>Launch VM</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Launch VM</em>' attribute.
-	 * @see #getLaunchVM()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Launch VM</em>' attribute.
+   * @see #getLaunchVM()
+   * @generated
+   */
 	void setLaunchVM(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Promotion</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Promotion</b></em>' containment reference.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Promotion</em>' containment reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Promotion</em>' containment reference.
-	 * @see #setPromotion(Promotion)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Promotion()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Promotion</em>' containment reference.
+   * @see #setPromotion(Promotion)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Promotion()
+   * @model containment="true" resolveProxies="true"
+   * @generated
+   */
 	Promotion getPromotion();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getPromotion <em>Promotion</em>}' containment reference.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getPromotion <em>Promotion</em>}' containment reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Promotion</em>' containment reference.
-	 * @see #getPromotion()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Promotion</em>' containment reference.
+   * @see #getPromotion()
+   * @generated
+   */
 	void setPromotion(Promotion value);
 
 	/**
-	 * Returns the value of the '<em><b>Builder URL</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Builder URL</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Builder URL</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Builder URL</em>' attribute.
-	 * @see #setBuilderURL(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_BuilderURL()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Builder URL</em>' attribute.
+   * @see #setBuilderURL(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_BuilderURL()
+   * @model
+   * @generated
+   */
 	String getBuilderURL();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getBuilderURL <em>Builder URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getBuilderURL <em>Builder URL</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Builder URL</em>' attribute.
-	 * @see #getBuilderURL()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Builder URL</em>' attribute.
+   * @see #getBuilderURL()
+   * @generated
+   */
 	void setBuilderURL(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Buildmaster</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Buildmaster</b></em>' containment reference.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Buildmaster</em>' containment reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Buildmaster</em>' containment reference.
-	 * @see #setBuildmaster(Contact)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Buildmaster()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Buildmaster</em>' containment reference.
+   * @see #setBuildmaster(Contact)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Buildmaster()
+   * @model containment="true" resolveProxies="true"
+   * @generated
+   */
 	Contact getBuildmaster();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getBuildmaster <em>Buildmaster</em>}' containment reference.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#getBuildmaster <em>Buildmaster</em>}' containment reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Buildmaster</em>' containment reference.
-	 * @see #getBuildmaster()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Buildmaster</em>' containment reference.
+   * @see #getBuildmaster()
+   * @generated
+   */
 	void setBuildmaster(Contact value);
 
 	/**
-	 * Returns the value of the '<em><b>Default Mail List</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.amalgam.releng.build.Contact}.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Default Mail List</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.amalgam.releng.build.Contact}.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Default Mail List</em>' containment reference list isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default Mail List</em>' containment reference list.
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_DefaultMailList()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Default Mail List</em>' containment reference list.
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_DefaultMailList()
+   * @model containment="true" resolveProxies="true"
+   * @generated
+   */
 	EList<Contact> getDefaultMailList();
 
 	/**
-	 * Returns the value of the '<em><b>Sendmail</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Sendmail</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Sendmail</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Sendmail</em>' attribute.
-	 * @see #setSendmail(boolean)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Sendmail()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Sendmail</em>' attribute.
+   * @see #setSendmail(boolean)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getBuild_Sendmail()
+   * @model
+   * @generated
+   */
 	boolean isSendmail();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#isSendmail <em>Sendmail</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Build#isSendmail <em>Sendmail</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Sendmail</em>' attribute.
-	 * @see #isSendmail()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Sendmail</em>' attribute.
+   * @see #isSendmail()
+   * @generated
+   */
 	void setSendmail(boolean value);
 
 } // Build
Index: src/org/eclipse/amalgam/releng/build/BuildFactory.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/BuildFactory.java,v
retrieving revision 1.4
diff -u -r1.4 BuildFactory.java
--- src/org/eclipse/amalgam/releng/build/BuildFactory.java	20 May 2009 18:12:35 -0000	1.4
+++ src/org/eclipse/amalgam/releng/build/BuildFactory.java	6 Jun 2010 14:35:26 -0000
@@ -25,137 +25,137 @@
  */
 public interface BuildFactory extends EFactory {
 	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
+   * The singleton instance of the factory.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	BuildFactory eINSTANCE = org.eclipse.amalgam.releng.build.impl.BuildFactoryImpl.init();
 
 	/**
-	 * Returns a new object of class '<em>Build</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Build</em>'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Build</em>'.
-	 * @generated
-	 */
+   * @return a new object of class '<em>Build</em>'.
+   * @generated
+   */
 	Build createBuild();
 
 	/**
-	 * Returns a new object of class '<em>Repository</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Repository</em>'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Repository</em>'.
-	 * @generated
-	 */
+   * @return a new object of class '<em>Repository</em>'.
+   * @generated
+   */
 	Repository createRepository();
 
 	/**
-	 * Returns a new object of class '<em>Platform</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Platform</em>'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Platform</em>'.
-	 * @generated
-	 */
+   * @return a new object of class '<em>Platform</em>'.
+   * @generated
+   */
 	Platform createPlatform();
 
 	/**
-	 * Returns a new object of class '<em>Config</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Config</em>'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Config</em>'.
-	 * @generated
-	 */
+   * @return a new object of class '<em>Config</em>'.
+   * @generated
+   */
 	Config createConfig();
 
 	/**
-	 * Returns a new object of class '<em>Map</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Map</em>'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Map</em>'.
-	 * @generated
-	 */
+   * @return a new object of class '<em>Map</em>'.
+   * @generated
+   */
 	Map createMap();
 
 	/**
-	 * Returns a new object of class '<em>Category</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Category</em>'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Category</em>'.
-	 * @generated
-	 */
+   * @return a new object of class '<em>Category</em>'.
+   * @generated
+   */
 	Category createCategory();
 
 	/**
-	 * Returns a new object of class '<em>Contribution</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Contribution</em>'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Contribution</em>'.
-	 * @generated
-	 */
+   * @return a new object of class '<em>Contribution</em>'.
+   * @generated
+   */
 	Contribution createContribution();
 
 	/**
-	 * Returns a new object of class '<em>Contact</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Contact</em>'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Contact</em>'.
-	 * @generated
-	 */
+   * @return a new object of class '<em>Contact</em>'.
+   * @generated
+   */
 	Contact createContact();
 
 	/**
-	 * Returns a new object of class '<em>Feature</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Feature</em>'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Feature</em>'.
-	 * @generated
-	 */
+   * @return a new object of class '<em>Feature</em>'.
+   * @generated
+   */
 	Feature createFeature();
 
 	/**
-	 * Returns a new object of class '<em>Bundle</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Bundle</em>'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bundle</em>'.
-	 * @generated
-	 */
+   * @return a new object of class '<em>Bundle</em>'.
+   * @generated
+   */
 	Bundle createBundle();
 
 	/**
-	 * Returns a new object of class '<em>Compiler</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Compiler</em>'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Compiler</em>'.
-	 * @generated
-	 */
+   * @return a new object of class '<em>Compiler</em>'.
+   * @generated
+   */
 	Compiler createCompiler();
 
 	/**
-	 * Returns a new object of class '<em>Promotion</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Promotion</em>'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Promotion</em>'.
-	 * @generated
-	 */
+   * @return a new object of class '<em>Promotion</em>'.
+   * @generated
+   */
 	Promotion createPromotion();
 
 	/**
-	 * Returns a new object of class '<em>Product</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns a new object of class '<em>Product</em>'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Product</em>'.
-	 * @generated
-	 */
+   * @return a new object of class '<em>Product</em>'.
+   * @generated
+   */
 	Product createProduct();
 
 	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
+   * Returns the package supported by this factory.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
+   * @return the package supported by this factory.
+   * @generated
+   */
 	BuildPackage getBuildPackage();
 
 } //BuildFactory
Index: src/org/eclipse/amalgam/releng/build/BuildPackage.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/BuildPackage.java,v
retrieving revision 1.10
diff -u -r1.10 BuildPackage.java
--- src/org/eclipse/amalgam/releng/build/BuildPackage.java	20 May 2009 18:12:35 -0000	1.10
+++ src/org/eclipse/amalgam/releng/build/BuildPackage.java	6 Jun 2010 14:35:27 -0000
@@ -36,1876 +36,1876 @@
  */
 public interface BuildPackage extends EPackage {
 	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
+   * The package name.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	String eNAME = "build";
 
 	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
+   * The package namespace URI.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	String eNS_URI = "http://www.eclipse.org/amalgam/2008/build";;
 
 	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
+   * The package namespace name.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	String eNS_PREFIX = "build";
 
 	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
+   * The singleton instance of the package.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	BuildPackage eINSTANCE = org.eclipse.amalgam.releng.build.impl.BuildPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.BuildImpl <em>Build</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.BuildImpl <em>Build</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildImpl
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getBuild()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.impl.BuildImpl
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getBuild()
+   * @generated
+   */
 	int BUILD = 0;
 
 	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Type</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__TYPE = 0;
 
 	/**
-	 * The feature id for the '<em><b>Build Root</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Build Root</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__BUILD_ROOT = 1;
 
 	/**
-	 * The feature id for the '<em><b>Platforms</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Platforms</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__PLATFORMS = 2;
 
 	/**
-	 * The feature id for the '<em><b>Configs</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Configs</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__CONFIGS = 3;
 
 	/**
-	 * The feature id for the '<em><b>Map</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Map</b></em>' containment reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__MAP = 4;
 
 	/**
-	 * The feature id for the '<em><b>Fetch Tag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Fetch Tag</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__FETCH_TAG = 5;
 
 	/**
-	 * The feature id for the '<em><b>Categories</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Categories</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__CATEGORIES = 6;
 
 	/**
-	 * The feature id for the '<em><b>Contributions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Contributions</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__CONTRIBUTIONS = 7;
 
 	/**
-	 * The feature id for the '<em><b>Product</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Product</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__PRODUCT = 8;
 
 	/**
-	 * The feature id for the '<em><b>Label</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Label</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__LABEL = 9;
 
 	/**
-	 * The feature id for the '<em><b>Base</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Base</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__BASE = 10;
 
 	/**
-	 * The feature id for the '<em><b>Builder</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Builder</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__BUILDER = 11;
 
 	/**
-	 * The feature id for the '<em><b>Date</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Date</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__DATE = 12;
 
 	/**
-	 * The feature id for the '<em><b>Time</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Time</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__TIME = 13;
 
 	/**
-	 * The feature id for the '<em><b>Compiler</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Compiler</b></em>' containment reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__COMPILER = 14;
 
 	/**
-	 * The feature id for the '<em><b>Launch VM</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Launch VM</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__LAUNCH_VM = 15;
 
 	/**
-	 * The feature id for the '<em><b>Promotion</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Promotion</b></em>' containment reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__PROMOTION = 16;
 
 	/**
-	 * The feature id for the '<em><b>Builder URL</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Builder URL</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__BUILDER_URL = 17;
 
 	/**
-	 * The feature id for the '<em><b>Buildmaster</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Buildmaster</b></em>' containment reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__BUILDMASTER = 18;
 
 	/**
-	 * The feature id for the '<em><b>Default Mail List</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Default Mail List</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__DEFAULT_MAIL_LIST = 19;
 
 	/**
-	 * The feature id for the '<em><b>Sendmail</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Sendmail</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD__SENDMAIL = 20;
 
 	/**
-	 * The number of structural features of the '<em>Build</em>' class.
-	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Build</em>' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUILD_FEATURE_COUNT = 21;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.RepositoryImpl <em>Repository</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.RepositoryImpl <em>Repository</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.impl.RepositoryImpl
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getRepository()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.impl.RepositoryImpl
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getRepository()
+   * @generated
+   */
 	int REPOSITORY = 1;
 
 	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Location</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int REPOSITORY__LOCATION = 0;
 
 	/**
-	 * The feature id for the '<em><b>Label</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Label</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int REPOSITORY__LABEL = 1;
 
 	/**
-	 * The number of structural features of the '<em>Repository</em>' class.
-	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Repository</em>' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int REPOSITORY_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.PlatformImpl <em>Platform</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.PlatformImpl <em>Platform</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.impl.PlatformImpl
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getPlatform()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.impl.PlatformImpl
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getPlatform()
+   * @generated
+   */
 	int PLATFORM = 2;
 
 	/**
-	 * The feature id for the '<em><b>File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>File</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int PLATFORM__FILE = 0;
 
 	/**
-	 * The feature id for the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Location</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int PLATFORM__LOCATION = 1;
 
 	/**
-	 * The feature id for the '<em><b>Config</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Config</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int PLATFORM__CONFIG = 2;
 
 	/**
-	 * The feature id for the '<em><b>Deltapack</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Deltapack</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int PLATFORM__DELTAPACK = 3;
 
 	/**
-	 * The number of structural features of the '<em>Platform</em>' class.
-	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Platform</em>' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int PLATFORM_FEATURE_COUNT = 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.ConfigImpl <em>Config</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.ConfigImpl <em>Config</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.impl.ConfigImpl
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getConfig()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.impl.ConfigImpl
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getConfig()
+   * @generated
+   */
 	int CONFIG = 3;
 
 	/**
-	 * The feature id for the '<em><b>Os</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Os</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CONFIG__OS = 0;
 
 	/**
-	 * The feature id for the '<em><b>Ws</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Ws</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CONFIG__WS = 1;
 
 	/**
-	 * The feature id for the '<em><b>Arch</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Arch</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CONFIG__ARCH = 2;
 
 	/**
-	 * The feature id for the '<em><b>Archive Format</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Archive Format</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CONFIG__ARCHIVE_FORMAT = 3;
 
 	/**
-	 * The number of structural features of the '<em>Config</em>' class.
-	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Config</em>' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CONFIG_FEATURE_COUNT = 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.MapImpl <em>Map</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.MapImpl <em>Map</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.impl.MapImpl
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getMap()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.impl.MapImpl
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getMap()
+   * @generated
+   */
 	int MAP = 4;
 
 	/**
-	 * The feature id for the '<em><b>Root</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Root</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int MAP__ROOT = 0;
 
 	/**
-	 * The feature id for the '<em><b>Repo</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Repo</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int MAP__REPO = 1;
 
 	/**
-	 * The feature id for the '<em><b>Tag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Tag</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int MAP__TAG = 2;
 
 	/**
-	 * The number of structural features of the '<em>Map</em>' class.
-	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Map</em>' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int MAP_FEATURE_COUNT = 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.CategoryImpl <em>Category</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.CategoryImpl <em>Category</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.impl.CategoryImpl
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getCategory()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.impl.CategoryImpl
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getCategory()
+   * @generated
+   */
 	int CATEGORY = 5;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CATEGORY__NAME = 0;
 
 	/**
-	 * The feature id for the '<em><b>Label</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Label</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CATEGORY__LABEL = 1;
 
 	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Description</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CATEGORY__DESCRIPTION = 2;
 
 	/**
-	 * The feature id for the '<em><b>Features</b></em>' reference list.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Features</b></em>' reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CATEGORY__FEATURES = 3;
 
 	/**
-	 * The number of structural features of the '<em>Category</em>' class.
-	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Category</em>' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CATEGORY_FEATURE_COUNT = 4;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.ContributionImpl <em>Contribution</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.ContributionImpl <em>Contribution</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.impl.ContributionImpl
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getContribution()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.impl.ContributionImpl
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getContribution()
+   * @generated
+   */
 	int CONTRIBUTION = 6;
 
 	/**
-	 * The feature id for the '<em><b>Contacts</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Contacts</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CONTRIBUTION__CONTACTS = 0;
 
 	/**
-	 * The feature id for the '<em><b>Features</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Features</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CONTRIBUTION__FEATURES = 1;
 
 	/**
-	 * The feature id for the '<em><b>Label</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Label</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CONTRIBUTION__LABEL = 2;
 
 	/**
-	 * The feature id for the '<em><b>Repositories</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Repositories</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CONTRIBUTION__REPOSITORIES = 3;
 
 	/**
-	 * The feature id for the '<em><b>Bundles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Bundles</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CONTRIBUTION__BUNDLES = 4;
 
 	/**
-	 * The feature id for the '<em><b>Products</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Products</b></em>' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CONTRIBUTION__PRODUCTS = 5;
 
 	/**
-	 * The number of structural features of the '<em>Contribution</em>' class.
-	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Contribution</em>' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CONTRIBUTION_FEATURE_COUNT = 6;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.ContactImpl <em>Contact</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.ContactImpl <em>Contact</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.impl.ContactImpl
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getContact()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.impl.ContactImpl
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getContact()
+   * @generated
+   */
 	int CONTACT = 7;
 
 	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CONTACT__NAME = 0;
 
 	/**
-	 * The feature id for the '<em><b>Email</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Email</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CONTACT__EMAIL = 1;
 
 	/**
-	 * The number of structural features of the '<em>Contact</em>' class.
-	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Contact</em>' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int CONTACT_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.InstallationUnitImpl <em>Installation Unit</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.InstallationUnitImpl <em>Installation Unit</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.impl.InstallationUnitImpl
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getInstallationUnit()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.impl.InstallationUnitImpl
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getInstallationUnit()
+   * @generated
+   */
 	int INSTALLATION_UNIT = 12;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Id</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int INSTALLATION_UNIT__ID = 0;
 
 	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Version</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int INSTALLATION_UNIT__VERSION = 1;
 
 	/**
-	 * The feature id for the '<em><b>Repo</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Repo</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int INSTALLATION_UNIT__REPO = 2;
 
 	/**
-	 * The number of structural features of the '<em>Installation Unit</em>' class.
-	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Installation Unit</em>' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int INSTALLATION_UNIT_FEATURE_COUNT = 3;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.FeatureImpl <em>Feature</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.FeatureImpl <em>Feature</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.impl.FeatureImpl
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getFeature()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.impl.FeatureImpl
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getFeature()
+   * @generated
+   */
 	int FEATURE = 8;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Id</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int FEATURE__ID = INSTALLATION_UNIT__ID;
 
 	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Version</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int FEATURE__VERSION = INSTALLATION_UNIT__VERSION;
 
 	/**
-	 * The feature id for the '<em><b>Repo</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Repo</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int FEATURE__REPO = INSTALLATION_UNIT__REPO;
 
 	/**
-	 * The feature id for the '<em><b>Category</b></em>' reference list.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Category</b></em>' reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int FEATURE__CATEGORY = INSTALLATION_UNIT_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>In Product</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>In Product</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int FEATURE__IN_PRODUCT = INSTALLATION_UNIT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Feature</em>' class.
-	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Feature</em>' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int FEATURE_FEATURE_COUNT = INSTALLATION_UNIT_FEATURE_COUNT + 2;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.BundleImpl <em>Bundle</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.BundleImpl <em>Bundle</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.impl.BundleImpl
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getBundle()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.impl.BundleImpl
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getBundle()
+   * @generated
+   */
 	int BUNDLE = 9;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Id</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUNDLE__ID = INSTALLATION_UNIT__ID;
 
 	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Version</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUNDLE__VERSION = INSTALLATION_UNIT__VERSION;
 
 	/**
-	 * The feature id for the '<em><b>Repo</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Repo</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUNDLE__REPO = INSTALLATION_UNIT__REPO;
 
 	/**
-	 * The number of structural features of the '<em>Bundle</em>' class.
-	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Bundle</em>' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int BUNDLE_FEATURE_COUNT = INSTALLATION_UNIT_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.CompilerImpl <em>Compiler</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.CompilerImpl <em>Compiler</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.impl.CompilerImpl
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getCompiler()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.impl.CompilerImpl
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getCompiler()
+   * @generated
+   */
 	int COMPILER = 10;
 
 	/**
-	 * The feature id for the '<em><b>Args</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Args</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int COMPILER__ARGS = 0;
 
 	/**
-	 * The feature id for the '<em><b>Source Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Source Version</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int COMPILER__SOURCE_VERSION = 1;
 
 	/**
-	 * The feature id for the '<em><b>Target Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Target Version</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int COMPILER__TARGET_VERSION = 2;
 
 	/**
-	 * The feature id for the '<em><b>Verbose</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Verbose</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int COMPILER__VERBOSE = 3;
 
 	/**
-	 * The feature id for the '<em><b>Fail On Error</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Fail On Error</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int COMPILER__FAIL_ON_ERROR = 4;
 
 	/**
-	 * The feature id for the '<em><b>Debug Info</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Debug Info</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int COMPILER__DEBUG_INFO = 5;
 
 	/**
-	 * The number of structural features of the '<em>Compiler</em>' class.
-	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Compiler</em>' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int COMPILER_FEATURE_COUNT = 6;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.PromotionImpl <em>Promotion</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.PromotionImpl <em>Promotion</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.impl.PromotionImpl
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getPromotion()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.impl.PromotionImpl
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getPromotion()
+   * @generated
+   */
 	int PROMOTION = 11;
 
 	/**
-	 * The feature id for the '<em><b>Upload Directory</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Upload Directory</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int PROMOTION__UPLOAD_DIRECTORY = 0;
 
 	/**
-	 * The feature id for the '<em><b>Download Directory</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Download Directory</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int PROMOTION__DOWNLOAD_DIRECTORY = 1;
 
 	/**
-	 * The feature id for the '<em><b>Incubating</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Incubating</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int PROMOTION__INCUBATING = 2;
 
 	/**
-	 * The feature id for the '<em><b>Base URL</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Base URL</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int PROMOTION__BASE_URL = 3;
 
 	/**
-	 * The feature id for the '<em><b>Build Alias</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Build Alias</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int PROMOTION__BUILD_ALIAS = 4;
 
 	/**
-	 * The number of structural features of the '<em>Promotion</em>' class.
-	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Promotion</em>' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int PROMOTION_FEATURE_COUNT = 5;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.ProductImpl <em>Product</em>}' class.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.impl.ProductImpl <em>Product</em>}' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.impl.ProductImpl
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getProduct()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.impl.ProductImpl
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getProduct()
+   * @generated
+   */
 	int PRODUCT = 13;
 
 	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Id</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int PRODUCT__ID = INSTALLATION_UNIT__ID;
 
 	/**
-	 * The feature id for the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Version</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int PRODUCT__VERSION = INSTALLATION_UNIT__VERSION;
 
 	/**
-	 * The feature id for the '<em><b>Repo</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * The feature id for the '<em><b>Repo</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int PRODUCT__REPO = INSTALLATION_UNIT__REPO;
 
 	/**
-	 * The number of structural features of the '<em>Product</em>' class.
-	 * <!-- begin-user-doc -->
+   * The number of structural features of the '<em>Product</em>' class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
+   * @generated
+   * @ordered
+   */
 	int PRODUCT_FEATURE_COUNT = INSTALLATION_UNIT_FEATURE_COUNT + 0;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.BuildType <em>Type</em>}' enum.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.BuildType <em>Type</em>}' enum.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.BuildType
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getBuildType()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.BuildType
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getBuildType()
+   * @generated
+   */
 	int BUILD_TYPE = 14;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.OS <em>OS</em>}' enum.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.OS <em>OS</em>}' enum.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.OS
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getOS()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.OS
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getOS()
+   * @generated
+   */
 	int OS = 15;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.WS <em>WS</em>}' enum.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.WS <em>WS</em>}' enum.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.WS
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getWS()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.WS
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getWS()
+   * @generated
+   */
 	int WS = 16;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.ARCH <em>ARCH</em>}' enum.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.ARCH <em>ARCH</em>}' enum.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.ARCH
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getARCH()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.ARCH
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getARCH()
+   * @generated
+   */
 	int ARCH = 17;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.amalgam.releng.build.ArchiveFormat <em>Archive Format</em>}' enum.
-	 * <!-- begin-user-doc -->
+   * The meta object id for the '{@link org.eclipse.amalgam.releng.build.ArchiveFormat <em>Archive Format</em>}' enum.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.amalgam.releng.build.ArchiveFormat
-	 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getArchiveFormat()
-	 * @generated
-	 */
+   * @see org.eclipse.amalgam.releng.build.ArchiveFormat
+   * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getArchiveFormat()
+   * @generated
+   */
 	int ARCHIVE_FORMAT = 18;
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Build <em>Build</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Build <em>Build</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Build</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build
-	 * @generated
-	 */
+   * @return the meta object for class '<em>Build</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build
+   * @generated
+   */
 	EClass getBuild();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Build#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Build#getType <em>Type</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getType()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Type</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getType()
+   * @see #getBuild()
+   * @generated
+   */
 	EAttribute getBuild_Type();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Build#getBuildRoot <em>Build Root</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Build#getBuildRoot <em>Build Root</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Build Root</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getBuildRoot()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Build Root</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getBuildRoot()
+   * @see #getBuild()
+   * @generated
+   */
 	EAttribute getBuild_BuildRoot();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Build#getPlatforms <em>Platforms</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Build#getPlatforms <em>Platforms</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Platforms</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getPlatforms()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the containment reference list '<em>Platforms</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getPlatforms()
+   * @see #getBuild()
+   * @generated
+   */
 	EReference getBuild_Platforms();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Build#getConfigs <em>Configs</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Build#getConfigs <em>Configs</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Configs</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getConfigs()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the containment reference list '<em>Configs</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getConfigs()
+   * @see #getBuild()
+   * @generated
+   */
 	EReference getBuild_Configs();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.amalgam.releng.build.Build#getMap <em>Map</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference '{@link org.eclipse.amalgam.releng.build.Build#getMap <em>Map</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Map</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getMap()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the containment reference '<em>Map</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getMap()
+   * @see #getBuild()
+   * @generated
+   */
 	EReference getBuild_Map();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Build#getFetchTag <em>Fetch Tag</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Build#getFetchTag <em>Fetch Tag</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Fetch Tag</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getFetchTag()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Fetch Tag</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getFetchTag()
+   * @see #getBuild()
+   * @generated
+   */
 	EAttribute getBuild_FetchTag();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Build#getCategories <em>Categories</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Build#getCategories <em>Categories</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Categories</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getCategories()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the containment reference list '<em>Categories</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getCategories()
+   * @see #getBuild()
+   * @generated
+   */
 	EReference getBuild_Categories();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Build#getContributions <em>Contributions</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Build#getContributions <em>Contributions</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Contributions</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getContributions()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the containment reference list '<em>Contributions</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getContributions()
+   * @see #getBuild()
+   * @generated
+   */
 	EReference getBuild_Contributions();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.amalgam.releng.build.Build#getProduct <em>Product</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.amalgam.releng.build.Build#getProduct <em>Product</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Product</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getProduct()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the reference '<em>Product</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getProduct()
+   * @see #getBuild()
+   * @generated
+   */
 	EReference getBuild_Product();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Build#getLabel <em>Label</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Build#getLabel <em>Label</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Label</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getLabel()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Label</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getLabel()
+   * @see #getBuild()
+   * @generated
+   */
 	EAttribute getBuild_Label();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.amalgam.releng.build.Build#getBase <em>Base</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.amalgam.releng.build.Build#getBase <em>Base</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Base</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getBase()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the reference '<em>Base</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getBase()
+   * @see #getBuild()
+   * @generated
+   */
 	EReference getBuild_Base();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.amalgam.releng.build.Build#getBuilder <em>Builder</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.amalgam.releng.build.Build#getBuilder <em>Builder</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Builder</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getBuilder()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the reference '<em>Builder</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getBuilder()
+   * @see #getBuild()
+   * @generated
+   */
 	EReference getBuild_Builder();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Build#getDate <em>Date</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Build#getDate <em>Date</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Date</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getDate()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Date</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getDate()
+   * @see #getBuild()
+   * @generated
+   */
 	EAttribute getBuild_Date();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Build#getTime <em>Time</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Build#getTime <em>Time</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Time</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getTime()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Time</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getTime()
+   * @see #getBuild()
+   * @generated
+   */
 	EAttribute getBuild_Time();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.amalgam.releng.build.Build#getCompiler <em>Compiler</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference '{@link org.eclipse.amalgam.releng.build.Build#getCompiler <em>Compiler</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Compiler</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getCompiler()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the containment reference '<em>Compiler</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getCompiler()
+   * @see #getBuild()
+   * @generated
+   */
 	EReference getBuild_Compiler();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Build#getLaunchVM <em>Launch VM</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Build#getLaunchVM <em>Launch VM</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Launch VM</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getLaunchVM()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Launch VM</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getLaunchVM()
+   * @see #getBuild()
+   * @generated
+   */
 	EAttribute getBuild_LaunchVM();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.amalgam.releng.build.Build#getPromotion <em>Promotion</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference '{@link org.eclipse.amalgam.releng.build.Build#getPromotion <em>Promotion</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Promotion</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getPromotion()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the containment reference '<em>Promotion</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getPromotion()
+   * @see #getBuild()
+   * @generated
+   */
 	EReference getBuild_Promotion();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Build#getBuilderURL <em>Builder URL</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Build#getBuilderURL <em>Builder URL</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Builder URL</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getBuilderURL()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Builder URL</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getBuilderURL()
+   * @see #getBuild()
+   * @generated
+   */
 	EAttribute getBuild_BuilderURL();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.amalgam.releng.build.Build#getBuildmaster <em>Buildmaster</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference '{@link org.eclipse.amalgam.releng.build.Build#getBuildmaster <em>Buildmaster</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Buildmaster</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getBuildmaster()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the containment reference '<em>Buildmaster</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getBuildmaster()
+   * @see #getBuild()
+   * @generated
+   */
 	EReference getBuild_Buildmaster();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Build#getDefaultMailList <em>Default Mail List</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Build#getDefaultMailList <em>Default Mail List</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Default Mail List</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#getDefaultMailList()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the containment reference list '<em>Default Mail List</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#getDefaultMailList()
+   * @see #getBuild()
+   * @generated
+   */
 	EReference getBuild_DefaultMailList();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Build#isSendmail <em>Sendmail</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Build#isSendmail <em>Sendmail</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Sendmail</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Build#isSendmail()
-	 * @see #getBuild()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Sendmail</em>'.
+   * @see org.eclipse.amalgam.releng.build.Build#isSendmail()
+   * @see #getBuild()
+   * @generated
+   */
 	EAttribute getBuild_Sendmail();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Repository <em>Repository</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Repository <em>Repository</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Repository</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Repository
-	 * @generated
-	 */
+   * @return the meta object for class '<em>Repository</em>'.
+   * @see org.eclipse.amalgam.releng.build.Repository
+   * @generated
+   */
 	EClass getRepository();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Repository#getLocation <em>Location</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Repository#getLocation <em>Location</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Location</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Repository#getLocation()
-	 * @see #getRepository()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Location</em>'.
+   * @see org.eclipse.amalgam.releng.build.Repository#getLocation()
+   * @see #getRepository()
+   * @generated
+   */
 	EAttribute getRepository_Location();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Repository#getLabel <em>Label</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Repository#getLabel <em>Label</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Label</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Repository#getLabel()
-	 * @see #getRepository()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Label</em>'.
+   * @see org.eclipse.amalgam.releng.build.Repository#getLabel()
+   * @see #getRepository()
+   * @generated
+   */
 	EAttribute getRepository_Label();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Platform <em>Platform</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Platform <em>Platform</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Platform</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Platform
-	 * @generated
-	 */
+   * @return the meta object for class '<em>Platform</em>'.
+   * @see org.eclipse.amalgam.releng.build.Platform
+   * @generated
+   */
 	EClass getPlatform();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Platform#getFile <em>File</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Platform#getFile <em>File</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>File</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Platform#getFile()
-	 * @see #getPlatform()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>File</em>'.
+   * @see org.eclipse.amalgam.releng.build.Platform#getFile()
+   * @see #getPlatform()
+   * @generated
+   */
 	EAttribute getPlatform_File();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Platform#getLocation <em>Location</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Platform#getLocation <em>Location</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Location</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Platform#getLocation()
-	 * @see #getPlatform()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Location</em>'.
+   * @see org.eclipse.amalgam.releng.build.Platform#getLocation()
+   * @see #getPlatform()
+   * @generated
+   */
 	EAttribute getPlatform_Location();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.amalgam.releng.build.Platform#getConfig <em>Config</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.amalgam.releng.build.Platform#getConfig <em>Config</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Config</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Platform#getConfig()
-	 * @see #getPlatform()
-	 * @generated
-	 */
+   * @return the meta object for the reference '<em>Config</em>'.
+   * @see org.eclipse.amalgam.releng.build.Platform#getConfig()
+   * @see #getPlatform()
+   * @generated
+   */
 	EReference getPlatform_Config();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Platform#getDeltapack <em>Deltapack</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Platform#getDeltapack <em>Deltapack</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Deltapack</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Platform#getDeltapack()
-	 * @see #getPlatform()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Deltapack</em>'.
+   * @see org.eclipse.amalgam.releng.build.Platform#getDeltapack()
+   * @see #getPlatform()
+   * @generated
+   */
 	EAttribute getPlatform_Deltapack();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Config <em>Config</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Config <em>Config</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Config</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Config
-	 * @generated
-	 */
+   * @return the meta object for class '<em>Config</em>'.
+   * @see org.eclipse.amalgam.releng.build.Config
+   * @generated
+   */
 	EClass getConfig();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Config#getOs <em>Os</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Config#getOs <em>Os</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Os</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Config#getOs()
-	 * @see #getConfig()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Os</em>'.
+   * @see org.eclipse.amalgam.releng.build.Config#getOs()
+   * @see #getConfig()
+   * @generated
+   */
 	EAttribute getConfig_Os();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Config#getWs <em>Ws</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Config#getWs <em>Ws</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ws</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Config#getWs()
-	 * @see #getConfig()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Ws</em>'.
+   * @see org.eclipse.amalgam.releng.build.Config#getWs()
+   * @see #getConfig()
+   * @generated
+   */
 	EAttribute getConfig_Ws();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Config#getArch <em>Arch</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Config#getArch <em>Arch</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Arch</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Config#getArch()
-	 * @see #getConfig()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Arch</em>'.
+   * @see org.eclipse.amalgam.releng.build.Config#getArch()
+   * @see #getConfig()
+   * @generated
+   */
 	EAttribute getConfig_Arch();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Config#getArchiveFormat <em>Archive Format</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Config#getArchiveFormat <em>Archive Format</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Archive Format</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Config#getArchiveFormat()
-	 * @see #getConfig()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Archive Format</em>'.
+   * @see org.eclipse.amalgam.releng.build.Config#getArchiveFormat()
+   * @see #getConfig()
+   * @generated
+   */
 	EAttribute getConfig_ArchiveFormat();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Map <em>Map</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Map <em>Map</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Map</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Map
-	 * @generated
-	 */
+   * @return the meta object for class '<em>Map</em>'.
+   * @see org.eclipse.amalgam.releng.build.Map
+   * @generated
+   */
 	EClass getMap();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Map#getRoot <em>Root</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Map#getRoot <em>Root</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Root</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Map#getRoot()
-	 * @see #getMap()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Root</em>'.
+   * @see org.eclipse.amalgam.releng.build.Map#getRoot()
+   * @see #getMap()
+   * @generated
+   */
 	EAttribute getMap_Root();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Map#getRepo <em>Repo</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Map#getRepo <em>Repo</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Repo</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Map#getRepo()
-	 * @see #getMap()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Repo</em>'.
+   * @see org.eclipse.amalgam.releng.build.Map#getRepo()
+   * @see #getMap()
+   * @generated
+   */
 	EAttribute getMap_Repo();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Map#getTag <em>Tag</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Map#getTag <em>Tag</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Tag</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Map#getTag()
-	 * @see #getMap()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Tag</em>'.
+   * @see org.eclipse.amalgam.releng.build.Map#getTag()
+   * @see #getMap()
+   * @generated
+   */
 	EAttribute getMap_Tag();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Category <em>Category</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Category <em>Category</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Category</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Category
-	 * @generated
-	 */
+   * @return the meta object for class '<em>Category</em>'.
+   * @see org.eclipse.amalgam.releng.build.Category
+   * @generated
+   */
 	EClass getCategory();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Category#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Category#getName <em>Name</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Category#getName()
-	 * @see #getCategory()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Name</em>'.
+   * @see org.eclipse.amalgam.releng.build.Category#getName()
+   * @see #getCategory()
+   * @generated
+   */
 	EAttribute getCategory_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Category#getLabel <em>Label</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Category#getLabel <em>Label</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Label</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Category#getLabel()
-	 * @see #getCategory()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Label</em>'.
+   * @see org.eclipse.amalgam.releng.build.Category#getLabel()
+   * @see #getCategory()
+   * @generated
+   */
 	EAttribute getCategory_Label();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Category#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Category#getDescription <em>Description</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Category#getDescription()
-	 * @see #getCategory()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Description</em>'.
+   * @see org.eclipse.amalgam.releng.build.Category#getDescription()
+   * @see #getCategory()
+   * @generated
+   */
 	EAttribute getCategory_Description();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.amalgam.releng.build.Category#getFeatures <em>Features</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the reference list '{@link org.eclipse.amalgam.releng.build.Category#getFeatures <em>Features</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Features</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Category#getFeatures()
-	 * @see #getCategory()
-	 * @generated
-	 */
+   * @return the meta object for the reference list '<em>Features</em>'.
+   * @see org.eclipse.amalgam.releng.build.Category#getFeatures()
+   * @see #getCategory()
+   * @generated
+   */
 	EReference getCategory_Features();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Contribution <em>Contribution</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Contribution <em>Contribution</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Contribution</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Contribution
-	 * @generated
-	 */
+   * @return the meta object for class '<em>Contribution</em>'.
+   * @see org.eclipse.amalgam.releng.build.Contribution
+   * @generated
+   */
 	EClass getContribution();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Contribution#getContacts <em>Contacts</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Contribution#getContacts <em>Contacts</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Contacts</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Contribution#getContacts()
-	 * @see #getContribution()
-	 * @generated
-	 */
+   * @return the meta object for the containment reference list '<em>Contacts</em>'.
+   * @see org.eclipse.amalgam.releng.build.Contribution#getContacts()
+   * @see #getContribution()
+   * @generated
+   */
 	EReference getContribution_Contacts();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Contribution#getFeatures <em>Features</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Contribution#getFeatures <em>Features</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Features</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Contribution#getFeatures()
-	 * @see #getContribution()
-	 * @generated
-	 */
+   * @return the meta object for the containment reference list '<em>Features</em>'.
+   * @see org.eclipse.amalgam.releng.build.Contribution#getFeatures()
+   * @see #getContribution()
+   * @generated
+   */
 	EReference getContribution_Features();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Contribution#getLabel <em>Label</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Contribution#getLabel <em>Label</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Label</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Contribution#getLabel()
-	 * @see #getContribution()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Label</em>'.
+   * @see org.eclipse.amalgam.releng.build.Contribution#getLabel()
+   * @see #getContribution()
+   * @generated
+   */
 	EAttribute getContribution_Label();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Contribution#getRepositories <em>Repositories</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Contribution#getRepositories <em>Repositories</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Repositories</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Contribution#getRepositories()
-	 * @see #getContribution()
-	 * @generated
-	 */
+   * @return the meta object for the containment reference list '<em>Repositories</em>'.
+   * @see org.eclipse.amalgam.releng.build.Contribution#getRepositories()
+   * @see #getContribution()
+   * @generated
+   */
 	EReference getContribution_Repositories();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Contribution#getBundles <em>Bundles</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Contribution#getBundles <em>Bundles</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Bundles</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Contribution#getBundles()
-	 * @see #getContribution()
-	 * @generated
-	 */
+   * @return the meta object for the containment reference list '<em>Bundles</em>'.
+   * @see org.eclipse.amalgam.releng.build.Contribution#getBundles()
+   * @see #getContribution()
+   * @generated
+   */
 	EReference getContribution_Bundles();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Contribution#getProducts <em>Products</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the containment reference list '{@link org.eclipse.amalgam.releng.build.Contribution#getProducts <em>Products</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Products</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Contribution#getProducts()
-	 * @see #getContribution()
-	 * @generated
-	 */
+   * @return the meta object for the containment reference list '<em>Products</em>'.
+   * @see org.eclipse.amalgam.releng.build.Contribution#getProducts()
+   * @see #getContribution()
+   * @generated
+   */
 	EReference getContribution_Products();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Contact <em>Contact</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Contact <em>Contact</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Contact</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Contact
-	 * @generated
-	 */
+   * @return the meta object for class '<em>Contact</em>'.
+   * @see org.eclipse.amalgam.releng.build.Contact
+   * @generated
+   */
 	EClass getContact();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Contact#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Contact#getName <em>Name</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Contact#getName()
-	 * @see #getContact()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Name</em>'.
+   * @see org.eclipse.amalgam.releng.build.Contact#getName()
+   * @see #getContact()
+   * @generated
+   */
 	EAttribute getContact_Name();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Contact#getEmail <em>Email</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Contact#getEmail <em>Email</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Email</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Contact#getEmail()
-	 * @see #getContact()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Email</em>'.
+   * @see org.eclipse.amalgam.releng.build.Contact#getEmail()
+   * @see #getContact()
+   * @generated
+   */
 	EAttribute getContact_Email();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Feature <em>Feature</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Feature <em>Feature</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Feature</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Feature
-	 * @generated
-	 */
+   * @return the meta object for class '<em>Feature</em>'.
+   * @see org.eclipse.amalgam.releng.build.Feature
+   * @generated
+   */
 	EClass getFeature();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.amalgam.releng.build.Feature#getCategory <em>Category</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the reference list '{@link org.eclipse.amalgam.releng.build.Feature#getCategory <em>Category</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Category</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Feature#getCategory()
-	 * @see #getFeature()
-	 * @generated
-	 */
+   * @return the meta object for the reference list '<em>Category</em>'.
+   * @see org.eclipse.amalgam.releng.build.Feature#getCategory()
+   * @see #getFeature()
+   * @generated
+   */
 	EReference getFeature_Category();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Feature#isInProduct <em>In Product</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Feature#isInProduct <em>In Product</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>In Product</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Feature#isInProduct()
-	 * @see #getFeature()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>In Product</em>'.
+   * @see org.eclipse.amalgam.releng.build.Feature#isInProduct()
+   * @see #getFeature()
+   * @generated
+   */
 	EAttribute getFeature_InProduct();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Bundle <em>Bundle</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Bundle <em>Bundle</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bundle</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Bundle
-	 * @generated
-	 */
+   * @return the meta object for class '<em>Bundle</em>'.
+   * @see org.eclipse.amalgam.releng.build.Bundle
+   * @generated
+   */
 	EClass getBundle();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Compiler <em>Compiler</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Compiler <em>Compiler</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Compiler</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Compiler
-	 * @generated
-	 */
+   * @return the meta object for class '<em>Compiler</em>'.
+   * @see org.eclipse.amalgam.releng.build.Compiler
+   * @generated
+   */
 	EClass getCompiler();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Compiler#getArgs <em>Args</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Compiler#getArgs <em>Args</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Args</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Compiler#getArgs()
-	 * @see #getCompiler()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Args</em>'.
+   * @see org.eclipse.amalgam.releng.build.Compiler#getArgs()
+   * @see #getCompiler()
+   * @generated
+   */
 	EAttribute getCompiler_Args();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Compiler#getSourceVersion <em>Source Version</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Compiler#getSourceVersion <em>Source Version</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Source Version</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Compiler#getSourceVersion()
-	 * @see #getCompiler()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Source Version</em>'.
+   * @see org.eclipse.amalgam.releng.build.Compiler#getSourceVersion()
+   * @see #getCompiler()
+   * @generated
+   */
 	EAttribute getCompiler_SourceVersion();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Compiler#getTargetVersion <em>Target Version</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Compiler#getTargetVersion <em>Target Version</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Target Version</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Compiler#getTargetVersion()
-	 * @see #getCompiler()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Target Version</em>'.
+   * @see org.eclipse.amalgam.releng.build.Compiler#getTargetVersion()
+   * @see #getCompiler()
+   * @generated
+   */
 	EAttribute getCompiler_TargetVersion();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Compiler#isVerbose <em>Verbose</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Compiler#isVerbose <em>Verbose</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Verbose</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Compiler#isVerbose()
-	 * @see #getCompiler()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Verbose</em>'.
+   * @see org.eclipse.amalgam.releng.build.Compiler#isVerbose()
+   * @see #getCompiler()
+   * @generated
+   */
 	EAttribute getCompiler_Verbose();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Compiler#isFailOnError <em>Fail On Error</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Compiler#isFailOnError <em>Fail On Error</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Fail On Error</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Compiler#isFailOnError()
-	 * @see #getCompiler()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Fail On Error</em>'.
+   * @see org.eclipse.amalgam.releng.build.Compiler#isFailOnError()
+   * @see #getCompiler()
+   * @generated
+   */
 	EAttribute getCompiler_FailOnError();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Compiler#isDebugInfo <em>Debug Info</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Compiler#isDebugInfo <em>Debug Info</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Debug Info</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Compiler#isDebugInfo()
-	 * @see #getCompiler()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Debug Info</em>'.
+   * @see org.eclipse.amalgam.releng.build.Compiler#isDebugInfo()
+   * @see #getCompiler()
+   * @generated
+   */
 	EAttribute getCompiler_DebugInfo();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Promotion <em>Promotion</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Promotion <em>Promotion</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Promotion</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Promotion
-	 * @generated
-	 */
+   * @return the meta object for class '<em>Promotion</em>'.
+   * @see org.eclipse.amalgam.releng.build.Promotion
+   * @generated
+   */
 	EClass getPromotion();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Promotion#getUploadDirectory <em>Upload Directory</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Promotion#getUploadDirectory <em>Upload Directory</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Upload Directory</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Promotion#getUploadDirectory()
-	 * @see #getPromotion()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Upload Directory</em>'.
+   * @see org.eclipse.amalgam.releng.build.Promotion#getUploadDirectory()
+   * @see #getPromotion()
+   * @generated
+   */
 	EAttribute getPromotion_UploadDirectory();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Promotion#getDownloadDirectory <em>Download Directory</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Promotion#getDownloadDirectory <em>Download Directory</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Download Directory</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Promotion#getDownloadDirectory()
-	 * @see #getPromotion()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Download Directory</em>'.
+   * @see org.eclipse.amalgam.releng.build.Promotion#getDownloadDirectory()
+   * @see #getPromotion()
+   * @generated
+   */
 	EAttribute getPromotion_DownloadDirectory();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Promotion#isIncubating <em>Incubating</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Promotion#isIncubating <em>Incubating</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Incubating</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Promotion#isIncubating()
-	 * @see #getPromotion()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Incubating</em>'.
+   * @see org.eclipse.amalgam.releng.build.Promotion#isIncubating()
+   * @see #getPromotion()
+   * @generated
+   */
 	EAttribute getPromotion_Incubating();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Promotion#getBaseURL <em>Base URL</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Promotion#getBaseURL <em>Base URL</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Base URL</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Promotion#getBaseURL()
-	 * @see #getPromotion()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Base URL</em>'.
+   * @see org.eclipse.amalgam.releng.build.Promotion#getBaseURL()
+   * @see #getPromotion()
+   * @generated
+   */
 	EAttribute getPromotion_BaseURL();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Promotion#getBuildAlias <em>Build Alias</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.Promotion#getBuildAlias <em>Build Alias</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Build Alias</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Promotion#getBuildAlias()
-	 * @see #getPromotion()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Build Alias</em>'.
+   * @see org.eclipse.amalgam.releng.build.Promotion#getBuildAlias()
+   * @see #getPromotion()
+   * @generated
+   */
 	EAttribute getPromotion_BuildAlias();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.InstallationUnit <em>Installation Unit</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.InstallationUnit <em>Installation Unit</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Installation Unit</em>'.
-	 * @see org.eclipse.amalgam.releng.build.InstallationUnit
-	 * @generated
-	 */
+   * @return the meta object for class '<em>Installation Unit</em>'.
+   * @see org.eclipse.amalgam.releng.build.InstallationUnit
+   * @generated
+   */
 	EClass getInstallationUnit();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.InstallationUnit#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.InstallationUnit#getId <em>Id</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.amalgam.releng.build.InstallationUnit#getId()
-	 * @see #getInstallationUnit()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Id</em>'.
+   * @see org.eclipse.amalgam.releng.build.InstallationUnit#getId()
+   * @see #getInstallationUnit()
+   * @generated
+   */
 	EAttribute getInstallationUnit_Id();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.InstallationUnit#getVersion <em>Version</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the attribute '{@link org.eclipse.amalgam.releng.build.InstallationUnit#getVersion <em>Version</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Version</em>'.
-	 * @see org.eclipse.amalgam.releng.build.InstallationUnit#getVersion()
-	 * @see #getInstallationUnit()
-	 * @generated
-	 */
+   * @return the meta object for the attribute '<em>Version</em>'.
+   * @see org.eclipse.amalgam.releng.build.InstallationUnit#getVersion()
+   * @see #getInstallationUnit()
+   * @generated
+   */
 	EAttribute getInstallationUnit_Version();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.amalgam.releng.build.InstallationUnit#getRepo <em>Repo</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for the reference '{@link org.eclipse.amalgam.releng.build.InstallationUnit#getRepo <em>Repo</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Repo</em>'.
-	 * @see org.eclipse.amalgam.releng.build.InstallationUnit#getRepo()
-	 * @see #getInstallationUnit()
-	 * @generated
-	 */
+   * @return the meta object for the reference '<em>Repo</em>'.
+   * @see org.eclipse.amalgam.releng.build.InstallationUnit#getRepo()
+   * @see #getInstallationUnit()
+   * @generated
+   */
 	EReference getInstallationUnit_Repo();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Product <em>Product</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for class '{@link org.eclipse.amalgam.releng.build.Product <em>Product</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Product</em>'.
-	 * @see org.eclipse.amalgam.releng.build.Product
-	 * @generated
-	 */
+   * @return the meta object for class '<em>Product</em>'.
+   * @see org.eclipse.amalgam.releng.build.Product
+   * @generated
+   */
 	EClass getProduct();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.amalgam.releng.build.BuildType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for enum '{@link org.eclipse.amalgam.releng.build.BuildType <em>Type</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Type</em>'.
-	 * @see org.eclipse.amalgam.releng.build.BuildType
-	 * @generated
-	 */
+   * @return the meta object for enum '<em>Type</em>'.
+   * @see org.eclipse.amalgam.releng.build.BuildType
+   * @generated
+   */
 	EEnum getBuildType();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.amalgam.releng.build.OS <em>OS</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for enum '{@link org.eclipse.amalgam.releng.build.OS <em>OS</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>OS</em>'.
-	 * @see org.eclipse.amalgam.releng.build.OS
-	 * @generated
-	 */
+   * @return the meta object for enum '<em>OS</em>'.
+   * @see org.eclipse.amalgam.releng.build.OS
+   * @generated
+   */
 	EEnum getOS();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.amalgam.releng.build.WS <em>WS</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for enum '{@link org.eclipse.amalgam.releng.build.WS <em>WS</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>WS</em>'.
-	 * @see org.eclipse.amalgam.releng.build.WS
-	 * @generated
-	 */
+   * @return the meta object for enum '<em>WS</em>'.
+   * @see org.eclipse.amalgam.releng.build.WS
+   * @generated
+   */
 	EEnum getWS();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.amalgam.releng.build.ARCH <em>ARCH</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for enum '{@link org.eclipse.amalgam.releng.build.ARCH <em>ARCH</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>ARCH</em>'.
-	 * @see org.eclipse.amalgam.releng.build.ARCH
-	 * @generated
-	 */
+   * @return the meta object for enum '<em>ARCH</em>'.
+   * @see org.eclipse.amalgam.releng.build.ARCH
+   * @generated
+   */
 	EEnum getARCH();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.amalgam.releng.build.ArchiveFormat <em>Archive Format</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the meta object for enum '{@link org.eclipse.amalgam.releng.build.ArchiveFormat <em>Archive Format</em>}'.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Archive Format</em>'.
-	 * @see org.eclipse.amalgam.releng.build.ArchiveFormat
-	 * @generated
-	 */
+   * @return the meta object for enum '<em>Archive Format</em>'.
+   * @see org.eclipse.amalgam.releng.build.ArchiveFormat
+   * @generated
+   */
 	EEnum getArchiveFormat();
 
 	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
+   * Returns the factory that creates the instances of the model.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
+   * @return the factory that creates the instances of the model.
+   * @generated
+   */
 	BuildFactory getBuildFactory();
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
 	 *   <li>each class,</li>
@@ -1914,693 +1914,693 @@
 	 *   <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.BuildImpl <em>Build</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.BuildImpl <em>Build</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildImpl
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getBuild()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.impl.BuildImpl
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getBuild()
+     * @generated
+     */
 		EClass BUILD = eINSTANCE.getBuild();
 
 		/**
-		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute BUILD__TYPE = eINSTANCE.getBuild_Type();
 
 		/**
-		 * The meta object literal for the '<em><b>Build Root</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Build Root</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute BUILD__BUILD_ROOT = eINSTANCE.getBuild_BuildRoot();
 
 		/**
-		 * The meta object literal for the '<em><b>Platforms</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Platforms</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference BUILD__PLATFORMS = eINSTANCE.getBuild_Platforms();
 
 		/**
-		 * The meta object literal for the '<em><b>Configs</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Configs</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference BUILD__CONFIGS = eINSTANCE.getBuild_Configs();
 
 		/**
-		 * The meta object literal for the '<em><b>Map</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Map</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference BUILD__MAP = eINSTANCE.getBuild_Map();
 
 		/**
-		 * The meta object literal for the '<em><b>Fetch Tag</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Fetch Tag</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute BUILD__FETCH_TAG = eINSTANCE.getBuild_FetchTag();
 
 		/**
-		 * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Categories</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference BUILD__CATEGORIES = eINSTANCE.getBuild_Categories();
 
 		/**
-		 * The meta object literal for the '<em><b>Contributions</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Contributions</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference BUILD__CONTRIBUTIONS = eINSTANCE.getBuild_Contributions();
 
 		/**
-		 * The meta object literal for the '<em><b>Product</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Product</b></em>' reference feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference BUILD__PRODUCT = eINSTANCE.getBuild_Product();
 
 		/**
-		 * The meta object literal for the '<em><b>Label</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Label</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute BUILD__LABEL = eINSTANCE.getBuild_Label();
 
 		/**
-		 * The meta object literal for the '<em><b>Base</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Base</b></em>' reference feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference BUILD__BASE = eINSTANCE.getBuild_Base();
 
 		/**
-		 * The meta object literal for the '<em><b>Builder</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Builder</b></em>' reference feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference BUILD__BUILDER = eINSTANCE.getBuild_Builder();
 
 		/**
-		 * The meta object literal for the '<em><b>Date</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Date</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute BUILD__DATE = eINSTANCE.getBuild_Date();
 
 		/**
-		 * The meta object literal for the '<em><b>Time</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Time</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute BUILD__TIME = eINSTANCE.getBuild_Time();
 
 		/**
-		 * The meta object literal for the '<em><b>Compiler</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Compiler</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference BUILD__COMPILER = eINSTANCE.getBuild_Compiler();
 
 		/**
-		 * The meta object literal for the '<em><b>Launch VM</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Launch VM</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute BUILD__LAUNCH_VM = eINSTANCE.getBuild_LaunchVM();
 
 		/**
-		 * The meta object literal for the '<em><b>Promotion</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Promotion</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference BUILD__PROMOTION = eINSTANCE.getBuild_Promotion();
 
 		/**
-		 * The meta object literal for the '<em><b>Builder URL</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Builder URL</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute BUILD__BUILDER_URL = eINSTANCE.getBuild_BuilderURL();
 
 		/**
-		 * The meta object literal for the '<em><b>Buildmaster</b></em>' containment reference feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Buildmaster</b></em>' containment reference feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference BUILD__BUILDMASTER = eINSTANCE.getBuild_Buildmaster();
 
 		/**
-		 * The meta object literal for the '<em><b>Default Mail List</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Default Mail List</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference BUILD__DEFAULT_MAIL_LIST = eINSTANCE.getBuild_DefaultMailList();
 
 		/**
-		 * The meta object literal for the '<em><b>Sendmail</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Sendmail</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute BUILD__SENDMAIL = eINSTANCE.getBuild_Sendmail();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.RepositoryImpl <em>Repository</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.RepositoryImpl <em>Repository</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.impl.RepositoryImpl
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getRepository()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.impl.RepositoryImpl
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getRepository()
+     * @generated
+     */
 		EClass REPOSITORY = eINSTANCE.getRepository();
 
 		/**
-		 * The meta object literal for the '<em><b>Location</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Location</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute REPOSITORY__LOCATION = eINSTANCE.getRepository_Location();
 
 		/**
-		 * The meta object literal for the '<em><b>Label</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Label</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute REPOSITORY__LABEL = eINSTANCE.getRepository_Label();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.PlatformImpl <em>Platform</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.PlatformImpl <em>Platform</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.impl.PlatformImpl
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getPlatform()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.impl.PlatformImpl
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getPlatform()
+     * @generated
+     */
 		EClass PLATFORM = eINSTANCE.getPlatform();
 
 		/**
-		 * The meta object literal for the '<em><b>File</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>File</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute PLATFORM__FILE = eINSTANCE.getPlatform_File();
 
 		/**
-		 * The meta object literal for the '<em><b>Location</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Location</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute PLATFORM__LOCATION = eINSTANCE.getPlatform_Location();
 
 		/**
-		 * The meta object literal for the '<em><b>Config</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Config</b></em>' reference feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference PLATFORM__CONFIG = eINSTANCE.getPlatform_Config();
 
 		/**
-		 * The meta object literal for the '<em><b>Deltapack</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Deltapack</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute PLATFORM__DELTAPACK = eINSTANCE.getPlatform_Deltapack();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.ConfigImpl <em>Config</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.ConfigImpl <em>Config</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.impl.ConfigImpl
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getConfig()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.impl.ConfigImpl
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getConfig()
+     * @generated
+     */
 		EClass CONFIG = eINSTANCE.getConfig();
 
 		/**
-		 * The meta object literal for the '<em><b>Os</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Os</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute CONFIG__OS = eINSTANCE.getConfig_Os();
 
 		/**
-		 * The meta object literal for the '<em><b>Ws</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Ws</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute CONFIG__WS = eINSTANCE.getConfig_Ws();
 
 		/**
-		 * The meta object literal for the '<em><b>Arch</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Arch</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute CONFIG__ARCH = eINSTANCE.getConfig_Arch();
 
 		/**
-		 * The meta object literal for the '<em><b>Archive Format</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Archive Format</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute CONFIG__ARCHIVE_FORMAT = eINSTANCE.getConfig_ArchiveFormat();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.MapImpl <em>Map</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.MapImpl <em>Map</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.impl.MapImpl
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getMap()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.impl.MapImpl
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getMap()
+     * @generated
+     */
 		EClass MAP = eINSTANCE.getMap();
 
 		/**
-		 * The meta object literal for the '<em><b>Root</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Root</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute MAP__ROOT = eINSTANCE.getMap_Root();
 
 		/**
-		 * The meta object literal for the '<em><b>Repo</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Repo</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute MAP__REPO = eINSTANCE.getMap_Repo();
 
 		/**
-		 * The meta object literal for the '<em><b>Tag</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Tag</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute MAP__TAG = eINSTANCE.getMap_Tag();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.CategoryImpl <em>Category</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.CategoryImpl <em>Category</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.impl.CategoryImpl
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getCategory()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.impl.CategoryImpl
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getCategory()
+     * @generated
+     */
 		EClass CATEGORY = eINSTANCE.getCategory();
 
 		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute CATEGORY__NAME = eINSTANCE.getCategory_Name();
 
 		/**
-		 * The meta object literal for the '<em><b>Label</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Label</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute CATEGORY__LABEL = eINSTANCE.getCategory_Label();
 
 		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute CATEGORY__DESCRIPTION = eINSTANCE.getCategory_Description();
 
 		/**
-		 * The meta object literal for the '<em><b>Features</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Features</b></em>' reference list feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference CATEGORY__FEATURES = eINSTANCE.getCategory_Features();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.ContributionImpl <em>Contribution</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.ContributionImpl <em>Contribution</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.impl.ContributionImpl
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getContribution()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.impl.ContributionImpl
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getContribution()
+     * @generated
+     */
 		EClass CONTRIBUTION = eINSTANCE.getContribution();
 
 		/**
-		 * The meta object literal for the '<em><b>Contacts</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Contacts</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference CONTRIBUTION__CONTACTS = eINSTANCE.getContribution_Contacts();
 
 		/**
-		 * The meta object literal for the '<em><b>Features</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Features</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference CONTRIBUTION__FEATURES = eINSTANCE.getContribution_Features();
 
 		/**
-		 * The meta object literal for the '<em><b>Label</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Label</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute CONTRIBUTION__LABEL = eINSTANCE.getContribution_Label();
 
 		/**
-		 * The meta object literal for the '<em><b>Repositories</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Repositories</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference CONTRIBUTION__REPOSITORIES = eINSTANCE.getContribution_Repositories();
 
 		/**
-		 * The meta object literal for the '<em><b>Bundles</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Bundles</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference CONTRIBUTION__BUNDLES = eINSTANCE.getContribution_Bundles();
 
 		/**
-		 * The meta object literal for the '<em><b>Products</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Products</b></em>' containment reference list feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference CONTRIBUTION__PRODUCTS = eINSTANCE.getContribution_Products();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.ContactImpl <em>Contact</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.ContactImpl <em>Contact</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.impl.ContactImpl
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getContact()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.impl.ContactImpl
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getContact()
+     * @generated
+     */
 		EClass CONTACT = eINSTANCE.getContact();
 
 		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute CONTACT__NAME = eINSTANCE.getContact_Name();
 
 		/**
-		 * The meta object literal for the '<em><b>Email</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Email</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute CONTACT__EMAIL = eINSTANCE.getContact_Email();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.FeatureImpl <em>Feature</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.FeatureImpl <em>Feature</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.impl.FeatureImpl
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getFeature()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.impl.FeatureImpl
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getFeature()
+     * @generated
+     */
 		EClass FEATURE = eINSTANCE.getFeature();
 
 		/**
-		 * The meta object literal for the '<em><b>Category</b></em>' reference list feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Category</b></em>' reference list feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference FEATURE__CATEGORY = eINSTANCE.getFeature_Category();
 
 		/**
-		 * The meta object literal for the '<em><b>In Product</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>In Product</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute FEATURE__IN_PRODUCT = eINSTANCE.getFeature_InProduct();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.BundleImpl <em>Bundle</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.BundleImpl <em>Bundle</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.impl.BundleImpl
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getBundle()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.impl.BundleImpl
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getBundle()
+     * @generated
+     */
 		EClass BUNDLE = eINSTANCE.getBundle();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.CompilerImpl <em>Compiler</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.CompilerImpl <em>Compiler</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.impl.CompilerImpl
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getCompiler()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.impl.CompilerImpl
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getCompiler()
+     * @generated
+     */
 		EClass COMPILER = eINSTANCE.getCompiler();
 
 		/**
-		 * The meta object literal for the '<em><b>Args</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Args</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute COMPILER__ARGS = eINSTANCE.getCompiler_Args();
 
 		/**
-		 * The meta object literal for the '<em><b>Source Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Source Version</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute COMPILER__SOURCE_VERSION = eINSTANCE.getCompiler_SourceVersion();
 
 		/**
-		 * The meta object literal for the '<em><b>Target Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Target Version</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute COMPILER__TARGET_VERSION = eINSTANCE.getCompiler_TargetVersion();
 
 		/**
-		 * The meta object literal for the '<em><b>Verbose</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Verbose</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute COMPILER__VERBOSE = eINSTANCE.getCompiler_Verbose();
 
 		/**
-		 * The meta object literal for the '<em><b>Fail On Error</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Fail On Error</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute COMPILER__FAIL_ON_ERROR = eINSTANCE.getCompiler_FailOnError();
 
 		/**
-		 * The meta object literal for the '<em><b>Debug Info</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Debug Info</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute COMPILER__DEBUG_INFO = eINSTANCE.getCompiler_DebugInfo();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.PromotionImpl <em>Promotion</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.PromotionImpl <em>Promotion</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.impl.PromotionImpl
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getPromotion()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.impl.PromotionImpl
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getPromotion()
+     * @generated
+     */
 		EClass PROMOTION = eINSTANCE.getPromotion();
 
 		/**
-		 * The meta object literal for the '<em><b>Upload Directory</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Upload Directory</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute PROMOTION__UPLOAD_DIRECTORY = eINSTANCE.getPromotion_UploadDirectory();
 
 		/**
-		 * The meta object literal for the '<em><b>Download Directory</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Download Directory</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute PROMOTION__DOWNLOAD_DIRECTORY = eINSTANCE.getPromotion_DownloadDirectory();
 
 		/**
-		 * The meta object literal for the '<em><b>Incubating</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Incubating</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute PROMOTION__INCUBATING = eINSTANCE.getPromotion_Incubating();
 
 		/**
-		 * The meta object literal for the '<em><b>Base URL</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Base URL</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute PROMOTION__BASE_URL = eINSTANCE.getPromotion_BaseURL();
 
 		/**
-		 * The meta object literal for the '<em><b>Build Alias</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Build Alias</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute PROMOTION__BUILD_ALIAS = eINSTANCE.getPromotion_BuildAlias();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.InstallationUnitImpl <em>Installation Unit</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.InstallationUnitImpl <em>Installation Unit</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.impl.InstallationUnitImpl
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getInstallationUnit()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.impl.InstallationUnitImpl
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getInstallationUnit()
+     * @generated
+     */
 		EClass INSTALLATION_UNIT = eINSTANCE.getInstallationUnit();
 
 		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute INSTALLATION_UNIT__ID = eINSTANCE.getInstallationUnit_Id();
 
 		/**
-		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EAttribute INSTALLATION_UNIT__VERSION = eINSTANCE.getInstallationUnit_Version();
 
 		/**
-		 * The meta object literal for the '<em><b>Repo</b></em>' reference feature.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '<em><b>Repo</b></em>' reference feature.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		EReference INSTALLATION_UNIT__REPO = eINSTANCE.getInstallationUnit_Repo();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.ProductImpl <em>Product</em>}' class.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.impl.ProductImpl <em>Product</em>}' class.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.impl.ProductImpl
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getProduct()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.impl.ProductImpl
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getProduct()
+     * @generated
+     */
 		EClass PRODUCT = eINSTANCE.getProduct();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.BuildType <em>Type</em>}' enum.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.BuildType <em>Type</em>}' enum.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.BuildType
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getBuildType()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.BuildType
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getBuildType()
+     * @generated
+     */
 		EEnum BUILD_TYPE = eINSTANCE.getBuildType();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.OS <em>OS</em>}' enum.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.OS <em>OS</em>}' enum.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.OS
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getOS()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.OS
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getOS()
+     * @generated
+     */
 		EEnum OS = eINSTANCE.getOS();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.WS <em>WS</em>}' enum.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.WS <em>WS</em>}' enum.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.WS
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getWS()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.WS
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getWS()
+     * @generated
+     */
 		EEnum WS = eINSTANCE.getWS();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.ARCH <em>ARCH</em>}' enum.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.ARCH <em>ARCH</em>}' enum.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.ARCH
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getARCH()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.ARCH
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getARCH()
+     * @generated
+     */
 		EEnum ARCH = eINSTANCE.getARCH();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.ArchiveFormat <em>Archive Format</em>}' enum.
-		 * <!-- begin-user-doc -->
+     * The meta object literal for the '{@link org.eclipse.amalgam.releng.build.ArchiveFormat <em>Archive Format</em>}' enum.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.amalgam.releng.build.ArchiveFormat
-		 * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getArchiveFormat()
-		 * @generated
-		 */
+     * @see org.eclipse.amalgam.releng.build.ArchiveFormat
+     * @see org.eclipse.amalgam.releng.build.impl.BuildPackageImpl#getArchiveFormat()
+     * @generated
+     */
 		EEnum ARCHIVE_FORMAT = eINSTANCE.getArchiveFormat();
 
 	}
Index: src/org/eclipse/amalgam/releng/build/BuildType.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/BuildType.java,v
retrieving revision 1.1
diff -u -r1.1 BuildType.java
--- src/org/eclipse/amalgam/releng/build/BuildType.java	24 Nov 2008 20:36:44 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/BuildType.java	6 Jun 2010 14:35:27 -0000
@@ -30,298 +30,304 @@
  */
 public enum BuildType implements Enumerator {
 	/**
-	 * The '<em><b>Continuous</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Continuous</b></em>' literal object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #CONTINUOUS_VALUE
-	 * @generated
-	 * @ordered
-	 */
+   * @see #CONTINUOUS_VALUE
+   * @generated
+   * @ordered
+   */
 	CONTINUOUS(0, "Continuous", "C"),
 
 	/**
-	 * The '<em><b>Nightly</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Nightly</b></em>' literal object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #NIGHTLY_VALUE
-	 * @generated
-	 * @ordered
-	 */
+   * @see #NIGHTLY_VALUE
+   * @generated
+   * @ordered
+   */
 	NIGHTLY(1, "Nightly", "N"),
 
 	/**
-	 * The '<em><b>Integration</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Integration</b></em>' literal object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #INTEGRATION_VALUE
-	 * @generated
-	 * @ordered
-	 */
+   * @see #INTEGRATION_VALUE
+   * @generated
+   * @ordered
+   */
 	INTEGRATION(2, "Integration", "I"),
 
 	/**
-	 * The '<em><b>Stable</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Stable</b></em>' literal object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #STABLE_VALUE
-	 * @generated
-	 * @ordered
-	 */
+   * @see #STABLE_VALUE
+   * @generated
+   * @ordered
+   */
 	STABLE(3, "Stable", "S"),
 
 	/**
-	 * The '<em><b>Release</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Release</b></em>' literal object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #RELEASE_VALUE
-	 * @generated
-	 * @ordered
-	 */
+   * @see #RELEASE_VALUE
+   * @generated
+   * @ordered
+   */
 	RELEASE(4, "Release", "R"),
 
 	/**
-	 * The '<em><b>Maintenance</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Maintenance</b></em>' literal object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #MAINTENANCE_VALUE
-	 * @generated
-	 * @ordered
-	 */
+   * @see #MAINTENANCE_VALUE
+   * @generated
+   * @ordered
+   */
 	MAINTENANCE(5, "Maintenance", "M");
 
 	/**
-	 * The '<em><b>Continuous</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Continuous</b></em>' literal value.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Continuous</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #CONTINUOUS
-	 * @model name="Continuous" literal="C"
-	 * @generated
-	 * @ordered
-	 */
+   * @see #CONTINUOUS
+   * @model name="Continuous" literal="C"
+   * @generated
+   * @ordered
+   */
 	public static final int CONTINUOUS_VALUE = 0;
 
 	/**
-	 * The '<em><b>Nightly</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Nightly</b></em>' literal value.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Nightly</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #NIGHTLY
-	 * @model name="Nightly" literal="N"
-	 * @generated
-	 * @ordered
-	 */
+   * @see #NIGHTLY
+   * @model name="Nightly" literal="N"
+   * @generated
+   * @ordered
+   */
 	public static final int NIGHTLY_VALUE = 1;
 
 	/**
-	 * The '<em><b>Integration</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Integration</b></em>' literal value.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Integration</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #INTEGRATION
-	 * @model name="Integration" literal="I"
-	 * @generated
-	 * @ordered
-	 */
+   * @see #INTEGRATION
+   * @model name="Integration" literal="I"
+   * @generated
+   * @ordered
+   */
 	public static final int INTEGRATION_VALUE = 2;
 
 	/**
-	 * The '<em><b>Stable</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Stable</b></em>' literal value.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Stable</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #STABLE
-	 * @model name="Stable" literal="S"
-	 * @generated
-	 * @ordered
-	 */
+   * @see #STABLE
+   * @model name="Stable" literal="S"
+   * @generated
+   * @ordered
+   */
 	public static final int STABLE_VALUE = 3;
 
 	/**
-	 * The '<em><b>Release</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Release</b></em>' literal value.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Release</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #RELEASE
-	 * @model name="Release" literal="R"
-	 * @generated
-	 * @ordered
-	 */
+   * @see #RELEASE
+   * @model name="Release" literal="R"
+   * @generated
+   * @ordered
+   */
 	public static final int RELEASE_VALUE = 4;
 
 	/**
-	 * The '<em><b>Maintenance</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Maintenance</b></em>' literal value.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Maintenance</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #MAINTENANCE
-	 * @model name="Maintenance" literal="M"
-	 * @generated
-	 * @ordered
-	 */
+   * @see #MAINTENANCE
+   * @model name="Maintenance" literal="M"
+   * @generated
+   * @ordered
+   */
 	public static final int MAINTENANCE_VALUE = 5;
 
 	/**
-	 * An array of all the '<em><b>Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
+   * An array of all the '<em><b>Type</b></em>' enumerators.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private static final BuildType[] VALUES_ARRAY =
-		new BuildType[] {
-			CONTINUOUS,
-			NIGHTLY,
-			INTEGRATION,
-			STABLE,
-			RELEASE,
-			MAINTENANCE,
-		};
+		new BuildType[]
+    {
+      CONTINUOUS,
+      NIGHTLY,
+      INTEGRATION,
+      STABLE,
+      RELEASE,
+      MAINTENANCE,
+    };
 
 	/**
-	 * A public read-only list of all the '<em><b>Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
+   * A public read-only list of all the '<em><b>Type</b></em>' enumerators.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static final List<BuildType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
+   * Returns the '<em><b>Type</b></em>' literal with the specified literal value.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static BuildType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			BuildType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      BuildType result = VALUES_ARRAY[i];
+      if (result.toString().equals(literal))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
 
 	/**
-	 * Returns the '<em><b>Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
+   * Returns the '<em><b>Type</b></em>' literal with the specified name.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static BuildType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			BuildType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      BuildType result = VALUES_ARRAY[i];
+      if (result.getName().equals(name))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
 
 	/**
-	 * Returns the '<em><b>Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
+   * Returns the '<em><b>Type</b></em>' literal with the specified integer value.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static BuildType get(int value) {
-		switch (value) {
-			case CONTINUOUS_VALUE: return CONTINUOUS;
-			case NIGHTLY_VALUE: return NIGHTLY;
-			case INTEGRATION_VALUE: return INTEGRATION;
-			case STABLE_VALUE: return STABLE;
-			case RELEASE_VALUE: return RELEASE;
-			case MAINTENANCE_VALUE: return MAINTENANCE;
-		}
-		return null;
-	}
+    switch (value)
+    {
+      case CONTINUOUS_VALUE: return CONTINUOUS;
+      case NIGHTLY_VALUE: return NIGHTLY;
+      case INTEGRATION_VALUE: return INTEGRATION;
+      case STABLE_VALUE: return STABLE;
+      case RELEASE_VALUE: return RELEASE;
+      case MAINTENANCE_VALUE: return MAINTENANCE;
+    }
+    return null;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
+   * Only this class can construct instances.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private BuildType(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
+    this.value = value;
+    this.name = name;
+    this.literal = literal;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public int getValue() {
-	  return value;
-	}
+    return value;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getName() {
-	  return name;
-	}
+    return name;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getLiteral() {
-	  return literal;
-	}
+    return literal;
+  }
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
+   * Returns the literal value of the enumerator, which is its string representation.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String toString() {
-		return literal;
-	}
+    return literal;
+  }
 	
 } //BuildType
Index: src/org/eclipse/amalgam/releng/build/Category.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/Category.java,v
retrieving revision 1.1
diff -u -r1.1 Category.java
--- src/org/eclipse/amalgam/releng/build/Category.java	24 Nov 2008 20:36:44 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/Category.java	6 Jun 2010 14:35:27 -0000
@@ -38,99 +38,99 @@
  */
 public interface Category extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getCategory_Name()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getCategory_Name()
+   * @model
+   * @generated
+   */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Category#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Category#getName <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
 	void setName(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Label</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Label</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Label</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Label</em>' attribute.
-	 * @see #setLabel(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getCategory_Label()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Label</em>' attribute.
+   * @see #setLabel(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getCategory_Label()
+   * @model
+   * @generated
+   */
 	String getLabel();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Category#getLabel <em>Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Category#getLabel <em>Label</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Label</em>' attribute.
-	 * @see #getLabel()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Label</em>' attribute.
+   * @see #getLabel()
+   * @generated
+   */
 	void setLabel(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Description</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getCategory_Description()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Description</em>' attribute.
+   * @see #setDescription(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getCategory_Description()
+   * @model
+   * @generated
+   */
 	String getDescription();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Category#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Category#getDescription <em>Description</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Description</em>' attribute.
+   * @see #getDescription()
+   * @generated
+   */
 	void setDescription(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Features</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.amalgam.releng.build.Feature}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.amalgam.releng.build.Feature#getCategory <em>Category</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Features</b></em>' reference list.
+   * The list contents are of type {@link org.eclipse.amalgam.releng.build.Feature}.
+   * It is bidirectional and its opposite is '{@link org.eclipse.amalgam.releng.build.Feature#getCategory <em>Category</em>}'.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Features</em>' reference list isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Features</em>' reference list.
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getCategory_Features()
-	 * @see org.eclipse.amalgam.releng.build.Feature#getCategory
-	 * @model opposite="category"
-	 * @generated
-	 */
+   * @return the value of the '<em>Features</em>' reference list.
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getCategory_Features()
+   * @see org.eclipse.amalgam.releng.build.Feature#getCategory
+   * @model opposite="category"
+   * @generated
+   */
 	EList<Feature> getFeatures();
 
 } // Category
Index: src/org/eclipse/amalgam/releng/build/Compiler.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/Compiler.java,v
retrieving revision 1.1
diff -u -r1.1 Compiler.java
--- src/org/eclipse/amalgam/releng/build/Compiler.java	24 Nov 2008 20:36:44 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/Compiler.java	6 Jun 2010 14:35:27 -0000
@@ -38,164 +38,164 @@
  */
 public interface Compiler extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Args</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Args</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Args</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Args</em>' attribute.
-	 * @see #setArgs(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getCompiler_Args()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Args</em>' attribute.
+   * @see #setArgs(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getCompiler_Args()
+   * @model
+   * @generated
+   */
 	String getArgs();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Compiler#getArgs <em>Args</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Compiler#getArgs <em>Args</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Args</em>' attribute.
-	 * @see #getArgs()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Args</em>' attribute.
+   * @see #getArgs()
+   * @generated
+   */
 	void setArgs(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Source Version</b></em>' attribute.
-	 * The default value is <code>"1.5"</code>.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Source Version</b></em>' attribute.
+   * The default value is <code>"1.5"</code>.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Source Version</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Source Version</em>' attribute.
-	 * @see #setSourceVersion(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getCompiler_SourceVersion()
-	 * @model default="1.5"
-	 * @generated
-	 */
+   * @return the value of the '<em>Source Version</em>' attribute.
+   * @see #setSourceVersion(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getCompiler_SourceVersion()
+   * @model default="1.5"
+   * @generated
+   */
 	String getSourceVersion();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Compiler#getSourceVersion <em>Source Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Compiler#getSourceVersion <em>Source Version</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source Version</em>' attribute.
-	 * @see #getSourceVersion()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Source Version</em>' attribute.
+   * @see #getSourceVersion()
+   * @generated
+   */
 	void setSourceVersion(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Target Version</b></em>' attribute.
-	 * The default value is <code>"1.5"</code>.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Target Version</b></em>' attribute.
+   * The default value is <code>"1.5"</code>.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Target Version</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Target Version</em>' attribute.
-	 * @see #setTargetVersion(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getCompiler_TargetVersion()
-	 * @model default="1.5"
-	 * @generated
-	 */
+   * @return the value of the '<em>Target Version</em>' attribute.
+   * @see #setTargetVersion(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getCompiler_TargetVersion()
+   * @model default="1.5"
+   * @generated
+   */
 	String getTargetVersion();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Compiler#getTargetVersion <em>Target Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Compiler#getTargetVersion <em>Target Version</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Version</em>' attribute.
-	 * @see #getTargetVersion()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Target Version</em>' attribute.
+   * @see #getTargetVersion()
+   * @generated
+   */
 	void setTargetVersion(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Verbose</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Verbose</b></em>' attribute.
+   * The default value is <code>"false"</code>.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Verbose</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Verbose</em>' attribute.
-	 * @see #setVerbose(boolean)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getCompiler_Verbose()
-	 * @model default="false"
-	 * @generated
-	 */
+   * @return the value of the '<em>Verbose</em>' attribute.
+   * @see #setVerbose(boolean)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getCompiler_Verbose()
+   * @model default="false"
+   * @generated
+   */
 	boolean isVerbose();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Compiler#isVerbose <em>Verbose</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Compiler#isVerbose <em>Verbose</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Verbose</em>' attribute.
-	 * @see #isVerbose()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Verbose</em>' attribute.
+   * @see #isVerbose()
+   * @generated
+   */
 	void setVerbose(boolean value);
 
 	/**
-	 * Returns the value of the '<em><b>Fail On Error</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Fail On Error</b></em>' attribute.
+   * The default value is <code>"false"</code>.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Fail On Error</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Fail On Error</em>' attribute.
-	 * @see #setFailOnError(boolean)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getCompiler_FailOnError()
-	 * @model default="false"
-	 * @generated
-	 */
+   * @return the value of the '<em>Fail On Error</em>' attribute.
+   * @see #setFailOnError(boolean)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getCompiler_FailOnError()
+   * @model default="false"
+   * @generated
+   */
 	boolean isFailOnError();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Compiler#isFailOnError <em>Fail On Error</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Compiler#isFailOnError <em>Fail On Error</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fail On Error</em>' attribute.
-	 * @see #isFailOnError()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Fail On Error</em>' attribute.
+   * @see #isFailOnError()
+   * @generated
+   */
 	void setFailOnError(boolean value);
 
 	/**
-	 * Returns the value of the '<em><b>Debug Info</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Debug Info</b></em>' attribute.
+   * The default value is <code>"true"</code>.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Debug Info</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Debug Info</em>' attribute.
-	 * @see #setDebugInfo(boolean)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getCompiler_DebugInfo()
-	 * @model default="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Debug Info</em>' attribute.
+   * @see #setDebugInfo(boolean)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getCompiler_DebugInfo()
+   * @model default="true"
+   * @generated
+   */
 	boolean isDebugInfo();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Compiler#isDebugInfo <em>Debug Info</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Compiler#isDebugInfo <em>Debug Info</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Debug Info</em>' attribute.
-	 * @see #isDebugInfo()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Debug Info</em>' attribute.
+   * @see #isDebugInfo()
+   * @generated
+   */
 	void setDebugInfo(boolean value);
 
 } // Compiler
Index: src/org/eclipse/amalgam/releng/build/Config.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/Config.java,v
retrieving revision 1.1
diff -u -r1.1 Config.java
--- src/org/eclipse/amalgam/releng/build/Config.java	24 Nov 2008 20:36:44 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/Config.java	6 Jun 2010 14:35:27 -0000
@@ -36,120 +36,120 @@
  */
 public interface Config extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Os</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.amalgam.releng.build.OS}.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Os</b></em>' attribute.
+   * The literals are from the enumeration {@link org.eclipse.amalgam.releng.build.OS}.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Os</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Os</em>' attribute.
-	 * @see org.eclipse.amalgam.releng.build.OS
-	 * @see #setOs(OS)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getConfig_Os()
-	 * @model required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Os</em>' attribute.
+   * @see org.eclipse.amalgam.releng.build.OS
+   * @see #setOs(OS)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getConfig_Os()
+   * @model required="true"
+   * @generated
+   */
 	OS getOs();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Config#getOs <em>Os</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Config#getOs <em>Os</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Os</em>' attribute.
-	 * @see org.eclipse.amalgam.releng.build.OS
-	 * @see #getOs()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Os</em>' attribute.
+   * @see org.eclipse.amalgam.releng.build.OS
+   * @see #getOs()
+   * @generated
+   */
 	void setOs(OS value);
 
 	/**
-	 * Returns the value of the '<em><b>Ws</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.amalgam.releng.build.WS}.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Ws</b></em>' attribute.
+   * The literals are from the enumeration {@link org.eclipse.amalgam.releng.build.WS}.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Ws</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ws</em>' attribute.
-	 * @see org.eclipse.amalgam.releng.build.WS
-	 * @see #setWs(WS)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getConfig_Ws()
-	 * @model required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Ws</em>' attribute.
+   * @see org.eclipse.amalgam.releng.build.WS
+   * @see #setWs(WS)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getConfig_Ws()
+   * @model required="true"
+   * @generated
+   */
 	WS getWs();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Config#getWs <em>Ws</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Config#getWs <em>Ws</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ws</em>' attribute.
-	 * @see org.eclipse.amalgam.releng.build.WS
-	 * @see #getWs()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Ws</em>' attribute.
+   * @see org.eclipse.amalgam.releng.build.WS
+   * @see #getWs()
+   * @generated
+   */
 	void setWs(WS value);
 
 	/**
-	 * Returns the value of the '<em><b>Arch</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.amalgam.releng.build.ARCH}.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Arch</b></em>' attribute.
+   * The literals are from the enumeration {@link org.eclipse.amalgam.releng.build.ARCH}.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Arch</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Arch</em>' attribute.
-	 * @see org.eclipse.amalgam.releng.build.ARCH
-	 * @see #setArch(ARCH)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getConfig_Arch()
-	 * @model required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Arch</em>' attribute.
+   * @see org.eclipse.amalgam.releng.build.ARCH
+   * @see #setArch(ARCH)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getConfig_Arch()
+   * @model required="true"
+   * @generated
+   */
 	ARCH getArch();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Config#getArch <em>Arch</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Config#getArch <em>Arch</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Arch</em>' attribute.
-	 * @see org.eclipse.amalgam.releng.build.ARCH
-	 * @see #getArch()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Arch</em>' attribute.
+   * @see org.eclipse.amalgam.releng.build.ARCH
+   * @see #getArch()
+   * @generated
+   */
 	void setArch(ARCH value);
 
 	/**
-	 * Returns the value of the '<em><b>Archive Format</b></em>' attribute.
-	 * The default value is <code>"tar.gz"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.amalgam.releng.build.ArchiveFormat}.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Archive Format</b></em>' attribute.
+   * The default value is <code>"tar.gz"</code>.
+   * The literals are from the enumeration {@link org.eclipse.amalgam.releng.build.ArchiveFormat}.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Archive Format</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Archive Format</em>' attribute.
-	 * @see org.eclipse.amalgam.releng.build.ArchiveFormat
-	 * @see #setArchiveFormat(ArchiveFormat)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getConfig_ArchiveFormat()
-	 * @model default="tar.gz"
-	 * @generated
-	 */
+   * @return the value of the '<em>Archive Format</em>' attribute.
+   * @see org.eclipse.amalgam.releng.build.ArchiveFormat
+   * @see #setArchiveFormat(ArchiveFormat)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getConfig_ArchiveFormat()
+   * @model default="tar.gz"
+   * @generated
+   */
 	ArchiveFormat getArchiveFormat();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Config#getArchiveFormat <em>Archive Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Config#getArchiveFormat <em>Archive Format</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Archive Format</em>' attribute.
-	 * @see org.eclipse.amalgam.releng.build.ArchiveFormat
-	 * @see #getArchiveFormat()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Archive Format</em>' attribute.
+   * @see org.eclipse.amalgam.releng.build.ArchiveFormat
+   * @see #getArchiveFormat()
+   * @generated
+   */
 	void setArchiveFormat(ArchiveFormat value);
 
 } // Config
Index: src/org/eclipse/amalgam/releng/build/Contact.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/Contact.java,v
retrieving revision 1.1
diff -u -r1.1 Contact.java
--- src/org/eclipse/amalgam/releng/build/Contact.java	24 Nov 2008 20:36:44 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/Contact.java	6 Jun 2010 14:35:27 -0000
@@ -34,55 +34,55 @@
  */
 public interface Contact extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getContact_Name()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getContact_Name()
+   * @model
+   * @generated
+   */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Contact#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Contact#getName <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
 	void setName(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Email</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Email</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Email</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Email</em>' attribute.
-	 * @see #setEmail(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getContact_Email()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Email</em>' attribute.
+   * @see #setEmail(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getContact_Email()
+   * @model
+   * @generated
+   */
 	String getEmail();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Contact#getEmail <em>Email</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Contact#getEmail <em>Email</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Email</em>' attribute.
-	 * @see #getEmail()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Email</em>' attribute.
+   * @see #getEmail()
+   * @generated
+   */
 	void setEmail(String value);
 
 } // Contact
Index: src/org/eclipse/amalgam/releng/build/Contribution.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/Contribution.java,v
retrieving revision 1.3
diff -u -r1.3 Contribution.java
--- src/org/eclipse/amalgam/releng/build/Contribution.java	21 May 2009 12:57:50 -0000	1.3
+++ src/org/eclipse/amalgam/releng/build/Contribution.java	6 Jun 2010 14:35:27 -0000
@@ -40,109 +40,109 @@
  */
 public interface Contribution extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Contacts</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.amalgam.releng.build.Contact}.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Contacts</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.amalgam.releng.build.Contact}.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Contacts</em>' containment reference list isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Contacts</em>' containment reference list.
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getContribution_Contacts()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Contacts</em>' containment reference list.
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getContribution_Contacts()
+   * @model containment="true" resolveProxies="true"
+   * @generated
+   */
 	EList<Contact> getContacts();
 
 	/**
-	 * Returns the value of the '<em><b>Features</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.amalgam.releng.build.Feature}.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Features</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.amalgam.releng.build.Feature}.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Features</em>' containment reference list isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Features</em>' containment reference list.
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getContribution_Features()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Features</em>' containment reference list.
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getContribution_Features()
+   * @model containment="true" resolveProxies="true"
+   * @generated
+   */
 	EList<Feature> getFeatures();
 
 	/**
-	 * Returns the value of the '<em><b>Label</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Label</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Label</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Label</em>' attribute.
-	 * @see #setLabel(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getContribution_Label()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Label</em>' attribute.
+   * @see #setLabel(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getContribution_Label()
+   * @model
+   * @generated
+   */
 	String getLabel();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Contribution#getLabel <em>Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Contribution#getLabel <em>Label</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Label</em>' attribute.
-	 * @see #getLabel()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Label</em>' attribute.
+   * @see #getLabel()
+   * @generated
+   */
 	void setLabel(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Repositories</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.amalgam.releng.build.Repository}.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Repositories</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.amalgam.releng.build.Repository}.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Repositories</em>' containment reference list isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Repositories</em>' containment reference list.
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getContribution_Repositories()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Repositories</em>' containment reference list.
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getContribution_Repositories()
+   * @model containment="true" resolveProxies="true"
+   * @generated
+   */
 	EList<Repository> getRepositories();
 
 	/**
-	 * Returns the value of the '<em><b>Bundles</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.amalgam.releng.build.Bundle}.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Bundles</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.amalgam.releng.build.Bundle}.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Bundles</em>' containment reference list isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Bundles</em>' containment reference list.
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getContribution_Bundles()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Bundles</em>' containment reference list.
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getContribution_Bundles()
+   * @model containment="true" resolveProxies="true"
+   * @generated
+   */
 	EList<Bundle> getBundles();
 
 	/**
-	 * Returns the value of the '<em><b>Products</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.amalgam.releng.build.Product}.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Products</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.amalgam.releng.build.Product}.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Products</em>' containment reference list isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Products</em>' containment reference list.
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getContribution_Products()
-	 * @model containment="true" resolveProxies="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Products</em>' containment reference list.
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getContribution_Products()
+   * @model containment="true" resolveProxies="true"
+   * @generated
+   */
 	EList<Product> getProducts();
 
 } // Contribution
Index: src/org/eclipse/amalgam/releng/build/Feature.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/Feature.java,v
retrieving revision 1.3
diff -u -r1.3 Feature.java
--- src/org/eclipse/amalgam/releng/build/Feature.java	20 May 2009 18:12:35 -0000	1.3
+++ src/org/eclipse/amalgam/releng/build/Feature.java	6 Jun 2010 14:35:27 -0000
@@ -35,48 +35,48 @@
  */
 public interface Feature extends InstallationUnit {
 	/**
-	 * Returns the value of the '<em><b>Category</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.amalgam.releng.build.Category}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.amalgam.releng.build.Category#getFeatures <em>Features</em>}'.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Category</b></em>' reference list.
+   * The list contents are of type {@link org.eclipse.amalgam.releng.build.Category}.
+   * It is bidirectional and its opposite is '{@link org.eclipse.amalgam.releng.build.Category#getFeatures <em>Features</em>}'.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Category</em>' reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Category</em>' reference list.
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getFeature_Category()
-	 * @see org.eclipse.amalgam.releng.build.Category#getFeatures
-	 * @model opposite="features"
-	 * @generated
-	 */
+   * @return the value of the '<em>Category</em>' reference list.
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getFeature_Category()
+   * @see org.eclipse.amalgam.releng.build.Category#getFeatures
+   * @model opposite="features"
+   * @generated
+   */
 	EList<Category> getCategory();
 
 	/**
-	 * Returns the value of the '<em><b>In Product</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>In Product</b></em>' attribute.
+   * The default value is <code>"true"</code>.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>In Product</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>In Product</em>' attribute.
-	 * @see #setInProduct(boolean)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getFeature_InProduct()
-	 * @model default="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>In Product</em>' attribute.
+   * @see #setInProduct(boolean)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getFeature_InProduct()
+   * @model default="true"
+   * @generated
+   */
 	boolean isInProduct();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Feature#isInProduct <em>In Product</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Feature#isInProduct <em>In Product</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>In Product</em>' attribute.
-	 * @see #isInProduct()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>In Product</em>' attribute.
+   * @see #isInProduct()
+   * @generated
+   */
 	void setInProduct(boolean value);
 
 } // Feature
Index: src/org/eclipse/amalgam/releng/build/InstallationUnit.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/InstallationUnit.java,v
retrieving revision 1.1
diff -u -r1.1 InstallationUnit.java
--- src/org/eclipse/amalgam/releng/build/InstallationUnit.java	20 May 2009 18:12:35 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/InstallationUnit.java	6 Jun 2010 14:35:27 -0000
@@ -35,81 +35,81 @@
  */
 public interface InstallationUnit extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Id</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Id</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getInstallationUnit_Id()
-	 * @model required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Id</em>' attribute.
+   * @see #setId(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getInstallationUnit_Id()
+   * @model required="true"
+   * @generated
+   */
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.InstallationUnit#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.InstallationUnit#getId <em>Id</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Id</em>' attribute.
+   * @see #getId()
+   * @generated
+   */
 	void setId(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Version</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Version</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Version</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Version</em>' attribute.
-	 * @see #setVersion(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getInstallationUnit_Version()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Version</em>' attribute.
+   * @see #setVersion(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getInstallationUnit_Version()
+   * @model
+   * @generated
+   */
 	String getVersion();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.InstallationUnit#getVersion <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.InstallationUnit#getVersion <em>Version</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Version</em>' attribute.
-	 * @see #getVersion()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Version</em>' attribute.
+   * @see #getVersion()
+   * @generated
+   */
 	void setVersion(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Repo</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Repo</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Repo</em>' reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Repo</em>' reference.
-	 * @see #setRepo(Repository)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getInstallationUnit_Repo()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Repo</em>' reference.
+   * @see #setRepo(Repository)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getInstallationUnit_Repo()
+   * @model
+   * @generated
+   */
 	Repository getRepo();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.InstallationUnit#getRepo <em>Repo</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.InstallationUnit#getRepo <em>Repo</em>}' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Repo</em>' reference.
-	 * @see #getRepo()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Repo</em>' reference.
+   * @see #getRepo()
+   * @generated
+   */
 	void setRepo(Repository value);
 
 } // InstallationUnit
Index: src/org/eclipse/amalgam/releng/build/Map.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/Map.java,v
retrieving revision 1.1
diff -u -r1.1 Map.java
--- src/org/eclipse/amalgam/releng/build/Map.java	24 Nov 2008 20:36:44 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/Map.java	6 Jun 2010 14:35:27 -0000
@@ -35,81 +35,81 @@
  */
 public interface Map extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Root</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Root</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Root</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Root</em>' attribute.
-	 * @see #setRoot(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getMap_Root()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Root</em>' attribute.
+   * @see #setRoot(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getMap_Root()
+   * @model
+   * @generated
+   */
 	String getRoot();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Map#getRoot <em>Root</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Map#getRoot <em>Root</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Root</em>' attribute.
-	 * @see #getRoot()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Root</em>' attribute.
+   * @see #getRoot()
+   * @generated
+   */
 	void setRoot(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Repo</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Repo</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Repo</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Repo</em>' attribute.
-	 * @see #setRepo(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getMap_Repo()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Repo</em>' attribute.
+   * @see #setRepo(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getMap_Repo()
+   * @model
+   * @generated
+   */
 	String getRepo();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Map#getRepo <em>Repo</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Map#getRepo <em>Repo</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Repo</em>' attribute.
-	 * @see #getRepo()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Repo</em>' attribute.
+   * @see #getRepo()
+   * @generated
+   */
 	void setRepo(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Tag</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Tag</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Tag</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tag</em>' attribute.
-	 * @see #setTag(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getMap_Tag()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Tag</em>' attribute.
+   * @see #setTag(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getMap_Tag()
+   * @model
+   * @generated
+   */
 	String getTag();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Map#getTag <em>Tag</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Map#getTag <em>Tag</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Tag</em>' attribute.
-	 * @see #getTag()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Tag</em>' attribute.
+   * @see #getTag()
+   * @generated
+   */
 	void setTag(String value);
 
 } // Map
Index: src/org/eclipse/amalgam/releng/build/OS.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/OS.java,v
retrieving revision 1.1
diff -u -r1.1 OS.java
--- src/org/eclipse/amalgam/releng/build/OS.java	24 Nov 2008 20:36:44 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/OS.java	6 Jun 2010 14:35:28 -0000
@@ -30,217 +30,298 @@
  */
 public enum OS implements Enumerator {
 	/**
-	 * The '<em><b>Win32</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Win32</b></em>' literal object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #WIN32_VALUE
-	 * @generated
-	 * @ordered
-	 */
+   * @see #WIN32_VALUE
+   * @generated
+   * @ordered
+   */
 	WIN32(0, "win32", "win32"),
 
 	/**
-	 * The '<em><b>Linux</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Linux</b></em>' literal object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #LINUX_VALUE
-	 * @generated
-	 * @ordered
-	 */
+   * @see #LINUX_VALUE
+   * @generated
+   * @ordered
+   */
 	LINUX(1, "linux", "linux"),
 
 	/**
-	 * The '<em><b>Macosx</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Macosx</b></em>' literal object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #MACOSX_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	MACOSX(2, "macosx", "macosx");
+   * @see #MACOSX_VALUE
+   * @generated
+   * @ordered
+   */
+	MACOSX(2, "macosx", "macosx"), /**
+   * The '<em><b>Aix</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #AIX_VALUE
+   * @generated
+   * @ordered
+   */
+  AIX(3, "aix", "aix"), /**
+   * The '<em><b>Hpux</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #HPUX_VALUE
+   * @generated
+   * @ordered
+   */
+  HPUX(4, "hpux", "hpux"), /**
+   * The '<em><b>Solaris</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #SOLARIS_VALUE
+   * @generated
+   * @ordered
+   */
+  SOLARIS(5, "solaris", "solaris");
 
 	/**
-	 * The '<em><b>Win32</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Win32</b></em>' literal value.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Win32</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #WIN32
-	 * @model name="win32"
-	 * @generated
-	 * @ordered
-	 */
+   * @see #WIN32
+   * @model name="win32"
+   * @generated
+   * @ordered
+   */
 	public static final int WIN32_VALUE = 0;
 
 	/**
-	 * The '<em><b>Linux</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Linux</b></em>' literal value.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Linux</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #LINUX
-	 * @model name="linux"
-	 * @generated
-	 * @ordered
-	 */
+   * @see #LINUX
+   * @model name="linux"
+   * @generated
+   * @ordered
+   */
 	public static final int LINUX_VALUE = 1;
 
 	/**
-	 * The '<em><b>Macosx</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Macosx</b></em>' literal value.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Macosx</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #MACOSX
-	 * @model name="macosx"
-	 * @generated
-	 * @ordered
-	 */
+   * @see #MACOSX
+   * @model name="macosx"
+   * @generated
+   * @ordered
+   */
 	public static final int MACOSX_VALUE = 2;
 
 	/**
-	 * An array of all the '<em><b>OS</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Aix</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>Aix</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #AIX
+   * @model name="aix"
+   * @generated
+   * @ordered
+   */
+  public static final int AIX_VALUE = 3;
+
+  /**
+   * The '<em><b>Hpux</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>Hpux</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #HPUX
+   * @model name="hpux"
+   * @generated
+   * @ordered
+   */
+  public static final int HPUX_VALUE = 4;
+
+  /**
+   * The '<em><b>Solaris</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>Solaris</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #SOLARIS
+   * @model name="solaris"
+   * @generated
+   * @ordered
+   */
+  public static final int SOLARIS_VALUE = 5;
+
+  /**
+   * An array of all the '<em><b>OS</b></em>' enumerators.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private static final OS[] VALUES_ARRAY =
-		new OS[] {
-			WIN32,
-			LINUX,
-			MACOSX,
-		};
+		new OS[]
+    {
+      WIN32,
+      LINUX,
+      MACOSX,
+      AIX,
+      HPUX,
+      SOLARIS,
+    };
 
 	/**
-	 * A public read-only list of all the '<em><b>OS</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
+   * A public read-only list of all the '<em><b>OS</b></em>' enumerators.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static final List<OS> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>OS</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
+   * Returns the '<em><b>OS</b></em>' literal with the specified literal value.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static OS get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			OS result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      OS result = VALUES_ARRAY[i];
+      if (result.toString().equals(literal))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
 
 	/**
-	 * Returns the '<em><b>OS</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
+   * Returns the '<em><b>OS</b></em>' literal with the specified name.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static OS getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			OS result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      OS result = VALUES_ARRAY[i];
+      if (result.getName().equals(name))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
 
 	/**
-	 * Returns the '<em><b>OS</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
+   * Returns the '<em><b>OS</b></em>' literal with the specified integer value.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static OS get(int value) {
-		switch (value) {
-			case WIN32_VALUE: return WIN32;
-			case LINUX_VALUE: return LINUX;
-			case MACOSX_VALUE: return MACOSX;
-		}
-		return null;
-	}
+    switch (value)
+    {
+      case WIN32_VALUE: return WIN32;
+      case LINUX_VALUE: return LINUX;
+      case MACOSX_VALUE: return MACOSX;
+      case AIX_VALUE: return AIX;
+      case HPUX_VALUE: return HPUX;
+      case SOLARIS_VALUE: return SOLARIS;
+    }
+    return null;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
+   * Only this class can construct instances.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private OS(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
+    this.value = value;
+    this.name = name;
+    this.literal = literal;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public int getValue() {
-	  return value;
-	}
+    return value;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getName() {
-	  return name;
-	}
+    return name;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getLiteral() {
-	  return literal;
-	}
+    return literal;
+  }
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
+   * Returns the literal value of the enumerator, which is its string representation.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String toString() {
-		return literal;
-	}
+    return literal;
+  }
 	
 } //OS
Index: src/org/eclipse/amalgam/releng/build/Platform.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/Platform.java,v
retrieving revision 1.3
diff -u -r1.3 Platform.java
--- src/org/eclipse/amalgam/releng/build/Platform.java	30 Dec 2008 20:03:10 -0000	1.3
+++ src/org/eclipse/amalgam/releng/build/Platform.java	6 Jun 2010 14:35:28 -0000
@@ -36,107 +36,107 @@
  */
 public interface Platform extends EObject {
 	/**
-	 * Returns the value of the '<em><b>File</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>File</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>File</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>File</em>' attribute.
-	 * @see #setFile(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getPlatform_File()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>File</em>' attribute.
+   * @see #setFile(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getPlatform_File()
+   * @model
+   * @generated
+   */
 	String getFile();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Platform#getFile <em>File</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Platform#getFile <em>File</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>File</em>' attribute.
-	 * @see #getFile()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>File</em>' attribute.
+   * @see #getFile()
+   * @generated
+   */
 	void setFile(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Location</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Location</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Location</em>' attribute.
-	 * @see #setLocation(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getPlatform_Location()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Location</em>' attribute.
+   * @see #setLocation(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getPlatform_Location()
+   * @model
+   * @generated
+   */
 	String getLocation();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Platform#getLocation <em>Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Platform#getLocation <em>Location</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Location</em>' attribute.
-	 * @see #getLocation()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Location</em>' attribute.
+   * @see #getLocation()
+   * @generated
+   */
 	void setLocation(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Config</b></em>' reference.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Config</b></em>' reference.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Config</em>' reference isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Config</em>' reference.
-	 * @see #setConfig(Config)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getPlatform_Config()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Config</em>' reference.
+   * @see #setConfig(Config)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getPlatform_Config()
+   * @model
+   * @generated
+   */
 	Config getConfig();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Platform#getConfig <em>Config</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Platform#getConfig <em>Config</em>}' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Config</em>' reference.
-	 * @see #getConfig()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Config</em>' reference.
+   * @see #getConfig()
+   * @generated
+   */
 	void setConfig(Config value);
 
 	/**
-	 * Returns the value of the '<em><b>Deltapack</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Deltapack</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Deltapack</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Deltapack</em>' attribute.
-	 * @see #setDeltapack(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getPlatform_Deltapack()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Deltapack</em>' attribute.
+   * @see #setDeltapack(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getPlatform_Deltapack()
+   * @model
+   * @generated
+   */
 	String getDeltapack();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Platform#getDeltapack <em>Deltapack</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Platform#getDeltapack <em>Deltapack</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Deltapack</em>' attribute.
-	 * @see #getDeltapack()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Deltapack</em>' attribute.
+   * @see #getDeltapack()
+   * @generated
+   */
 	void setDeltapack(String value);
 
 } // Platform
Index: src/org/eclipse/amalgam/releng/build/Promotion.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/Promotion.java,v
retrieving revision 1.3
diff -u -r1.3 Promotion.java
--- src/org/eclipse/amalgam/releng/build/Promotion.java	15 Dec 2008 21:09:05 -0000	1.3
+++ src/org/eclipse/amalgam/releng/build/Promotion.java	6 Jun 2010 14:35:28 -0000
@@ -37,133 +37,133 @@
  */
 public interface Promotion extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Upload Directory</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Upload Directory</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Upload Directory</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Upload Directory</em>' attribute.
-	 * @see #setUploadDirectory(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getPromotion_UploadDirectory()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Upload Directory</em>' attribute.
+   * @see #setUploadDirectory(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getPromotion_UploadDirectory()
+   * @model
+   * @generated
+   */
 	String getUploadDirectory();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Promotion#getUploadDirectory <em>Upload Directory</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Promotion#getUploadDirectory <em>Upload Directory</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Upload Directory</em>' attribute.
-	 * @see #getUploadDirectory()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Upload Directory</em>' attribute.
+   * @see #getUploadDirectory()
+   * @generated
+   */
 	void setUploadDirectory(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Download Directory</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Download Directory</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Download Directory</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Download Directory</em>' attribute.
-	 * @see #setDownloadDirectory(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getPromotion_DownloadDirectory()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Download Directory</em>' attribute.
+   * @see #setDownloadDirectory(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getPromotion_DownloadDirectory()
+   * @model
+   * @generated
+   */
 	String getDownloadDirectory();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Promotion#getDownloadDirectory <em>Download Directory</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Promotion#getDownloadDirectory <em>Download Directory</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Download Directory</em>' attribute.
-	 * @see #getDownloadDirectory()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Download Directory</em>' attribute.
+   * @see #getDownloadDirectory()
+   * @generated
+   */
 	void setDownloadDirectory(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Incubating</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Incubating</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Incubating</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Incubating</em>' attribute.
-	 * @see #setIncubating(boolean)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getPromotion_Incubating()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Incubating</em>' attribute.
+   * @see #setIncubating(boolean)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getPromotion_Incubating()
+   * @model
+   * @generated
+   */
 	boolean isIncubating();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Promotion#isIncubating <em>Incubating</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Promotion#isIncubating <em>Incubating</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Incubating</em>' attribute.
-	 * @see #isIncubating()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Incubating</em>' attribute.
+   * @see #isIncubating()
+   * @generated
+   */
 	void setIncubating(boolean value);
 
 	/**
-	 * Returns the value of the '<em><b>Base URL</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Base URL</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Base URL</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Base URL</em>' attribute.
-	 * @see #setBaseURL(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getPromotion_BaseURL()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Base URL</em>' attribute.
+   * @see #setBaseURL(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getPromotion_BaseURL()
+   * @model
+   * @generated
+   */
 	String getBaseURL();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Promotion#getBaseURL <em>Base URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Promotion#getBaseURL <em>Base URL</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base URL</em>' attribute.
-	 * @see #getBaseURL()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Base URL</em>' attribute.
+   * @see #getBaseURL()
+   * @generated
+   */
 	void setBaseURL(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Build Alias</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Build Alias</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Build Alias</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Build Alias</em>' attribute.
-	 * @see #setBuildAlias(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getPromotion_BuildAlias()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Build Alias</em>' attribute.
+   * @see #setBuildAlias(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getPromotion_BuildAlias()
+   * @model
+   * @generated
+   */
 	String getBuildAlias();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Promotion#getBuildAlias <em>Build Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Promotion#getBuildAlias <em>Build Alias</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Build Alias</em>' attribute.
-	 * @see #getBuildAlias()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Build Alias</em>' attribute.
+   * @see #getBuildAlias()
+   * @generated
+   */
 	void setBuildAlias(String value);
 
 } // Promotion
Index: src/org/eclipse/amalgam/releng/build/Repository.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/Repository.java,v
retrieving revision 1.1
diff -u -r1.1 Repository.java
--- src/org/eclipse/amalgam/releng/build/Repository.java	24 Nov 2008 20:36:44 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/Repository.java	6 Jun 2010 14:35:28 -0000
@@ -34,55 +34,55 @@
  */
 public interface Repository extends EObject {
 	/**
-	 * Returns the value of the '<em><b>Location</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Location</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Location</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Location</em>' attribute.
-	 * @see #setLocation(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getRepository_Location()
-	 * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
-	 * @generated
-	 */
+   * @return the value of the '<em>Location</em>' attribute.
+   * @see #setLocation(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getRepository_Location()
+   * @model dataType="org.eclipse.emf.ecore.xml.type.String" required="true"
+   * @generated
+   */
 	String getLocation();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Repository#getLocation <em>Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Repository#getLocation <em>Location</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Location</em>' attribute.
-	 * @see #getLocation()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Location</em>' attribute.
+   * @see #getLocation()
+   * @generated
+   */
 	void setLocation(String value);
 
 	/**
-	 * Returns the value of the '<em><b>Label</b></em>' attribute.
-	 * <!-- begin-user-doc -->
+   * Returns the value of the '<em><b>Label</b></em>' attribute.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Label</em>' attribute isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Label</em>' attribute.
-	 * @see #setLabel(String)
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#getRepository_Label()
-	 * @model
-	 * @generated
-	 */
+   * @return the value of the '<em>Label</em>' attribute.
+   * @see #setLabel(String)
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#getRepository_Label()
+   * @model
+   * @generated
+   */
 	String getLabel();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Repository#getLabel <em>Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * Sets the value of the '{@link org.eclipse.amalgam.releng.build.Repository#getLabel <em>Label</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Label</em>' attribute.
-	 * @see #getLabel()
-	 * @generated
-	 */
+   * @param value the new value of the '<em>Label</em>' attribute.
+   * @see #getLabel()
+   * @generated
+   */
 	void setLabel(String value);
 
 } // Repository
Index: src/org/eclipse/amalgam/releng/build/WS.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/WS.java,v
retrieving revision 1.1
diff -u -r1.1 WS.java
--- src/org/eclipse/amalgam/releng/build/WS.java	24 Nov 2008 20:36:44 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/WS.java	6 Jun 2010 14:35:28 -0000
@@ -30,244 +30,300 @@
  */
 public enum WS implements Enumerator {
 	/**
-	 * The '<em><b>Win32</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Win32</b></em>' literal object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #WIN32_VALUE
-	 * @generated
-	 * @ordered
-	 */
+   * @see #WIN32_VALUE
+   * @generated
+   * @ordered
+   */
 	WIN32(0, "win32", "win32"),
 
 	/**
-	 * The '<em><b>Gtk</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Gtk</b></em>' literal object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #GTK_VALUE
-	 * @generated
-	 * @ordered
-	 */
+   * @see #GTK_VALUE
+   * @generated
+   * @ordered
+   */
 	GTK(1, "gtk", "gtk"),
 
 	/**
-	 * The '<em><b>Carbon</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Carbon</b></em>' literal object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #CARBON_VALUE
-	 * @generated
-	 * @ordered
-	 */
+   * @see #CARBON_VALUE
+   * @generated
+   * @ordered
+   */
 	CARBON(2, "carbon", "carbon"),
 
 	/**
-	 * The '<em><b>Cocoa</b></em>' literal object.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Cocoa</b></em>' literal object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #COCOA_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	COCOA(3, "cocoa", "cocoa");
+   * @see #COCOA_VALUE
+   * @generated
+   * @ordered
+   */
+	COCOA(3, "cocoa", "cocoa"), /**
+   * The '<em><b>Motif</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #MOTIF_VALUE
+   * @generated
+   * @ordered
+   */
+  MOTIF(4, "motif", "motif"), /**
+   * The '<em><b>Solaris</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #SOLARIS_VALUE
+   * @generated
+   * @ordered
+   */
+  SOLARIS(5, "solaris", "solaris");
 
 	/**
-	 * The '<em><b>Win32</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Win32</b></em>' literal value.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Win32</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #WIN32
-	 * @model name="win32"
-	 * @generated
-	 * @ordered
-	 */
+   * @see #WIN32
+   * @model name="win32"
+   * @generated
+   * @ordered
+   */
 	public static final int WIN32_VALUE = 0;
 
 	/**
-	 * The '<em><b>Gtk</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Gtk</b></em>' literal value.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Gtk</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #GTK
-	 * @model name="gtk"
-	 * @generated
-	 * @ordered
-	 */
+   * @see #GTK
+   * @model name="gtk"
+   * @generated
+   * @ordered
+   */
 	public static final int GTK_VALUE = 1;
 
 	/**
-	 * The '<em><b>Carbon</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Carbon</b></em>' literal value.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Carbon</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #CARBON
-	 * @model name="carbon"
-	 * @generated
-	 * @ordered
-	 */
+   * @see #CARBON
+   * @model name="carbon"
+   * @generated
+   * @ordered
+   */
 	public static final int CARBON_VALUE = 2;
 
 	/**
-	 * The '<em><b>Cocoa</b></em>' literal value.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Cocoa</b></em>' literal value.
+   * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Cocoa</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * @see #COCOA
-	 * @model name="cocoa"
-	 * @generated
-	 * @ordered
-	 */
+   * @see #COCOA
+   * @model name="cocoa"
+   * @generated
+   * @ordered
+   */
 	public static final int COCOA_VALUE = 3;
 
 	/**
-	 * An array of all the '<em><b>WS</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
+   * The '<em><b>Motif</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>Motif</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #MOTIF
+   * @model name="motif"
+   * @generated
+   * @ordered
+   */
+  public static final int MOTIF_VALUE = 4;
+
+  /**
+   * The '<em><b>Solaris</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>Solaris</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #SOLARIS
+   * @model name="solaris"
+   * @generated
+   * @ordered
+   */
+  public static final int SOLARIS_VALUE = 5;
+
+  /**
+   * An array of all the '<em><b>WS</b></em>' enumerators.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private static final WS[] VALUES_ARRAY =
-		new WS[] {
-			WIN32,
-			GTK,
-			CARBON,
-			COCOA,
-		};
+		new WS[]
+    {
+      WIN32,
+      GTK,
+      CARBON,
+      COCOA,
+      MOTIF,
+      SOLARIS,
+    };
 
 	/**
-	 * A public read-only list of all the '<em><b>WS</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
+   * A public read-only list of all the '<em><b>WS</b></em>' enumerators.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static final List<WS> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>WS</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
+   * Returns the '<em><b>WS</b></em>' literal with the specified literal value.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static WS get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			WS result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      WS result = VALUES_ARRAY[i];
+      if (result.toString().equals(literal))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
 
 	/**
-	 * Returns the '<em><b>WS</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
+   * Returns the '<em><b>WS</b></em>' literal with the specified name.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static WS getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			WS result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      WS result = VALUES_ARRAY[i];
+      if (result.getName().equals(name))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
 
 	/**
-	 * Returns the '<em><b>WS</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
+   * Returns the '<em><b>WS</b></em>' literal with the specified integer value.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static WS get(int value) {
-		switch (value) {
-			case WIN32_VALUE: return WIN32;
-			case GTK_VALUE: return GTK;
-			case CARBON_VALUE: return CARBON;
-			case COCOA_VALUE: return COCOA;
-		}
-		return null;
-	}
+    switch (value)
+    {
+      case WIN32_VALUE: return WIN32;
+      case GTK_VALUE: return GTK;
+      case CARBON_VALUE: return CARBON;
+      case COCOA_VALUE: return COCOA;
+      case MOTIF_VALUE: return MOTIF;
+      case SOLARIS_VALUE: return SOLARIS;
+    }
+    return null;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private final int value;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private final String name;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
+   * Only this class can construct instances.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private WS(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
+    this.value = value;
+    this.name = name;
+    this.literal = literal;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public int getValue() {
-	  return value;
-	}
+    return value;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getName() {
-	  return name;
-	}
+    return name;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getLiteral() {
-	  return literal;
-	}
+    return literal;
+  }
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
+   * Returns the literal value of the enumerator, which is its string representation.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String toString() {
-		return literal;
-	}
+    return literal;
+  }
 	
 } //WS
Index: src/org/eclipse/amalgam/releng/build/impl/BuildFactoryImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/impl/BuildFactoryImpl.java,v
retrieving revision 1.3
diff -u -r1.3 BuildFactoryImpl.java
--- src/org/eclipse/amalgam/releng/build/impl/BuildFactoryImpl.java	20 May 2009 18:12:35 -0000	1.3
+++ src/org/eclipse/amalgam/releng/build/impl/BuildFactoryImpl.java	6 Jun 2010 14:35:28 -0000
@@ -49,354 +49,360 @@
  */
 public class BuildFactoryImpl extends EFactoryImpl implements BuildFactory {
 	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
+   * Creates the default factory implementation.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static BuildFactory init() {
-		try {
-			BuildFactory theBuildFactory = (BuildFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/amalgam/2008/build";); 
-			if (theBuildFactory != null) {
-				return theBuildFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new BuildFactoryImpl();
-	}
+    try
+    {
+      BuildFactory theBuildFactory = (BuildFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/amalgam/2008/build";); 
+      if (theBuildFactory != null)
+      {
+        return theBuildFactory;
+      }
+    }
+    catch (Exception exception)
+    {
+      EcorePlugin.INSTANCE.log(exception);
+    }
+    return new BuildFactoryImpl();
+  }
 
 	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
+   * Creates an instance of the factory.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public BuildFactoryImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case BuildPackage.BUILD: return createBuild();
-			case BuildPackage.REPOSITORY: return createRepository();
-			case BuildPackage.PLATFORM: return createPlatform();
-			case BuildPackage.CONFIG: return createConfig();
-			case BuildPackage.MAP: return createMap();
-			case BuildPackage.CATEGORY: return createCategory();
-			case BuildPackage.CONTRIBUTION: return createContribution();
-			case BuildPackage.CONTACT: return createContact();
-			case BuildPackage.FEATURE: return createFeature();
-			case BuildPackage.BUNDLE: return createBundle();
-			case BuildPackage.COMPILER: return createCompiler();
-			case BuildPackage.PROMOTION: return createPromotion();
-			case BuildPackage.PRODUCT: return createProduct();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
+    switch (eClass.getClassifierID())
+    {
+      case BuildPackage.BUILD: return createBuild();
+      case BuildPackage.REPOSITORY: return createRepository();
+      case BuildPackage.PLATFORM: return createPlatform();
+      case BuildPackage.CONFIG: return createConfig();
+      case BuildPackage.MAP: return createMap();
+      case BuildPackage.CATEGORY: return createCategory();
+      case BuildPackage.CONTRIBUTION: return createContribution();
+      case BuildPackage.CONTACT: return createContact();
+      case BuildPackage.FEATURE: return createFeature();
+      case BuildPackage.BUNDLE: return createBundle();
+      case BuildPackage.COMPILER: return createCompiler();
+      case BuildPackage.PROMOTION: return createPromotion();
+      case BuildPackage.PRODUCT: return createProduct();
+      default:
+        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+    }
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case BuildPackage.BUILD_TYPE:
-				return createBuildTypeFromString(eDataType, initialValue);
-			case BuildPackage.OS:
-				return createOSFromString(eDataType, initialValue);
-			case BuildPackage.WS:
-				return createWSFromString(eDataType, initialValue);
-			case BuildPackage.ARCH:
-				return createARCHFromString(eDataType, initialValue);
-			case BuildPackage.ARCHIVE_FORMAT:
-				return createArchiveFormatFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
+    switch (eDataType.getClassifierID())
+    {
+      case BuildPackage.BUILD_TYPE:
+        return createBuildTypeFromString(eDataType, initialValue);
+      case BuildPackage.OS:
+        return createOSFromString(eDataType, initialValue);
+      case BuildPackage.WS:
+        return createWSFromString(eDataType, initialValue);
+      case BuildPackage.ARCH:
+        return createARCHFromString(eDataType, initialValue);
+      case BuildPackage.ARCHIVE_FORMAT:
+        return createArchiveFormatFromString(eDataType, initialValue);
+      default:
+        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+    }
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case BuildPackage.BUILD_TYPE:
-				return convertBuildTypeToString(eDataType, instanceValue);
-			case BuildPackage.OS:
-				return convertOSToString(eDataType, instanceValue);
-			case BuildPackage.WS:
-				return convertWSToString(eDataType, instanceValue);
-			case BuildPackage.ARCH:
-				return convertARCHToString(eDataType, instanceValue);
-			case BuildPackage.ARCHIVE_FORMAT:
-				return convertArchiveFormatToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
+    switch (eDataType.getClassifierID())
+    {
+      case BuildPackage.BUILD_TYPE:
+        return convertBuildTypeToString(eDataType, instanceValue);
+      case BuildPackage.OS:
+        return convertOSToString(eDataType, instanceValue);
+      case BuildPackage.WS:
+        return convertWSToString(eDataType, instanceValue);
+      case BuildPackage.ARCH:
+        return convertARCHToString(eDataType, instanceValue);
+      case BuildPackage.ARCHIVE_FORMAT:
+        return convertArchiveFormatToString(eDataType, instanceValue);
+      default:
+        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+    }
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Build createBuild() {
-		BuildImpl build = new BuildImpl();
-		return build;
-	}
+    BuildImpl build = new BuildImpl();
+    return build;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Repository createRepository() {
-		RepositoryImpl repository = new RepositoryImpl();
-		return repository;
-	}
+    RepositoryImpl repository = new RepositoryImpl();
+    return repository;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Platform createPlatform() {
-		PlatformImpl platform = new PlatformImpl();
-		return platform;
-	}
+    PlatformImpl platform = new PlatformImpl();
+    return platform;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Config createConfig() {
-		ConfigImpl config = new ConfigImpl();
-		return config;
-	}
+    ConfigImpl config = new ConfigImpl();
+    return config;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Map createMap() {
-		MapImpl map = new MapImpl();
-		return map;
-	}
+    MapImpl map = new MapImpl();
+    return map;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Category createCategory() {
-		CategoryImpl category = new CategoryImpl();
-		return category;
-	}
+    CategoryImpl category = new CategoryImpl();
+    return category;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Contribution createContribution() {
-		ContributionImpl contribution = new ContributionImpl();
-		return contribution;
-	}
+    ContributionImpl contribution = new ContributionImpl();
+    return contribution;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Contact createContact() {
-		ContactImpl contact = new ContactImpl();
-		return contact;
-	}
+    ContactImpl contact = new ContactImpl();
+    return contact;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Feature createFeature() {
-		FeatureImpl feature = new FeatureImpl();
-		return feature;
-	}
+    FeatureImpl feature = new FeatureImpl();
+    return feature;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Bundle createBundle() {
-		BundleImpl bundle = new BundleImpl();
-		return bundle;
-	}
+    BundleImpl bundle = new BundleImpl();
+    return bundle;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public org.eclipse.amalgam.releng.build.Compiler createCompiler() {
-		CompilerImpl compiler = new CompilerImpl();
-		return compiler;
-	}
+    CompilerImpl compiler = new CompilerImpl();
+    return compiler;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Promotion createPromotion() {
-		PromotionImpl promotion = new PromotionImpl();
-		return promotion;
-	}
+    PromotionImpl promotion = new PromotionImpl();
+    return promotion;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Product createProduct() {
-		ProductImpl product = new ProductImpl();
-		return product;
-	}
+    ProductImpl product = new ProductImpl();
+    return product;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public BuildType createBuildTypeFromString(EDataType eDataType, String initialValue) {
-		BuildType result = BuildType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
+    BuildType result = BuildType.get(initialValue);
+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    return result;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String convertBuildTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
+    return instanceValue == null ? null : instanceValue.toString();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public OS createOSFromString(EDataType eDataType, String initialValue) {
-		OS result = OS.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
+    OS result = OS.get(initialValue);
+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    return result;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String convertOSToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
+    return instanceValue == null ? null : instanceValue.toString();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public WS createWSFromString(EDataType eDataType, String initialValue) {
-		WS result = WS.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
+    WS result = WS.get(initialValue);
+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    return result;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String convertWSToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
+    return instanceValue == null ? null : instanceValue.toString();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public ARCH createARCHFromString(EDataType eDataType, String initialValue) {
-		ARCH result = ARCH.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
+    ARCH result = ARCH.get(initialValue);
+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    return result;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String convertARCHToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
+    return instanceValue == null ? null : instanceValue.toString();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public ArchiveFormat createArchiveFormatFromString(EDataType eDataType, String initialValue) {
-		ArchiveFormat result = ArchiveFormat.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
+    ArchiveFormat result = ArchiveFormat.get(initialValue);
+    if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+    return result;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String convertArchiveFormatToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
+    return instanceValue == null ? null : instanceValue.toString();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public BuildPackage getBuildPackage() {
-		return (BuildPackage)getEPackage();
-	}
+    return (BuildPackage)getEPackage();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
+   * @deprecated
+   * @generated
+   */
 	@Deprecated
 	public static BuildPackage getPackage() {
-		return BuildPackage.eINSTANCE;
-	}
+    return BuildPackage.eINSTANCE;
+  }
 
 } //BuildFactoryImpl
Index: src/org/eclipse/amalgam/releng/build/impl/BuildImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/impl/BuildImpl.java,v
retrieving revision 1.7
diff -u -r1.7 BuildImpl.java
--- src/org/eclipse/amalgam/releng/build/impl/BuildImpl.java	13 Mar 2009 11:09:27 -0000	1.7
+++ src/org/eclipse/amalgam/releng/build/impl/BuildImpl.java	6 Jun 2010 14:35:28 -0000
@@ -77,1282 +77,1318 @@
  */
 public class BuildImpl extends EObjectImpl implements Build {
 	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getType() <em>Type</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getType()
+   * @generated
+   * @ordered
+   */
 	protected static final BuildType TYPE_EDEFAULT = BuildType.CONTINUOUS;
 
 	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getType()
+   * @generated
+   * @ordered
+   */
 	protected BuildType type = TYPE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getBuildRoot() <em>Build Root</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getBuildRoot() <em>Build Root</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getBuildRoot()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getBuildRoot()
+   * @generated
+   * @ordered
+   */
 	protected static final String BUILD_ROOT_EDEFAULT = "${user.home}/build";
 
 	/**
-	 * The cached value of the '{@link #getBuildRoot() <em>Build Root</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getBuildRoot() <em>Build Root</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getBuildRoot()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getBuildRoot()
+   * @generated
+   * @ordered
+   */
 	protected String buildRoot = BUILD_ROOT_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getPlatforms() <em>Platforms</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getPlatforms() <em>Platforms</em>}' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getPlatforms()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getPlatforms()
+   * @generated
+   * @ordered
+   */
 	protected EList<Platform> platforms;
 
 	/**
-	 * The cached value of the '{@link #getConfigs() <em>Configs</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getConfigs() <em>Configs</em>}' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getConfigs()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getConfigs()
+   * @generated
+   * @ordered
+   */
 	protected EList<Config> configs;
 
 	/**
-	 * The cached value of the '{@link #getMap() <em>Map</em>}' containment reference.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getMap() <em>Map</em>}' containment reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getMap()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getMap()
+   * @generated
+   * @ordered
+   */
 	protected Map map;
 
 	/**
-	 * The default value of the '{@link #getFetchTag() <em>Fetch Tag</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getFetchTag() <em>Fetch Tag</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getFetchTag()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getFetchTag()
+   * @generated
+   * @ordered
+   */
 	protected static final String FETCH_TAG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getFetchTag() <em>Fetch Tag</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getFetchTag() <em>Fetch Tag</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getFetchTag()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getFetchTag()
+   * @generated
+   * @ordered
+   */
 	protected String fetchTag = FETCH_TAG_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getCategories() <em>Categories</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getCategories() <em>Categories</em>}' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getCategories()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getCategories()
+   * @generated
+   * @ordered
+   */
 	protected EList<Category> categories;
 
 	/**
-	 * The cached value of the '{@link #getContributions() <em>Contributions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getContributions() <em>Contributions</em>}' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getContributions()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getContributions()
+   * @generated
+   * @ordered
+   */
 	protected EList<Contribution> contributions;
 
 	/**
-	 * The cached value of the '{@link #getProduct() <em>Product</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getProduct() <em>Product</em>}' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getProduct()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getProduct()
+   * @generated
+   * @ordered
+   */
 	protected Product product;
 
 	/**
-	 * The default value of the '{@link #getLabel() <em>Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getLabel() <em>Label</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getLabel()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getLabel()
+   * @generated
+   * @ordered
+   */
 	protected static final String LABEL_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLabel() <em>Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getLabel() <em>Label</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getLabel()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getLabel()
+   * @generated
+   * @ordered
+   */
 	protected String label = LABEL_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getBase() <em>Base</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getBase() <em>Base</em>}' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getBase()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getBase()
+   * @generated
+   * @ordered
+   */
 	protected Platform base;
 
 	/**
-	 * The cached value of the '{@link #getBuilder() <em>Builder</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getBuilder() <em>Builder</em>}' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getBuilder()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getBuilder()
+   * @generated
+   * @ordered
+   */
 	protected Platform builder;
 
 	/**
-	 * The default value of the '{@link #getDate() <em>Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getDate() <em>Date</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getDate()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getDate()
+   * @generated
+   * @ordered
+   */
 	protected static final String DATE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getDate() <em>Date</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getDate() <em>Date</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getDate()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getDate()
+   * @generated
+   * @ordered
+   */
 	protected String date = DATE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTime() <em>Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getTime() <em>Time</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getTime()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getTime()
+   * @generated
+   * @ordered
+   */
 	protected static final String TIME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTime() <em>Time</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getTime() <em>Time</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getTime()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getTime()
+   * @generated
+   * @ordered
+   */
 	protected String time = TIME_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getCompiler() <em>Compiler</em>}' containment reference.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getCompiler() <em>Compiler</em>}' containment reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getCompiler()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getCompiler()
+   * @generated
+   * @ordered
+   */
 	protected org.eclipse.amalgam.releng.build.Compiler compiler;
 
 	/**
-	 * The default value of the '{@link #getLaunchVM() <em>Launch VM</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getLaunchVM() <em>Launch VM</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getLaunchVM()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getLaunchVM()
+   * @generated
+   * @ordered
+   */
 	protected static final String LAUNCH_VM_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLaunchVM() <em>Launch VM</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getLaunchVM() <em>Launch VM</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getLaunchVM()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getLaunchVM()
+   * @generated
+   * @ordered
+   */
 	protected String launchVM = LAUNCH_VM_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getPromotion() <em>Promotion</em>}' containment reference.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getPromotion() <em>Promotion</em>}' containment reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getPromotion()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getPromotion()
+   * @generated
+   * @ordered
+   */
 	protected Promotion promotion;
 
 	/**
-	 * The default value of the '{@link #getBuilderURL() <em>Builder URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getBuilderURL() <em>Builder URL</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getBuilderURL()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getBuilderURL()
+   * @generated
+   * @ordered
+   */
 	protected static final String BUILDER_URL_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getBuilderURL() <em>Builder URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getBuilderURL() <em>Builder URL</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getBuilderURL()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getBuilderURL()
+   * @generated
+   * @ordered
+   */
 	protected String builderURL = BUILDER_URL_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getBuildmaster() <em>Buildmaster</em>}' containment reference.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getBuildmaster() <em>Buildmaster</em>}' containment reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getBuildmaster()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getBuildmaster()
+   * @generated
+   * @ordered
+   */
 	protected Contact buildmaster;
 
 	/**
-	 * The cached value of the '{@link #getDefaultMailList() <em>Default Mail List</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getDefaultMailList() <em>Default Mail List</em>}' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getDefaultMailList()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getDefaultMailList()
+   * @generated
+   * @ordered
+   */
 	protected EList<Contact> defaultMailList;
 
 	/**
-	 * The default value of the '{@link #isSendmail() <em>Sendmail</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #isSendmail() <em>Sendmail</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isSendmail()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #isSendmail()
+   * @generated
+   * @ordered
+   */
 	protected static final boolean SENDMAIL_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isSendmail() <em>Sendmail</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #isSendmail() <em>Sendmail</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isSendmail()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #isSendmail()
+   * @generated
+   * @ordered
+   */
 	protected boolean sendmail = SENDMAIL_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected BuildImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected EClass eStaticClass() {
-		return BuildPackage.Literals.BUILD;
-	}
+    return BuildPackage.Literals.BUILD;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public BuildType getType() {
-		return type;
-	}
+    return type;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setType(BuildType newType) {
-		BuildType oldType = type;
-		type = newType == null ? TYPE_EDEFAULT : newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__TYPE, oldType, type));
-	}
+    BuildType oldType = type;
+    type = newType == null ? TYPE_EDEFAULT : newType;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__TYPE, oldType, type));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getBuildRoot() {
-		return buildRoot;
-	}
+    return buildRoot;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setBuildRoot(String newBuildRoot) {
-		String oldBuildRoot = buildRoot;
-		buildRoot = newBuildRoot;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__BUILD_ROOT, oldBuildRoot, buildRoot));
-	}
+    String oldBuildRoot = buildRoot;
+    buildRoot = newBuildRoot;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__BUILD_ROOT, oldBuildRoot, buildRoot));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EList<Platform> getPlatforms() {
-		if (platforms == null) {
-			platforms = new EObjectContainmentEList.Resolving<Platform>(Platform.class, this, BuildPackage.BUILD__PLATFORMS);
-		}
-		return platforms;
-	}
+    if (platforms == null)
+    {
+      platforms = new EObjectContainmentEList.Resolving<Platform>(Platform.class, this, BuildPackage.BUILD__PLATFORMS);
+    }
+    return platforms;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EList<Config> getConfigs() {
-		if (configs == null) {
-			configs = new EObjectContainmentEList.Resolving<Config>(Config.class, this, BuildPackage.BUILD__CONFIGS);
-		}
-		return configs;
-	}
+    if (configs == null)
+    {
+      configs = new EObjectContainmentEList.Resolving<Config>(Config.class, this, BuildPackage.BUILD__CONFIGS);
+    }
+    return configs;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Map getMap() {
-		if (map != null && map.eIsProxy()) {
-			InternalEObject oldMap = (InternalEObject)map;
-			map = (Map)eResolveProxy(oldMap);
-			if (map != oldMap) {
-				InternalEObject newMap = (InternalEObject)map;
-				NotificationChain msgs = oldMap.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__MAP, null, null);
-				if (newMap.eInternalContainer() == null) {
-					msgs = newMap.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__MAP, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildPackage.BUILD__MAP, oldMap, map));
-			}
-		}
-		return map;
-	}
+    if (map != null && map.eIsProxy())
+    {
+      InternalEObject oldMap = (InternalEObject)map;
+      map = (Map)eResolveProxy(oldMap);
+      if (map != oldMap)
+      {
+        InternalEObject newMap = (InternalEObject)map;
+        NotificationChain msgs = oldMap.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__MAP, null, null);
+        if (newMap.eInternalContainer() == null)
+        {
+          msgs = newMap.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__MAP, null, msgs);
+        }
+        if (msgs != null) msgs.dispatch();
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildPackage.BUILD__MAP, oldMap, map));
+      }
+    }
+    return map;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Map basicGetMap() {
-		return map;
-	}
+    return map;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public NotificationChain basicSetMap(Map newMap, NotificationChain msgs) {
-		Map oldMap = map;
-		map = newMap;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__MAP, oldMap, newMap);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
+    Map oldMap = map;
+    map = newMap;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__MAP, oldMap, newMap);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setMap(Map newMap) {
-		if (newMap != map) {
-			NotificationChain msgs = null;
-			if (map != null)
-				msgs = ((InternalEObject)map).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__MAP, null, msgs);
-			if (newMap != null)
-				msgs = ((InternalEObject)newMap).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__MAP, null, msgs);
-			msgs = basicSetMap(newMap, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__MAP, newMap, newMap));
-	}
+    if (newMap != map)
+    {
+      NotificationChain msgs = null;
+      if (map != null)
+        msgs = ((InternalEObject)map).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__MAP, null, msgs);
+      if (newMap != null)
+        msgs = ((InternalEObject)newMap).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__MAP, null, msgs);
+      msgs = basicSetMap(newMap, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__MAP, newMap, newMap));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getFetchTag() {
-		return fetchTag;
-	}
+    return fetchTag;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setFetchTag(String newFetchTag) {
-		String oldFetchTag = fetchTag;
-		fetchTag = newFetchTag;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__FETCH_TAG, oldFetchTag, fetchTag));
-	}
+    String oldFetchTag = fetchTag;
+    fetchTag = newFetchTag;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__FETCH_TAG, oldFetchTag, fetchTag));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EList<Category> getCategories() {
-		if (categories == null) {
-			categories = new EObjectContainmentEList.Resolving<Category>(Category.class, this, BuildPackage.BUILD__CATEGORIES);
-		}
-		return categories;
-	}
+    if (categories == null)
+    {
+      categories = new EObjectContainmentEList.Resolving<Category>(Category.class, this, BuildPackage.BUILD__CATEGORIES);
+    }
+    return categories;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EList<Contribution> getContributions() {
-		if (contributions == null) {
-			contributions = new EObjectContainmentEList.Resolving<Contribution>(Contribution.class, this, BuildPackage.BUILD__CONTRIBUTIONS);
-		}
-		return contributions;
-	}
+    if (contributions == null)
+    {
+      contributions = new EObjectContainmentEList.Resolving<Contribution>(Contribution.class, this, BuildPackage.BUILD__CONTRIBUTIONS);
+    }
+    return contributions;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Product getProduct() {
-		if (product != null && product.eIsProxy()) {
-			InternalEObject oldProduct = (InternalEObject)product;
-			product = (Product)eResolveProxy(oldProduct);
-			if (product != oldProduct) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildPackage.BUILD__PRODUCT, oldProduct, product));
-			}
-		}
-		return product;
-	}
+    if (product != null && product.eIsProxy())
+    {
+      InternalEObject oldProduct = (InternalEObject)product;
+      product = (Product)eResolveProxy(oldProduct);
+      if (product != oldProduct)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildPackage.BUILD__PRODUCT, oldProduct, product));
+      }
+    }
+    return product;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Product basicGetProduct() {
-		return product;
-	}
+    return product;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setProduct(Product newProduct) {
-		Product oldProduct = product;
-		product = newProduct;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__PRODUCT, oldProduct, product));
-	}
+    Product oldProduct = product;
+    product = newProduct;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__PRODUCT, oldProduct, product));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getLabel() {
-		return label;
-	}
+    return label;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setLabel(String newLabel) {
-		String oldLabel = label;
-		label = newLabel;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__LABEL, oldLabel, label));
-	}
+    String oldLabel = label;
+    label = newLabel;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__LABEL, oldLabel, label));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Platform getBase() {
-		if (base != null && base.eIsProxy()) {
-			InternalEObject oldBase = (InternalEObject)base;
-			base = (Platform)eResolveProxy(oldBase);
-			if (base != oldBase) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildPackage.BUILD__BASE, oldBase, base));
-			}
-		}
-		return base;
-	}
+    if (base != null && base.eIsProxy())
+    {
+      InternalEObject oldBase = (InternalEObject)base;
+      base = (Platform)eResolveProxy(oldBase);
+      if (base != oldBase)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildPackage.BUILD__BASE, oldBase, base));
+      }
+    }
+    return base;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Platform basicGetBase() {
-		return base;
-	}
+    return base;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setBase(Platform newBase) {
-		Platform oldBase = base;
-		base = newBase;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__BASE, oldBase, base));
-	}
+    Platform oldBase = base;
+    base = newBase;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__BASE, oldBase, base));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Platform getBuilder() {
-		if (builder != null && builder.eIsProxy()) {
-			InternalEObject oldBuilder = (InternalEObject)builder;
-			builder = (Platform)eResolveProxy(oldBuilder);
-			if (builder != oldBuilder) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildPackage.BUILD__BUILDER, oldBuilder, builder));
-			}
-		}
-		return builder;
-	}
+    if (builder != null && builder.eIsProxy())
+    {
+      InternalEObject oldBuilder = (InternalEObject)builder;
+      builder = (Platform)eResolveProxy(oldBuilder);
+      if (builder != oldBuilder)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildPackage.BUILD__BUILDER, oldBuilder, builder));
+      }
+    }
+    return builder;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Platform basicGetBuilder() {
-		return builder;
-	}
+    return builder;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setBuilder(Platform newBuilder) {
-		Platform oldBuilder = builder;
-		builder = newBuilder;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__BUILDER, oldBuilder, builder));
-	}
+    Platform oldBuilder = builder;
+    builder = newBuilder;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__BUILDER, oldBuilder, builder));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getDate() {
-		return date;
-	}
+    return date;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setDate(String newDate) {
-		String oldDate = date;
-		date = newDate;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__DATE, oldDate, date));
-	}
+    String oldDate = date;
+    date = newDate;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__DATE, oldDate, date));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getTime() {
-		return time;
-	}
+    return time;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setTime(String newTime) {
-		String oldTime = time;
-		time = newTime;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__TIME, oldTime, time));
-	}
+    String oldTime = time;
+    time = newTime;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__TIME, oldTime, time));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public org.eclipse.amalgam.releng.build.Compiler getCompiler() {
-		if (compiler != null && compiler.eIsProxy()) {
-			InternalEObject oldCompiler = (InternalEObject)compiler;
-			compiler = (org.eclipse.amalgam.releng.build.Compiler)eResolveProxy(oldCompiler);
-			if (compiler != oldCompiler) {
-				InternalEObject newCompiler = (InternalEObject)compiler;
-				NotificationChain msgs = oldCompiler.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__COMPILER, null, null);
-				if (newCompiler.eInternalContainer() == null) {
-					msgs = newCompiler.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__COMPILER, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildPackage.BUILD__COMPILER, oldCompiler, compiler));
-			}
-		}
-		return compiler;
-	}
+    if (compiler != null && compiler.eIsProxy())
+    {
+      InternalEObject oldCompiler = (InternalEObject)compiler;
+      compiler = (org.eclipse.amalgam.releng.build.Compiler)eResolveProxy(oldCompiler);
+      if (compiler != oldCompiler)
+      {
+        InternalEObject newCompiler = (InternalEObject)compiler;
+        NotificationChain msgs = oldCompiler.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__COMPILER, null, null);
+        if (newCompiler.eInternalContainer() == null)
+        {
+          msgs = newCompiler.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__COMPILER, null, msgs);
+        }
+        if (msgs != null) msgs.dispatch();
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildPackage.BUILD__COMPILER, oldCompiler, compiler));
+      }
+    }
+    return compiler;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public org.eclipse.amalgam.releng.build.Compiler basicGetCompiler() {
-		return compiler;
-	}
+    return compiler;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public NotificationChain basicSetCompiler(org.eclipse.amalgam.releng.build.Compiler newCompiler, NotificationChain msgs) {
-		org.eclipse.amalgam.releng.build.Compiler oldCompiler = compiler;
-		compiler = newCompiler;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__COMPILER, oldCompiler, newCompiler);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
+    org.eclipse.amalgam.releng.build.Compiler oldCompiler = compiler;
+    compiler = newCompiler;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__COMPILER, oldCompiler, newCompiler);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setCompiler(org.eclipse.amalgam.releng.build.Compiler newCompiler) {
-		if (newCompiler != compiler) {
-			NotificationChain msgs = null;
-			if (compiler != null)
-				msgs = ((InternalEObject)compiler).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__COMPILER, null, msgs);
-			if (newCompiler != null)
-				msgs = ((InternalEObject)newCompiler).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__COMPILER, null, msgs);
-			msgs = basicSetCompiler(newCompiler, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__COMPILER, newCompiler, newCompiler));
-	}
+    if (newCompiler != compiler)
+    {
+      NotificationChain msgs = null;
+      if (compiler != null)
+        msgs = ((InternalEObject)compiler).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__COMPILER, null, msgs);
+      if (newCompiler != null)
+        msgs = ((InternalEObject)newCompiler).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__COMPILER, null, msgs);
+      msgs = basicSetCompiler(newCompiler, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__COMPILER, newCompiler, newCompiler));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getLaunchVM() {
-		return launchVM;
-	}
+    return launchVM;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setLaunchVM(String newLaunchVM) {
-		String oldLaunchVM = launchVM;
-		launchVM = newLaunchVM;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__LAUNCH_VM, oldLaunchVM, launchVM));
-	}
+    String oldLaunchVM = launchVM;
+    launchVM = newLaunchVM;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__LAUNCH_VM, oldLaunchVM, launchVM));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Promotion getPromotion() {
-		if (promotion != null && promotion.eIsProxy()) {
-			InternalEObject oldPromotion = (InternalEObject)promotion;
-			promotion = (Promotion)eResolveProxy(oldPromotion);
-			if (promotion != oldPromotion) {
-				InternalEObject newPromotion = (InternalEObject)promotion;
-				NotificationChain msgs = oldPromotion.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__PROMOTION, null, null);
-				if (newPromotion.eInternalContainer() == null) {
-					msgs = newPromotion.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__PROMOTION, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildPackage.BUILD__PROMOTION, oldPromotion, promotion));
-			}
-		}
-		return promotion;
-	}
+    if (promotion != null && promotion.eIsProxy())
+    {
+      InternalEObject oldPromotion = (InternalEObject)promotion;
+      promotion = (Promotion)eResolveProxy(oldPromotion);
+      if (promotion != oldPromotion)
+      {
+        InternalEObject newPromotion = (InternalEObject)promotion;
+        NotificationChain msgs = oldPromotion.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__PROMOTION, null, null);
+        if (newPromotion.eInternalContainer() == null)
+        {
+          msgs = newPromotion.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__PROMOTION, null, msgs);
+        }
+        if (msgs != null) msgs.dispatch();
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildPackage.BUILD__PROMOTION, oldPromotion, promotion));
+      }
+    }
+    return promotion;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Promotion basicGetPromotion() {
-		return promotion;
-	}
+    return promotion;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public NotificationChain basicSetPromotion(Promotion newPromotion, NotificationChain msgs) {
-		Promotion oldPromotion = promotion;
-		promotion = newPromotion;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__PROMOTION, oldPromotion, newPromotion);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
+    Promotion oldPromotion = promotion;
+    promotion = newPromotion;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__PROMOTION, oldPromotion, newPromotion);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setPromotion(Promotion newPromotion) {
-		if (newPromotion != promotion) {
-			NotificationChain msgs = null;
-			if (promotion != null)
-				msgs = ((InternalEObject)promotion).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__PROMOTION, null, msgs);
-			if (newPromotion != null)
-				msgs = ((InternalEObject)newPromotion).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__PROMOTION, null, msgs);
-			msgs = basicSetPromotion(newPromotion, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__PROMOTION, newPromotion, newPromotion));
-	}
+    if (newPromotion != promotion)
+    {
+      NotificationChain msgs = null;
+      if (promotion != null)
+        msgs = ((InternalEObject)promotion).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__PROMOTION, null, msgs);
+      if (newPromotion != null)
+        msgs = ((InternalEObject)newPromotion).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__PROMOTION, null, msgs);
+      msgs = basicSetPromotion(newPromotion, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__PROMOTION, newPromotion, newPromotion));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getBuilderURL() {
-		return builderURL;
-	}
+    return builderURL;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setBuilderURL(String newBuilderURL) {
-		String oldBuilderURL = builderURL;
-		builderURL = newBuilderURL;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__BUILDER_URL, oldBuilderURL, builderURL));
-	}
+    String oldBuilderURL = builderURL;
+    builderURL = newBuilderURL;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__BUILDER_URL, oldBuilderURL, builderURL));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Contact getBuildmaster() {
-		if (buildmaster != null && buildmaster.eIsProxy()) {
-			InternalEObject oldBuildmaster = (InternalEObject)buildmaster;
-			buildmaster = (Contact)eResolveProxy(oldBuildmaster);
-			if (buildmaster != oldBuildmaster) {
-				InternalEObject newBuildmaster = (InternalEObject)buildmaster;
-				NotificationChain msgs = oldBuildmaster.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__BUILDMASTER, null, null);
-				if (newBuildmaster.eInternalContainer() == null) {
-					msgs = newBuildmaster.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__BUILDMASTER, null, msgs);
-				}
-				if (msgs != null) msgs.dispatch();
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildPackage.BUILD__BUILDMASTER, oldBuildmaster, buildmaster));
-			}
-		}
-		return buildmaster;
-	}
+    if (buildmaster != null && buildmaster.eIsProxy())
+    {
+      InternalEObject oldBuildmaster = (InternalEObject)buildmaster;
+      buildmaster = (Contact)eResolveProxy(oldBuildmaster);
+      if (buildmaster != oldBuildmaster)
+      {
+        InternalEObject newBuildmaster = (InternalEObject)buildmaster;
+        NotificationChain msgs = oldBuildmaster.eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__BUILDMASTER, null, null);
+        if (newBuildmaster.eInternalContainer() == null)
+        {
+          msgs = newBuildmaster.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__BUILDMASTER, null, msgs);
+        }
+        if (msgs != null) msgs.dispatch();
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildPackage.BUILD__BUILDMASTER, oldBuildmaster, buildmaster));
+      }
+    }
+    return buildmaster;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Contact basicGetBuildmaster() {
-		return buildmaster;
-	}
+    return buildmaster;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public NotificationChain basicSetBuildmaster(Contact newBuildmaster, NotificationChain msgs) {
-		Contact oldBuildmaster = buildmaster;
-		buildmaster = newBuildmaster;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__BUILDMASTER, oldBuildmaster, newBuildmaster);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
+    Contact oldBuildmaster = buildmaster;
+    buildmaster = newBuildmaster;
+    if (eNotificationRequired())
+    {
+      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__BUILDMASTER, oldBuildmaster, newBuildmaster);
+      if (msgs == null) msgs = notification; else msgs.add(notification);
+    }
+    return msgs;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setBuildmaster(Contact newBuildmaster) {
-		if (newBuildmaster != buildmaster) {
-			NotificationChain msgs = null;
-			if (buildmaster != null)
-				msgs = ((InternalEObject)buildmaster).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__BUILDMASTER, null, msgs);
-			if (newBuildmaster != null)
-				msgs = ((InternalEObject)newBuildmaster).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__BUILDMASTER, null, msgs);
-			msgs = basicSetBuildmaster(newBuildmaster, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__BUILDMASTER, newBuildmaster, newBuildmaster));
-	}
+    if (newBuildmaster != buildmaster)
+    {
+      NotificationChain msgs = null;
+      if (buildmaster != null)
+        msgs = ((InternalEObject)buildmaster).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__BUILDMASTER, null, msgs);
+      if (newBuildmaster != null)
+        msgs = ((InternalEObject)newBuildmaster).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BuildPackage.BUILD__BUILDMASTER, null, msgs);
+      msgs = basicSetBuildmaster(newBuildmaster, msgs);
+      if (msgs != null) msgs.dispatch();
+    }
+    else if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__BUILDMASTER, newBuildmaster, newBuildmaster));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EList<Contact> getDefaultMailList() {
-		if (defaultMailList == null) {
-			defaultMailList = new EObjectContainmentEList.Resolving<Contact>(Contact.class, this, BuildPackage.BUILD__DEFAULT_MAIL_LIST);
-		}
-		return defaultMailList;
-	}
+    if (defaultMailList == null)
+    {
+      defaultMailList = new EObjectContainmentEList.Resolving<Contact>(Contact.class, this, BuildPackage.BUILD__DEFAULT_MAIL_LIST);
+    }
+    return defaultMailList;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public boolean isSendmail() {
-		return sendmail;
-	}
+    return sendmail;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setSendmail(boolean newSendmail) {
-		boolean oldSendmail = sendmail;
-		sendmail = newSendmail;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__SENDMAIL, oldSendmail, sendmail));
-	}
+    boolean oldSendmail = sendmail;
+    sendmail = newSendmail;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.BUILD__SENDMAIL, oldSendmail, sendmail));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case BuildPackage.BUILD__PLATFORMS:
-				return ((InternalEList<?>)getPlatforms()).basicRemove(otherEnd, msgs);
-			case BuildPackage.BUILD__CONFIGS:
-				return ((InternalEList<?>)getConfigs()).basicRemove(otherEnd, msgs);
-			case BuildPackage.BUILD__MAP:
-				return basicSetMap(null, msgs);
-			case BuildPackage.BUILD__CATEGORIES:
-				return ((InternalEList<?>)getCategories()).basicRemove(otherEnd, msgs);
-			case BuildPackage.BUILD__CONTRIBUTIONS:
-				return ((InternalEList<?>)getContributions()).basicRemove(otherEnd, msgs);
-			case BuildPackage.BUILD__COMPILER:
-				return basicSetCompiler(null, msgs);
-			case BuildPackage.BUILD__PROMOTION:
-				return basicSetPromotion(null, msgs);
-			case BuildPackage.BUILD__BUILDMASTER:
-				return basicSetBuildmaster(null, msgs);
-			case BuildPackage.BUILD__DEFAULT_MAIL_LIST:
-				return ((InternalEList<?>)getDefaultMailList()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.BUILD__PLATFORMS:
+        return ((InternalEList<?>)getPlatforms()).basicRemove(otherEnd, msgs);
+      case BuildPackage.BUILD__CONFIGS:
+        return ((InternalEList<?>)getConfigs()).basicRemove(otherEnd, msgs);
+      case BuildPackage.BUILD__MAP:
+        return basicSetMap(null, msgs);
+      case BuildPackage.BUILD__CATEGORIES:
+        return ((InternalEList<?>)getCategories()).basicRemove(otherEnd, msgs);
+      case BuildPackage.BUILD__CONTRIBUTIONS:
+        return ((InternalEList<?>)getContributions()).basicRemove(otherEnd, msgs);
+      case BuildPackage.BUILD__COMPILER:
+        return basicSetCompiler(null, msgs);
+      case BuildPackage.BUILD__PROMOTION:
+        return basicSetPromotion(null, msgs);
+      case BuildPackage.BUILD__BUILDMASTER:
+        return basicSetBuildmaster(null, msgs);
+      case BuildPackage.BUILD__DEFAULT_MAIL_LIST:
+        return ((InternalEList<?>)getDefaultMailList()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BuildPackage.BUILD__TYPE:
-				return getType();
-			case BuildPackage.BUILD__BUILD_ROOT:
-				return getBuildRoot();
-			case BuildPackage.BUILD__PLATFORMS:
-				return getPlatforms();
-			case BuildPackage.BUILD__CONFIGS:
-				return getConfigs();
-			case BuildPackage.BUILD__MAP:
-				if (resolve) return getMap();
-				return basicGetMap();
-			case BuildPackage.BUILD__FETCH_TAG:
-				return getFetchTag();
-			case BuildPackage.BUILD__CATEGORIES:
-				return getCategories();
-			case BuildPackage.BUILD__CONTRIBUTIONS:
-				return getContributions();
-			case BuildPackage.BUILD__PRODUCT:
-				if (resolve) return getProduct();
-				return basicGetProduct();
-			case BuildPackage.BUILD__LABEL:
-				return getLabel();
-			case BuildPackage.BUILD__BASE:
-				if (resolve) return getBase();
-				return basicGetBase();
-			case BuildPackage.BUILD__BUILDER:
-				if (resolve) return getBuilder();
-				return basicGetBuilder();
-			case BuildPackage.BUILD__DATE:
-				return getDate();
-			case BuildPackage.BUILD__TIME:
-				return getTime();
-			case BuildPackage.BUILD__COMPILER:
-				if (resolve) return getCompiler();
-				return basicGetCompiler();
-			case BuildPackage.BUILD__LAUNCH_VM:
-				return getLaunchVM();
-			case BuildPackage.BUILD__PROMOTION:
-				if (resolve) return getPromotion();
-				return basicGetPromotion();
-			case BuildPackage.BUILD__BUILDER_URL:
-				return getBuilderURL();
-			case BuildPackage.BUILD__BUILDMASTER:
-				if (resolve) return getBuildmaster();
-				return basicGetBuildmaster();
-			case BuildPackage.BUILD__DEFAULT_MAIL_LIST:
-				return getDefaultMailList();
-			case BuildPackage.BUILD__SENDMAIL:
-				return isSendmail();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.BUILD__TYPE:
+        return getType();
+      case BuildPackage.BUILD__BUILD_ROOT:
+        return getBuildRoot();
+      case BuildPackage.BUILD__PLATFORMS:
+        return getPlatforms();
+      case BuildPackage.BUILD__CONFIGS:
+        return getConfigs();
+      case BuildPackage.BUILD__MAP:
+        if (resolve) return getMap();
+        return basicGetMap();
+      case BuildPackage.BUILD__FETCH_TAG:
+        return getFetchTag();
+      case BuildPackage.BUILD__CATEGORIES:
+        return getCategories();
+      case BuildPackage.BUILD__CONTRIBUTIONS:
+        return getContributions();
+      case BuildPackage.BUILD__PRODUCT:
+        if (resolve) return getProduct();
+        return basicGetProduct();
+      case BuildPackage.BUILD__LABEL:
+        return getLabel();
+      case BuildPackage.BUILD__BASE:
+        if (resolve) return getBase();
+        return basicGetBase();
+      case BuildPackage.BUILD__BUILDER:
+        if (resolve) return getBuilder();
+        return basicGetBuilder();
+      case BuildPackage.BUILD__DATE:
+        return getDate();
+      case BuildPackage.BUILD__TIME:
+        return getTime();
+      case BuildPackage.BUILD__COMPILER:
+        if (resolve) return getCompiler();
+        return basicGetCompiler();
+      case BuildPackage.BUILD__LAUNCH_VM:
+        return getLaunchVM();
+      case BuildPackage.BUILD__PROMOTION:
+        if (resolve) return getPromotion();
+        return basicGetPromotion();
+      case BuildPackage.BUILD__BUILDER_URL:
+        return getBuilderURL();
+      case BuildPackage.BUILD__BUILDMASTER:
+        if (resolve) return getBuildmaster();
+        return basicGetBuildmaster();
+      case BuildPackage.BUILD__DEFAULT_MAIL_LIST:
+        return getDefaultMailList();
+      case BuildPackage.BUILD__SENDMAIL:
+        return isSendmail();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BuildPackage.BUILD__TYPE:
-				setType((BuildType)newValue);
-				return;
-			case BuildPackage.BUILD__BUILD_ROOT:
-				setBuildRoot((String)newValue);
-				return;
-			case BuildPackage.BUILD__PLATFORMS:
-				getPlatforms().clear();
-				getPlatforms().addAll((Collection<? extends Platform>)newValue);
-				return;
-			case BuildPackage.BUILD__CONFIGS:
-				getConfigs().clear();
-				getConfigs().addAll((Collection<? extends Config>)newValue);
-				return;
-			case BuildPackage.BUILD__MAP:
-				setMap((Map)newValue);
-				return;
-			case BuildPackage.BUILD__FETCH_TAG:
-				setFetchTag((String)newValue);
-				return;
-			case BuildPackage.BUILD__CATEGORIES:
-				getCategories().clear();
-				getCategories().addAll((Collection<? extends Category>)newValue);
-				return;
-			case BuildPackage.BUILD__CONTRIBUTIONS:
-				getContributions().clear();
-				getContributions().addAll((Collection<? extends Contribution>)newValue);
-				return;
-			case BuildPackage.BUILD__PRODUCT:
-				setProduct((Product)newValue);
-				return;
-			case BuildPackage.BUILD__LABEL:
-				setLabel((String)newValue);
-				return;
-			case BuildPackage.BUILD__BASE:
-				setBase((Platform)newValue);
-				return;
-			case BuildPackage.BUILD__BUILDER:
-				setBuilder((Platform)newValue);
-				return;
-			case BuildPackage.BUILD__DATE:
-				setDate((String)newValue);
-				return;
-			case BuildPackage.BUILD__TIME:
-				setTime((String)newValue);
-				return;
-			case BuildPackage.BUILD__COMPILER:
-				setCompiler((org.eclipse.amalgam.releng.build.Compiler)newValue);
-				return;
-			case BuildPackage.BUILD__LAUNCH_VM:
-				setLaunchVM((String)newValue);
-				return;
-			case BuildPackage.BUILD__PROMOTION:
-				setPromotion((Promotion)newValue);
-				return;
-			case BuildPackage.BUILD__BUILDER_URL:
-				setBuilderURL((String)newValue);
-				return;
-			case BuildPackage.BUILD__BUILDMASTER:
-				setBuildmaster((Contact)newValue);
-				return;
-			case BuildPackage.BUILD__DEFAULT_MAIL_LIST:
-				getDefaultMailList().clear();
-				getDefaultMailList().addAll((Collection<? extends Contact>)newValue);
-				return;
-			case BuildPackage.BUILD__SENDMAIL:
-				setSendmail((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.BUILD__TYPE:
+        setType((BuildType)newValue);
+        return;
+      case BuildPackage.BUILD__BUILD_ROOT:
+        setBuildRoot((String)newValue);
+        return;
+      case BuildPackage.BUILD__PLATFORMS:
+        getPlatforms().clear();
+        getPlatforms().addAll((Collection<? extends Platform>)newValue);
+        return;
+      case BuildPackage.BUILD__CONFIGS:
+        getConfigs().clear();
+        getConfigs().addAll((Collection<? extends Config>)newValue);
+        return;
+      case BuildPackage.BUILD__MAP:
+        setMap((Map)newValue);
+        return;
+      case BuildPackage.BUILD__FETCH_TAG:
+        setFetchTag((String)newValue);
+        return;
+      case BuildPackage.BUILD__CATEGORIES:
+        getCategories().clear();
+        getCategories().addAll((Collection<? extends Category>)newValue);
+        return;
+      case BuildPackage.BUILD__CONTRIBUTIONS:
+        getContributions().clear();
+        getContributions().addAll((Collection<? extends Contribution>)newValue);
+        return;
+      case BuildPackage.BUILD__PRODUCT:
+        setProduct((Product)newValue);
+        return;
+      case BuildPackage.BUILD__LABEL:
+        setLabel((String)newValue);
+        return;
+      case BuildPackage.BUILD__BASE:
+        setBase((Platform)newValue);
+        return;
+      case BuildPackage.BUILD__BUILDER:
+        setBuilder((Platform)newValue);
+        return;
+      case BuildPackage.BUILD__DATE:
+        setDate((String)newValue);
+        return;
+      case BuildPackage.BUILD__TIME:
+        setTime((String)newValue);
+        return;
+      case BuildPackage.BUILD__COMPILER:
+        setCompiler((org.eclipse.amalgam.releng.build.Compiler)newValue);
+        return;
+      case BuildPackage.BUILD__LAUNCH_VM:
+        setLaunchVM((String)newValue);
+        return;
+      case BuildPackage.BUILD__PROMOTION:
+        setPromotion((Promotion)newValue);
+        return;
+      case BuildPackage.BUILD__BUILDER_URL:
+        setBuilderURL((String)newValue);
+        return;
+      case BuildPackage.BUILD__BUILDMASTER:
+        setBuildmaster((Contact)newValue);
+        return;
+      case BuildPackage.BUILD__DEFAULT_MAIL_LIST:
+        getDefaultMailList().clear();
+        getDefaultMailList().addAll((Collection<? extends Contact>)newValue);
+        return;
+      case BuildPackage.BUILD__SENDMAIL:
+        setSendmail((Boolean)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BuildPackage.BUILD__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case BuildPackage.BUILD__BUILD_ROOT:
-				setBuildRoot(BUILD_ROOT_EDEFAULT);
-				return;
-			case BuildPackage.BUILD__PLATFORMS:
-				getPlatforms().clear();
-				return;
-			case BuildPackage.BUILD__CONFIGS:
-				getConfigs().clear();
-				return;
-			case BuildPackage.BUILD__MAP:
-				setMap((Map)null);
-				return;
-			case BuildPackage.BUILD__FETCH_TAG:
-				setFetchTag(FETCH_TAG_EDEFAULT);
-				return;
-			case BuildPackage.BUILD__CATEGORIES:
-				getCategories().clear();
-				return;
-			case BuildPackage.BUILD__CONTRIBUTIONS:
-				getContributions().clear();
-				return;
-			case BuildPackage.BUILD__PRODUCT:
-				setProduct((Product)null);
-				return;
-			case BuildPackage.BUILD__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
-			case BuildPackage.BUILD__BASE:
-				setBase((Platform)null);
-				return;
-			case BuildPackage.BUILD__BUILDER:
-				setBuilder((Platform)null);
-				return;
-			case BuildPackage.BUILD__DATE:
-				setDate(DATE_EDEFAULT);
-				return;
-			case BuildPackage.BUILD__TIME:
-				setTime(TIME_EDEFAULT);
-				return;
-			case BuildPackage.BUILD__COMPILER:
-				setCompiler((org.eclipse.amalgam.releng.build.Compiler)null);
-				return;
-			case BuildPackage.BUILD__LAUNCH_VM:
-				setLaunchVM(LAUNCH_VM_EDEFAULT);
-				return;
-			case BuildPackage.BUILD__PROMOTION:
-				setPromotion((Promotion)null);
-				return;
-			case BuildPackage.BUILD__BUILDER_URL:
-				setBuilderURL(BUILDER_URL_EDEFAULT);
-				return;
-			case BuildPackage.BUILD__BUILDMASTER:
-				setBuildmaster((Contact)null);
-				return;
-			case BuildPackage.BUILD__DEFAULT_MAIL_LIST:
-				getDefaultMailList().clear();
-				return;
-			case BuildPackage.BUILD__SENDMAIL:
-				setSendmail(SENDMAIL_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.BUILD__TYPE:
+        setType(TYPE_EDEFAULT);
+        return;
+      case BuildPackage.BUILD__BUILD_ROOT:
+        setBuildRoot(BUILD_ROOT_EDEFAULT);
+        return;
+      case BuildPackage.BUILD__PLATFORMS:
+        getPlatforms().clear();
+        return;
+      case BuildPackage.BUILD__CONFIGS:
+        getConfigs().clear();
+        return;
+      case BuildPackage.BUILD__MAP:
+        setMap((Map)null);
+        return;
+      case BuildPackage.BUILD__FETCH_TAG:
+        setFetchTag(FETCH_TAG_EDEFAULT);
+        return;
+      case BuildPackage.BUILD__CATEGORIES:
+        getCategories().clear();
+        return;
+      case BuildPackage.BUILD__CONTRIBUTIONS:
+        getContributions().clear();
+        return;
+      case BuildPackage.BUILD__PRODUCT:
+        setProduct((Product)null);
+        return;
+      case BuildPackage.BUILD__LABEL:
+        setLabel(LABEL_EDEFAULT);
+        return;
+      case BuildPackage.BUILD__BASE:
+        setBase((Platform)null);
+        return;
+      case BuildPackage.BUILD__BUILDER:
+        setBuilder((Platform)null);
+        return;
+      case BuildPackage.BUILD__DATE:
+        setDate(DATE_EDEFAULT);
+        return;
+      case BuildPackage.BUILD__TIME:
+        setTime(TIME_EDEFAULT);
+        return;
+      case BuildPackage.BUILD__COMPILER:
+        setCompiler((org.eclipse.amalgam.releng.build.Compiler)null);
+        return;
+      case BuildPackage.BUILD__LAUNCH_VM:
+        setLaunchVM(LAUNCH_VM_EDEFAULT);
+        return;
+      case BuildPackage.BUILD__PROMOTION:
+        setPromotion((Promotion)null);
+        return;
+      case BuildPackage.BUILD__BUILDER_URL:
+        setBuilderURL(BUILDER_URL_EDEFAULT);
+        return;
+      case BuildPackage.BUILD__BUILDMASTER:
+        setBuildmaster((Contact)null);
+        return;
+      case BuildPackage.BUILD__DEFAULT_MAIL_LIST:
+        getDefaultMailList().clear();
+        return;
+      case BuildPackage.BUILD__SENDMAIL:
+        setSendmail(SENDMAIL_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BuildPackage.BUILD__TYPE:
-				return type != TYPE_EDEFAULT;
-			case BuildPackage.BUILD__BUILD_ROOT:
-				return BUILD_ROOT_EDEFAULT == null ? buildRoot != null : !BUILD_ROOT_EDEFAULT.equals(buildRoot);
-			case BuildPackage.BUILD__PLATFORMS:
-				return platforms != null && !platforms.isEmpty();
-			case BuildPackage.BUILD__CONFIGS:
-				return configs != null && !configs.isEmpty();
-			case BuildPackage.BUILD__MAP:
-				return map != null;
-			case BuildPackage.BUILD__FETCH_TAG:
-				return FETCH_TAG_EDEFAULT == null ? fetchTag != null : !FETCH_TAG_EDEFAULT.equals(fetchTag);
-			case BuildPackage.BUILD__CATEGORIES:
-				return categories != null && !categories.isEmpty();
-			case BuildPackage.BUILD__CONTRIBUTIONS:
-				return contributions != null && !contributions.isEmpty();
-			case BuildPackage.BUILD__PRODUCT:
-				return product != null;
-			case BuildPackage.BUILD__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
-			case BuildPackage.BUILD__BASE:
-				return base != null;
-			case BuildPackage.BUILD__BUILDER:
-				return builder != null;
-			case BuildPackage.BUILD__DATE:
-				return DATE_EDEFAULT == null ? date != null : !DATE_EDEFAULT.equals(date);
-			case BuildPackage.BUILD__TIME:
-				return TIME_EDEFAULT == null ? time != null : !TIME_EDEFAULT.equals(time);
-			case BuildPackage.BUILD__COMPILER:
-				return compiler != null;
-			case BuildPackage.BUILD__LAUNCH_VM:
-				return LAUNCH_VM_EDEFAULT == null ? launchVM != null : !LAUNCH_VM_EDEFAULT.equals(launchVM);
-			case BuildPackage.BUILD__PROMOTION:
-				return promotion != null;
-			case BuildPackage.BUILD__BUILDER_URL:
-				return BUILDER_URL_EDEFAULT == null ? builderURL != null : !BUILDER_URL_EDEFAULT.equals(builderURL);
-			case BuildPackage.BUILD__BUILDMASTER:
-				return buildmaster != null;
-			case BuildPackage.BUILD__DEFAULT_MAIL_LIST:
-				return defaultMailList != null && !defaultMailList.isEmpty();
-			case BuildPackage.BUILD__SENDMAIL:
-				return sendmail != SENDMAIL_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.BUILD__TYPE:
+        return type != TYPE_EDEFAULT;
+      case BuildPackage.BUILD__BUILD_ROOT:
+        return BUILD_ROOT_EDEFAULT == null ? buildRoot != null : !BUILD_ROOT_EDEFAULT.equals(buildRoot);
+      case BuildPackage.BUILD__PLATFORMS:
+        return platforms != null && !platforms.isEmpty();
+      case BuildPackage.BUILD__CONFIGS:
+        return configs != null && !configs.isEmpty();
+      case BuildPackage.BUILD__MAP:
+        return map != null;
+      case BuildPackage.BUILD__FETCH_TAG:
+        return FETCH_TAG_EDEFAULT == null ? fetchTag != null : !FETCH_TAG_EDEFAULT.equals(fetchTag);
+      case BuildPackage.BUILD__CATEGORIES:
+        return categories != null && !categories.isEmpty();
+      case BuildPackage.BUILD__CONTRIBUTIONS:
+        return contributions != null && !contributions.isEmpty();
+      case BuildPackage.BUILD__PRODUCT:
+        return product != null;
+      case BuildPackage.BUILD__LABEL:
+        return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
+      case BuildPackage.BUILD__BASE:
+        return base != null;
+      case BuildPackage.BUILD__BUILDER:
+        return builder != null;
+      case BuildPackage.BUILD__DATE:
+        return DATE_EDEFAULT == null ? date != null : !DATE_EDEFAULT.equals(date);
+      case BuildPackage.BUILD__TIME:
+        return TIME_EDEFAULT == null ? time != null : !TIME_EDEFAULT.equals(time);
+      case BuildPackage.BUILD__COMPILER:
+        return compiler != null;
+      case BuildPackage.BUILD__LAUNCH_VM:
+        return LAUNCH_VM_EDEFAULT == null ? launchVM != null : !LAUNCH_VM_EDEFAULT.equals(launchVM);
+      case BuildPackage.BUILD__PROMOTION:
+        return promotion != null;
+      case BuildPackage.BUILD__BUILDER_URL:
+        return BUILDER_URL_EDEFAULT == null ? builderURL != null : !BUILDER_URL_EDEFAULT.equals(builderURL);
+      case BuildPackage.BUILD__BUILDMASTER:
+        return buildmaster != null;
+      case BuildPackage.BUILD__DEFAULT_MAIL_LIST:
+        return defaultMailList != null && !defaultMailList.isEmpty();
+      case BuildPackage.BUILD__SENDMAIL:
+        return sendmail != SENDMAIL_EDEFAULT;
+    }
+    return super.eIsSet(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+    if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (type: ");
-		result.append(type);
-		result.append(", buildRoot: ");
-		result.append(buildRoot);
-		result.append(", fetchTag: ");
-		result.append(fetchTag);
-		result.append(", label: ");
-		result.append(label);
-		result.append(", date: ");
-		result.append(date);
-		result.append(", time: ");
-		result.append(time);
-		result.append(", launchVM: ");
-		result.append(launchVM);
-		result.append(", builderURL: ");
-		result.append(builderURL);
-		result.append(", sendmail: ");
-		result.append(sendmail);
-		result.append(')');
-		return result.toString();
-	}
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (type: ");
+    result.append(type);
+    result.append(", buildRoot: ");
+    result.append(buildRoot);
+    result.append(", fetchTag: ");
+    result.append(fetchTag);
+    result.append(", label: ");
+    result.append(label);
+    result.append(", date: ");
+    result.append(date);
+    result.append(", time: ");
+    result.append(time);
+    result.append(", launchVM: ");
+    result.append(launchVM);
+    result.append(", builderURL: ");
+    result.append(builderURL);
+    result.append(", sendmail: ");
+    result.append(sendmail);
+    result.append(')');
+    return result.toString();
+  }
 
 } //BuildImpl
Index: src/org/eclipse/amalgam/releng/build/impl/BuildPackageImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/impl/BuildPackageImpl.java,v
retrieving revision 1.12
diff -u -r1.12 BuildPackageImpl.java
--- src/org/eclipse/amalgam/releng/build/impl/BuildPackageImpl.java	21 May 2009 12:57:50 -0000	1.12
+++ src/org/eclipse/amalgam/releng/build/impl/BuildPackageImpl.java	6 Jun 2010 14:35:29 -0000
@@ -51,1223 +51,1226 @@
  */
 public class BuildPackageImpl extends EPackageImpl implements BuildPackage {
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass buildEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass repositoryEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass platformEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass configEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass mapEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass categoryEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass contributionEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass contactEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass featureEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass bundleEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass compilerEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass promotionEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass installationUnitEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EClass productEClass = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EEnum buildTypeEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EEnum osEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EEnum wsEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EEnum archEEnum = null;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private EEnum archiveFormatEEnum = null;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.amalgam.releng.build.BuildPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
+   * Creates an instance of the model <b>Package</b>, registered with
+   * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+   * package URI value.
+   * <p>Note: the correct way to create the package is via the static
+   * factory method {@link #init init()}, which also performs
+   * initialization of the package, or returns the registered package,
+   * if one already exists.
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @see org.eclipse.emf.ecore.EPackage.Registry
+   * @see org.eclipse.amalgam.releng.build.BuildPackage#eNS_URI
+   * @see #init()
+   * @generated
+   */
 	private BuildPackageImpl() {
-		super(eNS_URI, BuildFactory.eINSTANCE);
-	}
+    super(eNS_URI, BuildFactory.eINSTANCE);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private static boolean isInited = false;
 
 	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
+   * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+   * 
+   * <p>This method is used to initialize {@link BuildPackage#eINSTANCE} when that field is accessed.
+   * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @see #eNS_URI
+   * @see #createPackageContents()
+   * @see #initializePackageContents()
+   * @generated
+   */
 	public static BuildPackage init() {
-		if (isInited) return (BuildPackage)EPackage.Registry.INSTANCE.getEPackage(BuildPackage.eNS_URI);
+    if (isInited) return (BuildPackage)EPackage.Registry.INSTANCE.getEPackage(BuildPackage.eNS_URI);
 
-		// Obtain or create and register package
-		BuildPackageImpl theBuildPackage = (BuildPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof BuildPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new BuildPackageImpl());
+    // Obtain or create and register package
+    BuildPackageImpl theBuildPackage = (BuildPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BuildPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new BuildPackageImpl());
 
-		isInited = true;
+    isInited = true;
 
-		// Initialize simple dependencies
-		ProductPackage.eINSTANCE.eClass();
-		XMLTypePackage.eINSTANCE.eClass();
+    // Initialize simple dependencies
+    ProductPackage.eINSTANCE.eClass();
+    XMLTypePackage.eINSTANCE.eClass();
 
-		// Create package meta-data objects
-		theBuildPackage.createPackageContents();
+    // Create package meta-data objects
+    theBuildPackage.createPackageContents();
 
-		// Initialize created meta-data
-		theBuildPackage.initializePackageContents();
+    // Initialize created meta-data
+    theBuildPackage.initializePackageContents();
 
-		// Mark meta-data to indicate it can't be changed
-		theBuildPackage.freeze();
+    // Mark meta-data to indicate it can't be changed
+    theBuildPackage.freeze();
 
-		return theBuildPackage;
-	}
+  
+    // Update the registry and return the package
+    EPackage.Registry.INSTANCE.put(BuildPackage.eNS_URI, theBuildPackage);
+    return theBuildPackage;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getBuild() {
-		return buildEClass;
-	}
+    return buildEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getBuild_Type() {
-		return (EAttribute)buildEClass.getEStructuralFeatures().get(0);
-	}
+    return (EAttribute)buildEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getBuild_BuildRoot() {
-		return (EAttribute)buildEClass.getEStructuralFeatures().get(1);
-	}
+    return (EAttribute)buildEClass.getEStructuralFeatures().get(1);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getBuild_Platforms() {
-		return (EReference)buildEClass.getEStructuralFeatures().get(2);
-	}
+    return (EReference)buildEClass.getEStructuralFeatures().get(2);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getBuild_Configs() {
-		return (EReference)buildEClass.getEStructuralFeatures().get(3);
-	}
+    return (EReference)buildEClass.getEStructuralFeatures().get(3);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getBuild_Map() {
-		return (EReference)buildEClass.getEStructuralFeatures().get(4);
-	}
+    return (EReference)buildEClass.getEStructuralFeatures().get(4);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getBuild_FetchTag() {
-		return (EAttribute)buildEClass.getEStructuralFeatures().get(5);
-	}
+    return (EAttribute)buildEClass.getEStructuralFeatures().get(5);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getBuild_Categories() {
-		return (EReference)buildEClass.getEStructuralFeatures().get(6);
-	}
+    return (EReference)buildEClass.getEStructuralFeatures().get(6);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getBuild_Contributions() {
-		return (EReference)buildEClass.getEStructuralFeatures().get(7);
-	}
+    return (EReference)buildEClass.getEStructuralFeatures().get(7);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getBuild_Product() {
-		return (EReference)buildEClass.getEStructuralFeatures().get(8);
-	}
+    return (EReference)buildEClass.getEStructuralFeatures().get(8);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getBuild_Label() {
-		return (EAttribute)buildEClass.getEStructuralFeatures().get(9);
-	}
+    return (EAttribute)buildEClass.getEStructuralFeatures().get(9);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getBuild_Base() {
-		return (EReference)buildEClass.getEStructuralFeatures().get(10);
-	}
+    return (EReference)buildEClass.getEStructuralFeatures().get(10);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getBuild_Builder() {
-		return (EReference)buildEClass.getEStructuralFeatures().get(11);
-	}
+    return (EReference)buildEClass.getEStructuralFeatures().get(11);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getBuild_Date() {
-		return (EAttribute)buildEClass.getEStructuralFeatures().get(12);
-	}
+    return (EAttribute)buildEClass.getEStructuralFeatures().get(12);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getBuild_Time() {
-		return (EAttribute)buildEClass.getEStructuralFeatures().get(13);
-	}
+    return (EAttribute)buildEClass.getEStructuralFeatures().get(13);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getBuild_Compiler() {
-		return (EReference)buildEClass.getEStructuralFeatures().get(14);
-	}
+    return (EReference)buildEClass.getEStructuralFeatures().get(14);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getBuild_LaunchVM() {
-		return (EAttribute)buildEClass.getEStructuralFeatures().get(15);
-	}
+    return (EAttribute)buildEClass.getEStructuralFeatures().get(15);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getBuild_Promotion() {
-		return (EReference)buildEClass.getEStructuralFeatures().get(16);
-	}
+    return (EReference)buildEClass.getEStructuralFeatures().get(16);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getBuild_BuilderURL() {
-		return (EAttribute)buildEClass.getEStructuralFeatures().get(17);
-	}
+    return (EAttribute)buildEClass.getEStructuralFeatures().get(17);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getBuild_Buildmaster() {
-		return (EReference)buildEClass.getEStructuralFeatures().get(18);
-	}
+    return (EReference)buildEClass.getEStructuralFeatures().get(18);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getBuild_DefaultMailList() {
-		return (EReference)buildEClass.getEStructuralFeatures().get(19);
-	}
+    return (EReference)buildEClass.getEStructuralFeatures().get(19);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getBuild_Sendmail() {
-		return (EAttribute)buildEClass.getEStructuralFeatures().get(20);
-	}
+    return (EAttribute)buildEClass.getEStructuralFeatures().get(20);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getRepository() {
-		return repositoryEClass;
-	}
+    return repositoryEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getRepository_Location() {
-		return (EAttribute)repositoryEClass.getEStructuralFeatures().get(0);
-	}
+    return (EAttribute)repositoryEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getRepository_Label() {
-		return (EAttribute)repositoryEClass.getEStructuralFeatures().get(1);
-	}
+    return (EAttribute)repositoryEClass.getEStructuralFeatures().get(1);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getPlatform() {
-		return platformEClass;
-	}
+    return platformEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getPlatform_File() {
-		return (EAttribute)platformEClass.getEStructuralFeatures().get(0);
-	}
+    return (EAttribute)platformEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getPlatform_Location() {
-		return (EAttribute)platformEClass.getEStructuralFeatures().get(1);
-	}
+    return (EAttribute)platformEClass.getEStructuralFeatures().get(1);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getPlatform_Config() {
-		return (EReference)platformEClass.getEStructuralFeatures().get(2);
-	}
+    return (EReference)platformEClass.getEStructuralFeatures().get(2);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getPlatform_Deltapack() {
-		return (EAttribute)platformEClass.getEStructuralFeatures().get(3);
-	}
+    return (EAttribute)platformEClass.getEStructuralFeatures().get(3);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getConfig() {
-		return configEClass;
-	}
+    return configEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getConfig_Os() {
-		return (EAttribute)configEClass.getEStructuralFeatures().get(0);
-	}
+    return (EAttribute)configEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getConfig_Ws() {
-		return (EAttribute)configEClass.getEStructuralFeatures().get(1);
-	}
+    return (EAttribute)configEClass.getEStructuralFeatures().get(1);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getConfig_Arch() {
-		return (EAttribute)configEClass.getEStructuralFeatures().get(2);
-	}
+    return (EAttribute)configEClass.getEStructuralFeatures().get(2);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getConfig_ArchiveFormat() {
-		return (EAttribute)configEClass.getEStructuralFeatures().get(3);
-	}
+    return (EAttribute)configEClass.getEStructuralFeatures().get(3);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getMap() {
-		return mapEClass;
-	}
+    return mapEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getMap_Root() {
-		return (EAttribute)mapEClass.getEStructuralFeatures().get(0);
-	}
+    return (EAttribute)mapEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getMap_Repo() {
-		return (EAttribute)mapEClass.getEStructuralFeatures().get(1);
-	}
+    return (EAttribute)mapEClass.getEStructuralFeatures().get(1);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getMap_Tag() {
-		return (EAttribute)mapEClass.getEStructuralFeatures().get(2);
-	}
+    return (EAttribute)mapEClass.getEStructuralFeatures().get(2);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getCategory() {
-		return categoryEClass;
-	}
+    return categoryEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getCategory_Name() {
-		return (EAttribute)categoryEClass.getEStructuralFeatures().get(0);
-	}
+    return (EAttribute)categoryEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getCategory_Label() {
-		return (EAttribute)categoryEClass.getEStructuralFeatures().get(1);
-	}
+    return (EAttribute)categoryEClass.getEStructuralFeatures().get(1);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getCategory_Description() {
-		return (EAttribute)categoryEClass.getEStructuralFeatures().get(2);
-	}
+    return (EAttribute)categoryEClass.getEStructuralFeatures().get(2);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getCategory_Features() {
-		return (EReference)categoryEClass.getEStructuralFeatures().get(3);
-	}
+    return (EReference)categoryEClass.getEStructuralFeatures().get(3);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getContribution() {
-		return contributionEClass;
-	}
+    return contributionEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getContribution_Contacts() {
-		return (EReference)contributionEClass.getEStructuralFeatures().get(0);
-	}
+    return (EReference)contributionEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getContribution_Features() {
-		return (EReference)contributionEClass.getEStructuralFeatures().get(1);
-	}
+    return (EReference)contributionEClass.getEStructuralFeatures().get(1);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getContribution_Label() {
-		return (EAttribute)contributionEClass.getEStructuralFeatures().get(2);
-	}
+    return (EAttribute)contributionEClass.getEStructuralFeatures().get(2);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getContribution_Repositories() {
-		return (EReference)contributionEClass.getEStructuralFeatures().get(3);
-	}
+    return (EReference)contributionEClass.getEStructuralFeatures().get(3);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getContribution_Bundles() {
-		return (EReference)contributionEClass.getEStructuralFeatures().get(4);
-	}
+    return (EReference)contributionEClass.getEStructuralFeatures().get(4);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getContribution_Products() {
-		return (EReference)contributionEClass.getEStructuralFeatures().get(5);
-	}
+    return (EReference)contributionEClass.getEStructuralFeatures().get(5);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getContact() {
-		return contactEClass;
-	}
+    return contactEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getContact_Name() {
-		return (EAttribute)contactEClass.getEStructuralFeatures().get(0);
-	}
+    return (EAttribute)contactEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getContact_Email() {
-		return (EAttribute)contactEClass.getEStructuralFeatures().get(1);
-	}
+    return (EAttribute)contactEClass.getEStructuralFeatures().get(1);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getFeature() {
-		return featureEClass;
-	}
+    return featureEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getFeature_Category() {
-		return (EReference)featureEClass.getEStructuralFeatures().get(0);
-	}
+    return (EReference)featureEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getFeature_InProduct() {
-		return (EAttribute)featureEClass.getEStructuralFeatures().get(1);
-	}
+    return (EAttribute)featureEClass.getEStructuralFeatures().get(1);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getBundle() {
-		return bundleEClass;
-	}
+    return bundleEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getCompiler() {
-		return compilerEClass;
-	}
+    return compilerEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getCompiler_Args() {
-		return (EAttribute)compilerEClass.getEStructuralFeatures().get(0);
-	}
+    return (EAttribute)compilerEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getCompiler_SourceVersion() {
-		return (EAttribute)compilerEClass.getEStructuralFeatures().get(1);
-	}
+    return (EAttribute)compilerEClass.getEStructuralFeatures().get(1);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getCompiler_TargetVersion() {
-		return (EAttribute)compilerEClass.getEStructuralFeatures().get(2);
-	}
+    return (EAttribute)compilerEClass.getEStructuralFeatures().get(2);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getCompiler_Verbose() {
-		return (EAttribute)compilerEClass.getEStructuralFeatures().get(3);
-	}
+    return (EAttribute)compilerEClass.getEStructuralFeatures().get(3);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getCompiler_FailOnError() {
-		return (EAttribute)compilerEClass.getEStructuralFeatures().get(4);
-	}
+    return (EAttribute)compilerEClass.getEStructuralFeatures().get(4);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getCompiler_DebugInfo() {
-		return (EAttribute)compilerEClass.getEStructuralFeatures().get(5);
-	}
+    return (EAttribute)compilerEClass.getEStructuralFeatures().get(5);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getPromotion() {
-		return promotionEClass;
-	}
+    return promotionEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getPromotion_UploadDirectory() {
-		return (EAttribute)promotionEClass.getEStructuralFeatures().get(0);
-	}
+    return (EAttribute)promotionEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getPromotion_DownloadDirectory() {
-		return (EAttribute)promotionEClass.getEStructuralFeatures().get(1);
-	}
+    return (EAttribute)promotionEClass.getEStructuralFeatures().get(1);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getPromotion_Incubating() {
-		return (EAttribute)promotionEClass.getEStructuralFeatures().get(2);
-	}
+    return (EAttribute)promotionEClass.getEStructuralFeatures().get(2);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getPromotion_BaseURL() {
-		return (EAttribute)promotionEClass.getEStructuralFeatures().get(3);
-	}
+    return (EAttribute)promotionEClass.getEStructuralFeatures().get(3);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getPromotion_BuildAlias() {
-		return (EAttribute)promotionEClass.getEStructuralFeatures().get(4);
-	}
+    return (EAttribute)promotionEClass.getEStructuralFeatures().get(4);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getInstallationUnit() {
-		return installationUnitEClass;
-	}
+    return installationUnitEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getInstallationUnit_Id() {
-		return (EAttribute)installationUnitEClass.getEStructuralFeatures().get(0);
-	}
+    return (EAttribute)installationUnitEClass.getEStructuralFeatures().get(0);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EAttribute getInstallationUnit_Version() {
-		return (EAttribute)installationUnitEClass.getEStructuralFeatures().get(1);
-	}
+    return (EAttribute)installationUnitEClass.getEStructuralFeatures().get(1);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EReference getInstallationUnit_Repo() {
-		return (EReference)installationUnitEClass.getEStructuralFeatures().get(2);
-	}
+    return (EReference)installationUnitEClass.getEStructuralFeatures().get(2);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EClass getProduct() {
-		return productEClass;
-	}
+    return productEClass;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EEnum getBuildType() {
-		return buildTypeEEnum;
-	}
+    return buildTypeEEnum;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EEnum getOS() {
-		return osEEnum;
-	}
+    return osEEnum;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EEnum getWS() {
-		return wsEEnum;
-	}
+    return wsEEnum;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EEnum getARCH() {
-		return archEEnum;
-	}
+    return archEEnum;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EEnum getArchiveFormat() {
-		return archiveFormatEEnum;
-	}
+    return archiveFormatEEnum;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public BuildFactory getBuildFactory() {
-		return (BuildFactory)getEFactoryInstance();
-	}
+    return (BuildFactory)getEFactoryInstance();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private boolean isCreated = false;
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
+   * Creates the meta-model objects for the package.  This method is
+   * guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
+    if (isCreated) return;
+    isCreated = true;
 
-		// Create classes and their features
-		buildEClass = createEClass(BUILD);
-		createEAttribute(buildEClass, BUILD__TYPE);
-		createEAttribute(buildEClass, BUILD__BUILD_ROOT);
-		createEReference(buildEClass, BUILD__PLATFORMS);
-		createEReference(buildEClass, BUILD__CONFIGS);
-		createEReference(buildEClass, BUILD__MAP);
-		createEAttribute(buildEClass, BUILD__FETCH_TAG);
-		createEReference(buildEClass, BUILD__CATEGORIES);
-		createEReference(buildEClass, BUILD__CONTRIBUTIONS);
-		createEReference(buildEClass, BUILD__PRODUCT);
-		createEAttribute(buildEClass, BUILD__LABEL);
-		createEReference(buildEClass, BUILD__BASE);
-		createEReference(buildEClass, BUILD__BUILDER);
-		createEAttribute(buildEClass, BUILD__DATE);
-		createEAttribute(buildEClass, BUILD__TIME);
-		createEReference(buildEClass, BUILD__COMPILER);
-		createEAttribute(buildEClass, BUILD__LAUNCH_VM);
-		createEReference(buildEClass, BUILD__PROMOTION);
-		createEAttribute(buildEClass, BUILD__BUILDER_URL);
-		createEReference(buildEClass, BUILD__BUILDMASTER);
-		createEReference(buildEClass, BUILD__DEFAULT_MAIL_LIST);
-		createEAttribute(buildEClass, BUILD__SENDMAIL);
-
-		repositoryEClass = createEClass(REPOSITORY);
-		createEAttribute(repositoryEClass, REPOSITORY__LOCATION);
-		createEAttribute(repositoryEClass, REPOSITORY__LABEL);
-
-		platformEClass = createEClass(PLATFORM);
-		createEAttribute(platformEClass, PLATFORM__FILE);
-		createEAttribute(platformEClass, PLATFORM__LOCATION);
-		createEReference(platformEClass, PLATFORM__CONFIG);
-		createEAttribute(platformEClass, PLATFORM__DELTAPACK);
-
-		configEClass = createEClass(CONFIG);
-		createEAttribute(configEClass, CONFIG__OS);
-		createEAttribute(configEClass, CONFIG__WS);
-		createEAttribute(configEClass, CONFIG__ARCH);
-		createEAttribute(configEClass, CONFIG__ARCHIVE_FORMAT);
-
-		mapEClass = createEClass(MAP);
-		createEAttribute(mapEClass, MAP__ROOT);
-		createEAttribute(mapEClass, MAP__REPO);
-		createEAttribute(mapEClass, MAP__TAG);
-
-		categoryEClass = createEClass(CATEGORY);
-		createEAttribute(categoryEClass, CATEGORY__NAME);
-		createEAttribute(categoryEClass, CATEGORY__LABEL);
-		createEAttribute(categoryEClass, CATEGORY__DESCRIPTION);
-		createEReference(categoryEClass, CATEGORY__FEATURES);
-
-		contributionEClass = createEClass(CONTRIBUTION);
-		createEReference(contributionEClass, CONTRIBUTION__CONTACTS);
-		createEReference(contributionEClass, CONTRIBUTION__FEATURES);
-		createEAttribute(contributionEClass, CONTRIBUTION__LABEL);
-		createEReference(contributionEClass, CONTRIBUTION__REPOSITORIES);
-		createEReference(contributionEClass, CONTRIBUTION__BUNDLES);
-		createEReference(contributionEClass, CONTRIBUTION__PRODUCTS);
-
-		contactEClass = createEClass(CONTACT);
-		createEAttribute(contactEClass, CONTACT__NAME);
-		createEAttribute(contactEClass, CONTACT__EMAIL);
-
-		featureEClass = createEClass(FEATURE);
-		createEReference(featureEClass, FEATURE__CATEGORY);
-		createEAttribute(featureEClass, FEATURE__IN_PRODUCT);
-
-		bundleEClass = createEClass(BUNDLE);
-
-		compilerEClass = createEClass(COMPILER);
-		createEAttribute(compilerEClass, COMPILER__ARGS);
-		createEAttribute(compilerEClass, COMPILER__SOURCE_VERSION);
-		createEAttribute(compilerEClass, COMPILER__TARGET_VERSION);
-		createEAttribute(compilerEClass, COMPILER__VERBOSE);
-		createEAttribute(compilerEClass, COMPILER__FAIL_ON_ERROR);
-		createEAttribute(compilerEClass, COMPILER__DEBUG_INFO);
-
-		promotionEClass = createEClass(PROMOTION);
-		createEAttribute(promotionEClass, PROMOTION__UPLOAD_DIRECTORY);
-		createEAttribute(promotionEClass, PROMOTION__DOWNLOAD_DIRECTORY);
-		createEAttribute(promotionEClass, PROMOTION__INCUBATING);
-		createEAttribute(promotionEClass, PROMOTION__BASE_URL);
-		createEAttribute(promotionEClass, PROMOTION__BUILD_ALIAS);
-
-		installationUnitEClass = createEClass(INSTALLATION_UNIT);
-		createEAttribute(installationUnitEClass, INSTALLATION_UNIT__ID);
-		createEAttribute(installationUnitEClass, INSTALLATION_UNIT__VERSION);
-		createEReference(installationUnitEClass, INSTALLATION_UNIT__REPO);
-
-		productEClass = createEClass(PRODUCT);
-
-		// Create enums
-		buildTypeEEnum = createEEnum(BUILD_TYPE);
-		osEEnum = createEEnum(OS);
-		wsEEnum = createEEnum(WS);
-		archEEnum = createEEnum(ARCH);
-		archiveFormatEEnum = createEEnum(ARCHIVE_FORMAT);
-	}
+    // Create classes and their features
+    buildEClass = createEClass(BUILD);
+    createEAttribute(buildEClass, BUILD__TYPE);
+    createEAttribute(buildEClass, BUILD__BUILD_ROOT);
+    createEReference(buildEClass, BUILD__PLATFORMS);
+    createEReference(buildEClass, BUILD__CONFIGS);
+    createEReference(buildEClass, BUILD__MAP);
+    createEAttribute(buildEClass, BUILD__FETCH_TAG);
+    createEReference(buildEClass, BUILD__CATEGORIES);
+    createEReference(buildEClass, BUILD__CONTRIBUTIONS);
+    createEReference(buildEClass, BUILD__PRODUCT);
+    createEAttribute(buildEClass, BUILD__LABEL);
+    createEReference(buildEClass, BUILD__BASE);
+    createEReference(buildEClass, BUILD__BUILDER);
+    createEAttribute(buildEClass, BUILD__DATE);
+    createEAttribute(buildEClass, BUILD__TIME);
+    createEReference(buildEClass, BUILD__COMPILER);
+    createEAttribute(buildEClass, BUILD__LAUNCH_VM);
+    createEReference(buildEClass, BUILD__PROMOTION);
+    createEAttribute(buildEClass, BUILD__BUILDER_URL);
+    createEReference(buildEClass, BUILD__BUILDMASTER);
+    createEReference(buildEClass, BUILD__DEFAULT_MAIL_LIST);
+    createEAttribute(buildEClass, BUILD__SENDMAIL);
+
+    repositoryEClass = createEClass(REPOSITORY);
+    createEAttribute(repositoryEClass, REPOSITORY__LOCATION);
+    createEAttribute(repositoryEClass, REPOSITORY__LABEL);
+
+    platformEClass = createEClass(PLATFORM);
+    createEAttribute(platformEClass, PLATFORM__FILE);
+    createEAttribute(platformEClass, PLATFORM__LOCATION);
+    createEReference(platformEClass, PLATFORM__CONFIG);
+    createEAttribute(platformEClass, PLATFORM__DELTAPACK);
+
+    configEClass = createEClass(CONFIG);
+    createEAttribute(configEClass, CONFIG__OS);
+    createEAttribute(configEClass, CONFIG__WS);
+    createEAttribute(configEClass, CONFIG__ARCH);
+    createEAttribute(configEClass, CONFIG__ARCHIVE_FORMAT);
+
+    mapEClass = createEClass(MAP);
+    createEAttribute(mapEClass, MAP__ROOT);
+    createEAttribute(mapEClass, MAP__REPO);
+    createEAttribute(mapEClass, MAP__TAG);
+
+    categoryEClass = createEClass(CATEGORY);
+    createEAttribute(categoryEClass, CATEGORY__NAME);
+    createEAttribute(categoryEClass, CATEGORY__LABEL);
+    createEAttribute(categoryEClass, CATEGORY__DESCRIPTION);
+    createEReference(categoryEClass, CATEGORY__FEATURES);
+
+    contributionEClass = createEClass(CONTRIBUTION);
+    createEReference(contributionEClass, CONTRIBUTION__CONTACTS);
+    createEReference(contributionEClass, CONTRIBUTION__FEATURES);
+    createEAttribute(contributionEClass, CONTRIBUTION__LABEL);
+    createEReference(contributionEClass, CONTRIBUTION__REPOSITORIES);
+    createEReference(contributionEClass, CONTRIBUTION__BUNDLES);
+    createEReference(contributionEClass, CONTRIBUTION__PRODUCTS);
+
+    contactEClass = createEClass(CONTACT);
+    createEAttribute(contactEClass, CONTACT__NAME);
+    createEAttribute(contactEClass, CONTACT__EMAIL);
+
+    featureEClass = createEClass(FEATURE);
+    createEReference(featureEClass, FEATURE__CATEGORY);
+    createEAttribute(featureEClass, FEATURE__IN_PRODUCT);
+
+    bundleEClass = createEClass(BUNDLE);
+
+    compilerEClass = createEClass(COMPILER);
+    createEAttribute(compilerEClass, COMPILER__ARGS);
+    createEAttribute(compilerEClass, COMPILER__SOURCE_VERSION);
+    createEAttribute(compilerEClass, COMPILER__TARGET_VERSION);
+    createEAttribute(compilerEClass, COMPILER__VERBOSE);
+    createEAttribute(compilerEClass, COMPILER__FAIL_ON_ERROR);
+    createEAttribute(compilerEClass, COMPILER__DEBUG_INFO);
+
+    promotionEClass = createEClass(PROMOTION);
+    createEAttribute(promotionEClass, PROMOTION__UPLOAD_DIRECTORY);
+    createEAttribute(promotionEClass, PROMOTION__DOWNLOAD_DIRECTORY);
+    createEAttribute(promotionEClass, PROMOTION__INCUBATING);
+    createEAttribute(promotionEClass, PROMOTION__BASE_URL);
+    createEAttribute(promotionEClass, PROMOTION__BUILD_ALIAS);
+
+    installationUnitEClass = createEClass(INSTALLATION_UNIT);
+    createEAttribute(installationUnitEClass, INSTALLATION_UNIT__ID);
+    createEAttribute(installationUnitEClass, INSTALLATION_UNIT__VERSION);
+    createEReference(installationUnitEClass, INSTALLATION_UNIT__REPO);
+
+    productEClass = createEClass(PRODUCT);
+
+    // Create enums
+    buildTypeEEnum = createEEnum(BUILD_TYPE);
+    osEEnum = createEEnum(OS);
+    wsEEnum = createEEnum(WS);
+    archEEnum = createEEnum(ARCH);
+    archiveFormatEEnum = createEEnum(ARCHIVE_FORMAT);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private boolean isInitialized = false;
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
+   * Complete the initialization of the package and its meta-model.  This
+   * method is guarded to have no affect on any invocation but its first.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
+    if (isInitialized) return;
+    isInitialized = true;
 
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		ProductPackage theProductPackage = (ProductPackage)EPackage.Registry.INSTANCE.getEPackage(ProductPackage.eNS_URI);
-		XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		featureEClass.getESuperTypes().add(this.getInstallationUnit());
-		bundleEClass.getESuperTypes().add(this.getInstallationUnit());
-		productEClass.getESuperTypes().add(this.getInstallationUnit());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(buildEClass, Build.class, "Build", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBuild_Type(), this.getBuildType(), "type", null, 1, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBuild_BuildRoot(), ecorePackage.getEString(), "buildRoot", "${user.home}/build", 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBuild_Platforms(), this.getPlatform(), null, "platforms", null, 1, -1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBuild_Configs(), this.getConfig(), null, "configs", null, 1, -1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBuild_Map(), this.getMap(), null, "map", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBuild_FetchTag(), ecorePackage.getEString(), "fetchTag", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBuild_Categories(), this.getCategory(), null, "categories", null, 0, -1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBuild_Contributions(), this.getContribution(), null, "contributions", null, 0, -1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBuild_Product(), theProductPackage.getProduct(), null, "product", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBuild_Label(), ecorePackage.getEString(), "label", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBuild_Base(), this.getPlatform(), null, "base", null, 1, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBuild_Builder(), this.getPlatform(), null, "builder", null, 1, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBuild_Date(), ecorePackage.getEString(), "date", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBuild_Time(), ecorePackage.getEString(), "time", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBuild_Compiler(), this.getCompiler(), null, "compiler", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBuild_LaunchVM(), ecorePackage.getEString(), "launchVM", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBuild_Promotion(), this.getPromotion(), null, "promotion", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBuild_BuilderURL(), ecorePackage.getEString(), "builderURL", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBuild_Buildmaster(), this.getContact(), null, "buildmaster", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getBuild_DefaultMailList(), this.getContact(), null, "defaultMailList", null, 0, -1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBuild_Sendmail(), ecorePackage.getEBoolean(), "sendmail", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(repositoryEClass, Repository.class, "Repository", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRepository_Location(), theXMLTypePackage.getString(), "location", null, 1, 1, Repository.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getRepository_Label(), ecorePackage.getEString(), "label", null, 0, 1, Repository.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(platformEClass, Platform.class, "Platform", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPlatform_File(), ecorePackage.getEString(), "file", null, 0, 1, Platform.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPlatform_Location(), ecorePackage.getEString(), "location", null, 0, 1, Platform.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPlatform_Config(), this.getConfig(), null, "config", null, 0, 1, Platform.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPlatform_Deltapack(), ecorePackage.getEString(), "deltapack", null, 0, 1, Platform.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(configEClass, Config.class, "Config", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getConfig_Os(), this.getOS(), "os", null, 1, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getConfig_Ws(), this.getWS(), "ws", null, 1, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getConfig_Arch(), this.getARCH(), "arch", null, 1, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getConfig_ArchiveFormat(), this.getArchiveFormat(), "archiveFormat", "tar.gz", 0, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(mapEClass, Map.class, "Map", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMap_Root(), ecorePackage.getEString(), "root", null, 0, 1, Map.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMap_Repo(), ecorePackage.getEString(), "repo", null, 0, 1, Map.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMap_Tag(), ecorePackage.getEString(), "tag", null, 0, 1, Map.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCategory_Label(), ecorePackage.getEString(), "label", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCategory_Description(), ecorePackage.getEString(), "description", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCategory_Features(), this.getFeature(), this.getFeature_Category(), "features", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(contributionEClass, Contribution.class, "Contribution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getContribution_Contacts(), this.getContact(), null, "contacts", null, 0, -1, Contribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getContribution_Features(), this.getFeature(), null, "features", null, 0, -1, Contribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getContribution_Label(), ecorePackage.getEString(), "label", null, 0, 1, Contribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getContribution_Repositories(), this.getRepository(), null, "repositories", null, 0, -1, Contribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getContribution_Bundles(), this.getBundle(), null, "bundles", null, 0, -1, Contribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getContribution_Products(), this.getProduct(), null, "products", null, 0, -1, Contribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(contactEClass, Contact.class, "Contact", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getContact_Name(), ecorePackage.getEString(), "name", null, 0, 1, Contact.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getContact_Email(), ecorePackage.getEString(), "email", null, 0, 1, Contact.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(featureEClass, Feature.class, "Feature", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getFeature_Category(), this.getCategory(), this.getCategory_Features(), "category", null, 0, -1, Feature.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeature_InProduct(), ecorePackage.getEBoolean(), "inProduct", "true", 0, 1, Feature.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(bundleEClass, Bundle.class, "Bundle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(compilerEClass, org.eclipse.amalgam.releng.build.Compiler.class, "Compiler", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCompiler_Args(), ecorePackage.getEString(), "args", null, 0, 1, org.eclipse.amalgam.releng.build.Compiler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCompiler_SourceVersion(), ecorePackage.getEString(), "sourceVersion", "1.5", 0, 1, org.eclipse.amalgam.releng.build.Compiler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCompiler_TargetVersion(), ecorePackage.getEString(), "targetVersion", "1.5", 0, 1, org.eclipse.amalgam.releng.build.Compiler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCompiler_Verbose(), ecorePackage.getEBoolean(), "verbose", "false", 0, 1, org.eclipse.amalgam.releng.build.Compiler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCompiler_FailOnError(), ecorePackage.getEBoolean(), "failOnError", "false", 0, 1, org.eclipse.amalgam.releng.build.Compiler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCompiler_DebugInfo(), ecorePackage.getEBoolean(), "debugInfo", "true", 0, 1, org.eclipse.amalgam.releng.build.Compiler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(promotionEClass, Promotion.class, "Promotion", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPromotion_UploadDirectory(), ecorePackage.getEString(), "uploadDirectory", null, 0, 1, Promotion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPromotion_DownloadDirectory(), ecorePackage.getEString(), "downloadDirectory", null, 0, 1, Promotion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPromotion_Incubating(), ecorePackage.getEBoolean(), "incubating", null, 0, 1, Promotion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPromotion_BaseURL(), ecorePackage.getEString(), "baseURL", null, 0, 1, Promotion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPromotion_BuildAlias(), ecorePackage.getEString(), "buildAlias", null, 0, 1, Promotion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(installationUnitEClass, InstallationUnit.class, "InstallationUnit", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getInstallationUnit_Id(), ecorePackage.getEString(), "id", null, 1, 1, InstallationUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getInstallationUnit_Version(), ecorePackage.getEString(), "version", null, 0, 1, InstallationUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getInstallationUnit_Repo(), this.getRepository(), null, "repo", null, 0, 1, InstallationUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(productEClass, Product.class, "Product", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		// Initialize enums and add enum literals
-		initEEnum(buildTypeEEnum, BuildType.class, "BuildType");
-		addEEnumLiteral(buildTypeEEnum, BuildType.CONTINUOUS);
-		addEEnumLiteral(buildTypeEEnum, BuildType.NIGHTLY);
-		addEEnumLiteral(buildTypeEEnum, BuildType.INTEGRATION);
-		addEEnumLiteral(buildTypeEEnum, BuildType.STABLE);
-		addEEnumLiteral(buildTypeEEnum, BuildType.RELEASE);
-		addEEnumLiteral(buildTypeEEnum, BuildType.MAINTENANCE);
-
-		initEEnum(osEEnum, org.eclipse.amalgam.releng.build.OS.class, "OS");
-		addEEnumLiteral(osEEnum, org.eclipse.amalgam.releng.build.OS.WIN32);
-		addEEnumLiteral(osEEnum, org.eclipse.amalgam.releng.build.OS.LINUX);
-		addEEnumLiteral(osEEnum, org.eclipse.amalgam.releng.build.OS.MACOSX);
-
-		initEEnum(wsEEnum, org.eclipse.amalgam.releng.build.WS.class, "WS");
-		addEEnumLiteral(wsEEnum, org.eclipse.amalgam.releng.build.WS.WIN32);
-		addEEnumLiteral(wsEEnum, org.eclipse.amalgam.releng.build.WS.GTK);
-		addEEnumLiteral(wsEEnum, org.eclipse.amalgam.releng.build.WS.CARBON);
-		addEEnumLiteral(wsEEnum, org.eclipse.amalgam.releng.build.WS.COCOA);
-
-		initEEnum(archEEnum, org.eclipse.amalgam.releng.build.ARCH.class, "ARCH");
-		addEEnumLiteral(archEEnum, org.eclipse.amalgam.releng.build.ARCH.X86);
-		addEEnumLiteral(archEEnum, org.eclipse.amalgam.releng.build.ARCH.PPC);
-		addEEnumLiteral(archEEnum, org.eclipse.amalgam.releng.build.ARCH.X86_64);
-
-		initEEnum(archiveFormatEEnum, ArchiveFormat.class, "ArchiveFormat");
-		addEEnumLiteral(archiveFormatEEnum, ArchiveFormat.ZIP);
-		addEEnumLiteral(archiveFormatEEnum, ArchiveFormat.TAR);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
+    // Initialize package
+    setName(eNAME);
+    setNsPrefix(eNS_PREFIX);
+    setNsURI(eNS_URI);
+
+    // Obtain other dependent packages
+    ProductPackage theProductPackage = (ProductPackage)EPackage.Registry.INSTANCE.getEPackage(ProductPackage.eNS_URI);
+    XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
+
+    // Create type parameters
+
+    // Set bounds for type parameters
+
+    // Add supertypes to classes
+    featureEClass.getESuperTypes().add(this.getInstallationUnit());
+    bundleEClass.getESuperTypes().add(this.getInstallationUnit());
+    productEClass.getESuperTypes().add(this.getInstallationUnit());
+
+    // Initialize classes and features; add operations and parameters
+    initEClass(buildEClass, Build.class, "Build", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getBuild_Type(), this.getBuildType(), "type", null, 1, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBuild_BuildRoot(), ecorePackage.getEString(), "buildRoot", "${user.home}/build", 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBuild_Platforms(), this.getPlatform(), null, "platforms", null, 1, -1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBuild_Configs(), this.getConfig(), null, "configs", null, 1, -1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBuild_Map(), this.getMap(), null, "map", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBuild_FetchTag(), ecorePackage.getEString(), "fetchTag", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBuild_Categories(), this.getCategory(), null, "categories", null, 0, -1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBuild_Contributions(), this.getContribution(), null, "contributions", null, 0, -1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBuild_Product(), theProductPackage.getProduct(), null, "product", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBuild_Label(), ecorePackage.getEString(), "label", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBuild_Base(), this.getPlatform(), null, "base", null, 1, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBuild_Builder(), this.getPlatform(), null, "builder", null, 1, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBuild_Date(), ecorePackage.getEString(), "date", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBuild_Time(), ecorePackage.getEString(), "time", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBuild_Compiler(), this.getCompiler(), null, "compiler", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBuild_LaunchVM(), ecorePackage.getEString(), "launchVM", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBuild_Promotion(), this.getPromotion(), null, "promotion", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBuild_BuilderURL(), ecorePackage.getEString(), "builderURL", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBuild_Buildmaster(), this.getContact(), null, "buildmaster", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getBuild_DefaultMailList(), this.getContact(), null, "defaultMailList", null, 0, -1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getBuild_Sendmail(), ecorePackage.getEBoolean(), "sendmail", null, 0, 1, Build.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(repositoryEClass, Repository.class, "Repository", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getRepository_Location(), theXMLTypePackage.getString(), "location", null, 1, 1, Repository.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getRepository_Label(), ecorePackage.getEString(), "label", null, 0, 1, Repository.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(platformEClass, Platform.class, "Platform", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getPlatform_File(), ecorePackage.getEString(), "file", null, 0, 1, Platform.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getPlatform_Location(), ecorePackage.getEString(), "location", null, 0, 1, Platform.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getPlatform_Config(), this.getConfig(), null, "config", null, 0, 1, Platform.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getPlatform_Deltapack(), ecorePackage.getEString(), "deltapack", null, 0, 1, Platform.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(configEClass, Config.class, "Config", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getConfig_Os(), this.getOS(), "os", null, 1, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getConfig_Ws(), this.getWS(), "ws", null, 1, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getConfig_Arch(), this.getARCH(), "arch", null, 1, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getConfig_ArchiveFormat(), this.getArchiveFormat(), "archiveFormat", "tar.gz", 0, 1, Config.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(mapEClass, Map.class, "Map", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getMap_Root(), ecorePackage.getEString(), "root", null, 0, 1, Map.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMap_Repo(), ecorePackage.getEString(), "repo", null, 0, 1, Map.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getMap_Tag(), ecorePackage.getEString(), "tag", null, 0, 1, Map.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(categoryEClass, Category.class, "Category", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getCategory_Name(), ecorePackage.getEString(), "name", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCategory_Label(), ecorePackage.getEString(), "label", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCategory_Description(), ecorePackage.getEString(), "description", null, 0, 1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getCategory_Features(), this.getFeature(), this.getFeature_Category(), "features", null, 0, -1, Category.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(contributionEClass, Contribution.class, "Contribution", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getContribution_Contacts(), this.getContact(), null, "contacts", null, 0, -1, Contribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getContribution_Features(), this.getFeature(), null, "features", null, 0, -1, Contribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getContribution_Label(), ecorePackage.getEString(), "label", null, 0, 1, Contribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getContribution_Repositories(), this.getRepository(), null, "repositories", null, 0, -1, Contribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getContribution_Bundles(), this.getBundle(), null, "bundles", null, 0, -1, Contribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getContribution_Products(), this.getProduct(), null, "products", null, 0, -1, Contribution.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(contactEClass, Contact.class, "Contact", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getContact_Name(), ecorePackage.getEString(), "name", null, 0, 1, Contact.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getContact_Email(), ecorePackage.getEString(), "email", null, 0, 1, Contact.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(featureEClass, Feature.class, "Feature", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEReference(getFeature_Category(), this.getCategory(), this.getCategory_Features(), "category", null, 0, -1, Feature.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getFeature_InProduct(), ecorePackage.getEBoolean(), "inProduct", "true", 0, 1, Feature.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(bundleEClass, Bundle.class, "Bundle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+    initEClass(compilerEClass, org.eclipse.amalgam.releng.build.Compiler.class, "Compiler", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getCompiler_Args(), ecorePackage.getEString(), "args", null, 0, 1, org.eclipse.amalgam.releng.build.Compiler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCompiler_SourceVersion(), ecorePackage.getEString(), "sourceVersion", "1.5", 0, 1, org.eclipse.amalgam.releng.build.Compiler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCompiler_TargetVersion(), ecorePackage.getEString(), "targetVersion", "1.5", 0, 1, org.eclipse.amalgam.releng.build.Compiler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCompiler_Verbose(), ecorePackage.getEBoolean(), "verbose", "false", 0, 1, org.eclipse.amalgam.releng.build.Compiler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCompiler_FailOnError(), ecorePackage.getEBoolean(), "failOnError", "false", 0, 1, org.eclipse.amalgam.releng.build.Compiler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getCompiler_DebugInfo(), ecorePackage.getEBoolean(), "debugInfo", "true", 0, 1, org.eclipse.amalgam.releng.build.Compiler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(promotionEClass, Promotion.class, "Promotion", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getPromotion_UploadDirectory(), ecorePackage.getEString(), "uploadDirectory", null, 0, 1, Promotion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getPromotion_DownloadDirectory(), ecorePackage.getEString(), "downloadDirectory", null, 0, 1, Promotion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getPromotion_Incubating(), ecorePackage.getEBoolean(), "incubating", null, 0, 1, Promotion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getPromotion_BaseURL(), ecorePackage.getEString(), "baseURL", null, 0, 1, Promotion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getPromotion_BuildAlias(), ecorePackage.getEString(), "buildAlias", null, 0, 1, Promotion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(installationUnitEClass, InstallationUnit.class, "InstallationUnit", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+    initEAttribute(getInstallationUnit_Id(), ecorePackage.getEString(), "id", null, 1, 1, InstallationUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEAttribute(getInstallationUnit_Version(), ecorePackage.getEString(), "version", null, 0, 1, InstallationUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+    initEReference(getInstallationUnit_Repo(), this.getRepository(), null, "repo", null, 0, 1, InstallationUnit.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+    initEClass(productEClass, Product.class, "Product", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+    // Initialize enums and add enum literals
+    initEEnum(buildTypeEEnum, BuildType.class, "BuildType");
+    addEEnumLiteral(buildTypeEEnum, BuildType.CONTINUOUS);
+    addEEnumLiteral(buildTypeEEnum, BuildType.NIGHTLY);
+    addEEnumLiteral(buildTypeEEnum, BuildType.INTEGRATION);
+    addEEnumLiteral(buildTypeEEnum, BuildType.STABLE);
+    addEEnumLiteral(buildTypeEEnum, BuildType.RELEASE);
+    addEEnumLiteral(buildTypeEEnum, BuildType.MAINTENANCE);
+
+    initEEnum(osEEnum, org.eclipse.amalgam.releng.build.OS.class, "OS");
+    addEEnumLiteral(osEEnum, org.eclipse.amalgam.releng.build.OS.WIN32);
+    addEEnumLiteral(osEEnum, org.eclipse.amalgam.releng.build.OS.LINUX);
+    addEEnumLiteral(osEEnum, org.eclipse.amalgam.releng.build.OS.MACOSX);
+    addEEnumLiteral(osEEnum, org.eclipse.amalgam.releng.build.OS.AIX);
+    addEEnumLiteral(osEEnum, org.eclipse.amalgam.releng.build.OS.HPUX);
+    addEEnumLiteral(osEEnum, org.eclipse.amalgam.releng.build.OS.SOLARIS);
+
+    initEEnum(wsEEnum, org.eclipse.amalgam.releng.build.WS.class, "WS");
+    addEEnumLiteral(wsEEnum, org.eclipse.amalgam.releng.build.WS.WIN32);
+    addEEnumLiteral(wsEEnum, org.eclipse.amalgam.releng.build.WS.GTK);
+    addEEnumLiteral(wsEEnum, org.eclipse.amalgam.releng.build.WS.CARBON);
+    addEEnumLiteral(wsEEnum, org.eclipse.amalgam.releng.build.WS.COCOA);
+    addEEnumLiteral(wsEEnum, org.eclipse.amalgam.releng.build.WS.MOTIF);
+    addEEnumLiteral(wsEEnum, org.eclipse.amalgam.releng.build.WS.SOLARIS);
+
+    initEEnum(archEEnum, org.eclipse.amalgam.releng.build.ARCH.class, "ARCH");
+    addEEnumLiteral(archEEnum, org.eclipse.amalgam.releng.build.ARCH.X86);
+    addEEnumLiteral(archEEnum, org.eclipse.amalgam.releng.build.ARCH.PPC);
+    addEEnumLiteral(archEEnum, org.eclipse.amalgam.releng.build.ARCH.X86_64);
+    addEEnumLiteral(archEEnum, org.eclipse.amalgam.releng.build.ARCH.IA64_32);
+    addEEnumLiteral(archEEnum, org.eclipse.amalgam.releng.build.ARCH.PPC64);
+    addEEnumLiteral(archEEnum, org.eclipse.amalgam.releng.build.ARCH.S390);
+    addEEnumLiteral(archEEnum, org.eclipse.amalgam.releng.build.ARCH.S390X);
+    addEEnumLiteral(archEEnum, org.eclipse.amalgam.releng.build.ARCH.SPARC);
+
+    initEEnum(archiveFormatEEnum, ArchiveFormat.class, "ArchiveFormat");
+    addEEnumLiteral(archiveFormatEEnum, ArchiveFormat.ZIP);
+    addEEnumLiteral(archiveFormatEEnum, ArchiveFormat.TAR);
+
+    // Create resource
+    createResource(eNS_URI);
+  }
 
 } //BuildPackageImpl
Index: src/org/eclipse/amalgam/releng/build/impl/BundleImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/impl/BundleImpl.java,v
retrieving revision 1.2
diff -u -r1.2 BundleImpl.java
--- src/org/eclipse/amalgam/releng/build/impl/BundleImpl.java	20 May 2009 18:12:35 -0000	1.2
+++ src/org/eclipse/amalgam/releng/build/impl/BundleImpl.java	6 Jun 2010 14:35:29 -0000
@@ -36,22 +36,22 @@
  */
 public class BundleImpl extends InstallationUnitImpl implements Bundle {
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected BundleImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected EClass eStaticClass() {
-		return BuildPackage.Literals.BUNDLE;
-	}
+    return BuildPackage.Literals.BUNDLE;
+  }
 
 } //BundleImpl
Index: src/org/eclipse/amalgam/releng/build/impl/CategoryImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/impl/CategoryImpl.java,v
retrieving revision 1.2
diff -u -r1.2 CategoryImpl.java
--- src/org/eclipse/amalgam/releng/build/impl/CategoryImpl.java	17 Apr 2009 23:42:56 -0000	1.2
+++ src/org/eclipse/amalgam/releng/build/impl/CategoryImpl.java	6 Jun 2010 14:35:29 -0000
@@ -51,306 +51,313 @@
  */
 public class CategoryImpl extends EObjectImpl implements Category {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLabel() <em>Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getLabel() <em>Label</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getLabel()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getLabel()
+   * @generated
+   * @ordered
+   */
 	protected static final String LABEL_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLabel() <em>Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getLabel() <em>Label</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getLabel()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getLabel()
+   * @generated
+   * @ordered
+   */
 	protected String label = LABEL_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getDescription()
+   * @generated
+   * @ordered
+   */
 	protected static final String DESCRIPTION_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getDescription()
+   * @generated
+   * @ordered
+   */
 	protected String description = DESCRIPTION_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getFeatures() <em>Features</em>}' reference list.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getFeatures() <em>Features</em>}' reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getFeatures()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getFeatures()
+   * @generated
+   * @ordered
+   */
 	protected EList<Feature> features;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected CategoryImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected EClass eStaticClass() {
-		return BuildPackage.Literals.CATEGORY;
-	}
+    return BuildPackage.Literals.CATEGORY;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getName() {
-		return name;
-	}
+    return name;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CATEGORY__NAME, oldName, name));
-	}
+    String oldName = name;
+    name = newName;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CATEGORY__NAME, oldName, name));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getLabel() {
-		return label;
-	}
+    return label;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setLabel(String newLabel) {
-		String oldLabel = label;
-		label = newLabel;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CATEGORY__LABEL, oldLabel, label));
-	}
+    String oldLabel = label;
+    label = newLabel;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CATEGORY__LABEL, oldLabel, label));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getDescription() {
-		return description;
-	}
+    return description;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CATEGORY__DESCRIPTION, oldDescription, description));
-	}
+    String oldDescription = description;
+    description = newDescription;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CATEGORY__DESCRIPTION, oldDescription, description));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EList<Feature> getFeatures() {
-		if (features == null) {
-			features = new EObjectWithInverseResolvingEList.ManyInverse<Feature>(Feature.class, this, BuildPackage.CATEGORY__FEATURES, BuildPackage.FEATURE__CATEGORY);
-		}
-		return features;
-	}
+    if (features == null)
+    {
+      features = new EObjectWithInverseResolvingEList.ManyInverse<Feature>(Feature.class, this, BuildPackage.CATEGORY__FEATURES, BuildPackage.FEATURE__CATEGORY);
+    }
+    return features;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@SuppressWarnings("unchecked")
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case BuildPackage.CATEGORY__FEATURES:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getFeatures()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CATEGORY__FEATURES:
+        return ((InternalEList<InternalEObject>)(InternalEList<?>)getFeatures()).basicAdd(otherEnd, msgs);
+    }
+    return super.eInverseAdd(otherEnd, featureID, msgs);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case BuildPackage.CATEGORY__FEATURES:
-				return ((InternalEList<?>)getFeatures()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CATEGORY__FEATURES:
+        return ((InternalEList<?>)getFeatures()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BuildPackage.CATEGORY__NAME:
-				return getName();
-			case BuildPackage.CATEGORY__LABEL:
-				return getLabel();
-			case BuildPackage.CATEGORY__DESCRIPTION:
-				return getDescription();
-			case BuildPackage.CATEGORY__FEATURES:
-				return getFeatures();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CATEGORY__NAME:
+        return getName();
+      case BuildPackage.CATEGORY__LABEL:
+        return getLabel();
+      case BuildPackage.CATEGORY__DESCRIPTION:
+        return getDescription();
+      case BuildPackage.CATEGORY__FEATURES:
+        return getFeatures();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BuildPackage.CATEGORY__NAME:
-				setName((String)newValue);
-				return;
-			case BuildPackage.CATEGORY__LABEL:
-				setLabel((String)newValue);
-				return;
-			case BuildPackage.CATEGORY__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case BuildPackage.CATEGORY__FEATURES:
-				getFeatures().clear();
-				getFeatures().addAll((Collection<? extends Feature>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CATEGORY__NAME:
+        setName((String)newValue);
+        return;
+      case BuildPackage.CATEGORY__LABEL:
+        setLabel((String)newValue);
+        return;
+      case BuildPackage.CATEGORY__DESCRIPTION:
+        setDescription((String)newValue);
+        return;
+      case BuildPackage.CATEGORY__FEATURES:
+        getFeatures().clear();
+        getFeatures().addAll((Collection<? extends Feature>)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BuildPackage.CATEGORY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BuildPackage.CATEGORY__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
-			case BuildPackage.CATEGORY__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case BuildPackage.CATEGORY__FEATURES:
-				getFeatures().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CATEGORY__NAME:
+        setName(NAME_EDEFAULT);
+        return;
+      case BuildPackage.CATEGORY__LABEL:
+        setLabel(LABEL_EDEFAULT);
+        return;
+      case BuildPackage.CATEGORY__DESCRIPTION:
+        setDescription(DESCRIPTION_EDEFAULT);
+        return;
+      case BuildPackage.CATEGORY__FEATURES:
+        getFeatures().clear();
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BuildPackage.CATEGORY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BuildPackage.CATEGORY__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
-			case BuildPackage.CATEGORY__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case BuildPackage.CATEGORY__FEATURES:
-				return features != null && !features.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CATEGORY__NAME:
+        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+      case BuildPackage.CATEGORY__LABEL:
+        return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
+      case BuildPackage.CATEGORY__DESCRIPTION:
+        return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+      case BuildPackage.CATEGORY__FEATURES:
+        return features != null && !features.isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+    if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", label: ");
-		result.append(label);
-		result.append(", description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (name: ");
+    result.append(name);
+    result.append(", label: ");
+    result.append(label);
+    result.append(", description: ");
+    result.append(description);
+    result.append(')');
+    return result.toString();
+  }
 
 } //CategoryImpl
Index: src/org/eclipse/amalgam/releng/build/impl/CompilerImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/impl/CompilerImpl.java,v
retrieving revision 1.2
diff -u -r1.2 CompilerImpl.java
--- src/org/eclipse/amalgam/releng/build/impl/CompilerImpl.java	13 Mar 2009 11:09:27 -0000	1.2
+++ src/org/eclipse/amalgam/releng/build/impl/CompilerImpl.java	6 Jun 2010 14:35:29 -0000
@@ -42,402 +42,406 @@
  */
 public class CompilerImpl extends EObjectImpl implements org.eclipse.amalgam.releng.build.Compiler {
 	/**
-	 * The default value of the '{@link #getArgs() <em>Args</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getArgs() <em>Args</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getArgs()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getArgs()
+   * @generated
+   * @ordered
+   */
 	protected static final String ARGS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getArgs() <em>Args</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getArgs() <em>Args</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getArgs()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getArgs()
+   * @generated
+   * @ordered
+   */
 	protected String args = ARGS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getSourceVersion() <em>Source Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getSourceVersion() <em>Source Version</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getSourceVersion()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getSourceVersion()
+   * @generated
+   * @ordered
+   */
 	protected static final String SOURCE_VERSION_EDEFAULT = "1.5";
 
 	/**
-	 * The cached value of the '{@link #getSourceVersion() <em>Source Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getSourceVersion() <em>Source Version</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getSourceVersion()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getSourceVersion()
+   * @generated
+   * @ordered
+   */
 	protected String sourceVersion = SOURCE_VERSION_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTargetVersion() <em>Target Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getTargetVersion() <em>Target Version</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getTargetVersion()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getTargetVersion()
+   * @generated
+   * @ordered
+   */
 	protected static final String TARGET_VERSION_EDEFAULT = "1.5";
 
 	/**
-	 * The cached value of the '{@link #getTargetVersion() <em>Target Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getTargetVersion() <em>Target Version</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getTargetVersion()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getTargetVersion()
+   * @generated
+   * @ordered
+   */
 	protected String targetVersion = TARGET_VERSION_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #isVerbose() <em>Verbose</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #isVerbose() <em>Verbose</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isVerbose()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #isVerbose()
+   * @generated
+   * @ordered
+   */
 	protected static final boolean VERBOSE_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isVerbose() <em>Verbose</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #isVerbose() <em>Verbose</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isVerbose()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #isVerbose()
+   * @generated
+   * @ordered
+   */
 	protected boolean verbose = VERBOSE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #isFailOnError() <em>Fail On Error</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #isFailOnError() <em>Fail On Error</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isFailOnError()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #isFailOnError()
+   * @generated
+   * @ordered
+   */
 	protected static final boolean FAIL_ON_ERROR_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isFailOnError() <em>Fail On Error</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #isFailOnError() <em>Fail On Error</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isFailOnError()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #isFailOnError()
+   * @generated
+   * @ordered
+   */
 	protected boolean failOnError = FAIL_ON_ERROR_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #isDebugInfo() <em>Debug Info</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #isDebugInfo() <em>Debug Info</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isDebugInfo()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #isDebugInfo()
+   * @generated
+   * @ordered
+   */
 	protected static final boolean DEBUG_INFO_EDEFAULT = true;
 
 	/**
-	 * The cached value of the '{@link #isDebugInfo() <em>Debug Info</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #isDebugInfo() <em>Debug Info</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isDebugInfo()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #isDebugInfo()
+   * @generated
+   * @ordered
+   */
 	protected boolean debugInfo = DEBUG_INFO_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected CompilerImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected EClass eStaticClass() {
-		return BuildPackage.Literals.COMPILER;
-	}
+    return BuildPackage.Literals.COMPILER;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getArgs() {
-		return args;
-	}
+    return args;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setArgs(String newArgs) {
-		String oldArgs = args;
-		args = newArgs;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.COMPILER__ARGS, oldArgs, args));
-	}
+    String oldArgs = args;
+    args = newArgs;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.COMPILER__ARGS, oldArgs, args));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getSourceVersion() {
-		return sourceVersion;
-	}
+    return sourceVersion;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setSourceVersion(String newSourceVersion) {
-		String oldSourceVersion = sourceVersion;
-		sourceVersion = newSourceVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.COMPILER__SOURCE_VERSION, oldSourceVersion, sourceVersion));
-	}
+    String oldSourceVersion = sourceVersion;
+    sourceVersion = newSourceVersion;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.COMPILER__SOURCE_VERSION, oldSourceVersion, sourceVersion));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getTargetVersion() {
-		return targetVersion;
-	}
+    return targetVersion;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setTargetVersion(String newTargetVersion) {
-		String oldTargetVersion = targetVersion;
-		targetVersion = newTargetVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.COMPILER__TARGET_VERSION, oldTargetVersion, targetVersion));
-	}
+    String oldTargetVersion = targetVersion;
+    targetVersion = newTargetVersion;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.COMPILER__TARGET_VERSION, oldTargetVersion, targetVersion));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public boolean isVerbose() {
-		return verbose;
-	}
+    return verbose;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setVerbose(boolean newVerbose) {
-		boolean oldVerbose = verbose;
-		verbose = newVerbose;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.COMPILER__VERBOSE, oldVerbose, verbose));
-	}
+    boolean oldVerbose = verbose;
+    verbose = newVerbose;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.COMPILER__VERBOSE, oldVerbose, verbose));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public boolean isFailOnError() {
-		return failOnError;
-	}
+    return failOnError;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setFailOnError(boolean newFailOnError) {
-		boolean oldFailOnError = failOnError;
-		failOnError = newFailOnError;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.COMPILER__FAIL_ON_ERROR, oldFailOnError, failOnError));
-	}
+    boolean oldFailOnError = failOnError;
+    failOnError = newFailOnError;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.COMPILER__FAIL_ON_ERROR, oldFailOnError, failOnError));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public boolean isDebugInfo() {
-		return debugInfo;
-	}
+    return debugInfo;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setDebugInfo(boolean newDebugInfo) {
-		boolean oldDebugInfo = debugInfo;
-		debugInfo = newDebugInfo;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.COMPILER__DEBUG_INFO, oldDebugInfo, debugInfo));
-	}
+    boolean oldDebugInfo = debugInfo;
+    debugInfo = newDebugInfo;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.COMPILER__DEBUG_INFO, oldDebugInfo, debugInfo));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BuildPackage.COMPILER__ARGS:
-				return getArgs();
-			case BuildPackage.COMPILER__SOURCE_VERSION:
-				return getSourceVersion();
-			case BuildPackage.COMPILER__TARGET_VERSION:
-				return getTargetVersion();
-			case BuildPackage.COMPILER__VERBOSE:
-				return isVerbose();
-			case BuildPackage.COMPILER__FAIL_ON_ERROR:
-				return isFailOnError();
-			case BuildPackage.COMPILER__DEBUG_INFO:
-				return isDebugInfo();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.COMPILER__ARGS:
+        return getArgs();
+      case BuildPackage.COMPILER__SOURCE_VERSION:
+        return getSourceVersion();
+      case BuildPackage.COMPILER__TARGET_VERSION:
+        return getTargetVersion();
+      case BuildPackage.COMPILER__VERBOSE:
+        return isVerbose();
+      case BuildPackage.COMPILER__FAIL_ON_ERROR:
+        return isFailOnError();
+      case BuildPackage.COMPILER__DEBUG_INFO:
+        return isDebugInfo();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BuildPackage.COMPILER__ARGS:
-				setArgs((String)newValue);
-				return;
-			case BuildPackage.COMPILER__SOURCE_VERSION:
-				setSourceVersion((String)newValue);
-				return;
-			case BuildPackage.COMPILER__TARGET_VERSION:
-				setTargetVersion((String)newValue);
-				return;
-			case BuildPackage.COMPILER__VERBOSE:
-				setVerbose((Boolean)newValue);
-				return;
-			case BuildPackage.COMPILER__FAIL_ON_ERROR:
-				setFailOnError((Boolean)newValue);
-				return;
-			case BuildPackage.COMPILER__DEBUG_INFO:
-				setDebugInfo((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.COMPILER__ARGS:
+        setArgs((String)newValue);
+        return;
+      case BuildPackage.COMPILER__SOURCE_VERSION:
+        setSourceVersion((String)newValue);
+        return;
+      case BuildPackage.COMPILER__TARGET_VERSION:
+        setTargetVersion((String)newValue);
+        return;
+      case BuildPackage.COMPILER__VERBOSE:
+        setVerbose((Boolean)newValue);
+        return;
+      case BuildPackage.COMPILER__FAIL_ON_ERROR:
+        setFailOnError((Boolean)newValue);
+        return;
+      case BuildPackage.COMPILER__DEBUG_INFO:
+        setDebugInfo((Boolean)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BuildPackage.COMPILER__ARGS:
-				setArgs(ARGS_EDEFAULT);
-				return;
-			case BuildPackage.COMPILER__SOURCE_VERSION:
-				setSourceVersion(SOURCE_VERSION_EDEFAULT);
-				return;
-			case BuildPackage.COMPILER__TARGET_VERSION:
-				setTargetVersion(TARGET_VERSION_EDEFAULT);
-				return;
-			case BuildPackage.COMPILER__VERBOSE:
-				setVerbose(VERBOSE_EDEFAULT);
-				return;
-			case BuildPackage.COMPILER__FAIL_ON_ERROR:
-				setFailOnError(FAIL_ON_ERROR_EDEFAULT);
-				return;
-			case BuildPackage.COMPILER__DEBUG_INFO:
-				setDebugInfo(DEBUG_INFO_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.COMPILER__ARGS:
+        setArgs(ARGS_EDEFAULT);
+        return;
+      case BuildPackage.COMPILER__SOURCE_VERSION:
+        setSourceVersion(SOURCE_VERSION_EDEFAULT);
+        return;
+      case BuildPackage.COMPILER__TARGET_VERSION:
+        setTargetVersion(TARGET_VERSION_EDEFAULT);
+        return;
+      case BuildPackage.COMPILER__VERBOSE:
+        setVerbose(VERBOSE_EDEFAULT);
+        return;
+      case BuildPackage.COMPILER__FAIL_ON_ERROR:
+        setFailOnError(FAIL_ON_ERROR_EDEFAULT);
+        return;
+      case BuildPackage.COMPILER__DEBUG_INFO:
+        setDebugInfo(DEBUG_INFO_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BuildPackage.COMPILER__ARGS:
-				return ARGS_EDEFAULT == null ? args != null : !ARGS_EDEFAULT.equals(args);
-			case BuildPackage.COMPILER__SOURCE_VERSION:
-				return SOURCE_VERSION_EDEFAULT == null ? sourceVersion != null : !SOURCE_VERSION_EDEFAULT.equals(sourceVersion);
-			case BuildPackage.COMPILER__TARGET_VERSION:
-				return TARGET_VERSION_EDEFAULT == null ? targetVersion != null : !TARGET_VERSION_EDEFAULT.equals(targetVersion);
-			case BuildPackage.COMPILER__VERBOSE:
-				return verbose != VERBOSE_EDEFAULT;
-			case BuildPackage.COMPILER__FAIL_ON_ERROR:
-				return failOnError != FAIL_ON_ERROR_EDEFAULT;
-			case BuildPackage.COMPILER__DEBUG_INFO:
-				return debugInfo != DEBUG_INFO_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.COMPILER__ARGS:
+        return ARGS_EDEFAULT == null ? args != null : !ARGS_EDEFAULT.equals(args);
+      case BuildPackage.COMPILER__SOURCE_VERSION:
+        return SOURCE_VERSION_EDEFAULT == null ? sourceVersion != null : !SOURCE_VERSION_EDEFAULT.equals(sourceVersion);
+      case BuildPackage.COMPILER__TARGET_VERSION:
+        return TARGET_VERSION_EDEFAULT == null ? targetVersion != null : !TARGET_VERSION_EDEFAULT.equals(targetVersion);
+      case BuildPackage.COMPILER__VERBOSE:
+        return verbose != VERBOSE_EDEFAULT;
+      case BuildPackage.COMPILER__FAIL_ON_ERROR:
+        return failOnError != FAIL_ON_ERROR_EDEFAULT;
+      case BuildPackage.COMPILER__DEBUG_INFO:
+        return debugInfo != DEBUG_INFO_EDEFAULT;
+    }
+    return super.eIsSet(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+    if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (args: ");
-		result.append(args);
-		result.append(", sourceVersion: ");
-		result.append(sourceVersion);
-		result.append(", targetVersion: ");
-		result.append(targetVersion);
-		result.append(", verbose: ");
-		result.append(verbose);
-		result.append(", failOnError: ");
-		result.append(failOnError);
-		result.append(", debugInfo: ");
-		result.append(debugInfo);
-		result.append(')');
-		return result.toString();
-	}
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (args: ");
+    result.append(args);
+    result.append(", sourceVersion: ");
+    result.append(sourceVersion);
+    result.append(", targetVersion: ");
+    result.append(targetVersion);
+    result.append(", verbose: ");
+    result.append(verbose);
+    result.append(", failOnError: ");
+    result.append(failOnError);
+    result.append(", debugInfo: ");
+    result.append(debugInfo);
+    result.append(')');
+    return result.toString();
+  }
 
 } //CompilerImpl
Index: src/org/eclipse/amalgam/releng/build/impl/ConfigImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/impl/ConfigImpl.java,v
retrieving revision 1.1
diff -u -r1.1 ConfigImpl.java
--- src/org/eclipse/amalgam/releng/build/impl/ConfigImpl.java	24 Nov 2008 20:36:44 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/impl/ConfigImpl.java	6 Jun 2010 14:35:29 -0000
@@ -45,296 +45,300 @@
  */
 public class ConfigImpl extends EObjectImpl implements Config {
 	/**
-	 * The default value of the '{@link #getOs() <em>Os</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getOs() <em>Os</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getOs()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getOs()
+   * @generated
+   * @ordered
+   */
 	protected static final OS OS_EDEFAULT = OS.WIN32;
 
 	/**
-	 * The cached value of the '{@link #getOs() <em>Os</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getOs() <em>Os</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getOs()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getOs()
+   * @generated
+   * @ordered
+   */
 	protected OS os = OS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getWs() <em>Ws</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getWs() <em>Ws</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getWs()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getWs()
+   * @generated
+   * @ordered
+   */
 	protected static final WS WS_EDEFAULT = WS.WIN32;
 
 	/**
-	 * The cached value of the '{@link #getWs() <em>Ws</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getWs() <em>Ws</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getWs()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getWs()
+   * @generated
+   * @ordered
+   */
 	protected WS ws = WS_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getArch() <em>Arch</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getArch() <em>Arch</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getArch()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getArch()
+   * @generated
+   * @ordered
+   */
 	protected static final ARCH ARCH_EDEFAULT = ARCH.X86;
 
 	/**
-	 * The cached value of the '{@link #getArch() <em>Arch</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getArch() <em>Arch</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getArch()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getArch()
+   * @generated
+   * @ordered
+   */
 	protected ARCH arch = ARCH_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getArchiveFormat() <em>Archive Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getArchiveFormat() <em>Archive Format</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getArchiveFormat()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getArchiveFormat()
+   * @generated
+   * @ordered
+   */
 	protected static final ArchiveFormat ARCHIVE_FORMAT_EDEFAULT = ArchiveFormat.ZIP;
 
 	/**
-	 * The cached value of the '{@link #getArchiveFormat() <em>Archive Format</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getArchiveFormat() <em>Archive Format</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getArchiveFormat()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getArchiveFormat()
+   * @generated
+   * @ordered
+   */
 	protected ArchiveFormat archiveFormat = ARCHIVE_FORMAT_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected ConfigImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected EClass eStaticClass() {
-		return BuildPackage.Literals.CONFIG;
-	}
+    return BuildPackage.Literals.CONFIG;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public OS getOs() {
-		return os;
-	}
+    return os;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setOs(OS newOs) {
-		OS oldOs = os;
-		os = newOs == null ? OS_EDEFAULT : newOs;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CONFIG__OS, oldOs, os));
-	}
+    OS oldOs = os;
+    os = newOs == null ? OS_EDEFAULT : newOs;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CONFIG__OS, oldOs, os));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public WS getWs() {
-		return ws;
-	}
+    return ws;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setWs(WS newWs) {
-		WS oldWs = ws;
-		ws = newWs == null ? WS_EDEFAULT : newWs;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CONFIG__WS, oldWs, ws));
-	}
+    WS oldWs = ws;
+    ws = newWs == null ? WS_EDEFAULT : newWs;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CONFIG__WS, oldWs, ws));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public ARCH getArch() {
-		return arch;
-	}
+    return arch;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setArch(ARCH newArch) {
-		ARCH oldArch = arch;
-		arch = newArch == null ? ARCH_EDEFAULT : newArch;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CONFIG__ARCH, oldArch, arch));
-	}
+    ARCH oldArch = arch;
+    arch = newArch == null ? ARCH_EDEFAULT : newArch;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CONFIG__ARCH, oldArch, arch));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public ArchiveFormat getArchiveFormat() {
-		return archiveFormat;
-	}
+    return archiveFormat;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setArchiveFormat(ArchiveFormat newArchiveFormat) {
-		ArchiveFormat oldArchiveFormat = archiveFormat;
-		archiveFormat = newArchiveFormat == null ? ARCHIVE_FORMAT_EDEFAULT : newArchiveFormat;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CONFIG__ARCHIVE_FORMAT, oldArchiveFormat, archiveFormat));
-	}
+    ArchiveFormat oldArchiveFormat = archiveFormat;
+    archiveFormat = newArchiveFormat == null ? ARCHIVE_FORMAT_EDEFAULT : newArchiveFormat;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CONFIG__ARCHIVE_FORMAT, oldArchiveFormat, archiveFormat));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BuildPackage.CONFIG__OS:
-				return getOs();
-			case BuildPackage.CONFIG__WS:
-				return getWs();
-			case BuildPackage.CONFIG__ARCH:
-				return getArch();
-			case BuildPackage.CONFIG__ARCHIVE_FORMAT:
-				return getArchiveFormat();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CONFIG__OS:
+        return getOs();
+      case BuildPackage.CONFIG__WS:
+        return getWs();
+      case BuildPackage.CONFIG__ARCH:
+        return getArch();
+      case BuildPackage.CONFIG__ARCHIVE_FORMAT:
+        return getArchiveFormat();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BuildPackage.CONFIG__OS:
-				setOs((OS)newValue);
-				return;
-			case BuildPackage.CONFIG__WS:
-				setWs((WS)newValue);
-				return;
-			case BuildPackage.CONFIG__ARCH:
-				setArch((ARCH)newValue);
-				return;
-			case BuildPackage.CONFIG__ARCHIVE_FORMAT:
-				setArchiveFormat((ArchiveFormat)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CONFIG__OS:
+        setOs((OS)newValue);
+        return;
+      case BuildPackage.CONFIG__WS:
+        setWs((WS)newValue);
+        return;
+      case BuildPackage.CONFIG__ARCH:
+        setArch((ARCH)newValue);
+        return;
+      case BuildPackage.CONFIG__ARCHIVE_FORMAT:
+        setArchiveFormat((ArchiveFormat)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BuildPackage.CONFIG__OS:
-				setOs(OS_EDEFAULT);
-				return;
-			case BuildPackage.CONFIG__WS:
-				setWs(WS_EDEFAULT);
-				return;
-			case BuildPackage.CONFIG__ARCH:
-				setArch(ARCH_EDEFAULT);
-				return;
-			case BuildPackage.CONFIG__ARCHIVE_FORMAT:
-				setArchiveFormat(ARCHIVE_FORMAT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CONFIG__OS:
+        setOs(OS_EDEFAULT);
+        return;
+      case BuildPackage.CONFIG__WS:
+        setWs(WS_EDEFAULT);
+        return;
+      case BuildPackage.CONFIG__ARCH:
+        setArch(ARCH_EDEFAULT);
+        return;
+      case BuildPackage.CONFIG__ARCHIVE_FORMAT:
+        setArchiveFormat(ARCHIVE_FORMAT_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BuildPackage.CONFIG__OS:
-				return os != OS_EDEFAULT;
-			case BuildPackage.CONFIG__WS:
-				return ws != WS_EDEFAULT;
-			case BuildPackage.CONFIG__ARCH:
-				return arch != ARCH_EDEFAULT;
-			case BuildPackage.CONFIG__ARCHIVE_FORMAT:
-				return archiveFormat != ARCHIVE_FORMAT_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CONFIG__OS:
+        return os != OS_EDEFAULT;
+      case BuildPackage.CONFIG__WS:
+        return ws != WS_EDEFAULT;
+      case BuildPackage.CONFIG__ARCH:
+        return arch != ARCH_EDEFAULT;
+      case BuildPackage.CONFIG__ARCHIVE_FORMAT:
+        return archiveFormat != ARCHIVE_FORMAT_EDEFAULT;
+    }
+    return super.eIsSet(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+    if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (os: ");
-		result.append(os);
-		result.append(", ws: ");
-		result.append(ws);
-		result.append(", arch: ");
-		result.append(arch);
-		result.append(", archiveFormat: ");
-		result.append(archiveFormat);
-		result.append(')');
-		return result.toString();
-	}
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (os: ");
+    result.append(os);
+    result.append(", ws: ");
+    result.append(ws);
+    result.append(", arch: ");
+    result.append(arch);
+    result.append(", archiveFormat: ");
+    result.append(archiveFormat);
+    result.append(')');
+    return result.toString();
+  }
 
 } //ConfigImpl
Index: src/org/eclipse/amalgam/releng/build/impl/ContactImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/impl/ContactImpl.java,v
retrieving revision 1.1
diff -u -r1.1 ContactImpl.java
--- src/org/eclipse/amalgam/releng/build/impl/ContactImpl.java	24 Nov 2008 20:36:44 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/impl/ContactImpl.java	6 Jun 2010 14:35:30 -0000
@@ -39,190 +39,194 @@
  */
 public class ContactImpl extends EObjectImpl implements Contact {
 	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
 	protected static final String NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getName()
+   * @generated
+   * @ordered
+   */
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getEmail() <em>Email</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getEmail() <em>Email</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getEmail()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getEmail()
+   * @generated
+   * @ordered
+   */
 	protected static final String EMAIL_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getEmail() <em>Email</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getEmail() <em>Email</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getEmail()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getEmail()
+   * @generated
+   * @ordered
+   */
 	protected String email = EMAIL_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected ContactImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected EClass eStaticClass() {
-		return BuildPackage.Literals.CONTACT;
-	}
+    return BuildPackage.Literals.CONTACT;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getName() {
-		return name;
-	}
+    return name;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CONTACT__NAME, oldName, name));
-	}
+    String oldName = name;
+    name = newName;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CONTACT__NAME, oldName, name));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getEmail() {
-		return email;
-	}
+    return email;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setEmail(String newEmail) {
-		String oldEmail = email;
-		email = newEmail;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CONTACT__EMAIL, oldEmail, email));
-	}
+    String oldEmail = email;
+    email = newEmail;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CONTACT__EMAIL, oldEmail, email));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BuildPackage.CONTACT__NAME:
-				return getName();
-			case BuildPackage.CONTACT__EMAIL:
-				return getEmail();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CONTACT__NAME:
+        return getName();
+      case BuildPackage.CONTACT__EMAIL:
+        return getEmail();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BuildPackage.CONTACT__NAME:
-				setName((String)newValue);
-				return;
-			case BuildPackage.CONTACT__EMAIL:
-				setEmail((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CONTACT__NAME:
+        setName((String)newValue);
+        return;
+      case BuildPackage.CONTACT__EMAIL:
+        setEmail((String)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BuildPackage.CONTACT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case BuildPackage.CONTACT__EMAIL:
-				setEmail(EMAIL_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CONTACT__NAME:
+        setName(NAME_EDEFAULT);
+        return;
+      case BuildPackage.CONTACT__EMAIL:
+        setEmail(EMAIL_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BuildPackage.CONTACT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case BuildPackage.CONTACT__EMAIL:
-				return EMAIL_EDEFAULT == null ? email != null : !EMAIL_EDEFAULT.equals(email);
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CONTACT__NAME:
+        return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+      case BuildPackage.CONTACT__EMAIL:
+        return EMAIL_EDEFAULT == null ? email != null : !EMAIL_EDEFAULT.equals(email);
+    }
+    return super.eIsSet(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+    if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", email: ");
-		result.append(email);
-		result.append(')');
-		return result.toString();
-	}
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (name: ");
+    result.append(name);
+    result.append(", email: ");
+    result.append(email);
+    result.append(')');
+    return result.toString();
+  }
 
 } //ContactImpl
Index: src/org/eclipse/amalgam/releng/build/impl/ContributionImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/impl/ContributionImpl.java,v
retrieving revision 1.3
diff -u -r1.3 ContributionImpl.java
--- src/org/eclipse/amalgam/releng/build/impl/ContributionImpl.java	21 May 2009 12:57:50 -0000	1.3
+++ src/org/eclipse/amalgam/releng/build/impl/ContributionImpl.java	6 Jun 2010 14:35:30 -0000
@@ -57,325 +57,335 @@
  */
 public class ContributionImpl extends EObjectImpl implements Contribution {
 	/**
-	 * The cached value of the '{@link #getContacts() <em>Contacts</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getContacts() <em>Contacts</em>}' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getContacts()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getContacts()
+   * @generated
+   * @ordered
+   */
 	protected EList<Contact> contacts;
 
 	/**
-	 * The cached value of the '{@link #getFeatures() <em>Features</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getFeatures() <em>Features</em>}' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getFeatures()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getFeatures()
+   * @generated
+   * @ordered
+   */
 	protected EList<Feature> features;
 
 	/**
-	 * The default value of the '{@link #getLabel() <em>Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getLabel() <em>Label</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getLabel()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getLabel()
+   * @generated
+   * @ordered
+   */
 	protected static final String LABEL_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLabel() <em>Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getLabel() <em>Label</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getLabel()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getLabel()
+   * @generated
+   * @ordered
+   */
 	protected String label = LABEL_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getRepositories() <em>Repositories</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getRepositories() <em>Repositories</em>}' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getRepositories()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getRepositories()
+   * @generated
+   * @ordered
+   */
 	protected EList<Repository> repositories;
 
 	/**
-	 * The cached value of the '{@link #getBundles() <em>Bundles</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getBundles() <em>Bundles</em>}' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getBundles()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getBundles()
+   * @generated
+   * @ordered
+   */
 	protected EList<Bundle> bundles;
 
 	/**
-	 * The cached value of the '{@link #getProducts() <em>Products</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getProducts() <em>Products</em>}' containment reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getProducts()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getProducts()
+   * @generated
+   * @ordered
+   */
 	protected EList<Product> products;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected ContributionImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected EClass eStaticClass() {
-		return BuildPackage.Literals.CONTRIBUTION;
-	}
+    return BuildPackage.Literals.CONTRIBUTION;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EList<Contact> getContacts() {
-		if (contacts == null) {
-			contacts = new EObjectContainmentEList.Resolving<Contact>(Contact.class, this, BuildPackage.CONTRIBUTION__CONTACTS);
-		}
-		return contacts;
-	}
+    if (contacts == null)
+    {
+      contacts = new EObjectContainmentEList.Resolving<Contact>(Contact.class, this, BuildPackage.CONTRIBUTION__CONTACTS);
+    }
+    return contacts;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EList<Feature> getFeatures() {
-		if (features == null) {
-			features = new EObjectContainmentEList.Resolving<Feature>(Feature.class, this, BuildPackage.CONTRIBUTION__FEATURES);
-		}
-		return features;
-	}
+    if (features == null)
+    {
+      features = new EObjectContainmentEList.Resolving<Feature>(Feature.class, this, BuildPackage.CONTRIBUTION__FEATURES);
+    }
+    return features;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getLabel() {
-		return label;
-	}
+    return label;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setLabel(String newLabel) {
-		String oldLabel = label;
-		label = newLabel;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CONTRIBUTION__LABEL, oldLabel, label));
-	}
+    String oldLabel = label;
+    label = newLabel;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.CONTRIBUTION__LABEL, oldLabel, label));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EList<Repository> getRepositories() {
-		if (repositories == null) {
-			repositories = new EObjectContainmentEList.Resolving<Repository>(Repository.class, this, BuildPackage.CONTRIBUTION__REPOSITORIES);
-		}
-		return repositories;
-	}
+    if (repositories == null)
+    {
+      repositories = new EObjectContainmentEList.Resolving<Repository>(Repository.class, this, BuildPackage.CONTRIBUTION__REPOSITORIES);
+    }
+    return repositories;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EList<Bundle> getBundles() {
-		if (bundles == null) {
-			bundles = new EObjectContainmentEList.Resolving<Bundle>(Bundle.class, this, BuildPackage.CONTRIBUTION__BUNDLES);
-		}
-		return bundles;
-	}
+    if (bundles == null)
+    {
+      bundles = new EObjectContainmentEList.Resolving<Bundle>(Bundle.class, this, BuildPackage.CONTRIBUTION__BUNDLES);
+    }
+    return bundles;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EList<Product> getProducts() {
-		if (products == null) {
-			products = new EObjectContainmentEList.Resolving<Product>(Product.class, this, BuildPackage.CONTRIBUTION__PRODUCTS);
-		}
-		return products;
-	}
+    if (products == null)
+    {
+      products = new EObjectContainmentEList.Resolving<Product>(Product.class, this, BuildPackage.CONTRIBUTION__PRODUCTS);
+    }
+    return products;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case BuildPackage.CONTRIBUTION__CONTACTS:
-				return ((InternalEList<?>)getContacts()).basicRemove(otherEnd, msgs);
-			case BuildPackage.CONTRIBUTION__FEATURES:
-				return ((InternalEList<?>)getFeatures()).basicRemove(otherEnd, msgs);
-			case BuildPackage.CONTRIBUTION__REPOSITORIES:
-				return ((InternalEList<?>)getRepositories()).basicRemove(otherEnd, msgs);
-			case BuildPackage.CONTRIBUTION__BUNDLES:
-				return ((InternalEList<?>)getBundles()).basicRemove(otherEnd, msgs);
-			case BuildPackage.CONTRIBUTION__PRODUCTS:
-				return ((InternalEList<?>)getProducts()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CONTRIBUTION__CONTACTS:
+        return ((InternalEList<?>)getContacts()).basicRemove(otherEnd, msgs);
+      case BuildPackage.CONTRIBUTION__FEATURES:
+        return ((InternalEList<?>)getFeatures()).basicRemove(otherEnd, msgs);
+      case BuildPackage.CONTRIBUTION__REPOSITORIES:
+        return ((InternalEList<?>)getRepositories()).basicRemove(otherEnd, msgs);
+      case BuildPackage.CONTRIBUTION__BUNDLES:
+        return ((InternalEList<?>)getBundles()).basicRemove(otherEnd, msgs);
+      case BuildPackage.CONTRIBUTION__PRODUCTS:
+        return ((InternalEList<?>)getProducts()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BuildPackage.CONTRIBUTION__CONTACTS:
-				return getContacts();
-			case BuildPackage.CONTRIBUTION__FEATURES:
-				return getFeatures();
-			case BuildPackage.CONTRIBUTION__LABEL:
-				return getLabel();
-			case BuildPackage.CONTRIBUTION__REPOSITORIES:
-				return getRepositories();
-			case BuildPackage.CONTRIBUTION__BUNDLES:
-				return getBundles();
-			case BuildPackage.CONTRIBUTION__PRODUCTS:
-				return getProducts();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CONTRIBUTION__CONTACTS:
+        return getContacts();
+      case BuildPackage.CONTRIBUTION__FEATURES:
+        return getFeatures();
+      case BuildPackage.CONTRIBUTION__LABEL:
+        return getLabel();
+      case BuildPackage.CONTRIBUTION__REPOSITORIES:
+        return getRepositories();
+      case BuildPackage.CONTRIBUTION__BUNDLES:
+        return getBundles();
+      case BuildPackage.CONTRIBUTION__PRODUCTS:
+        return getProducts();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BuildPackage.CONTRIBUTION__CONTACTS:
-				getContacts().clear();
-				getContacts().addAll((Collection<? extends Contact>)newValue);
-				return;
-			case BuildPackage.CONTRIBUTION__FEATURES:
-				getFeatures().clear();
-				getFeatures().addAll((Collection<? extends Feature>)newValue);
-				return;
-			case BuildPackage.CONTRIBUTION__LABEL:
-				setLabel((String)newValue);
-				return;
-			case BuildPackage.CONTRIBUTION__REPOSITORIES:
-				getRepositories().clear();
-				getRepositories().addAll((Collection<? extends Repository>)newValue);
-				return;
-			case BuildPackage.CONTRIBUTION__BUNDLES:
-				getBundles().clear();
-				getBundles().addAll((Collection<? extends Bundle>)newValue);
-				return;
-			case BuildPackage.CONTRIBUTION__PRODUCTS:
-				getProducts().clear();
-				getProducts().addAll((Collection<? extends Product>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CONTRIBUTION__CONTACTS:
+        getContacts().clear();
+        getContacts().addAll((Collection<? extends Contact>)newValue);
+        return;
+      case BuildPackage.CONTRIBUTION__FEATURES:
+        getFeatures().clear();
+        getFeatures().addAll((Collection<? extends Feature>)newValue);
+        return;
+      case BuildPackage.CONTRIBUTION__LABEL:
+        setLabel((String)newValue);
+        return;
+      case BuildPackage.CONTRIBUTION__REPOSITORIES:
+        getRepositories().clear();
+        getRepositories().addAll((Collection<? extends Repository>)newValue);
+        return;
+      case BuildPackage.CONTRIBUTION__BUNDLES:
+        getBundles().clear();
+        getBundles().addAll((Collection<? extends Bundle>)newValue);
+        return;
+      case BuildPackage.CONTRIBUTION__PRODUCTS:
+        getProducts().clear();
+        getProducts().addAll((Collection<? extends Product>)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BuildPackage.CONTRIBUTION__CONTACTS:
-				getContacts().clear();
-				return;
-			case BuildPackage.CONTRIBUTION__FEATURES:
-				getFeatures().clear();
-				return;
-			case BuildPackage.CONTRIBUTION__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
-			case BuildPackage.CONTRIBUTION__REPOSITORIES:
-				getRepositories().clear();
-				return;
-			case BuildPackage.CONTRIBUTION__BUNDLES:
-				getBundles().clear();
-				return;
-			case BuildPackage.CONTRIBUTION__PRODUCTS:
-				getProducts().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CONTRIBUTION__CONTACTS:
+        getContacts().clear();
+        return;
+      case BuildPackage.CONTRIBUTION__FEATURES:
+        getFeatures().clear();
+        return;
+      case BuildPackage.CONTRIBUTION__LABEL:
+        setLabel(LABEL_EDEFAULT);
+        return;
+      case BuildPackage.CONTRIBUTION__REPOSITORIES:
+        getRepositories().clear();
+        return;
+      case BuildPackage.CONTRIBUTION__BUNDLES:
+        getBundles().clear();
+        return;
+      case BuildPackage.CONTRIBUTION__PRODUCTS:
+        getProducts().clear();
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BuildPackage.CONTRIBUTION__CONTACTS:
-				return contacts != null && !contacts.isEmpty();
-			case BuildPackage.CONTRIBUTION__FEATURES:
-				return features != null && !features.isEmpty();
-			case BuildPackage.CONTRIBUTION__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
-			case BuildPackage.CONTRIBUTION__REPOSITORIES:
-				return repositories != null && !repositories.isEmpty();
-			case BuildPackage.CONTRIBUTION__BUNDLES:
-				return bundles != null && !bundles.isEmpty();
-			case BuildPackage.CONTRIBUTION__PRODUCTS:
-				return products != null && !products.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.CONTRIBUTION__CONTACTS:
+        return contacts != null && !contacts.isEmpty();
+      case BuildPackage.CONTRIBUTION__FEATURES:
+        return features != null && !features.isEmpty();
+      case BuildPackage.CONTRIBUTION__LABEL:
+        return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
+      case BuildPackage.CONTRIBUTION__REPOSITORIES:
+        return repositories != null && !repositories.isEmpty();
+      case BuildPackage.CONTRIBUTION__BUNDLES:
+        return bundles != null && !bundles.isEmpty();
+      case BuildPackage.CONTRIBUTION__PRODUCTS:
+        return products != null && !products.isEmpty();
+    }
+    return super.eIsSet(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+    if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (label: ");
-		result.append(label);
-		result.append(')');
-		return result.toString();
-	}
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (label: ");
+    result.append(label);
+    result.append(')');
+    return result.toString();
+  }
 
 } //ContributionImpl
Index: src/org/eclipse/amalgam/releng/build/impl/FeatureImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/impl/FeatureImpl.java,v
retrieving revision 1.4
diff -u -r1.4 FeatureImpl.java
--- src/org/eclipse/amalgam/releng/build/impl/FeatureImpl.java	20 May 2009 18:12:35 -0000	1.4
+++ src/org/eclipse/amalgam/releng/build/impl/FeatureImpl.java	6 Jun 2010 14:35:30 -0000
@@ -47,200 +47,207 @@
  */
 public class FeatureImpl extends InstallationUnitImpl implements Feature {
 	/**
-	 * The cached value of the '{@link #getCategory() <em>Category</em>}' reference list.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getCategory() <em>Category</em>}' reference list.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getCategory()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getCategory()
+   * @generated
+   * @ordered
+   */
 	protected EList<Category> category;
 
 	/**
-	 * The default value of the '{@link #isInProduct() <em>In Product</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #isInProduct() <em>In Product</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isInProduct()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #isInProduct()
+   * @generated
+   * @ordered
+   */
 	protected static final boolean IN_PRODUCT_EDEFAULT = true;
 
 	/**
-	 * The cached value of the '{@link #isInProduct() <em>In Product</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #isInProduct() <em>In Product</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isInProduct()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #isInProduct()
+   * @generated
+   * @ordered
+   */
 	protected boolean inProduct = IN_PRODUCT_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected FeatureImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected EClass eStaticClass() {
-		return BuildPackage.Literals.FEATURE;
-	}
+    return BuildPackage.Literals.FEATURE;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EList<Category> getCategory() {
-		if (category == null) {
-			category = new EObjectWithInverseResolvingEList.ManyInverse<Category>(Category.class, this, BuildPackage.FEATURE__CATEGORY, BuildPackage.CATEGORY__FEATURES);
-		}
-		return category;
-	}
+    if (category == null)
+    {
+      category = new EObjectWithInverseResolvingEList.ManyInverse<Category>(Category.class, this, BuildPackage.FEATURE__CATEGORY, BuildPackage.CATEGORY__FEATURES);
+    }
+    return category;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public boolean isInProduct() {
-		return inProduct;
-	}
+    return inProduct;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setInProduct(boolean newInProduct) {
-		boolean oldInProduct = inProduct;
-		inProduct = newInProduct;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.FEATURE__IN_PRODUCT, oldInProduct, inProduct));
-	}
+    boolean oldInProduct = inProduct;
+    inProduct = newInProduct;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.FEATURE__IN_PRODUCT, oldInProduct, inProduct));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@SuppressWarnings("unchecked")
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case BuildPackage.FEATURE__CATEGORY:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getCategory()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.FEATURE__CATEGORY:
+        return ((InternalEList<InternalEObject>)(InternalEList<?>)getCategory()).basicAdd(otherEnd, msgs);
+    }
+    return super.eInverseAdd(otherEnd, featureID, msgs);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case BuildPackage.FEATURE__CATEGORY:
-				return ((InternalEList<?>)getCategory()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.FEATURE__CATEGORY:
+        return ((InternalEList<?>)getCategory()).basicRemove(otherEnd, msgs);
+    }
+    return super.eInverseRemove(otherEnd, featureID, msgs);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BuildPackage.FEATURE__CATEGORY:
-				return getCategory();
-			case BuildPackage.FEATURE__IN_PRODUCT:
-				return isInProduct();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.FEATURE__CATEGORY:
+        return getCategory();
+      case BuildPackage.FEATURE__IN_PRODUCT:
+        return isInProduct();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BuildPackage.FEATURE__CATEGORY:
-				getCategory().clear();
-				getCategory().addAll((Collection<? extends Category>)newValue);
-				return;
-			case BuildPackage.FEATURE__IN_PRODUCT:
-				setInProduct((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.FEATURE__CATEGORY:
+        getCategory().clear();
+        getCategory().addAll((Collection<? extends Category>)newValue);
+        return;
+      case BuildPackage.FEATURE__IN_PRODUCT:
+        setInProduct((Boolean)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BuildPackage.FEATURE__CATEGORY:
-				getCategory().clear();
-				return;
-			case BuildPackage.FEATURE__IN_PRODUCT:
-				setInProduct(IN_PRODUCT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.FEATURE__CATEGORY:
+        getCategory().clear();
+        return;
+      case BuildPackage.FEATURE__IN_PRODUCT:
+        setInProduct(IN_PRODUCT_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BuildPackage.FEATURE__CATEGORY:
-				return category != null && !category.isEmpty();
-			case BuildPackage.FEATURE__IN_PRODUCT:
-				return inProduct != IN_PRODUCT_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.FEATURE__CATEGORY:
+        return category != null && !category.isEmpty();
+      case BuildPackage.FEATURE__IN_PRODUCT:
+        return inProduct != IN_PRODUCT_EDEFAULT;
+    }
+    return super.eIsSet(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+    if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (inProduct: ");
-		result.append(inProduct);
-		result.append(')');
-		return result.toString();
-	}
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (inProduct: ");
+    result.append(inProduct);
+    result.append(')');
+    return result.toString();
+  }
 
 } //FeatureImpl
Index: src/org/eclipse/amalgam/releng/build/impl/InstallationUnitImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/impl/InstallationUnitImpl.java,v
retrieving revision 1.1
diff -u -r1.1 InstallationUnitImpl.java
--- src/org/eclipse/amalgam/releng/build/impl/InstallationUnitImpl.java	20 May 2009 18:12:35 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/impl/InstallationUnitImpl.java	6 Jun 2010 14:35:30 -0000
@@ -42,249 +42,255 @@
  */
 public abstract class InstallationUnitImpl extends EObjectImpl implements InstallationUnit {
 	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getId() <em>Id</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getId()
+   * @generated
+   * @ordered
+   */
 	protected static final String ID_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getId()
+   * @generated
+   * @ordered
+   */
 	protected String id = ID_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getVersion()
+   * @generated
+   * @ordered
+   */
 	protected static final String VERSION_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getVersion()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getVersion()
+   * @generated
+   * @ordered
+   */
 	protected String version = VERSION_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getRepo() <em>Repo</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getRepo() <em>Repo</em>}' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getRepo()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getRepo()
+   * @generated
+   * @ordered
+   */
 	protected Repository repo;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected InstallationUnitImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected EClass eStaticClass() {
-		return BuildPackage.Literals.INSTALLATION_UNIT;
-	}
+    return BuildPackage.Literals.INSTALLATION_UNIT;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getId() {
-		return id;
-	}
+    return id;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.INSTALLATION_UNIT__ID, oldId, id));
-	}
+    String oldId = id;
+    id = newId;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.INSTALLATION_UNIT__ID, oldId, id));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getVersion() {
-		return version;
-	}
+    return version;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setVersion(String newVersion) {
-		String oldVersion = version;
-		version = newVersion;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.INSTALLATION_UNIT__VERSION, oldVersion, version));
-	}
+    String oldVersion = version;
+    version = newVersion;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.INSTALLATION_UNIT__VERSION, oldVersion, version));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Repository getRepo() {
-		if (repo != null && repo.eIsProxy()) {
-			InternalEObject oldRepo = (InternalEObject)repo;
-			repo = (Repository)eResolveProxy(oldRepo);
-			if (repo != oldRepo) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildPackage.INSTALLATION_UNIT__REPO, oldRepo, repo));
-			}
-		}
-		return repo;
-	}
+    if (repo != null && repo.eIsProxy())
+    {
+      InternalEObject oldRepo = (InternalEObject)repo;
+      repo = (Repository)eResolveProxy(oldRepo);
+      if (repo != oldRepo)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildPackage.INSTALLATION_UNIT__REPO, oldRepo, repo));
+      }
+    }
+    return repo;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Repository basicGetRepo() {
-		return repo;
-	}
+    return repo;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setRepo(Repository newRepo) {
-		Repository oldRepo = repo;
-		repo = newRepo;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.INSTALLATION_UNIT__REPO, oldRepo, repo));
-	}
+    Repository oldRepo = repo;
+    repo = newRepo;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.INSTALLATION_UNIT__REPO, oldRepo, repo));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BuildPackage.INSTALLATION_UNIT__ID:
-				return getId();
-			case BuildPackage.INSTALLATION_UNIT__VERSION:
-				return getVersion();
-			case BuildPackage.INSTALLATION_UNIT__REPO:
-				if (resolve) return getRepo();
-				return basicGetRepo();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.INSTALLATION_UNIT__ID:
+        return getId();
+      case BuildPackage.INSTALLATION_UNIT__VERSION:
+        return getVersion();
+      case BuildPackage.INSTALLATION_UNIT__REPO:
+        if (resolve) return getRepo();
+        return basicGetRepo();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BuildPackage.INSTALLATION_UNIT__ID:
-				setId((String)newValue);
-				return;
-			case BuildPackage.INSTALLATION_UNIT__VERSION:
-				setVersion((String)newValue);
-				return;
-			case BuildPackage.INSTALLATION_UNIT__REPO:
-				setRepo((Repository)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.INSTALLATION_UNIT__ID:
+        setId((String)newValue);
+        return;
+      case BuildPackage.INSTALLATION_UNIT__VERSION:
+        setVersion((String)newValue);
+        return;
+      case BuildPackage.INSTALLATION_UNIT__REPO:
+        setRepo((Repository)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BuildPackage.INSTALLATION_UNIT__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case BuildPackage.INSTALLATION_UNIT__VERSION:
-				setVersion(VERSION_EDEFAULT);
-				return;
-			case BuildPackage.INSTALLATION_UNIT__REPO:
-				setRepo((Repository)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.INSTALLATION_UNIT__ID:
+        setId(ID_EDEFAULT);
+        return;
+      case BuildPackage.INSTALLATION_UNIT__VERSION:
+        setVersion(VERSION_EDEFAULT);
+        return;
+      case BuildPackage.INSTALLATION_UNIT__REPO:
+        setRepo((Repository)null);
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BuildPackage.INSTALLATION_UNIT__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case BuildPackage.INSTALLATION_UNIT__VERSION:
-				return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
-			case BuildPackage.INSTALLATION_UNIT__REPO:
-				return repo != null;
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.INSTALLATION_UNIT__ID:
+        return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+      case BuildPackage.INSTALLATION_UNIT__VERSION:
+        return VERSION_EDEFAULT == null ? version != null : !VERSION_EDEFAULT.equals(version);
+      case BuildPackage.INSTALLATION_UNIT__REPO:
+        return repo != null;
+    }
+    return super.eIsSet(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+    if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", version: ");
-		result.append(version);
-		result.append(')');
-		return result.toString();
-	}
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (id: ");
+    result.append(id);
+    result.append(", version: ");
+    result.append(version);
+    result.append(')');
+    return result.toString();
+  }
 
 } //InstallationUnitImpl
Index: src/org/eclipse/amalgam/releng/build/impl/MapImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/impl/MapImpl.java,v
retrieving revision 1.1
diff -u -r1.1 MapImpl.java
--- src/org/eclipse/amalgam/releng/build/impl/MapImpl.java	24 Nov 2008 20:36:44 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/impl/MapImpl.java	6 Jun 2010 14:35:30 -0000
@@ -40,243 +40,247 @@
  */
 public class MapImpl extends EObjectImpl implements Map {
 	/**
-	 * The default value of the '{@link #getRoot() <em>Root</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getRoot() <em>Root</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getRoot()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getRoot()
+   * @generated
+   * @ordered
+   */
 	protected static final String ROOT_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getRoot() <em>Root</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getRoot() <em>Root</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getRoot()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getRoot()
+   * @generated
+   * @ordered
+   */
 	protected String root = ROOT_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getRepo() <em>Repo</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getRepo() <em>Repo</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getRepo()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getRepo()
+   * @generated
+   * @ordered
+   */
 	protected static final String REPO_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getRepo() <em>Repo</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getRepo() <em>Repo</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getRepo()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getRepo()
+   * @generated
+   * @ordered
+   */
 	protected String repo = REPO_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTag() <em>Tag</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getTag() <em>Tag</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getTag()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getTag()
+   * @generated
+   * @ordered
+   */
 	protected static final String TAG_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTag() <em>Tag</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getTag() <em>Tag</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getTag()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getTag()
+   * @generated
+   * @ordered
+   */
 	protected String tag = TAG_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected MapImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected EClass eStaticClass() {
-		return BuildPackage.Literals.MAP;
-	}
+    return BuildPackage.Literals.MAP;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getRoot() {
-		return root;
-	}
+    return root;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setRoot(String newRoot) {
-		String oldRoot = root;
-		root = newRoot;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.MAP__ROOT, oldRoot, root));
-	}
+    String oldRoot = root;
+    root = newRoot;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.MAP__ROOT, oldRoot, root));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getRepo() {
-		return repo;
-	}
+    return repo;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setRepo(String newRepo) {
-		String oldRepo = repo;
-		repo = newRepo;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.MAP__REPO, oldRepo, repo));
-	}
+    String oldRepo = repo;
+    repo = newRepo;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.MAP__REPO, oldRepo, repo));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getTag() {
-		return tag;
-	}
+    return tag;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setTag(String newTag) {
-		String oldTag = tag;
-		tag = newTag;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.MAP__TAG, oldTag, tag));
-	}
+    String oldTag = tag;
+    tag = newTag;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.MAP__TAG, oldTag, tag));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BuildPackage.MAP__ROOT:
-				return getRoot();
-			case BuildPackage.MAP__REPO:
-				return getRepo();
-			case BuildPackage.MAP__TAG:
-				return getTag();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.MAP__ROOT:
+        return getRoot();
+      case BuildPackage.MAP__REPO:
+        return getRepo();
+      case BuildPackage.MAP__TAG:
+        return getTag();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BuildPackage.MAP__ROOT:
-				setRoot((String)newValue);
-				return;
-			case BuildPackage.MAP__REPO:
-				setRepo((String)newValue);
-				return;
-			case BuildPackage.MAP__TAG:
-				setTag((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.MAP__ROOT:
+        setRoot((String)newValue);
+        return;
+      case BuildPackage.MAP__REPO:
+        setRepo((String)newValue);
+        return;
+      case BuildPackage.MAP__TAG:
+        setTag((String)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BuildPackage.MAP__ROOT:
-				setRoot(ROOT_EDEFAULT);
-				return;
-			case BuildPackage.MAP__REPO:
-				setRepo(REPO_EDEFAULT);
-				return;
-			case BuildPackage.MAP__TAG:
-				setTag(TAG_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.MAP__ROOT:
+        setRoot(ROOT_EDEFAULT);
+        return;
+      case BuildPackage.MAP__REPO:
+        setRepo(REPO_EDEFAULT);
+        return;
+      case BuildPackage.MAP__TAG:
+        setTag(TAG_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BuildPackage.MAP__ROOT:
-				return ROOT_EDEFAULT == null ? root != null : !ROOT_EDEFAULT.equals(root);
-			case BuildPackage.MAP__REPO:
-				return REPO_EDEFAULT == null ? repo != null : !REPO_EDEFAULT.equals(repo);
-			case BuildPackage.MAP__TAG:
-				return TAG_EDEFAULT == null ? tag != null : !TAG_EDEFAULT.equals(tag);
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.MAP__ROOT:
+        return ROOT_EDEFAULT == null ? root != null : !ROOT_EDEFAULT.equals(root);
+      case BuildPackage.MAP__REPO:
+        return REPO_EDEFAULT == null ? repo != null : !REPO_EDEFAULT.equals(repo);
+      case BuildPackage.MAP__TAG:
+        return TAG_EDEFAULT == null ? tag != null : !TAG_EDEFAULT.equals(tag);
+    }
+    return super.eIsSet(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+    if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (root: ");
-		result.append(root);
-		result.append(", repo: ");
-		result.append(repo);
-		result.append(", tag: ");
-		result.append(tag);
-		result.append(')');
-		return result.toString();
-	}
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (root: ");
+    result.append(root);
+    result.append(", repo: ");
+    result.append(repo);
+    result.append(", tag: ");
+    result.append(tag);
+    result.append(')');
+    return result.toString();
+  }
 
 } //MapImpl
Index: src/org/eclipse/amalgam/releng/build/impl/PlatformImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/impl/PlatformImpl.java,v
retrieving revision 1.3
diff -u -r1.3 PlatformImpl.java
--- src/org/eclipse/amalgam/releng/build/impl/PlatformImpl.java	30 Dec 2008 20:03:10 -0000	1.3
+++ src/org/eclipse/amalgam/releng/build/impl/PlatformImpl.java	6 Jun 2010 14:35:30 -0000
@@ -43,302 +43,308 @@
  */
 public class PlatformImpl extends EObjectImpl implements Platform {
 	/**
-	 * The default value of the '{@link #getFile() <em>File</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getFile() <em>File</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getFile()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getFile()
+   * @generated
+   * @ordered
+   */
 	protected static final String FILE_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getFile() <em>File</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getFile() <em>File</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getFile()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getFile()
+   * @generated
+   * @ordered
+   */
 	protected String file = FILE_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLocation() <em>Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getLocation() <em>Location</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getLocation()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getLocation()
+   * @generated
+   * @ordered
+   */
 	protected static final String LOCATION_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLocation() <em>Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getLocation() <em>Location</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getLocation()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getLocation()
+   * @generated
+   * @ordered
+   */
 	protected String location = LOCATION_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getConfig() <em>Config</em>}' reference.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getConfig() <em>Config</em>}' reference.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getConfig()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getConfig()
+   * @generated
+   * @ordered
+   */
 	protected Config config;
 
 	/**
-	 * The default value of the '{@link #getDeltapack() <em>Deltapack</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getDeltapack() <em>Deltapack</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getDeltapack()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getDeltapack()
+   * @generated
+   * @ordered
+   */
 	protected static final String DELTAPACK_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getDeltapack() <em>Deltapack</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getDeltapack() <em>Deltapack</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getDeltapack()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getDeltapack()
+   * @generated
+   * @ordered
+   */
 	protected String deltapack = DELTAPACK_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected PlatformImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected EClass eStaticClass() {
-		return BuildPackage.Literals.PLATFORM;
-	}
+    return BuildPackage.Literals.PLATFORM;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getFile() {
-		return file;
-	}
+    return file;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setFile(String newFile) {
-		String oldFile = file;
-		file = newFile;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.PLATFORM__FILE, oldFile, file));
-	}
+    String oldFile = file;
+    file = newFile;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.PLATFORM__FILE, oldFile, file));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getLocation() {
-		return location;
-	}
+    return location;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setLocation(String newLocation) {
-		String oldLocation = location;
-		location = newLocation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.PLATFORM__LOCATION, oldLocation, location));
-	}
+    String oldLocation = location;
+    location = newLocation;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.PLATFORM__LOCATION, oldLocation, location));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Config getConfig() {
-		if (config != null && config.eIsProxy()) {
-			InternalEObject oldConfig = (InternalEObject)config;
-			config = (Config)eResolveProxy(oldConfig);
-			if (config != oldConfig) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildPackage.PLATFORM__CONFIG, oldConfig, config));
-			}
-		}
-		return config;
-	}
+    if (config != null && config.eIsProxy())
+    {
+      InternalEObject oldConfig = (InternalEObject)config;
+      config = (Config)eResolveProxy(oldConfig);
+      if (config != oldConfig)
+      {
+        if (eNotificationRequired())
+          eNotify(new ENotificationImpl(this, Notification.RESOLVE, BuildPackage.PLATFORM__CONFIG, oldConfig, config));
+      }
+    }
+    return config;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Config basicGetConfig() {
-		return config;
-	}
+    return config;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setConfig(Config newConfig) {
-		Config oldConfig = config;
-		config = newConfig;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.PLATFORM__CONFIG, oldConfig, config));
-	}
+    Config oldConfig = config;
+    config = newConfig;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.PLATFORM__CONFIG, oldConfig, config));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getDeltapack() {
-		return deltapack;
-	}
+    return deltapack;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setDeltapack(String newDeltapack) {
-		String oldDeltapack = deltapack;
-		deltapack = newDeltapack;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.PLATFORM__DELTAPACK, oldDeltapack, deltapack));
-	}
+    String oldDeltapack = deltapack;
+    deltapack = newDeltapack;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.PLATFORM__DELTAPACK, oldDeltapack, deltapack));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BuildPackage.PLATFORM__FILE:
-				return getFile();
-			case BuildPackage.PLATFORM__LOCATION:
-				return getLocation();
-			case BuildPackage.PLATFORM__CONFIG:
-				if (resolve) return getConfig();
-				return basicGetConfig();
-			case BuildPackage.PLATFORM__DELTAPACK:
-				return getDeltapack();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.PLATFORM__FILE:
+        return getFile();
+      case BuildPackage.PLATFORM__LOCATION:
+        return getLocation();
+      case BuildPackage.PLATFORM__CONFIG:
+        if (resolve) return getConfig();
+        return basicGetConfig();
+      case BuildPackage.PLATFORM__DELTAPACK:
+        return getDeltapack();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BuildPackage.PLATFORM__FILE:
-				setFile((String)newValue);
-				return;
-			case BuildPackage.PLATFORM__LOCATION:
-				setLocation((String)newValue);
-				return;
-			case BuildPackage.PLATFORM__CONFIG:
-				setConfig((Config)newValue);
-				return;
-			case BuildPackage.PLATFORM__DELTAPACK:
-				setDeltapack((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.PLATFORM__FILE:
+        setFile((String)newValue);
+        return;
+      case BuildPackage.PLATFORM__LOCATION:
+        setLocation((String)newValue);
+        return;
+      case BuildPackage.PLATFORM__CONFIG:
+        setConfig((Config)newValue);
+        return;
+      case BuildPackage.PLATFORM__DELTAPACK:
+        setDeltapack((String)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BuildPackage.PLATFORM__FILE:
-				setFile(FILE_EDEFAULT);
-				return;
-			case BuildPackage.PLATFORM__LOCATION:
-				setLocation(LOCATION_EDEFAULT);
-				return;
-			case BuildPackage.PLATFORM__CONFIG:
-				setConfig((Config)null);
-				return;
-			case BuildPackage.PLATFORM__DELTAPACK:
-				setDeltapack(DELTAPACK_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.PLATFORM__FILE:
+        setFile(FILE_EDEFAULT);
+        return;
+      case BuildPackage.PLATFORM__LOCATION:
+        setLocation(LOCATION_EDEFAULT);
+        return;
+      case BuildPackage.PLATFORM__CONFIG:
+        setConfig((Config)null);
+        return;
+      case BuildPackage.PLATFORM__DELTAPACK:
+        setDeltapack(DELTAPACK_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BuildPackage.PLATFORM__FILE:
-				return FILE_EDEFAULT == null ? file != null : !FILE_EDEFAULT.equals(file);
-			case BuildPackage.PLATFORM__LOCATION:
-				return LOCATION_EDEFAULT == null ? location != null : !LOCATION_EDEFAULT.equals(location);
-			case BuildPackage.PLATFORM__CONFIG:
-				return config != null;
-			case BuildPackage.PLATFORM__DELTAPACK:
-				return DELTAPACK_EDEFAULT == null ? deltapack != null : !DELTAPACK_EDEFAULT.equals(deltapack);
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.PLATFORM__FILE:
+        return FILE_EDEFAULT == null ? file != null : !FILE_EDEFAULT.equals(file);
+      case BuildPackage.PLATFORM__LOCATION:
+        return LOCATION_EDEFAULT == null ? location != null : !LOCATION_EDEFAULT.equals(location);
+      case BuildPackage.PLATFORM__CONFIG:
+        return config != null;
+      case BuildPackage.PLATFORM__DELTAPACK:
+        return DELTAPACK_EDEFAULT == null ? deltapack != null : !DELTAPACK_EDEFAULT.equals(deltapack);
+    }
+    return super.eIsSet(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+    if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (file: ");
-		result.append(file);
-		result.append(", location: ");
-		result.append(location);
-		result.append(", deltapack: ");
-		result.append(deltapack);
-		result.append(')');
-		return result.toString();
-	}
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (file: ");
+    result.append(file);
+    result.append(", location: ");
+    result.append(location);
+    result.append(", deltapack: ");
+    result.append(deltapack);
+    result.append(')');
+    return result.toString();
+  }
 
 } //PlatformImpl
Index: src/org/eclipse/amalgam/releng/build/impl/ProductImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/impl/ProductImpl.java,v
retrieving revision 1.1
diff -u -r1.1 ProductImpl.java
--- src/org/eclipse/amalgam/releng/build/impl/ProductImpl.java	20 May 2009 18:12:35 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/impl/ProductImpl.java	6 Jun 2010 14:35:30 -0000
@@ -29,22 +29,22 @@
  */
 public class ProductImpl extends InstallationUnitImpl implements Product {
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected ProductImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected EClass eStaticClass() {
-		return BuildPackage.Literals.PRODUCT;
-	}
+    return BuildPackage.Literals.PRODUCT;
+  }
 
 } //ProductImpl
Index: src/org/eclipse/amalgam/releng/build/impl/PromotionImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/impl/PromotionImpl.java,v
retrieving revision 1.4
diff -u -r1.4 PromotionImpl.java
--- src/org/eclipse/amalgam/releng/build/impl/PromotionImpl.java	13 Mar 2009 11:09:27 -0000	1.4
+++ src/org/eclipse/amalgam/releng/build/impl/PromotionImpl.java	6 Jun 2010 14:35:30 -0000
@@ -42,349 +42,353 @@
  */
 public class PromotionImpl extends EObjectImpl implements Promotion {
 	/**
-	 * The default value of the '{@link #getUploadDirectory() <em>Upload Directory</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getUploadDirectory() <em>Upload Directory</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getUploadDirectory()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getUploadDirectory()
+   * @generated
+   * @ordered
+   */
 	protected static final String UPLOAD_DIRECTORY_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getUploadDirectory() <em>Upload Directory</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getUploadDirectory() <em>Upload Directory</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getUploadDirectory()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getUploadDirectory()
+   * @generated
+   * @ordered
+   */
 	protected String uploadDirectory = UPLOAD_DIRECTORY_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDownloadDirectory() <em>Download Directory</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getDownloadDirectory() <em>Download Directory</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getDownloadDirectory()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getDownloadDirectory()
+   * @generated
+   * @ordered
+   */
 	protected static final String DOWNLOAD_DIRECTORY_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getDownloadDirectory() <em>Download Directory</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getDownloadDirectory() <em>Download Directory</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getDownloadDirectory()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getDownloadDirectory()
+   * @generated
+   * @ordered
+   */
 	protected String downloadDirectory = DOWNLOAD_DIRECTORY_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #isIncubating() <em>Incubating</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #isIncubating() <em>Incubating</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isIncubating()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #isIncubating()
+   * @generated
+   * @ordered
+   */
 	protected static final boolean INCUBATING_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isIncubating() <em>Incubating</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #isIncubating() <em>Incubating</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isIncubating()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #isIncubating()
+   * @generated
+   * @ordered
+   */
 	protected boolean incubating = INCUBATING_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getBaseURL() <em>Base URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getBaseURL() <em>Base URL</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getBaseURL()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getBaseURL()
+   * @generated
+   * @ordered
+   */
 	protected static final String BASE_URL_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getBaseURL() <em>Base URL</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getBaseURL() <em>Base URL</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getBaseURL()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getBaseURL()
+   * @generated
+   * @ordered
+   */
 	protected String baseURL = BASE_URL_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getBuildAlias() <em>Build Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getBuildAlias() <em>Build Alias</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getBuildAlias()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getBuildAlias()
+   * @generated
+   * @ordered
+   */
 	protected static final String BUILD_ALIAS_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getBuildAlias() <em>Build Alias</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getBuildAlias() <em>Build Alias</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getBuildAlias()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getBuildAlias()
+   * @generated
+   * @ordered
+   */
 	protected String buildAlias = BUILD_ALIAS_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected PromotionImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected EClass eStaticClass() {
-		return BuildPackage.Literals.PROMOTION;
-	}
+    return BuildPackage.Literals.PROMOTION;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getUploadDirectory() {
-		return uploadDirectory;
-	}
+    return uploadDirectory;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setUploadDirectory(String newUploadDirectory) {
-		String oldUploadDirectory = uploadDirectory;
-		uploadDirectory = newUploadDirectory;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.PROMOTION__UPLOAD_DIRECTORY, oldUploadDirectory, uploadDirectory));
-	}
+    String oldUploadDirectory = uploadDirectory;
+    uploadDirectory = newUploadDirectory;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.PROMOTION__UPLOAD_DIRECTORY, oldUploadDirectory, uploadDirectory));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getDownloadDirectory() {
-		return downloadDirectory;
-	}
+    return downloadDirectory;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setDownloadDirectory(String newDownloadDirectory) {
-		String oldDownloadDirectory = downloadDirectory;
-		downloadDirectory = newDownloadDirectory;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.PROMOTION__DOWNLOAD_DIRECTORY, oldDownloadDirectory, downloadDirectory));
-	}
+    String oldDownloadDirectory = downloadDirectory;
+    downloadDirectory = newDownloadDirectory;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.PROMOTION__DOWNLOAD_DIRECTORY, oldDownloadDirectory, downloadDirectory));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public boolean isIncubating() {
-		return incubating;
-	}
+    return incubating;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setIncubating(boolean newIncubating) {
-		boolean oldIncubating = incubating;
-		incubating = newIncubating;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.PROMOTION__INCUBATING, oldIncubating, incubating));
-	}
+    boolean oldIncubating = incubating;
+    incubating = newIncubating;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.PROMOTION__INCUBATING, oldIncubating, incubating));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getBaseURL() {
-		return baseURL;
-	}
+    return baseURL;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setBaseURL(String newBaseURL) {
-		String oldBaseURL = baseURL;
-		baseURL = newBaseURL;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.PROMOTION__BASE_URL, oldBaseURL, baseURL));
-	}
+    String oldBaseURL = baseURL;
+    baseURL = newBaseURL;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.PROMOTION__BASE_URL, oldBaseURL, baseURL));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getBuildAlias() {
-		return buildAlias;
-	}
+    return buildAlias;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setBuildAlias(String newBuildAlias) {
-		String oldBuildAlias = buildAlias;
-		buildAlias = newBuildAlias;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.PROMOTION__BUILD_ALIAS, oldBuildAlias, buildAlias));
-	}
+    String oldBuildAlias = buildAlias;
+    buildAlias = newBuildAlias;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.PROMOTION__BUILD_ALIAS, oldBuildAlias, buildAlias));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BuildPackage.PROMOTION__UPLOAD_DIRECTORY:
-				return getUploadDirectory();
-			case BuildPackage.PROMOTION__DOWNLOAD_DIRECTORY:
-				return getDownloadDirectory();
-			case BuildPackage.PROMOTION__INCUBATING:
-				return isIncubating();
-			case BuildPackage.PROMOTION__BASE_URL:
-				return getBaseURL();
-			case BuildPackage.PROMOTION__BUILD_ALIAS:
-				return getBuildAlias();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.PROMOTION__UPLOAD_DIRECTORY:
+        return getUploadDirectory();
+      case BuildPackage.PROMOTION__DOWNLOAD_DIRECTORY:
+        return getDownloadDirectory();
+      case BuildPackage.PROMOTION__INCUBATING:
+        return isIncubating();
+      case BuildPackage.PROMOTION__BASE_URL:
+        return getBaseURL();
+      case BuildPackage.PROMOTION__BUILD_ALIAS:
+        return getBuildAlias();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BuildPackage.PROMOTION__UPLOAD_DIRECTORY:
-				setUploadDirectory((String)newValue);
-				return;
-			case BuildPackage.PROMOTION__DOWNLOAD_DIRECTORY:
-				setDownloadDirectory((String)newValue);
-				return;
-			case BuildPackage.PROMOTION__INCUBATING:
-				setIncubating((Boolean)newValue);
-				return;
-			case BuildPackage.PROMOTION__BASE_URL:
-				setBaseURL((String)newValue);
-				return;
-			case BuildPackage.PROMOTION__BUILD_ALIAS:
-				setBuildAlias((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.PROMOTION__UPLOAD_DIRECTORY:
+        setUploadDirectory((String)newValue);
+        return;
+      case BuildPackage.PROMOTION__DOWNLOAD_DIRECTORY:
+        setDownloadDirectory((String)newValue);
+        return;
+      case BuildPackage.PROMOTION__INCUBATING:
+        setIncubating((Boolean)newValue);
+        return;
+      case BuildPackage.PROMOTION__BASE_URL:
+        setBaseURL((String)newValue);
+        return;
+      case BuildPackage.PROMOTION__BUILD_ALIAS:
+        setBuildAlias((String)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BuildPackage.PROMOTION__UPLOAD_DIRECTORY:
-				setUploadDirectory(UPLOAD_DIRECTORY_EDEFAULT);
-				return;
-			case BuildPackage.PROMOTION__DOWNLOAD_DIRECTORY:
-				setDownloadDirectory(DOWNLOAD_DIRECTORY_EDEFAULT);
-				return;
-			case BuildPackage.PROMOTION__INCUBATING:
-				setIncubating(INCUBATING_EDEFAULT);
-				return;
-			case BuildPackage.PROMOTION__BASE_URL:
-				setBaseURL(BASE_URL_EDEFAULT);
-				return;
-			case BuildPackage.PROMOTION__BUILD_ALIAS:
-				setBuildAlias(BUILD_ALIAS_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.PROMOTION__UPLOAD_DIRECTORY:
+        setUploadDirectory(UPLOAD_DIRECTORY_EDEFAULT);
+        return;
+      case BuildPackage.PROMOTION__DOWNLOAD_DIRECTORY:
+        setDownloadDirectory(DOWNLOAD_DIRECTORY_EDEFAULT);
+        return;
+      case BuildPackage.PROMOTION__INCUBATING:
+        setIncubating(INCUBATING_EDEFAULT);
+        return;
+      case BuildPackage.PROMOTION__BASE_URL:
+        setBaseURL(BASE_URL_EDEFAULT);
+        return;
+      case BuildPackage.PROMOTION__BUILD_ALIAS:
+        setBuildAlias(BUILD_ALIAS_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BuildPackage.PROMOTION__UPLOAD_DIRECTORY:
-				return UPLOAD_DIRECTORY_EDEFAULT == null ? uploadDirectory != null : !UPLOAD_DIRECTORY_EDEFAULT.equals(uploadDirectory);
-			case BuildPackage.PROMOTION__DOWNLOAD_DIRECTORY:
-				return DOWNLOAD_DIRECTORY_EDEFAULT == null ? downloadDirectory != null : !DOWNLOAD_DIRECTORY_EDEFAULT.equals(downloadDirectory);
-			case BuildPackage.PROMOTION__INCUBATING:
-				return incubating != INCUBATING_EDEFAULT;
-			case BuildPackage.PROMOTION__BASE_URL:
-				return BASE_URL_EDEFAULT == null ? baseURL != null : !BASE_URL_EDEFAULT.equals(baseURL);
-			case BuildPackage.PROMOTION__BUILD_ALIAS:
-				return BUILD_ALIAS_EDEFAULT == null ? buildAlias != null : !BUILD_ALIAS_EDEFAULT.equals(buildAlias);
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.PROMOTION__UPLOAD_DIRECTORY:
+        return UPLOAD_DIRECTORY_EDEFAULT == null ? uploadDirectory != null : !UPLOAD_DIRECTORY_EDEFAULT.equals(uploadDirectory);
+      case BuildPackage.PROMOTION__DOWNLOAD_DIRECTORY:
+        return DOWNLOAD_DIRECTORY_EDEFAULT == null ? downloadDirectory != null : !DOWNLOAD_DIRECTORY_EDEFAULT.equals(downloadDirectory);
+      case BuildPackage.PROMOTION__INCUBATING:
+        return incubating != INCUBATING_EDEFAULT;
+      case BuildPackage.PROMOTION__BASE_URL:
+        return BASE_URL_EDEFAULT == null ? baseURL != null : !BASE_URL_EDEFAULT.equals(baseURL);
+      case BuildPackage.PROMOTION__BUILD_ALIAS:
+        return BUILD_ALIAS_EDEFAULT == null ? buildAlias != null : !BUILD_ALIAS_EDEFAULT.equals(buildAlias);
+    }
+    return super.eIsSet(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+    if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (uploadDirectory: ");
-		result.append(uploadDirectory);
-		result.append(", downloadDirectory: ");
-		result.append(downloadDirectory);
-		result.append(", incubating: ");
-		result.append(incubating);
-		result.append(", baseURL: ");
-		result.append(baseURL);
-		result.append(", buildAlias: ");
-		result.append(buildAlias);
-		result.append(')');
-		return result.toString();
-	}
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (uploadDirectory: ");
+    result.append(uploadDirectory);
+    result.append(", downloadDirectory: ");
+    result.append(downloadDirectory);
+    result.append(", incubating: ");
+    result.append(incubating);
+    result.append(", baseURL: ");
+    result.append(baseURL);
+    result.append(", buildAlias: ");
+    result.append(buildAlias);
+    result.append(')');
+    return result.toString();
+  }
 
 } //PromotionImpl
Index: src/org/eclipse/amalgam/releng/build/impl/RepositoryImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/impl/RepositoryImpl.java,v
retrieving revision 1.1
diff -u -r1.1 RepositoryImpl.java
--- src/org/eclipse/amalgam/releng/build/impl/RepositoryImpl.java	24 Nov 2008 20:36:44 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/impl/RepositoryImpl.java	6 Jun 2010 14:35:30 -0000
@@ -39,190 +39,194 @@
  */
 public class RepositoryImpl extends EObjectImpl implements Repository {
 	/**
-	 * The default value of the '{@link #getLocation() <em>Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getLocation() <em>Location</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getLocation()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getLocation()
+   * @generated
+   * @ordered
+   */
 	protected static final String LOCATION_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLocation() <em>Location</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getLocation() <em>Location</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getLocation()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getLocation()
+   * @generated
+   * @ordered
+   */
 	protected String location = LOCATION_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getLabel() <em>Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The default value of the '{@link #getLabel() <em>Label</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getLabel()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getLabel()
+   * @generated
+   * @ordered
+   */
 	protected static final String LABEL_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getLabel() <em>Label</em>}' attribute.
-	 * <!-- begin-user-doc -->
+   * The cached value of the '{@link #getLabel() <em>Label</em>}' attribute.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getLabel()
-	 * @generated
-	 * @ordered
-	 */
+   * @see #getLabel()
+   * @generated
+   * @ordered
+   */
 	protected String label = LABEL_EDEFAULT;
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected RepositoryImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected EClass eStaticClass() {
-		return BuildPackage.Literals.REPOSITORY;
-	}
+    return BuildPackage.Literals.REPOSITORY;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getLocation() {
-		return location;
-	}
+    return location;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setLocation(String newLocation) {
-		String oldLocation = location;
-		location = newLocation;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.REPOSITORY__LOCATION, oldLocation, location));
-	}
+    String oldLocation = location;
+    location = newLocation;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.REPOSITORY__LOCATION, oldLocation, location));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getLabel() {
-		return label;
-	}
+    return label;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setLabel(String newLabel) {
-		String oldLabel = label;
-		label = newLabel;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.REPOSITORY__LABEL, oldLabel, label));
-	}
+    String oldLabel = label;
+    label = newLabel;
+    if (eNotificationRequired())
+      eNotify(new ENotificationImpl(this, Notification.SET, BuildPackage.REPOSITORY__LABEL, oldLabel, label));
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case BuildPackage.REPOSITORY__LOCATION:
-				return getLocation();
-			case BuildPackage.REPOSITORY__LABEL:
-				return getLabel();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.REPOSITORY__LOCATION:
+        return getLocation();
+      case BuildPackage.REPOSITORY__LABEL:
+        return getLabel();
+    }
+    return super.eGet(featureID, resolve, coreType);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case BuildPackage.REPOSITORY__LOCATION:
-				setLocation((String)newValue);
-				return;
-			case BuildPackage.REPOSITORY__LABEL:
-				setLabel((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.REPOSITORY__LOCATION:
+        setLocation((String)newValue);
+        return;
+      case BuildPackage.REPOSITORY__LABEL:
+        setLabel((String)newValue);
+        return;
+    }
+    super.eSet(featureID, newValue);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case BuildPackage.REPOSITORY__LOCATION:
-				setLocation(LOCATION_EDEFAULT);
-				return;
-			case BuildPackage.REPOSITORY__LABEL:
-				setLabel(LABEL_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.REPOSITORY__LOCATION:
+        setLocation(LOCATION_EDEFAULT);
+        return;
+      case BuildPackage.REPOSITORY__LABEL:
+        setLabel(LABEL_EDEFAULT);
+        return;
+    }
+    super.eUnset(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case BuildPackage.REPOSITORY__LOCATION:
-				return LOCATION_EDEFAULT == null ? location != null : !LOCATION_EDEFAULT.equals(location);
-			case BuildPackage.REPOSITORY__LABEL:
-				return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
-		}
-		return super.eIsSet(featureID);
-	}
+    switch (featureID)
+    {
+      case BuildPackage.REPOSITORY__LOCATION:
+        return LOCATION_EDEFAULT == null ? location != null : !LOCATION_EDEFAULT.equals(location);
+      case BuildPackage.REPOSITORY__LABEL:
+        return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
+    }
+    return super.eIsSet(featureID);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
+    if (eIsProxy()) return super.toString();
 
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (location: ");
-		result.append(location);
-		result.append(", label: ");
-		result.append(label);
-		result.append(')');
-		return result.toString();
-	}
+    StringBuffer result = new StringBuffer(super.toString());
+    result.append(" (location: ");
+    result.append(location);
+    result.append(", label: ");
+    result.append(label);
+    result.append(')');
+    return result.toString();
+  }
 
 } //RepositoryImpl
Index: src/org/eclipse/amalgam/releng/build/util/BuildAdapterFactory.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/util/BuildAdapterFactory.java,v
retrieving revision 1.3
diff -u -r1.3 BuildAdapterFactory.java
--- src/org/eclipse/amalgam/releng/build/util/BuildAdapterFactory.java	20 May 2009 18:12:35 -0000	1.3
+++ src/org/eclipse/amalgam/releng/build/util/BuildAdapterFactory.java	6 Jun 2010 14:35:31 -0000
@@ -44,334 +44,353 @@
  */
 public class BuildAdapterFactory extends AdapterFactoryImpl {
 	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
+   * The cached model package.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected static BuildPackage modelPackage;
 
 	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
+   * Creates an instance of the adapter factory.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public BuildAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = BuildPackage.eINSTANCE;
-		}
-	}
+    if (modelPackage == null)
+    {
+      modelPackage = BuildPackage.eINSTANCE;
+    }
+  }
 
 	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
+   * Returns whether this factory is applicable for the type of the object.
+   * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
+   * @return whether this factory is applicable for the type of the object.
+   * @generated
+   */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
+    if (object == modelPackage)
+    {
+      return true;
+    }
+    if (object instanceof EObject)
+    {
+      return ((EObject)object).eClass().getEPackage() == modelPackage;
+    }
+    return false;
+  }
 
 	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
+   * The switch that delegates to the <code>createXXX</code> methods.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected BuildSwitch<Adapter> modelSwitch =
-		new BuildSwitch<Adapter>() {
-			@Override
-			public Adapter caseBuild(Build object) {
-				return createBuildAdapter();
-			}
-			@Override
-			public Adapter caseRepository(Repository object) {
-				return createRepositoryAdapter();
-			}
-			@Override
-			public Adapter casePlatform(Platform object) {
-				return createPlatformAdapter();
-			}
-			@Override
-			public Adapter caseConfig(Config object) {
-				return createConfigAdapter();
-			}
-			@Override
-			public Adapter caseMap(Map object) {
-				return createMapAdapter();
-			}
-			@Override
-			public Adapter caseCategory(Category object) {
-				return createCategoryAdapter();
-			}
-			@Override
-			public Adapter caseContribution(Contribution object) {
-				return createContributionAdapter();
-			}
-			@Override
-			public Adapter caseContact(Contact object) {
-				return createContactAdapter();
-			}
-			@Override
-			public Adapter caseFeature(Feature object) {
-				return createFeatureAdapter();
-			}
-			@Override
-			public Adapter caseBundle(Bundle object) {
-				return createBundleAdapter();
-			}
-			@Override
-			public Adapter caseCompiler(org.eclipse.amalgam.releng.build.Compiler object) {
-				return createCompilerAdapter();
-			}
-			@Override
-			public Adapter casePromotion(Promotion object) {
-				return createPromotionAdapter();
-			}
-			@Override
-			public Adapter caseInstallationUnit(InstallationUnit object) {
-				return createInstallationUnitAdapter();
-			}
-			@Override
-			public Adapter caseProduct(Product object) {
-				return createProductAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
+		new BuildSwitch<Adapter>()
+    {
+      @Override
+      public Adapter caseBuild(Build object)
+      {
+        return createBuildAdapter();
+      }
+      @Override
+      public Adapter caseRepository(Repository object)
+      {
+        return createRepositoryAdapter();
+      }
+      @Override
+      public Adapter casePlatform(Platform object)
+      {
+        return createPlatformAdapter();
+      }
+      @Override
+      public Adapter caseConfig(Config object)
+      {
+        return createConfigAdapter();
+      }
+      @Override
+      public Adapter caseMap(Map object)
+      {
+        return createMapAdapter();
+      }
+      @Override
+      public Adapter caseCategory(Category object)
+      {
+        return createCategoryAdapter();
+      }
+      @Override
+      public Adapter caseContribution(Contribution object)
+      {
+        return createContributionAdapter();
+      }
+      @Override
+      public Adapter caseContact(Contact object)
+      {
+        return createContactAdapter();
+      }
+      @Override
+      public Adapter caseFeature(Feature object)
+      {
+        return createFeatureAdapter();
+      }
+      @Override
+      public Adapter caseBundle(Bundle object)
+      {
+        return createBundleAdapter();
+      }
+      @Override
+      public Adapter caseCompiler(org.eclipse.amalgam.releng.build.Compiler object)
+      {
+        return createCompilerAdapter();
+      }
+      @Override
+      public Adapter casePromotion(Promotion object)
+      {
+        return createPromotionAdapter();
+      }
+      @Override
+      public Adapter caseInstallationUnit(InstallationUnit object)
+      {
+        return createInstallationUnitAdapter();
+      }
+      @Override
+      public Adapter caseProduct(Product object)
+      {
+        return createProductAdapter();
+      }
+      @Override
+      public Adapter defaultCase(EObject object)
+      {
+        return createEObjectAdapter();
+      }
+    };
+
+	/**
+   * Creates an adapter for the <code>target</code>.
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @param target the object to adapt.
+   * @return the adapter for the <code>target</code>.
+   * @generated
+   */
 	@Override
 	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
+    return modelSwitch.doSwitch((EObject)target);
+  }
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Build <em>Build</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Build <em>Build</em>}'.
+   * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.amalgam.releng.build.Build
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.amalgam.releng.build.Build
+   * @generated
+   */
 	public Adapter createBuildAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Repository <em>Repository</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Repository <em>Repository</em>}'.
+   * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.amalgam.releng.build.Repository
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.amalgam.releng.build.Repository
+   * @generated
+   */
 	public Adapter createRepositoryAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Platform <em>Platform</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Platform <em>Platform</em>}'.
+   * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.amalgam.releng.build.Platform
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.amalgam.releng.build.Platform
+   * @generated
+   */
 	public Adapter createPlatformAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Config <em>Config</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Config <em>Config</em>}'.
+   * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.amalgam.releng.build.Config
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.amalgam.releng.build.Config
+   * @generated
+   */
 	public Adapter createConfigAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Map <em>Map</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Map <em>Map</em>}'.
+   * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.amalgam.releng.build.Map
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.amalgam.releng.build.Map
+   * @generated
+   */
 	public Adapter createMapAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Category <em>Category</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Category <em>Category</em>}'.
+   * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.amalgam.releng.build.Category
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.amalgam.releng.build.Category
+   * @generated
+   */
 	public Adapter createCategoryAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Contribution <em>Contribution</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Contribution <em>Contribution</em>}'.
+   * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.amalgam.releng.build.Contribution
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.amalgam.releng.build.Contribution
+   * @generated
+   */
 	public Adapter createContributionAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Contact <em>Contact</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Contact <em>Contact</em>}'.
+   * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.amalgam.releng.build.Contact
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.amalgam.releng.build.Contact
+   * @generated
+   */
 	public Adapter createContactAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Feature <em>Feature</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Feature <em>Feature</em>}'.
+   * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.amalgam.releng.build.Feature
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.amalgam.releng.build.Feature
+   * @generated
+   */
 	public Adapter createFeatureAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Bundle <em>Bundle</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Bundle <em>Bundle</em>}'.
+   * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.amalgam.releng.build.Bundle
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.amalgam.releng.build.Bundle
+   * @generated
+   */
 	public Adapter createBundleAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Compiler <em>Compiler</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Compiler <em>Compiler</em>}'.
+   * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.amalgam.releng.build.Compiler
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.amalgam.releng.build.Compiler
+   * @generated
+   */
 	public Adapter createCompilerAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Promotion <em>Promotion</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Promotion <em>Promotion</em>}'.
+   * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.amalgam.releng.build.Promotion
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.amalgam.releng.build.Promotion
+   * @generated
+   */
 	public Adapter createPromotionAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.InstallationUnit <em>Installation Unit</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.InstallationUnit <em>Installation Unit</em>}'.
+   * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.amalgam.releng.build.InstallationUnit
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.amalgam.releng.build.InstallationUnit
+   * @generated
+   */
 	public Adapter createInstallationUnitAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Product <em>Product</em>}'.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for an object of class '{@link org.eclipse.amalgam.releng.build.Product <em>Product</em>}'.
+   * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.amalgam.releng.build.Product
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @see org.eclipse.amalgam.releng.build.Product
+   * @generated
+   */
 	public Adapter createProductAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
+   * Creates a new adapter for the default case.
+   * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
+   * @return the new adapter.
+   * @generated
+   */
 	public Adapter createEObjectAdapter() {
-		return null;
-	}
+    return null;
+  }
 
 } //BuildAdapterFactory
Index: src/org/eclipse/amalgam/releng/build/util/BuildResourceFactoryImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/util/BuildResourceFactoryImpl.java,v
retrieving revision 1.1
diff -u -r1.1 BuildResourceFactoryImpl.java
--- src/org/eclipse/amalgam/releng/build/util/BuildResourceFactoryImpl.java	24 Nov 2008 20:36:44 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/util/BuildResourceFactoryImpl.java	6 Jun 2010 14:35:31 -0000
@@ -28,25 +28,25 @@
  */
 public class BuildResourceFactoryImpl extends ResourceFactoryImpl {
 	/**
-	 * Creates an instance of the resource factory.
-	 * <!-- begin-user-doc -->
+   * Creates an instance of the resource factory.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public BuildResourceFactoryImpl() {
-		super();
-	}
+    super();
+  }
 
 	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
+   * Creates an instance of the resource.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Resource createResource(URI uri) {
-		Resource result = new BuildResourceImpl(uri);
-		return result;
-	}
+    Resource result = new BuildResourceImpl(uri);
+    return result;
+  }
 
 } //BuildResourceFactoryImpl
Index: src/org/eclipse/amalgam/releng/build/util/BuildResourceImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/util/BuildResourceImpl.java,v
retrieving revision 1.1
diff -u -r1.1 BuildResourceImpl.java
--- src/org/eclipse/amalgam/releng/build/util/BuildResourceImpl.java	24 Nov 2008 20:36:44 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/util/BuildResourceImpl.java	6 Jun 2010 14:35:31 -0000
@@ -26,14 +26,14 @@
  */
 public class BuildResourceImpl extends XMIResourceImpl {
 	/**
-	 * Creates an instance of the resource.
-	 * <!-- begin-user-doc -->
+   * Creates an instance of the resource.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
-	 * @generated
-	 */
+   * @param uri the URI of the new resource.
+   * @generated
+   */
 	public BuildResourceImpl(URI uri) {
-		super(uri);
-	}
+    super(uri);
+  }
 
 } //BuildResourceImpl
Index: src/org/eclipse/amalgam/releng/build/util/BuildSwitch.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model/src/org/eclipse/amalgam/releng/build/util/BuildSwitch.java,v
retrieving revision 1.3
diff -u -r1.3 BuildSwitch.java
--- src/org/eclipse/amalgam/releng/build/util/BuildSwitch.java	20 May 2009 18:12:35 -0000	1.3
+++ src/org/eclipse/amalgam/releng/build/util/BuildSwitch.java	6 Jun 2010 14:35:31 -0000
@@ -47,379 +47,397 @@
  */
 public class BuildSwitch<T> {
 	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
+   * The cached model package
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected static BuildPackage modelPackage;
 
 	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
+   * Creates an instance of the switch.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public BuildSwitch() {
-		if (modelPackage == null) {
-			modelPackage = BuildPackage.eINSTANCE;
-		}
-	}
+    if (modelPackage == null)
+    {
+      modelPackage = BuildPackage.eINSTANCE;
+    }
+  }
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
+   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
 	public T doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
+    return doSwitch(theEObject.eClass(), theEObject);
+  }
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
+   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
 	protected T doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List<EClass> eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch(eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
+    if (theEClass.eContainer() == modelPackage)
+    {
+      return doSwitch(theEClass.getClassifierID(), theEObject);
+    }
+    else
+    {
+      List<EClass> eSuperTypes = theEClass.getESuperTypes();
+      return
+        eSuperTypes.isEmpty() ?
+          defaultCase(theEObject) :
+          doSwitch(eSuperTypes.get(0), theEObject);
+    }
+  }
+
+	/**
+   * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+   * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+   * @return the first non-null result returned by a <code>caseXXX</code> call.
+   * @generated
+   */
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case BuildPackage.BUILD: {
-				Build build = (Build)theEObject;
-				T result = caseBuild(build);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case BuildPackage.REPOSITORY: {
-				Repository repository = (Repository)theEObject;
-				T result = caseRepository(repository);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case BuildPackage.PLATFORM: {
-				Platform platform = (Platform)theEObject;
-				T result = casePlatform(platform);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case BuildPackage.CONFIG: {
-				Config config = (Config)theEObject;
-				T result = caseConfig(config);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case BuildPackage.MAP: {
-				Map map = (Map)theEObject;
-				T result = caseMap(map);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case BuildPackage.CATEGORY: {
-				Category category = (Category)theEObject;
-				T result = caseCategory(category);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case BuildPackage.CONTRIBUTION: {
-				Contribution contribution = (Contribution)theEObject;
-				T result = caseContribution(contribution);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case BuildPackage.CONTACT: {
-				Contact contact = (Contact)theEObject;
-				T result = caseContact(contact);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case BuildPackage.FEATURE: {
-				Feature feature = (Feature)theEObject;
-				T result = caseFeature(feature);
-				if (result == null) result = caseInstallationUnit(feature);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case BuildPackage.BUNDLE: {
-				Bundle bundle = (Bundle)theEObject;
-				T result = caseBundle(bundle);
-				if (result == null) result = caseInstallationUnit(bundle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case BuildPackage.COMPILER: {
-				org.eclipse.amalgam.releng.build.Compiler compiler = (org.eclipse.amalgam.releng.build.Compiler)theEObject;
-				T result = caseCompiler(compiler);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case BuildPackage.PROMOTION: {
-				Promotion promotion = (Promotion)theEObject;
-				T result = casePromotion(promotion);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case BuildPackage.INSTALLATION_UNIT: {
-				InstallationUnit installationUnit = (InstallationUnit)theEObject;
-				T result = caseInstallationUnit(installationUnit);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case BuildPackage.PRODUCT: {
-				Product product = (Product)theEObject;
-				T result = caseProduct(product);
-				if (result == null) result = caseInstallationUnit(product);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Build</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Build</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+    switch (classifierID)
+    {
+      case BuildPackage.BUILD:
+      {
+        Build build = (Build)theEObject;
+        T result = caseBuild(build);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case BuildPackage.REPOSITORY:
+      {
+        Repository repository = (Repository)theEObject;
+        T result = caseRepository(repository);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case BuildPackage.PLATFORM:
+      {
+        Platform platform = (Platform)theEObject;
+        T result = casePlatform(platform);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case BuildPackage.CONFIG:
+      {
+        Config config = (Config)theEObject;
+        T result = caseConfig(config);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case BuildPackage.MAP:
+      {
+        Map map = (Map)theEObject;
+        T result = caseMap(map);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case BuildPackage.CATEGORY:
+      {
+        Category category = (Category)theEObject;
+        T result = caseCategory(category);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case BuildPackage.CONTRIBUTION:
+      {
+        Contribution contribution = (Contribution)theEObject;
+        T result = caseContribution(contribution);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case BuildPackage.CONTACT:
+      {
+        Contact contact = (Contact)theEObject;
+        T result = caseContact(contact);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case BuildPackage.FEATURE:
+      {
+        Feature feature = (Feature)theEObject;
+        T result = caseFeature(feature);
+        if (result == null) result = caseInstallationUnit(feature);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case BuildPackage.BUNDLE:
+      {
+        Bundle bundle = (Bundle)theEObject;
+        T result = caseBundle(bundle);
+        if (result == null) result = caseInstallationUnit(bundle);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case BuildPackage.COMPILER:
+      {
+        org.eclipse.amalgam.releng.build.Compiler compiler = (org.eclipse.amalgam.releng.build.Compiler)theEObject;
+        T result = caseCompiler(compiler);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case BuildPackage.PROMOTION:
+      {
+        Promotion promotion = (Promotion)theEObject;
+        T result = casePromotion(promotion);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case BuildPackage.INSTALLATION_UNIT:
+      {
+        InstallationUnit installationUnit = (InstallationUnit)theEObject;
+        T result = caseInstallationUnit(installationUnit);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      case BuildPackage.PRODUCT:
+      {
+        Product product = (Product)theEObject;
+        T result = caseProduct(product);
+        if (result == null) result = caseInstallationUnit(product);
+        if (result == null) result = defaultCase(theEObject);
+        return result;
+      }
+      default: return defaultCase(theEObject);
+    }
+  }
+
+	/**
+   * Returns the result of interpreting the object as an instance of '<em>Build</em>'.
+   * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Build</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseBuild(Build object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Repository</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Repository</em>'.
+   * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Repository</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Repository</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseRepository(Repository object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Platform</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Platform</em>'.
+   * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Platform</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Platform</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T casePlatform(Platform object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Config</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Config</em>'.
+   * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Config</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Config</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseConfig(Config object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Map</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Map</em>'.
+   * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Map</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Map</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseMap(Map object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Category</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Category</em>'.
+   * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Category</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Category</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseCategory(Category object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Contribution</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Contribution</em>'.
+   * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Contribution</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Contribution</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseContribution(Contribution object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Contact</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Contact</em>'.
+   * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Contact</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Contact</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseContact(Contact object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Feature</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Feature</em>'.
+   * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Feature</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Feature</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseFeature(Feature object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Bundle</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Bundle</em>'.
+   * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Bundle</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Bundle</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseBundle(Bundle object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Compiler</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Compiler</em>'.
+   * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Compiler</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Compiler</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseCompiler(org.eclipse.amalgam.releng.build.Compiler object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Promotion</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Promotion</em>'.
+   * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Promotion</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Promotion</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T casePromotion(Promotion object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Installation Unit</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Installation Unit</em>'.
+   * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Installation Unit</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Installation Unit</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseInstallationUnit(InstallationUnit object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Product</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>Product</em>'.
+   * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Product</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>Product</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+   * @generated
+   */
 	public T caseProduct(Product object) {
-		return null;
-	}
+    return null;
+  }
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
+   * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
+   * @param object the target of the switch.
+   * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+   * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+   * @generated
+   */
 	public T defaultCase(EObject object) {
-		return null;
-	}
+    return null;
+  }
 
 } //BuildSwitch
#P org.eclipse.amalgam.releng.build.model.edit
Index: plugin.properties
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.edit/plugin.properties,v
retrieving revision 1.11
diff -u -r1.11 plugin.properties
--- plugin.properties	20 May 2009 18:12:37 -0000	1.11
+++ plugin.properties	6 Jun 2010 14:35:34 -0000
@@ -136,3 +136,13 @@
 _UI_InstallationUnit_version_feature = Version
 _UI_InstallationUnit_repo_feature = Repo
 _UI_Contribution_products_feature = Products
+_UI_OS_aix_literal = aix
+_UI_OS_hpux_literal = hpux
+_UI_WS_motif_literal = motif
+_UI_WS_solaris_literal = solaris
+_UI_ARCH_ia64_32_literal = ia64_32
+_UI_ARCH_ppc64_literal = ppc64
+_UI_ARCH_s390_literal = s390
+_UI_ARCH_s390x_literal = s390x
+_UI_ARCH_sparc_literal = sparc
+_UI_OS_solaris_literal = solaris
Index: src/org/eclipse/amalgam/releng/build/provider/BuildEditPlugin.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.edit/src/org/eclipse/amalgam/releng/build/provider/BuildEditPlugin.java,v
retrieving revision 1.1
diff -u -r1.1 BuildEditPlugin.java
--- src/org/eclipse/amalgam/releng/build/provider/BuildEditPlugin.java	24 Nov 2008 20:37:38 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/provider/BuildEditPlugin.java	6 Jun 2010 14:35:35 -0000
@@ -27,77 +27,78 @@
  */
 public final class BuildEditPlugin extends EMFPlugin {
 	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
+   * Keep track of the singleton.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static final BuildEditPlugin INSTANCE = new BuildEditPlugin();
 
 	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
+   * Keep track of the singleton.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private static Implementation plugin;
 
 	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
+   * Create the instance.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public BuildEditPlugin() {
-		super
-		  (new ResourceLocator [] {
-		     ProductEditPlugin.INSTANCE,
-		   });
-	}
+    super
+      (new ResourceLocator [] 
+       {
+         ProductEditPlugin.INSTANCE,
+       });
+  }
 
 	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
+   * Returns the singleton instance of the Eclipse plugin.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
+   * @return the singleton instance.
+   * @generated
+   */
 	@Override
 	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
+    return plugin;
+  }
 
 	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
+   * Returns the singleton instance of the Eclipse plugin.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
+   * @return the singleton instance.
+   * @generated
+   */
 	public static Implementation getPlugin() {
-		return plugin;
-	}
+    return plugin;
+  }
 
 	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
+   * The actual implementation of the Eclipse <b>Plugin</b>.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static class Implementation extends EclipsePlugin {
 		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
+     * Creates an instance.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		public Implementation() {
-			super();
+      super();
 
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
+      // Remember the static instance.
+      //
+      plugin = this;
+    }
 	}
 
 }
Index: src/org/eclipse/amalgam/releng/build/provider/BuildItemProvider.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.edit/src/org/eclipse/amalgam/releng/build/provider/BuildItemProvider.java,v
retrieving revision 1.6
diff -u -r1.6 BuildItemProvider.java
--- src/org/eclipse/amalgam/releng/build/provider/BuildItemProvider.java	30 Dec 2008 20:03:11 -0000	1.6
+++ src/org/eclipse/amalgam/releng/build/provider/BuildItemProvider.java	6 Jun 2010 14:35:35 -0000
@@ -54,496 +54,500 @@
 		IItemLabelProvider,
 		IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
+   * This constructs an instance from a factory and a notifier.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public BuildItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
+    super(adapterFactory);
+  }
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the property descriptors for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addTypePropertyDescriptor(object);
-			addBuildRootPropertyDescriptor(object);
-			addFetchTagPropertyDescriptor(object);
-			addProductPropertyDescriptor(object);
-			addLabelPropertyDescriptor(object);
-			addBasePropertyDescriptor(object);
-			addBuilderPropertyDescriptor(object);
-			addDatePropertyDescriptor(object);
-			addTimePropertyDescriptor(object);
-			addLaunchVMPropertyDescriptor(object);
-			addBuilderURLPropertyDescriptor(object);
-			addSendmailPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
+    if (itemPropertyDescriptors == null)
+    {
+      super.getPropertyDescriptors(object);
+
+      addTypePropertyDescriptor(object);
+      addBuildRootPropertyDescriptor(object);
+      addFetchTagPropertyDescriptor(object);
+      addProductPropertyDescriptor(object);
+      addLabelPropertyDescriptor(object);
+      addBasePropertyDescriptor(object);
+      addBuilderPropertyDescriptor(object);
+      addDatePropertyDescriptor(object);
+      addTimePropertyDescriptor(object);
+      addLaunchVMPropertyDescriptor(object);
+      addBuilderURLPropertyDescriptor(object);
+      addSendmailPropertyDescriptor(object);
+    }
+    return itemPropertyDescriptors;
+  }
 
 	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Type feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Build_type_feature"),
-				 getString("_UI_Build_type_description"),
-				 BuildPackage.Literals.BUILD__TYPE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Build_type_feature"),
+         getString("_UI_Build_type_description"),
+         BuildPackage.Literals.BUILD__TYPE,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Build Root feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Build Root feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addBuildRootPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Build_buildRoot_feature"),
-				 getString("_UI_Build_buildRoot_description"),
-				 BuildPackage.Literals.BUILD__BUILD_ROOT,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Build_buildRoot_feature"),
+         getString("_UI_Build_buildRoot_description"),
+         BuildPackage.Literals.BUILD__BUILD_ROOT,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Fetch Tag feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Fetch Tag feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addFetchTagPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Build_fetchTag_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Build_fetchTag_feature", "_UI_Build_type"),
-				 BuildPackage.Literals.BUILD__FETCH_TAG,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Build_fetchTag_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Build_fetchTag_feature", "_UI_Build_type"),
+         BuildPackage.Literals.BUILD__FETCH_TAG,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Product feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Product feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addProductPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Build_product_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Build_product_feature", "_UI_Build_type"),
-				 BuildPackage.Literals.BUILD__PRODUCT,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Build_product_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Build_product_feature", "_UI_Build_type"),
+         BuildPackage.Literals.BUILD__PRODUCT,
+         true,
+         false,
+         true,
+         null,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Label feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Label feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addLabelPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Build_label_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Build_label_feature", "_UI_Build_type"),
-				 BuildPackage.Literals.BUILD__LABEL,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Build_label_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Build_label_feature", "_UI_Build_type"),
+         BuildPackage.Literals.BUILD__LABEL,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Base feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Base feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addBasePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Build_base_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Build_base_feature", "_UI_Build_type"),
-				 BuildPackage.Literals.BUILD__BASE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Build_base_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Build_base_feature", "_UI_Build_type"),
+         BuildPackage.Literals.BUILD__BASE,
+         true,
+         false,
+         true,
+         null,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Builder feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Builder feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addBuilderPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Build_builder_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Build_builder_feature", "_UI_Build_type"),
-				 BuildPackage.Literals.BUILD__BUILDER,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Build_builder_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Build_builder_feature", "_UI_Build_type"),
+         BuildPackage.Literals.BUILD__BUILDER,
+         true,
+         false,
+         true,
+         null,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Date feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Date feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addDatePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Build_date_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Build_date_feature", "_UI_Build_type"),
-				 BuildPackage.Literals.BUILD__DATE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Build_date_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Build_date_feature", "_UI_Build_type"),
+         BuildPackage.Literals.BUILD__DATE,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Time feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Time feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addTimePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Build_time_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Build_time_feature", "_UI_Build_type"),
-				 BuildPackage.Literals.BUILD__TIME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Build_time_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Build_time_feature", "_UI_Build_type"),
+         BuildPackage.Literals.BUILD__TIME,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Launch VM feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Launch VM feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addLaunchVMPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Build_launchVM_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Build_launchVM_feature", "_UI_Build_type"),
-				 BuildPackage.Literals.BUILD__LAUNCH_VM,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Build_launchVM_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Build_launchVM_feature", "_UI_Build_type"),
+         BuildPackage.Literals.BUILD__LAUNCH_VM,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Builder URL feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Builder URL feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addBuilderURLPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Build_builderURL_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Build_builderURL_feature", "_UI_Build_type"),
-				 BuildPackage.Literals.BUILD__BUILDER_URL,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Build_builderURL_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Build_builderURL_feature", "_UI_Build_type"),
+         BuildPackage.Literals.BUILD__BUILDER_URL,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Sendmail feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Sendmail feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addSendmailPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Build_sendmail_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Build_sendmail_feature", "_UI_Build_type"),
-				 BuildPackage.Literals.BUILD__SENDMAIL,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Build_sendmail_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Build_sendmail_feature", "_UI_Build_type"),
+         BuildPackage.Literals.BUILD__SENDMAIL,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+         null,
+         null));
+  }
+
+	/**
+   * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+   * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+   * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(BuildPackage.Literals.BUILD__PLATFORMS);
-			childrenFeatures.add(BuildPackage.Literals.BUILD__CONFIGS);
-			childrenFeatures.add(BuildPackage.Literals.BUILD__MAP);
-			childrenFeatures.add(BuildPackage.Literals.BUILD__CATEGORIES);
-			childrenFeatures.add(BuildPackage.Literals.BUILD__CONTRIBUTIONS);
-			childrenFeatures.add(BuildPackage.Literals.BUILD__COMPILER);
-			childrenFeatures.add(BuildPackage.Literals.BUILD__PROMOTION);
-			childrenFeatures.add(BuildPackage.Literals.BUILD__BUILDMASTER);
-			childrenFeatures.add(BuildPackage.Literals.BUILD__DEFAULT_MAIL_LIST);
-		}
-		return childrenFeatures;
-	}
+    if (childrenFeatures == null)
+    {
+      super.getChildrenFeatures(object);
+      childrenFeatures.add(BuildPackage.Literals.BUILD__PLATFORMS);
+      childrenFeatures.add(BuildPackage.Literals.BUILD__CONFIGS);
+      childrenFeatures.add(BuildPackage.Literals.BUILD__MAP);
+      childrenFeatures.add(BuildPackage.Literals.BUILD__CATEGORIES);
+      childrenFeatures.add(BuildPackage.Literals.BUILD__CONTRIBUTIONS);
+      childrenFeatures.add(BuildPackage.Literals.BUILD__COMPILER);
+      childrenFeatures.add(BuildPackage.Literals.BUILD__PROMOTION);
+      childrenFeatures.add(BuildPackage.Literals.BUILD__BUILDMASTER);
+      childrenFeatures.add(BuildPackage.Literals.BUILD__DEFAULT_MAIL_LIST);
+    }
+    return childrenFeatures;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
+    // Check the type of the specified child object and return the proper feature to use for
+    // adding (see {@link AddCommand}) it as a child.
 
-		return super.getChildFeature(object, child);
-	}
+    return super.getChildFeature(object, child);
+  }
 
 	/**
-	 * This returns Build.gif.
-	 * <!-- begin-user-doc -->
+   * This returns Build.gif.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Build"));
-	}
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/Build"));
+  }
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the label text for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String getText(Object object) {
-		String label = ((Build)object).getLabel();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Build_type") :
-			getString("_UI_Build_type") + " " + label;
-	}
+    String label = ((Build)object).getLabel();
+    return label == null || label.length() == 0 ?
+      getString("_UI_Build_type") :
+      getString("_UI_Build_type") + " " + label;
+  }
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
+    updateChildren(notification);
 
-		switch (notification.getFeatureID(Build.class)) {
-			case BuildPackage.BUILD__TYPE:
-			case BuildPackage.BUILD__BUILD_ROOT:
-			case BuildPackage.BUILD__FETCH_TAG:
-			case BuildPackage.BUILD__LABEL:
-			case BuildPackage.BUILD__DATE:
-			case BuildPackage.BUILD__TIME:
-			case BuildPackage.BUILD__LAUNCH_VM:
-			case BuildPackage.BUILD__BUILDER_URL:
-			case BuildPackage.BUILD__SENDMAIL:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case BuildPackage.BUILD__PLATFORMS:
-			case BuildPackage.BUILD__CONFIGS:
-			case BuildPackage.BUILD__MAP:
-			case BuildPackage.BUILD__CATEGORIES:
-			case BuildPackage.BUILD__CONTRIBUTIONS:
-			case BuildPackage.BUILD__COMPILER:
-			case BuildPackage.BUILD__PROMOTION:
-			case BuildPackage.BUILD__BUILDMASTER:
-			case BuildPackage.BUILD__DEFAULT_MAIL_LIST:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+    switch (notification.getFeatureID(Build.class))
+    {
+      case BuildPackage.BUILD__TYPE:
+      case BuildPackage.BUILD__BUILD_ROOT:
+      case BuildPackage.BUILD__FETCH_TAG:
+      case BuildPackage.BUILD__LABEL:
+      case BuildPackage.BUILD__DATE:
+      case BuildPackage.BUILD__TIME:
+      case BuildPackage.BUILD__LAUNCH_VM:
+      case BuildPackage.BUILD__BUILDER_URL:
+      case BuildPackage.BUILD__SENDMAIL:
+        fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+        return;
+      case BuildPackage.BUILD__PLATFORMS:
+      case BuildPackage.BUILD__CONFIGS:
+      case BuildPackage.BUILD__MAP:
+      case BuildPackage.BUILD__CATEGORIES:
+      case BuildPackage.BUILD__CONTRIBUTIONS:
+      case BuildPackage.BUILD__COMPILER:
+      case BuildPackage.BUILD__PROMOTION:
+      case BuildPackage.BUILD__BUILDMASTER:
+      case BuildPackage.BUILD__DEFAULT_MAIL_LIST:
+        fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+        return;
+    }
+    super.notifyChanged(notification);
+  }
+
+	/**
+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+   * that can be created under this object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
+    super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(BuildPackage.Literals.BUILD__PLATFORMS,
-				 BuildFactory.eINSTANCE.createPlatform()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(BuildPackage.Literals.BUILD__CONFIGS,
-				 BuildFactory.eINSTANCE.createConfig()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(BuildPackage.Literals.BUILD__MAP,
-				 BuildFactory.eINSTANCE.createMap()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(BuildPackage.Literals.BUILD__CATEGORIES,
-				 BuildFactory.eINSTANCE.createCategory()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(BuildPackage.Literals.BUILD__CONTRIBUTIONS,
-				 BuildFactory.eINSTANCE.createContribution()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(BuildPackage.Literals.BUILD__COMPILER,
-				 BuildFactory.eINSTANCE.createCompiler()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(BuildPackage.Literals.BUILD__PROMOTION,
-				 BuildFactory.eINSTANCE.createPromotion()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(BuildPackage.Literals.BUILD__BUILDMASTER,
-				 BuildFactory.eINSTANCE.createContact()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(BuildPackage.Literals.BUILD__DEFAULT_MAIL_LIST,
-				 BuildFactory.eINSTANCE.createContact()));
-	}
+    newChildDescriptors.add
+      (createChildParameter
+        (BuildPackage.Literals.BUILD__PLATFORMS,
+         BuildFactory.eINSTANCE.createPlatform()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (BuildPackage.Literals.BUILD__CONFIGS,
+         BuildFactory.eINSTANCE.createConfig()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (BuildPackage.Literals.BUILD__MAP,
+         BuildFactory.eINSTANCE.createMap()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (BuildPackage.Literals.BUILD__CATEGORIES,
+         BuildFactory.eINSTANCE.createCategory()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (BuildPackage.Literals.BUILD__CONTRIBUTIONS,
+         BuildFactory.eINSTANCE.createContribution()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (BuildPackage.Literals.BUILD__COMPILER,
+         BuildFactory.eINSTANCE.createCompiler()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (BuildPackage.Literals.BUILD__PROMOTION,
+         BuildFactory.eINSTANCE.createPromotion()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (BuildPackage.Literals.BUILD__BUILDMASTER,
+         BuildFactory.eINSTANCE.createContact()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (BuildPackage.Literals.BUILD__DEFAULT_MAIL_LIST,
+         BuildFactory.eINSTANCE.createContact()));
+  }
 
 	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
+   * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
+    Object childFeature = feature;
+    Object childObject = child;
 
-		boolean qualify =
-			childFeature == BuildPackage.Literals.BUILD__BUILDMASTER ||
-			childFeature == BuildPackage.Literals.BUILD__DEFAULT_MAIL_LIST;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
+    boolean qualify =
+      childFeature == BuildPackage.Literals.BUILD__BUILDMASTER ||
+      childFeature == BuildPackage.Literals.BUILD__DEFAULT_MAIL_LIST;
+
+    if (qualify)
+    {
+      return getString
+        ("_UI_CreateChild_text2",
+         new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+    }
+    return super.getCreateChildText(owner, feature, child, selection);
+  }
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
+   * Return the resource locator for this item provider's resources.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return BuildEditPlugin.INSTANCE;
-	}
+    return BuildEditPlugin.INSTANCE;
+  }
 
 }
Index: src/org/eclipse/amalgam/releng/build/provider/BuildItemProviderAdapterFactory.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.edit/src/org/eclipse/amalgam/releng/build/provider/BuildItemProviderAdapterFactory.java,v
retrieving revision 1.4
diff -u -r1.4 BuildItemProviderAdapterFactory.java
--- src/org/eclipse/amalgam/releng/build/provider/BuildItemProviderAdapterFactory.java	20 May 2009 18:12:37 -0000	1.4
+++ src/org/eclipse/amalgam/releng/build/provider/BuildItemProviderAdapterFactory.java	6 Jun 2010 14:35:35 -0000
@@ -45,454 +45,470 @@
  */
 public class BuildItemProviderAdapterFactory extends BuildAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the root adapter factory that delegates to this adapter factory.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected ComposedAdapterFactory parentAdapterFactory;
 
 	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
+   * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected IChangeNotifier changeNotifier = new ChangeNotifier();
 
 	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
+   * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected Collection<Object> supportedTypes = new ArrayList<Object>();
 
 	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
+   * This constructs an instance.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public BuildItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
+    supportedTypes.add(IEditingDomainItemProvider.class);
+    supportedTypes.add(IStructuredItemContentProvider.class);
+    supportedTypes.add(ITreeItemContentProvider.class);
+    supportedTypes.add(IItemLabelProvider.class);
+    supportedTypes.add(IItemPropertySource.class);
+  }
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Build} instances.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Build} instances.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected BuildItemProvider buildItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Build}.
-	 * <!-- begin-user-doc -->
+   * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Build}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Adapter createBuildAdapter() {
-		if (buildItemProvider == null) {
-			buildItemProvider = new BuildItemProvider(this);
-		}
+    if (buildItemProvider == null)
+    {
+      buildItemProvider = new BuildItemProvider(this);
+    }
 
-		return buildItemProvider;
-	}
+    return buildItemProvider;
+  }
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Repository} instances.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Repository} instances.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected RepositoryItemProvider repositoryItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Repository}.
-	 * <!-- begin-user-doc -->
+   * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Repository}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Adapter createRepositoryAdapter() {
-		if (repositoryItemProvider == null) {
-			repositoryItemProvider = new RepositoryItemProvider(this);
-		}
+    if (repositoryItemProvider == null)
+    {
+      repositoryItemProvider = new RepositoryItemProvider(this);
+    }
 
-		return repositoryItemProvider;
-	}
+    return repositoryItemProvider;
+  }
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Platform} instances.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Platform} instances.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected PlatformItemProvider platformItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Platform}.
-	 * <!-- begin-user-doc -->
+   * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Platform}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Adapter createPlatformAdapter() {
-		if (platformItemProvider == null) {
-			platformItemProvider = new PlatformItemProvider(this);
-		}
+    if (platformItemProvider == null)
+    {
+      platformItemProvider = new PlatformItemProvider(this);
+    }
 
-		return platformItemProvider;
-	}
+    return platformItemProvider;
+  }
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Config} instances.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Config} instances.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected ConfigItemProvider configItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Config}.
-	 * <!-- begin-user-doc -->
+   * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Config}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Adapter createConfigAdapter() {
-		if (configItemProvider == null) {
-			configItemProvider = new ConfigItemProvider(this);
-		}
+    if (configItemProvider == null)
+    {
+      configItemProvider = new ConfigItemProvider(this);
+    }
 
-		return configItemProvider;
-	}
+    return configItemProvider;
+  }
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Map} instances.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Map} instances.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected MapItemProvider mapItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Map}.
-	 * <!-- begin-user-doc -->
+   * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Map}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Adapter createMapAdapter() {
-		if (mapItemProvider == null) {
-			mapItemProvider = new MapItemProvider(this);
-		}
+    if (mapItemProvider == null)
+    {
+      mapItemProvider = new MapItemProvider(this);
+    }
 
-		return mapItemProvider;
-	}
+    return mapItemProvider;
+  }
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Category} instances.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Category} instances.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected CategoryItemProvider categoryItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Category}.
-	 * <!-- begin-user-doc -->
+   * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Category}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Adapter createCategoryAdapter() {
-		if (categoryItemProvider == null) {
-			categoryItemProvider = new CategoryItemProvider(this);
-		}
+    if (categoryItemProvider == null)
+    {
+      categoryItemProvider = new CategoryItemProvider(this);
+    }
 
-		return categoryItemProvider;
-	}
+    return categoryItemProvider;
+  }
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Contribution} instances.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Contribution} instances.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected ContributionItemProvider contributionItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Contribution}.
-	 * <!-- begin-user-doc -->
+   * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Contribution}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Adapter createContributionAdapter() {
-		if (contributionItemProvider == null) {
-			contributionItemProvider = new ContributionItemProvider(this);
-		}
+    if (contributionItemProvider == null)
+    {
+      contributionItemProvider = new ContributionItemProvider(this);
+    }
 
-		return contributionItemProvider;
-	}
+    return contributionItemProvider;
+  }
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Contact} instances.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Contact} instances.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected ContactItemProvider contactItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Contact}.
-	 * <!-- begin-user-doc -->
+   * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Contact}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Adapter createContactAdapter() {
-		if (contactItemProvider == null) {
-			contactItemProvider = new ContactItemProvider(this);
-		}
+    if (contactItemProvider == null)
+    {
+      contactItemProvider = new ContactItemProvider(this);
+    }
 
-		return contactItemProvider;
-	}
+    return contactItemProvider;
+  }
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Feature} instances.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Feature} instances.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected FeatureItemProvider featureItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Feature}.
-	 * <!-- begin-user-doc -->
+   * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Feature}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Adapter createFeatureAdapter() {
-		if (featureItemProvider == null) {
-			featureItemProvider = new FeatureItemProvider(this);
-		}
+    if (featureItemProvider == null)
+    {
+      featureItemProvider = new FeatureItemProvider(this);
+    }
 
-		return featureItemProvider;
-	}
+    return featureItemProvider;
+  }
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Bundle} instances.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Bundle} instances.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected BundleItemProvider bundleItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Bundle}.
-	 * <!-- begin-user-doc -->
+   * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Bundle}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Adapter createBundleAdapter() {
-		if (bundleItemProvider == null) {
-			bundleItemProvider = new BundleItemProvider(this);
-		}
+    if (bundleItemProvider == null)
+    {
+      bundleItemProvider = new BundleItemProvider(this);
+    }
 
-		return bundleItemProvider;
-	}
+    return bundleItemProvider;
+  }
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Compiler} instances.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Compiler} instances.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected CompilerItemProvider compilerItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Compiler}.
-	 * <!-- begin-user-doc -->
+   * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Compiler}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Adapter createCompilerAdapter() {
-		if (compilerItemProvider == null) {
-			compilerItemProvider = new CompilerItemProvider(this);
-		}
+    if (compilerItemProvider == null)
+    {
+      compilerItemProvider = new CompilerItemProvider(this);
+    }
 
-		return compilerItemProvider;
-	}
+    return compilerItemProvider;
+  }
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Promotion} instances.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Promotion} instances.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected PromotionItemProvider promotionItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Promotion}.
-	 * <!-- begin-user-doc -->
+   * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Promotion}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Adapter createPromotionAdapter() {
-		if (promotionItemProvider == null) {
-			promotionItemProvider = new PromotionItemProvider(this);
-		}
+    if (promotionItemProvider == null)
+    {
+      promotionItemProvider = new PromotionItemProvider(this);
+    }
 
-		return promotionItemProvider;
-	}
+    return promotionItemProvider;
+  }
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Product} instances.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the one adapter used for all {@link org.eclipse.amalgam.releng.build.Product} instances.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected ProductItemProvider productItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Product}.
-	 * <!-- begin-user-doc -->
+   * This creates an adapter for a {@link org.eclipse.amalgam.releng.build.Product}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Adapter createProductAdapter() {
-		if (productItemProvider == null) {
-			productItemProvider = new ProductItemProvider(this);
-		}
+    if (productItemProvider == null)
+    {
+      productItemProvider = new ProductItemProvider(this);
+    }
 
-		return productItemProvider;
-	}
+    return productItemProvider;
+  }
 
 	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
+   * This returns the root adapter factory that contains this factory.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
+    return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+  }
 
 	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
+   * This sets the composed adapter factory that contains this factory.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
+    this.parentAdapterFactory = parentAdapterFactory;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
+    return supportedTypes.contains(type) || super.isFactoryForType(type);
+  }
 
 	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
+   * This implementation substitutes the factory itself as the key for the adapter.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
+    return super.adapt(notifier, this);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
+    if (isFactoryForType(type))
+    {
+      Object adapter = super.adapt(object, type);
+      if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter)))
+      {
+        return adapter;
+      }
+    }
+
+    return null;
+  }
 
 	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
+   * This adds a listener.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
+    changeNotifier.addListener(notifyChangedListener);
+  }
 
 	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
+   * This removes a listener.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
+    changeNotifier.removeListener(notifyChangedListener);
+  }
 
 	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
+   * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
+    changeNotifier.fireNotifyChanged(notification);
 
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
+    if (parentAdapterFactory != null)
+    {
+      parentAdapterFactory.fireNotifyChanged(notification);
+    }
+  }
 
 	/**
-	 * This disposes all of the item providers created by this factory. 
-	 * <!-- begin-user-doc -->
+   * This disposes all of the item providers created by this factory. 
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void dispose() {
-		if (buildItemProvider != null) buildItemProvider.dispose();
-		if (repositoryItemProvider != null) repositoryItemProvider.dispose();
-		if (platformItemProvider != null) platformItemProvider.dispose();
-		if (configItemProvider != null) configItemProvider.dispose();
-		if (mapItemProvider != null) mapItemProvider.dispose();
-		if (categoryItemProvider != null) categoryItemProvider.dispose();
-		if (contributionItemProvider != null) contributionItemProvider.dispose();
-		if (contactItemProvider != null) contactItemProvider.dispose();
-		if (featureItemProvider != null) featureItemProvider.dispose();
-		if (bundleItemProvider != null) bundleItemProvider.dispose();
-		if (compilerItemProvider != null) compilerItemProvider.dispose();
-		if (promotionItemProvider != null) promotionItemProvider.dispose();
-		if (productItemProvider != null) productItemProvider.dispose();
-	}
+    if (buildItemProvider != null) buildItemProvider.dispose();
+    if (repositoryItemProvider != null) repositoryItemProvider.dispose();
+    if (platformItemProvider != null) platformItemProvider.dispose();
+    if (configItemProvider != null) configItemProvider.dispose();
+    if (mapItemProvider != null) mapItemProvider.dispose();
+    if (categoryItemProvider != null) categoryItemProvider.dispose();
+    if (contributionItemProvider != null) contributionItemProvider.dispose();
+    if (contactItemProvider != null) contactItemProvider.dispose();
+    if (featureItemProvider != null) featureItemProvider.dispose();
+    if (bundleItemProvider != null) bundleItemProvider.dispose();
+    if (compilerItemProvider != null) compilerItemProvider.dispose();
+    if (promotionItemProvider != null) promotionItemProvider.dispose();
+    if (productItemProvider != null) productItemProvider.dispose();
+  }
 
 }
Index: src/org/eclipse/amalgam/releng/build/provider/BundleItemProvider.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.edit/src/org/eclipse/amalgam/releng/build/provider/BundleItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 BundleItemProvider.java
--- src/org/eclipse/amalgam/releng/build/provider/BundleItemProvider.java	20 May 2009 18:12:37 -0000	1.2
+++ src/org/eclipse/amalgam/releng/build/provider/BundleItemProvider.java	6 Jun 2010 14:35:35 -0000
@@ -51,78 +51,79 @@
 		IItemLabelProvider,
 		IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
+   * This constructs an instance from a factory and a notifier.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public BundleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
+    super(adapterFactory);
+  }
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the property descriptors for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
+    if (itemPropertyDescriptors == null)
+    {
+      super.getPropertyDescriptors(object);
+
+    }
+    return itemPropertyDescriptors;
+  }
 
 	/**
-	 * This returns Bundle.gif.
-	 * <!-- begin-user-doc -->
+   * This returns Bundle.gif.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Bundle"));
-	}
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/Bundle"));
+  }
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the label text for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String getText(Object object) {
-		String label = ((Bundle)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Bundle_type") :
-			getString("_UI_Bundle_type") + " " + label;
-	}
+    String label = ((Bundle)object).getId();
+    return label == null || label.length() == 0 ?
+      getString("_UI_Bundle_type") :
+      getString("_UI_Bundle_type") + " " + label;
+  }
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
+    updateChildren(notification);
+    super.notifyChanged(notification);
+  }
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+   * that can be created under this object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
+    super.collectNewChildDescriptors(newChildDescriptors, object);
+  }
 
 }
Index: src/org/eclipse/amalgam/releng/build/provider/CategoryItemProvider.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.edit/src/org/eclipse/amalgam/releng/build/provider/CategoryItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 CategoryItemProvider.java
--- src/org/eclipse/amalgam/releng/build/provider/CategoryItemProvider.java	24 Nov 2008 20:37:38 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/provider/CategoryItemProvider.java	6 Jun 2010 14:35:35 -0000
@@ -51,189 +51,191 @@
 		IItemLabelProvider,
 		IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
+   * This constructs an instance from a factory and a notifier.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public CategoryItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
+    super(adapterFactory);
+  }
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the property descriptors for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-			addLabelPropertyDescriptor(object);
-			addDescriptionPropertyDescriptor(object);
-			addFeaturesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
+    if (itemPropertyDescriptors == null)
+    {
+      super.getPropertyDescriptors(object);
+
+      addNamePropertyDescriptor(object);
+      addLabelPropertyDescriptor(object);
+      addDescriptionPropertyDescriptor(object);
+      addFeaturesPropertyDescriptor(object);
+    }
+    return itemPropertyDescriptors;
+  }
 
 	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Name feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Category_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Category_name_feature", "_UI_Category_type"),
-				 BuildPackage.Literals.CATEGORY__NAME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Category_name_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Category_name_feature", "_UI_Category_type"),
+         BuildPackage.Literals.CATEGORY__NAME,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Label feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Label feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addLabelPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Category_label_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Category_label_feature", "_UI_Category_type"),
-				 BuildPackage.Literals.CATEGORY__LABEL,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Category_label_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Category_label_feature", "_UI_Category_type"),
+         BuildPackage.Literals.CATEGORY__LABEL,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Description feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Description feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Category_description_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Category_description_feature", "_UI_Category_type"),
-				 BuildPackage.Literals.CATEGORY__DESCRIPTION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Category_description_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Category_description_feature", "_UI_Category_type"),
+         BuildPackage.Literals.CATEGORY__DESCRIPTION,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Features feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Features feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addFeaturesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Category_features_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Category_features_feature", "_UI_Category_type"),
-				 BuildPackage.Literals.CATEGORY__FEATURES,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Category_features_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Category_features_feature", "_UI_Category_type"),
+         BuildPackage.Literals.CATEGORY__FEATURES,
+         true,
+         false,
+         true,
+         null,
+         null,
+         null));
+  }
 
 	/**
-	 * This returns Category.gif.
-	 * <!-- begin-user-doc -->
+   * This returns Category.gif.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Category"));
-	}
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/Category"));
+  }
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the label text for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String getText(Object object) {
-		String label = ((Category)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Category_type") :
-			getString("_UI_Category_type") + " " + label;
-	}
+    String label = ((Category)object).getName();
+    return label == null || label.length() == 0 ?
+      getString("_UI_Category_type") :
+      getString("_UI_Category_type") + " " + label;
+  }
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
+    updateChildren(notification);
 
-		switch (notification.getFeatureID(Category.class)) {
-			case BuildPackage.CATEGORY__NAME:
-			case BuildPackage.CATEGORY__LABEL:
-			case BuildPackage.CATEGORY__DESCRIPTION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+    switch (notification.getFeatureID(Category.class))
+    {
+      case BuildPackage.CATEGORY__NAME:
+      case BuildPackage.CATEGORY__LABEL:
+      case BuildPackage.CATEGORY__DESCRIPTION:
+        fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+        return;
+    }
+    super.notifyChanged(notification);
+  }
+
+	/**
+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+   * that can be created under this object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
+    super.collectNewChildDescriptors(newChildDescriptors, object);
+  }
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
+   * Return the resource locator for this item provider's resources.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return BuildEditPlugin.INSTANCE;
-	}
+    return BuildEditPlugin.INSTANCE;
+  }
 
 }
Index: src/org/eclipse/amalgam/releng/build/provider/CompilerItemProvider.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.edit/src/org/eclipse/amalgam/releng/build/provider/CompilerItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 CompilerItemProvider.java
--- src/org/eclipse/amalgam/releng/build/provider/CompilerItemProvider.java	24 Nov 2008 20:37:38 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/provider/CompilerItemProvider.java	6 Jun 2010 14:35:35 -0000
@@ -50,238 +50,240 @@
 		IItemLabelProvider,
 		IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
+   * This constructs an instance from a factory and a notifier.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public CompilerItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
+    super(adapterFactory);
+  }
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the property descriptors for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addArgsPropertyDescriptor(object);
-			addSourceVersionPropertyDescriptor(object);
-			addTargetVersionPropertyDescriptor(object);
-			addVerbosePropertyDescriptor(object);
-			addFailOnErrorPropertyDescriptor(object);
-			addDebugInfoPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
+    if (itemPropertyDescriptors == null)
+    {
+      super.getPropertyDescriptors(object);
+
+      addArgsPropertyDescriptor(object);
+      addSourceVersionPropertyDescriptor(object);
+      addTargetVersionPropertyDescriptor(object);
+      addVerbosePropertyDescriptor(object);
+      addFailOnErrorPropertyDescriptor(object);
+      addDebugInfoPropertyDescriptor(object);
+    }
+    return itemPropertyDescriptors;
+  }
 
 	/**
-	 * This adds a property descriptor for the Args feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Args feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addArgsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Compiler_args_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Compiler_args_feature", "_UI_Compiler_type"),
-				 BuildPackage.Literals.COMPILER__ARGS,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Compiler_args_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Compiler_args_feature", "_UI_Compiler_type"),
+         BuildPackage.Literals.COMPILER__ARGS,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Source Version feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Source Version feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addSourceVersionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Compiler_sourceVersion_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Compiler_sourceVersion_feature", "_UI_Compiler_type"),
-				 BuildPackage.Literals.COMPILER__SOURCE_VERSION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Compiler_sourceVersion_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Compiler_sourceVersion_feature", "_UI_Compiler_type"),
+         BuildPackage.Literals.COMPILER__SOURCE_VERSION,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Target Version feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Target Version feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addTargetVersionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Compiler_targetVersion_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Compiler_targetVersion_feature", "_UI_Compiler_type"),
-				 BuildPackage.Literals.COMPILER__TARGET_VERSION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Compiler_targetVersion_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Compiler_targetVersion_feature", "_UI_Compiler_type"),
+         BuildPackage.Literals.COMPILER__TARGET_VERSION,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Verbose feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Verbose feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addVerbosePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Compiler_verbose_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Compiler_verbose_feature", "_UI_Compiler_type"),
-				 BuildPackage.Literals.COMPILER__VERBOSE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Compiler_verbose_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Compiler_verbose_feature", "_UI_Compiler_type"),
+         BuildPackage.Literals.COMPILER__VERBOSE,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Fail On Error feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Fail On Error feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addFailOnErrorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Compiler_failOnError_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Compiler_failOnError_feature", "_UI_Compiler_type"),
-				 BuildPackage.Literals.COMPILER__FAIL_ON_ERROR,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Compiler_failOnError_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Compiler_failOnError_feature", "_UI_Compiler_type"),
+         BuildPackage.Literals.COMPILER__FAIL_ON_ERROR,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Debug Info feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Debug Info feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addDebugInfoPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Compiler_debugInfo_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Compiler_debugInfo_feature", "_UI_Compiler_type"),
-				 BuildPackage.Literals.COMPILER__DEBUG_INFO,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Compiler_debugInfo_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Compiler_debugInfo_feature", "_UI_Compiler_type"),
+         BuildPackage.Literals.COMPILER__DEBUG_INFO,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This returns Compiler.gif.
-	 * <!-- begin-user-doc -->
+   * This returns Compiler.gif.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Compiler"));
-	}
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/Compiler"));
+  }
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the label text for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String getText(Object object) {
-		String label = ((org.eclipse.amalgam.releng.build.Compiler)object).getArgs();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Compiler_type") :
-			getString("_UI_Compiler_type") + " " + label;
-	}
+    String label = ((org.eclipse.amalgam.releng.build.Compiler)object).getArgs();
+    return label == null || label.length() == 0 ?
+      getString("_UI_Compiler_type") :
+      getString("_UI_Compiler_type") + " " + label;
+  }
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
+    updateChildren(notification);
 
-		switch (notification.getFeatureID(org.eclipse.amalgam.releng.build.Compiler.class)) {
-			case BuildPackage.COMPILER__ARGS:
-			case BuildPackage.COMPILER__SOURCE_VERSION:
-			case BuildPackage.COMPILER__TARGET_VERSION:
-			case BuildPackage.COMPILER__VERBOSE:
-			case BuildPackage.COMPILER__FAIL_ON_ERROR:
-			case BuildPackage.COMPILER__DEBUG_INFO:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+    switch (notification.getFeatureID(org.eclipse.amalgam.releng.build.Compiler.class))
+    {
+      case BuildPackage.COMPILER__ARGS:
+      case BuildPackage.COMPILER__SOURCE_VERSION:
+      case BuildPackage.COMPILER__TARGET_VERSION:
+      case BuildPackage.COMPILER__VERBOSE:
+      case BuildPackage.COMPILER__FAIL_ON_ERROR:
+      case BuildPackage.COMPILER__DEBUG_INFO:
+        fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+        return;
+    }
+    super.notifyChanged(notification);
+  }
+
+	/**
+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+   * that can be created under this object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
+    super.collectNewChildDescriptors(newChildDescriptors, object);
+  }
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
+   * Return the resource locator for this item provider's resources.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return BuildEditPlugin.INSTANCE;
-	}
+    return BuildEditPlugin.INSTANCE;
+  }
 
 }
Index: src/org/eclipse/amalgam/releng/build/provider/ConfigItemProvider.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.edit/src/org/eclipse/amalgam/releng/build/provider/ConfigItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 ConfigItemProvider.java
--- src/org/eclipse/amalgam/releng/build/provider/ConfigItemProvider.java	25 Nov 2008 00:35:09 -0000	1.2
+++ src/org/eclipse/amalgam/releng/build/provider/ConfigItemProvider.java	6 Jun 2010 14:35:35 -0000
@@ -54,132 +54,133 @@
 		IItemLabelProvider,
 		IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
+   * This constructs an instance from a factory and a notifier.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public ConfigItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
+    super(adapterFactory);
+  }
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the property descriptors for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addOsPropertyDescriptor(object);
-			addWsPropertyDescriptor(object);
-			addArchPropertyDescriptor(object);
-			addArchiveFormatPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
+    if (itemPropertyDescriptors == null)
+    {
+      super.getPropertyDescriptors(object);
+
+      addOsPropertyDescriptor(object);
+      addWsPropertyDescriptor(object);
+      addArchPropertyDescriptor(object);
+      addArchiveFormatPropertyDescriptor(object);
+    }
+    return itemPropertyDescriptors;
+  }
 
 	/**
-	 * This adds a property descriptor for the Os feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Os feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addOsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Config_os_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Config_os_feature", "_UI_Config_type"),
-				 BuildPackage.Literals.CONFIG__OS,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Config_os_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Config_os_feature", "_UI_Config_type"),
+         BuildPackage.Literals.CONFIG__OS,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Ws feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Ws feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addWsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Config_ws_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Config_ws_feature", "_UI_Config_type"),
-				 BuildPackage.Literals.CONFIG__WS,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Config_ws_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Config_ws_feature", "_UI_Config_type"),
+         BuildPackage.Literals.CONFIG__WS,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Arch feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Arch feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addArchPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Config_arch_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Config_arch_feature", "_UI_Config_type"),
-				 BuildPackage.Literals.CONFIG__ARCH,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Config_arch_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Config_arch_feature", "_UI_Config_type"),
+         BuildPackage.Literals.CONFIG__ARCH,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Archive Format feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Archive Format feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addArchiveFormatPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Config_archiveFormat_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Config_archiveFormat_feature", "_UI_Config_type"),
-				 BuildPackage.Literals.CONFIG__ARCHIVE_FORMAT,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Config_archiveFormat_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Config_archiveFormat_feature", "_UI_Config_type"),
+         BuildPackage.Literals.CONFIG__ARCHIVE_FORMAT,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This returns Config.gif.
-	 * <!-- begin-user-doc -->
+   * This returns Config.gif.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Config"));
-	}
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/Config"));
+  }
 
 	/**
 	 * This returns the label text for the adapted class.
@@ -199,62 +200,63 @@
 	}
 	
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the label text for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public String getTextGen(Object object) {
-		OS labelValue = ((Config)object).getOs();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Config_type") :
-			getString("_UI_Config_type") + " " + label;
-	}
+    OS labelValue = ((Config)object).getOs();
+    String label = labelValue == null ? null : labelValue.toString();
+    return label == null || label.length() == 0 ?
+      getString("_UI_Config_type") :
+      getString("_UI_Config_type") + " " + label;
+  }
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
+    updateChildren(notification);
 
-		switch (notification.getFeatureID(Config.class)) {
-			case BuildPackage.CONFIG__OS:
-			case BuildPackage.CONFIG__WS:
-			case BuildPackage.CONFIG__ARCH:
-			case BuildPackage.CONFIG__ARCHIVE_FORMAT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+    switch (notification.getFeatureID(Config.class))
+    {
+      case BuildPackage.CONFIG__OS:
+      case BuildPackage.CONFIG__WS:
+      case BuildPackage.CONFIG__ARCH:
+      case BuildPackage.CONFIG__ARCHIVE_FORMAT:
+        fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+        return;
+    }
+    super.notifyChanged(notification);
+  }
+
+	/**
+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+   * that can be created under this object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
+    super.collectNewChildDescriptors(newChildDescriptors, object);
+  }
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
+   * Return the resource locator for this item provider's resources.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return BuildEditPlugin.INSTANCE;
-	}
+    return BuildEditPlugin.INSTANCE;
+  }
 
 }
Index: src/org/eclipse/amalgam/releng/build/provider/ContactItemProvider.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.edit/src/org/eclipse/amalgam/releng/build/provider/ContactItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 ContactItemProvider.java
--- src/org/eclipse/amalgam/releng/build/provider/ContactItemProvider.java	24 Nov 2008 20:37:38 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/provider/ContactItemProvider.java	6 Jun 2010 14:35:35 -0000
@@ -51,142 +51,144 @@
 		IItemLabelProvider,
 		IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
+   * This constructs an instance from a factory and a notifier.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public ContactItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
+    super(adapterFactory);
+  }
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the property descriptors for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-			addEmailPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
+    if (itemPropertyDescriptors == null)
+    {
+      super.getPropertyDescriptors(object);
+
+      addNamePropertyDescriptor(object);
+      addEmailPropertyDescriptor(object);
+    }
+    return itemPropertyDescriptors;
+  }
 
 	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Name feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Contact_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Contact_name_feature", "_UI_Contact_type"),
-				 BuildPackage.Literals.CONTACT__NAME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Contact_name_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Contact_name_feature", "_UI_Contact_type"),
+         BuildPackage.Literals.CONTACT__NAME,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Email feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Email feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addEmailPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Contact_email_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Contact_email_feature", "_UI_Contact_type"),
-				 BuildPackage.Literals.CONTACT__EMAIL,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Contact_email_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Contact_email_feature", "_UI_Contact_type"),
+         BuildPackage.Literals.CONTACT__EMAIL,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This returns Contact.gif.
-	 * <!-- begin-user-doc -->
+   * This returns Contact.gif.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Contact"));
-	}
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/Contact"));
+  }
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the label text for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String getText(Object object) {
-		String label = ((Contact)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Contact_type") :
-			getString("_UI_Contact_type") + " " + label;
-	}
+    String label = ((Contact)object).getName();
+    return label == null || label.length() == 0 ?
+      getString("_UI_Contact_type") :
+      getString("_UI_Contact_type") + " " + label;
+  }
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
+    updateChildren(notification);
 
-		switch (notification.getFeatureID(Contact.class)) {
-			case BuildPackage.CONTACT__NAME:
-			case BuildPackage.CONTACT__EMAIL:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+    switch (notification.getFeatureID(Contact.class))
+    {
+      case BuildPackage.CONTACT__NAME:
+      case BuildPackage.CONTACT__EMAIL:
+        fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+        return;
+    }
+    super.notifyChanged(notification);
+  }
+
+	/**
+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+   * that can be created under this object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
+    super.collectNewChildDescriptors(newChildDescriptors, object);
+  }
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
+   * Return the resource locator for this item provider's resources.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return BuildEditPlugin.INSTANCE;
-	}
+    return BuildEditPlugin.INSTANCE;
+  }
 
 }
Index: src/org/eclipse/amalgam/releng/build/provider/ContributionItemProvider.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.edit/src/org/eclipse/amalgam/releng/build/provider/ContributionItemProvider.java,v
retrieving revision 1.3
diff -u -r1.3 ContributionItemProvider.java
--- src/org/eclipse/amalgam/releng/build/provider/ContributionItemProvider.java	21 May 2009 12:57:52 -0000	1.3
+++ src/org/eclipse/amalgam/releng/build/provider/ContributionItemProvider.java	6 Jun 2010 14:35:35 -0000
@@ -54,184 +54,187 @@
 		IItemLabelProvider,
 		IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
+   * This constructs an instance from a factory and a notifier.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public ContributionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
+    super(adapterFactory);
+  }
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the property descriptors for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
+    if (itemPropertyDescriptors == null)
+    {
+      super.getPropertyDescriptors(object);
 
-			addLabelPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
+      addLabelPropertyDescriptor(object);
+    }
+    return itemPropertyDescriptors;
+  }
 
 	/**
-	 * This adds a property descriptor for the Label feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Label feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addLabelPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Contribution_label_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Contribution_label_feature", "_UI_Contribution_type"),
-				 BuildPackage.Literals.CONTRIBUTION__LABEL,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Contribution_label_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Contribution_label_feature", "_UI_Contribution_type"),
+         BuildPackage.Literals.CONTRIBUTION__LABEL,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
+
+	/**
+   * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+   * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+   * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(BuildPackage.Literals.CONTRIBUTION__CONTACTS);
-			childrenFeatures.add(BuildPackage.Literals.CONTRIBUTION__FEATURES);
-			childrenFeatures.add(BuildPackage.Literals.CONTRIBUTION__REPOSITORIES);
-			childrenFeatures.add(BuildPackage.Literals.CONTRIBUTION__BUNDLES);
-			childrenFeatures.add(BuildPackage.Literals.CONTRIBUTION__PRODUCTS);
-		}
-		return childrenFeatures;
-	}
+    if (childrenFeatures == null)
+    {
+      super.getChildrenFeatures(object);
+      childrenFeatures.add(BuildPackage.Literals.CONTRIBUTION__CONTACTS);
+      childrenFeatures.add(BuildPackage.Literals.CONTRIBUTION__FEATURES);
+      childrenFeatures.add(BuildPackage.Literals.CONTRIBUTION__REPOSITORIES);
+      childrenFeatures.add(BuildPackage.Literals.CONTRIBUTION__BUNDLES);
+      childrenFeatures.add(BuildPackage.Literals.CONTRIBUTION__PRODUCTS);
+    }
+    return childrenFeatures;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
+    // Check the type of the specified child object and return the proper feature to use for
+    // adding (see {@link AddCommand}) it as a child.
 
-		return super.getChildFeature(object, child);
-	}
+    return super.getChildFeature(object, child);
+  }
 
 	/**
-	 * This returns Contribution.gif.
-	 * <!-- begin-user-doc -->
+   * This returns Contribution.gif.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Contribution"));
-	}
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/Contribution"));
+  }
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the label text for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String getText(Object object) {
-		String label = ((Contribution)object).getLabel();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Contribution_type") :
-			getString("_UI_Contribution_type") + " " + label;
-	}
+    String label = ((Contribution)object).getLabel();
+    return label == null || label.length() == 0 ?
+      getString("_UI_Contribution_type") :
+      getString("_UI_Contribution_type") + " " + label;
+  }
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
+    updateChildren(notification);
 
-		switch (notification.getFeatureID(Contribution.class)) {
-			case BuildPackage.CONTRIBUTION__LABEL:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case BuildPackage.CONTRIBUTION__CONTACTS:
-			case BuildPackage.CONTRIBUTION__FEATURES:
-			case BuildPackage.CONTRIBUTION__REPOSITORIES:
-			case BuildPackage.CONTRIBUTION__BUNDLES:
-			case BuildPackage.CONTRIBUTION__PRODUCTS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+    switch (notification.getFeatureID(Contribution.class))
+    {
+      case BuildPackage.CONTRIBUTION__LABEL:
+        fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+        return;
+      case BuildPackage.CONTRIBUTION__CONTACTS:
+      case BuildPackage.CONTRIBUTION__FEATURES:
+      case BuildPackage.CONTRIBUTION__REPOSITORIES:
+      case BuildPackage.CONTRIBUTION__BUNDLES:
+      case BuildPackage.CONTRIBUTION__PRODUCTS:
+        fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+        return;
+    }
+    super.notifyChanged(notification);
+  }
+
+	/**
+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+   * that can be created under this object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
+    super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-				(BuildPackage.Literals.CONTRIBUTION__CONTACTS,
-				 BuildFactory.eINSTANCE.createContact()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(BuildPackage.Literals.CONTRIBUTION__FEATURES,
-				 BuildFactory.eINSTANCE.createFeature()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(BuildPackage.Literals.CONTRIBUTION__REPOSITORIES,
-				 BuildFactory.eINSTANCE.createRepository()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(BuildPackage.Literals.CONTRIBUTION__BUNDLES,
-				 BuildFactory.eINSTANCE.createBundle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(BuildPackage.Literals.CONTRIBUTION__PRODUCTS,
-				 BuildFactory.eINSTANCE.createProduct()));
-	}
+    newChildDescriptors.add
+      (createChildParameter
+        (BuildPackage.Literals.CONTRIBUTION__CONTACTS,
+         BuildFactory.eINSTANCE.createContact()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (BuildPackage.Literals.CONTRIBUTION__FEATURES,
+         BuildFactory.eINSTANCE.createFeature()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (BuildPackage.Literals.CONTRIBUTION__REPOSITORIES,
+         BuildFactory.eINSTANCE.createRepository()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (BuildPackage.Literals.CONTRIBUTION__BUNDLES,
+         BuildFactory.eINSTANCE.createBundle()));
+
+    newChildDescriptors.add
+      (createChildParameter
+        (BuildPackage.Literals.CONTRIBUTION__PRODUCTS,
+         BuildFactory.eINSTANCE.createProduct()));
+  }
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
+   * Return the resource locator for this item provider's resources.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return BuildEditPlugin.INSTANCE;
-	}
+    return BuildEditPlugin.INSTANCE;
+  }
 
 }
Index: src/org/eclipse/amalgam/releng/build/provider/FeatureItemProvider.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.edit/src/org/eclipse/amalgam/releng/build/provider/FeatureItemProvider.java,v
retrieving revision 1.2
diff -u -r1.2 FeatureItemProvider.java
--- src/org/eclipse/amalgam/releng/build/provider/FeatureItemProvider.java	20 May 2009 18:12:37 -0000	1.2
+++ src/org/eclipse/amalgam/releng/build/provider/FeatureItemProvider.java	6 Jun 2010 14:35:35 -0000
@@ -51,130 +51,132 @@
 		IItemLabelProvider,
 		IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
+   * This constructs an instance from a factory and a notifier.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public FeatureItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
+    super(adapterFactory);
+  }
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the property descriptors for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addCategoryPropertyDescriptor(object);
-			addInProductPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
+    if (itemPropertyDescriptors == null)
+    {
+      super.getPropertyDescriptors(object);
+
+      addCategoryPropertyDescriptor(object);
+      addInProductPropertyDescriptor(object);
+    }
+    return itemPropertyDescriptors;
+  }
 
 	/**
-	 * This adds a property descriptor for the Category feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Category feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addCategoryPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Feature_category_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Feature_category_feature", "_UI_Feature_type"),
-				 BuildPackage.Literals.FEATURE__CATEGORY,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Feature_category_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Feature_category_feature", "_UI_Feature_type"),
+         BuildPackage.Literals.FEATURE__CATEGORY,
+         true,
+         false,
+         true,
+         null,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the In Product feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the In Product feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addInProductPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Feature_inProduct_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Feature_inProduct_feature", "_UI_Feature_type"),
-				 BuildPackage.Literals.FEATURE__IN_PRODUCT,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Feature_inProduct_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Feature_inProduct_feature", "_UI_Feature_type"),
+         BuildPackage.Literals.FEATURE__IN_PRODUCT,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This returns Feature.gif.
-	 * <!-- begin-user-doc -->
+   * This returns Feature.gif.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Feature"));
-	}
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/Feature"));
+  }
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the label text for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String getText(Object object) {
-		String label = ((Feature)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Feature_type") :
-			getString("_UI_Feature_type") + " " + label;
-	}
+    String label = ((Feature)object).getId();
+    return label == null || label.length() == 0 ?
+      getString("_UI_Feature_type") :
+      getString("_UI_Feature_type") + " " + label;
+  }
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
+    updateChildren(notification);
 
-		switch (notification.getFeatureID(Feature.class)) {
-			case BuildPackage.FEATURE__IN_PRODUCT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+    switch (notification.getFeatureID(Feature.class))
+    {
+      case BuildPackage.FEATURE__IN_PRODUCT:
+        fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+        return;
+    }
+    super.notifyChanged(notification);
+  }
+
+	/**
+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+   * that can be created under this object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
+    super.collectNewChildDescriptors(newChildDescriptors, object);
+  }
 
 }
Index: src/org/eclipse/amalgam/releng/build/provider/InstallationUnitItemProvider.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.edit/src/org/eclipse/amalgam/releng/build/provider/InstallationUnitItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 InstallationUnitItemProvider.java
--- src/org/eclipse/amalgam/releng/build/provider/InstallationUnitItemProvider.java	20 May 2009 18:12:37 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/provider/InstallationUnitItemProvider.java	6 Jun 2010 14:35:35 -0000
@@ -51,154 +51,156 @@
 		IItemLabelProvider,
 		IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
+   * This constructs an instance from a factory and a notifier.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public InstallationUnitItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
+    super(adapterFactory);
+  }
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the property descriptors for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdPropertyDescriptor(object);
-			addVersionPropertyDescriptor(object);
-			addRepoPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
+    if (itemPropertyDescriptors == null)
+    {
+      super.getPropertyDescriptors(object);
+
+      addIdPropertyDescriptor(object);
+      addVersionPropertyDescriptor(object);
+      addRepoPropertyDescriptor(object);
+    }
+    return itemPropertyDescriptors;
+  }
 
 	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Id feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_InstallationUnit_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_InstallationUnit_id_feature", "_UI_InstallationUnit_type"),
-				 BuildPackage.Literals.INSTALLATION_UNIT__ID,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_InstallationUnit_id_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_InstallationUnit_id_feature", "_UI_InstallationUnit_type"),
+         BuildPackage.Literals.INSTALLATION_UNIT__ID,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Version feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Version feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addVersionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_InstallationUnit_version_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_InstallationUnit_version_feature", "_UI_InstallationUnit_type"),
-				 BuildPackage.Literals.INSTALLATION_UNIT__VERSION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_InstallationUnit_version_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_InstallationUnit_version_feature", "_UI_InstallationUnit_type"),
+         BuildPackage.Literals.INSTALLATION_UNIT__VERSION,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Repo feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Repo feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addRepoPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_InstallationUnit_repo_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_InstallationUnit_repo_feature", "_UI_InstallationUnit_type"),
-				 BuildPackage.Literals.INSTALLATION_UNIT__REPO,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_InstallationUnit_repo_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_InstallationUnit_repo_feature", "_UI_InstallationUnit_type"),
+         BuildPackage.Literals.INSTALLATION_UNIT__REPO,
+         true,
+         false,
+         true,
+         null,
+         null,
+         null));
+  }
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the label text for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String getText(Object object) {
-		String label = ((InstallationUnit)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_InstallationUnit_type") :
-			getString("_UI_InstallationUnit_type") + " " + label;
-	}
+    String label = ((InstallationUnit)object).getId();
+    return label == null || label.length() == 0 ?
+      getString("_UI_InstallationUnit_type") :
+      getString("_UI_InstallationUnit_type") + " " + label;
+  }
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
+    updateChildren(notification);
 
-		switch (notification.getFeatureID(InstallationUnit.class)) {
-			case BuildPackage.INSTALLATION_UNIT__ID:
-			case BuildPackage.INSTALLATION_UNIT__VERSION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+    switch (notification.getFeatureID(InstallationUnit.class))
+    {
+      case BuildPackage.INSTALLATION_UNIT__ID:
+      case BuildPackage.INSTALLATION_UNIT__VERSION:
+        fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+        return;
+    }
+    super.notifyChanged(notification);
+  }
+
+	/**
+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+   * that can be created under this object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
+    super.collectNewChildDescriptors(newChildDescriptors, object);
+  }
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
+   * Return the resource locator for this item provider's resources.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return BuildEditPlugin.INSTANCE;
-	}
+    return BuildEditPlugin.INSTANCE;
+  }
 
 }
Index: src/org/eclipse/amalgam/releng/build/provider/MapItemProvider.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.edit/src/org/eclipse/amalgam/releng/build/provider/MapItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 MapItemProvider.java
--- src/org/eclipse/amalgam/releng/build/provider/MapItemProvider.java	24 Nov 2008 20:37:38 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/provider/MapItemProvider.java	6 Jun 2010 14:35:36 -0000
@@ -51,166 +51,168 @@
 		IItemLabelProvider,
 		IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
+   * This constructs an instance from a factory and a notifier.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public MapItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
+    super(adapterFactory);
+  }
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the property descriptors for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addRootPropertyDescriptor(object);
-			addRepoPropertyDescriptor(object);
-			addTagPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
+    if (itemPropertyDescriptors == null)
+    {
+      super.getPropertyDescriptors(object);
+
+      addRootPropertyDescriptor(object);
+      addRepoPropertyDescriptor(object);
+      addTagPropertyDescriptor(object);
+    }
+    return itemPropertyDescriptors;
+  }
 
 	/**
-	 * This adds a property descriptor for the Root feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Root feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addRootPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Map_root_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Map_root_feature", "_UI_Map_type"),
-				 BuildPackage.Literals.MAP__ROOT,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Map_root_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Map_root_feature", "_UI_Map_type"),
+         BuildPackage.Literals.MAP__ROOT,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Repo feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Repo feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addRepoPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Map_repo_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Map_repo_feature", "_UI_Map_type"),
-				 BuildPackage.Literals.MAP__REPO,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Map_repo_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Map_repo_feature", "_UI_Map_type"),
+         BuildPackage.Literals.MAP__REPO,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Tag feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Tag feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addTagPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Map_tag_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Map_tag_feature", "_UI_Map_type"),
-				 BuildPackage.Literals.MAP__TAG,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Map_tag_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Map_tag_feature", "_UI_Map_type"),
+         BuildPackage.Literals.MAP__TAG,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This returns Map.gif.
-	 * <!-- begin-user-doc -->
+   * This returns Map.gif.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Map"));
-	}
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/Map"));
+  }
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the label text for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String getText(Object object) {
-		String label = ((Map)object).getRoot();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Map_type") :
-			getString("_UI_Map_type") + " " + label;
-	}
+    String label = ((Map)object).getRoot();
+    return label == null || label.length() == 0 ?
+      getString("_UI_Map_type") :
+      getString("_UI_Map_type") + " " + label;
+  }
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
+    updateChildren(notification);
 
-		switch (notification.getFeatureID(Map.class)) {
-			case BuildPackage.MAP__ROOT:
-			case BuildPackage.MAP__REPO:
-			case BuildPackage.MAP__TAG:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+    switch (notification.getFeatureID(Map.class))
+    {
+      case BuildPackage.MAP__ROOT:
+      case BuildPackage.MAP__REPO:
+      case BuildPackage.MAP__TAG:
+        fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+        return;
+    }
+    super.notifyChanged(notification);
+  }
+
+	/**
+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+   * that can be created under this object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
+    super.collectNewChildDescriptors(newChildDescriptors, object);
+  }
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
+   * Return the resource locator for this item provider's resources.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return BuildEditPlugin.INSTANCE;
-	}
+    return BuildEditPlugin.INSTANCE;
+  }
 
 }
Index: src/org/eclipse/amalgam/releng/build/provider/PlatformItemProvider.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.edit/src/org/eclipse/amalgam/releng/build/provider/PlatformItemProvider.java,v
retrieving revision 1.3
diff -u -r1.3 PlatformItemProvider.java
--- src/org/eclipse/amalgam/releng/build/provider/PlatformItemProvider.java	30 Dec 2008 20:03:11 -0000	1.3
+++ src/org/eclipse/amalgam/releng/build/provider/PlatformItemProvider.java	6 Jun 2010 14:35:36 -0000
@@ -51,189 +51,191 @@
 		IItemLabelProvider,
 		IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
+   * This constructs an instance from a factory and a notifier.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public PlatformItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
+    super(adapterFactory);
+  }
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the property descriptors for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addFilePropertyDescriptor(object);
-			addLocationPropertyDescriptor(object);
-			addConfigPropertyDescriptor(object);
-			addDeltapackPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
+    if (itemPropertyDescriptors == null)
+    {
+      super.getPropertyDescriptors(object);
+
+      addFilePropertyDescriptor(object);
+      addLocationPropertyDescriptor(object);
+      addConfigPropertyDescriptor(object);
+      addDeltapackPropertyDescriptor(object);
+    }
+    return itemPropertyDescriptors;
+  }
 
 	/**
-	 * This adds a property descriptor for the File feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the File feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addFilePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Platform_file_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Platform_file_feature", "_UI_Platform_type"),
-				 BuildPackage.Literals.PLATFORM__FILE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Platform_file_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Platform_file_feature", "_UI_Platform_type"),
+         BuildPackage.Literals.PLATFORM__FILE,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Location feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Location feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addLocationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Platform_location_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Platform_location_feature", "_UI_Platform_type"),
-				 BuildPackage.Literals.PLATFORM__LOCATION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Platform_location_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Platform_location_feature", "_UI_Platform_type"),
+         BuildPackage.Literals.PLATFORM__LOCATION,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Config feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Config feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addConfigPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Platform_config_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Platform_config_feature", "_UI_Platform_type"),
-				 BuildPackage.Literals.PLATFORM__CONFIG,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Platform_config_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Platform_config_feature", "_UI_Platform_type"),
+         BuildPackage.Literals.PLATFORM__CONFIG,
+         true,
+         false,
+         true,
+         null,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Deltapack feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Deltapack feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addDeltapackPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Platform_deltapack_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Platform_deltapack_feature", "_UI_Platform_type"),
-				 BuildPackage.Literals.PLATFORM__DELTAPACK,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Platform_deltapack_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Platform_deltapack_feature", "_UI_Platform_type"),
+         BuildPackage.Literals.PLATFORM__DELTAPACK,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This returns Platform.gif.
-	 * <!-- begin-user-doc -->
+   * This returns Platform.gif.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Platform"));
-	}
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/Platform"));
+  }
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the label text for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String getText(Object object) {
-		String label = ((Platform)object).getFile();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Platform_type") :
-			getString("_UI_Platform_type") + " " + label;
-	}
+    String label = ((Platform)object).getFile();
+    return label == null || label.length() == 0 ?
+      getString("_UI_Platform_type") :
+      getString("_UI_Platform_type") + " " + label;
+  }
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
+    updateChildren(notification);
 
-		switch (notification.getFeatureID(Platform.class)) {
-			case BuildPackage.PLATFORM__FILE:
-			case BuildPackage.PLATFORM__LOCATION:
-			case BuildPackage.PLATFORM__DELTAPACK:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+    switch (notification.getFeatureID(Platform.class))
+    {
+      case BuildPackage.PLATFORM__FILE:
+      case BuildPackage.PLATFORM__LOCATION:
+      case BuildPackage.PLATFORM__DELTAPACK:
+        fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+        return;
+    }
+    super.notifyChanged(notification);
+  }
+
+	/**
+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+   * that can be created under this object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
+    super.collectNewChildDescriptors(newChildDescriptors, object);
+  }
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
+   * Return the resource locator for this item provider's resources.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return BuildEditPlugin.INSTANCE;
-	}
+    return BuildEditPlugin.INSTANCE;
+  }
 
 }
Index: src/org/eclipse/amalgam/releng/build/provider/ProductItemProvider.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.edit/src/org/eclipse/amalgam/releng/build/provider/ProductItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 ProductItemProvider.java
--- src/org/eclipse/amalgam/releng/build/provider/ProductItemProvider.java	20 May 2009 18:12:37 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/provider/ProductItemProvider.java	6 Jun 2010 14:35:36 -0000
@@ -44,78 +44,79 @@
 		IItemLabelProvider,
 		IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
+   * This constructs an instance from a factory and a notifier.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public ProductItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
+    super(adapterFactory);
+  }
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the property descriptors for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
+    if (itemPropertyDescriptors == null)
+    {
+      super.getPropertyDescriptors(object);
+
+    }
+    return itemPropertyDescriptors;
+  }
 
 	/**
-	 * This returns Product.gif.
-	 * <!-- begin-user-doc -->
+   * This returns Product.gif.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Product"));
-	}
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/Product"));
+  }
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the label text for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String getText(Object object) {
-		String label = ((Product)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Product_type") :
-			getString("_UI_Product_type") + " " + label;
-	}
+    String label = ((Product)object).getId();
+    return label == null || label.length() == 0 ?
+      getString("_UI_Product_type") :
+      getString("_UI_Product_type") + " " + label;
+  }
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
+    updateChildren(notification);
+    super.notifyChanged(notification);
+  }
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+   * that can be created under this object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
+    super.collectNewChildDescriptors(newChildDescriptors, object);
+  }
 
 }
Index: src/org/eclipse/amalgam/releng/build/provider/PromotionItemProvider.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.edit/src/org/eclipse/amalgam/releng/build/provider/PromotionItemProvider.java,v
retrieving revision 1.3
diff -u -r1.3 PromotionItemProvider.java
--- src/org/eclipse/amalgam/releng/build/provider/PromotionItemProvider.java	15 Dec 2008 21:09:01 -0000	1.3
+++ src/org/eclipse/amalgam/releng/build/provider/PromotionItemProvider.java	6 Jun 2010 14:35:36 -0000
@@ -51,214 +51,216 @@
 		IItemLabelProvider,
 		IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
+   * This constructs an instance from a factory and a notifier.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public PromotionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
+    super(adapterFactory);
+  }
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the property descriptors for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addUploadDirectoryPropertyDescriptor(object);
-			addDownloadDirectoryPropertyDescriptor(object);
-			addIncubatingPropertyDescriptor(object);
-			addBaseURLPropertyDescriptor(object);
-			addBuildAliasPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
+    if (itemPropertyDescriptors == null)
+    {
+      super.getPropertyDescriptors(object);
+
+      addUploadDirectoryPropertyDescriptor(object);
+      addDownloadDirectoryPropertyDescriptor(object);
+      addIncubatingPropertyDescriptor(object);
+      addBaseURLPropertyDescriptor(object);
+      addBuildAliasPropertyDescriptor(object);
+    }
+    return itemPropertyDescriptors;
+  }
 
 	/**
-	 * This adds a property descriptor for the Upload Directory feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Upload Directory feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addUploadDirectoryPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Promotion_uploadDirectory_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Promotion_uploadDirectory_feature", "_UI_Promotion_type"),
-				 BuildPackage.Literals.PROMOTION__UPLOAD_DIRECTORY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Promotion_uploadDirectory_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Promotion_uploadDirectory_feature", "_UI_Promotion_type"),
+         BuildPackage.Literals.PROMOTION__UPLOAD_DIRECTORY,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Download Directory feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Download Directory feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addDownloadDirectoryPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Promotion_downloadDirectory_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Promotion_downloadDirectory_feature", "_UI_Promotion_type"),
-				 BuildPackage.Literals.PROMOTION__DOWNLOAD_DIRECTORY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Promotion_downloadDirectory_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Promotion_downloadDirectory_feature", "_UI_Promotion_type"),
+         BuildPackage.Literals.PROMOTION__DOWNLOAD_DIRECTORY,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Incubating feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Incubating feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addIncubatingPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Promotion_incubating_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Promotion_incubating_feature", "_UI_Promotion_type"),
-				 BuildPackage.Literals.PROMOTION__INCUBATING,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Promotion_incubating_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Promotion_incubating_feature", "_UI_Promotion_type"),
+         BuildPackage.Literals.PROMOTION__INCUBATING,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Base URL feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Base URL feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addBaseURLPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Promotion_baseURL_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Promotion_baseURL_feature", "_UI_Promotion_type"),
-				 BuildPackage.Literals.PROMOTION__BASE_URL,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Promotion_baseURL_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Promotion_baseURL_feature", "_UI_Promotion_type"),
+         BuildPackage.Literals.PROMOTION__BASE_URL,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Build Alias feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Build Alias feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addBuildAliasPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Promotion_buildAlias_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Promotion_buildAlias_feature", "_UI_Promotion_type"),
-				 BuildPackage.Literals.PROMOTION__BUILD_ALIAS,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Promotion_buildAlias_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Promotion_buildAlias_feature", "_UI_Promotion_type"),
+         BuildPackage.Literals.PROMOTION__BUILD_ALIAS,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This returns Promotion.gif.
-	 * <!-- begin-user-doc -->
+   * This returns Promotion.gif.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Promotion"));
-	}
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/Promotion"));
+  }
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the label text for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String getText(Object object) {
-		String label = ((Promotion)object).getUploadDirectory();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Promotion_type") :
-			getString("_UI_Promotion_type") + " " + label;
-	}
+    String label = ((Promotion)object).getUploadDirectory();
+    return label == null || label.length() == 0 ?
+      getString("_UI_Promotion_type") :
+      getString("_UI_Promotion_type") + " " + label;
+  }
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
+    updateChildren(notification);
 
-		switch (notification.getFeatureID(Promotion.class)) {
-			case BuildPackage.PROMOTION__UPLOAD_DIRECTORY:
-			case BuildPackage.PROMOTION__DOWNLOAD_DIRECTORY:
-			case BuildPackage.PROMOTION__INCUBATING:
-			case BuildPackage.PROMOTION__BASE_URL:
-			case BuildPackage.PROMOTION__BUILD_ALIAS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+    switch (notification.getFeatureID(Promotion.class))
+    {
+      case BuildPackage.PROMOTION__UPLOAD_DIRECTORY:
+      case BuildPackage.PROMOTION__DOWNLOAD_DIRECTORY:
+      case BuildPackage.PROMOTION__INCUBATING:
+      case BuildPackage.PROMOTION__BASE_URL:
+      case BuildPackage.PROMOTION__BUILD_ALIAS:
+        fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+        return;
+    }
+    super.notifyChanged(notification);
+  }
+
+	/**
+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+   * that can be created under this object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
+    super.collectNewChildDescriptors(newChildDescriptors, object);
+  }
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
+   * Return the resource locator for this item provider's resources.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return BuildEditPlugin.INSTANCE;
-	}
+    return BuildEditPlugin.INSTANCE;
+  }
 
 }
Index: src/org/eclipse/amalgam/releng/build/provider/RepositoryItemProvider.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.edit/src/org/eclipse/amalgam/releng/build/provider/RepositoryItemProvider.java,v
retrieving revision 1.1
diff -u -r1.1 RepositoryItemProvider.java
--- src/org/eclipse/amalgam/releng/build/provider/RepositoryItemProvider.java	24 Nov 2008 20:37:38 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/provider/RepositoryItemProvider.java	6 Jun 2010 14:35:36 -0000
@@ -51,142 +51,144 @@
 		IItemLabelProvider,
 		IItemPropertySource {
 	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
+   * This constructs an instance from a factory and a notifier.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public RepositoryItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
+    super(adapterFactory);
+  }
 
 	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the property descriptors for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addLocationPropertyDescriptor(object);
-			addLabelPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
+    if (itemPropertyDescriptors == null)
+    {
+      super.getPropertyDescriptors(object);
+
+      addLocationPropertyDescriptor(object);
+      addLabelPropertyDescriptor(object);
+    }
+    return itemPropertyDescriptors;
+  }
 
 	/**
-	 * This adds a property descriptor for the Location feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Location feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addLocationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Repository_location_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Repository_location_feature", "_UI_Repository_type"),
-				 BuildPackage.Literals.REPOSITORY__LOCATION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Repository_location_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Repository_location_feature", "_UI_Repository_type"),
+         BuildPackage.Literals.REPOSITORY__LOCATION,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This adds a property descriptor for the Label feature.
-	 * <!-- begin-user-doc -->
+   * This adds a property descriptor for the Label feature.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void addLabelPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Repository_label_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Repository_label_feature", "_UI_Repository_type"),
-				 BuildPackage.Literals.REPOSITORY__LABEL,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
+    itemPropertyDescriptors.add
+      (createItemPropertyDescriptor
+        (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+         getResourceLocator(),
+         getString("_UI_Repository_label_feature"),
+         getString("_UI_PropertyDescriptor_description", "_UI_Repository_label_feature", "_UI_Repository_type"),
+         BuildPackage.Literals.REPOSITORY__LABEL,
+         true,
+         false,
+         false,
+         ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+         null,
+         null));
+  }
 
 	/**
-	 * This returns Repository.gif.
-	 * <!-- begin-user-doc -->
+   * This returns Repository.gif.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Repository"));
-	}
+    return overlayImage(object, getResourceLocator().getImage("full/obj16/Repository"));
+  }
 
 	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
+   * This returns the label text for the adapted class.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public String getText(Object object) {
-		String label = ((Repository)object).getLabel();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Repository_type") :
-			getString("_UI_Repository_type") + " " + label;
-	}
+    String label = ((Repository)object).getLabel();
+    return label == null || label.length() == 0 ?
+      getString("_UI_Repository_type") :
+      getString("_UI_Repository_type") + " " + label;
+  }
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
+   * This handles model notifications by calling {@link #updateChildren} to update any cached
+   * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
+    updateChildren(notification);
 
-		switch (notification.getFeatureID(Repository.class)) {
-			case BuildPackage.REPOSITORY__LOCATION:
-			case BuildPackage.REPOSITORY__LABEL:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
+    switch (notification.getFeatureID(Repository.class))
+    {
+      case BuildPackage.REPOSITORY__LOCATION:
+      case BuildPackage.REPOSITORY__LABEL:
+        fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+        return;
+    }
+    super.notifyChanged(notification);
+  }
+
+	/**
+   * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+   * that can be created under this object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
+    super.collectNewChildDescriptors(newChildDescriptors, object);
+  }
 
 	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
+   * Return the resource locator for this item provider's resources.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public ResourceLocator getResourceLocator() {
-		return BuildEditPlugin.INSTANCE;
-	}
+    return BuildEditPlugin.INSTANCE;
+  }
 
 }
#P org.eclipse.amalgam.releng.build.model.editor
Index: src/org/eclipse/amalgam/releng/build/presentation/BuildActionBarContributor.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.editor/src/org/eclipse/amalgam/releng/build/presentation/BuildActionBarContributor.java,v
retrieving revision 1.1
diff -u -r1.1 BuildActionBarContributor.java
--- src/org/eclipse/amalgam/releng/build/presentation/BuildActionBarContributor.java	24 Nov 2008 20:38:02 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/presentation/BuildActionBarContributor.java	6 Jun 2010 14:35:40 -0000
@@ -60,375 +60,408 @@
 	extends EditingDomainActionBarContributor
 	implements ISelectionChangedListener {
 	/**
-	 * This keeps track of the active editor.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the active editor.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected IEditorPart activeEditorPart;
 
 	/**
-	 * This keeps track of the current selection provider.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the current selection provider.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected ISelectionProvider selectionProvider;
 
 	/**
-	 * This action opens the Properties view.
-	 * <!-- begin-user-doc -->
+   * This action opens the Properties view.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected IAction showPropertiesViewAction =
-		new Action(BuildEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
-			@Override
-			public void run() {
-				try {
-					getPage().showView("org.eclipse.ui.views.PropertySheet");
-				}
-				catch (PartInitException exception) {
-					BuildEditorPlugin.INSTANCE.log(exception);
-				}
-			}
-		};
-
-	/**
-	 * This action refreshes the viewer of the current editor if the editor
-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
-	 * <!-- begin-user-doc -->
+		new Action(BuildEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item"))
+    {
+      @Override
+      public void run()
+      {
+        try
+        {
+          getPage().showView("org.eclipse.ui.views.PropertySheet");
+        }
+        catch (PartInitException exception)
+        {
+          BuildEditorPlugin.INSTANCE.log(exception);
+        }
+      }
+    };
+
+	/**
+   * This action refreshes the viewer of the current editor if the editor
+   * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected IAction refreshViewerAction =
-		new Action(BuildEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
-			@Override
-			public boolean isEnabled() {
-				return activeEditorPart instanceof IViewerProvider;
-			}
-
-			@Override
-			public void run() {
-				if (activeEditorPart instanceof IViewerProvider) {
-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
-					if (viewer != null) {
-						viewer.refresh();
-					}
-				}
-			}
-		};
-
-	/**
-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
-	 * generated for the current selection by the item provider.
-	 * <!-- begin-user-doc -->
+		new Action(BuildEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item"))
+    {
+      @Override
+      public boolean isEnabled()
+      {
+        return activeEditorPart instanceof IViewerProvider;
+      }
+
+      @Override
+      public void run()
+      {
+        if (activeEditorPart instanceof IViewerProvider)
+        {
+          Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+          if (viewer != null)
+          {
+            viewer.refresh();
+          }
+        }
+      }
+    };
+
+	/**
+   * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+   * generated for the current selection by the item provider.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected Collection<IAction> createChildActions;
 
 	/**
-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
-	 * <!-- begin-user-doc -->
+   * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected IMenuManager createChildMenuManager;
 
 	/**
-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
-	 * generated for the current selection by the item provider.
-	 * <!-- begin-user-doc -->
+   * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+   * generated for the current selection by the item provider.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected Collection<IAction> createSiblingActions;
 
 	/**
-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
-	 * <!-- begin-user-doc -->
+   * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected IMenuManager createSiblingMenuManager;
 
 	/**
-	 * This creates an instance of the contributor.
-	 * <!-- begin-user-doc -->
+   * This creates an instance of the contributor.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public BuildActionBarContributor() {
-		super(ADDITIONS_LAST_STYLE);
-		loadResourceAction = new LoadResourceAction();
-		validateAction = new ValidateAction();
-		controlAction = new ControlAction();
-	}
+    super(ADDITIONS_LAST_STYLE);
+    loadResourceAction = new LoadResourceAction();
+    validateAction = new ValidateAction();
+    controlAction = new ControlAction();
+  }
 
 	/**
-	 * This adds Separators for editor additions to the tool bar.
-	 * <!-- begin-user-doc -->
+   * This adds Separators for editor additions to the tool bar.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void contributeToToolBar(IToolBarManager toolBarManager) {
-		toolBarManager.add(new Separator("build-settings"));
-		toolBarManager.add(new Separator("build-additions"));
-	}
+    toolBarManager.add(new Separator("build-settings"));
+    toolBarManager.add(new Separator("build-additions"));
+  }
 
 	/**
-	 * This adds to the menu bar a menu and some separators for editor additions,
-	 * as well as the sub-menus for object creation items.
-	 * <!-- begin-user-doc -->
+   * This adds to the menu bar a menu and some separators for editor additions,
+   * as well as the sub-menus for object creation items.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void contributeToMenu(IMenuManager menuManager) {
-		super.contributeToMenu(menuManager);
+    super.contributeToMenu(menuManager);
 
-		IMenuManager submenuManager = new MenuManager(BuildEditorPlugin.INSTANCE.getString("_UI_BuildEditor_menu"), "org.eclipse.amalgam.releng.buildMenuID");
-		menuManager.insertAfter("additions", submenuManager);
-		submenuManager.add(new Separator("settings"));
-		submenuManager.add(new Separator("actions"));
-		submenuManager.add(new Separator("additions"));
-		submenuManager.add(new Separator("additions-end"));
-
-		// Prepare for CreateChild item addition or removal.
-		//
-		createChildMenuManager = new MenuManager(BuildEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
-		submenuManager.insertBefore("additions", createChildMenuManager);
-
-		// Prepare for CreateSibling item addition or removal.
-		//
-		createSiblingMenuManager = new MenuManager(BuildEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
-		submenuManager.insertBefore("additions", createSiblingMenuManager);
-
-		// Force an update because Eclipse hides empty menus now.
-		//
-		submenuManager.addMenuListener
-			(new IMenuListener() {
-				 public void menuAboutToShow(IMenuManager menuManager) {
-					 menuManager.updateAll(true);
-				 }
-			 });
-
-		addGlobalActions(submenuManager);
-	}
+    IMenuManager submenuManager = new MenuManager(BuildEditorPlugin.INSTANCE.getString("_UI_BuildEditor_menu"), "org.eclipse.amalgam.releng.buildMenuID");
+    menuManager.insertAfter("additions", submenuManager);
+    submenuManager.add(new Separator("settings"));
+    submenuManager.add(new Separator("actions"));
+    submenuManager.add(new Separator("additions"));
+    submenuManager.add(new Separator("additions-end"));
+
+    // Prepare for CreateChild item addition or removal.
+    //
+    createChildMenuManager = new MenuManager(BuildEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+    submenuManager.insertBefore("additions", createChildMenuManager);
+
+    // Prepare for CreateSibling item addition or removal.
+    //
+    createSiblingMenuManager = new MenuManager(BuildEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+    submenuManager.insertBefore("additions", createSiblingMenuManager);
+
+    // Force an update because Eclipse hides empty menus now.
+    //
+    submenuManager.addMenuListener
+      (new IMenuListener()
+       {
+         public void menuAboutToShow(IMenuManager menuManager)
+         {
+           menuManager.updateAll(true);
+         }
+       });
+
+    addGlobalActions(submenuManager);
+  }
 
 	/**
-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
-	 * <!-- begin-user-doc -->
+   * When the active editor changes, this remembers the change and registers with it as a selection provider.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void setActiveEditor(IEditorPart part) {
-		super.setActiveEditor(part);
-		activeEditorPart = part;
+    super.setActiveEditor(part);
+    activeEditorPart = part;
 
-		// Switch to the new selection provider.
-		//
-		if (selectionProvider != null) {
-			selectionProvider.removeSelectionChangedListener(this);
-		}
-		if (part == null) {
-			selectionProvider = null;
-		}
-		else {
-			selectionProvider = part.getSite().getSelectionProvider();
-			selectionProvider.addSelectionChangedListener(this);
-
-			// Fake a selection changed event to update the menus.
-			//
-			if (selectionProvider.getSelection() != null) {
-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
-			}
-		}
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
-	 * that can be added to the selected object and updating the menus accordingly.
-	 * <!-- begin-user-doc -->
+    // Switch to the new selection provider.
+    //
+    if (selectionProvider != null)
+    {
+      selectionProvider.removeSelectionChangedListener(this);
+    }
+    if (part == null)
+    {
+      selectionProvider = null;
+    }
+    else
+    {
+      selectionProvider = part.getSite().getSelectionProvider();
+      selectionProvider.addSelectionChangedListener(this);
+
+      // Fake a selection changed event to update the menus.
+      //
+      if (selectionProvider.getSelection() != null)
+      {
+        selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+      }
+    }
+  }
+
+	/**
+   * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+   * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+   * that can be added to the selected object and updating the menus accordingly.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void selectionChanged(SelectionChangedEvent event) {
-		// Remove any menu items for old selection.
-		//
-		if (createChildMenuManager != null) {
-			depopulateManager(createChildMenuManager, createChildActions);
-		}
-		if (createSiblingMenuManager != null) {
-			depopulateManager(createSiblingMenuManager, createSiblingActions);
-		}
-
-		// Query the new selection for appropriate new child/sibling descriptors
-		//
-		Collection<?> newChildDescriptors = null;
-		Collection<?> newSiblingDescriptors = null;
-
-		ISelection selection = event.getSelection();
-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
-			Object object = ((IStructuredSelection)selection).getFirstElement();
-
-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
-
-			newChildDescriptors = domain.getNewChildDescriptors(object, null);
-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
-		}
-
-		// Generate actions for selection; populate and redraw the menus.
-		//
-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
-
-		if (createChildMenuManager != null) {
-			populateManager(createChildMenuManager, createChildActions, null);
-			createChildMenuManager.update(true);
-		}
-		if (createSiblingMenuManager != null) {
-			populateManager(createSiblingMenuManager, createSiblingActions, null);
-			createSiblingMenuManager.update(true);
-		}
-	}
-
-	/**
-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
-	 * and returns the collection of these actions.
-	 * <!-- begin-user-doc -->
+    // Remove any menu items for old selection.
+    //
+    if (createChildMenuManager != null)
+    {
+      depopulateManager(createChildMenuManager, createChildActions);
+    }
+    if (createSiblingMenuManager != null)
+    {
+      depopulateManager(createSiblingMenuManager, createSiblingActions);
+    }
+
+    // Query the new selection for appropriate new child/sibling descriptors
+    //
+    Collection<?> newChildDescriptors = null;
+    Collection<?> newSiblingDescriptors = null;
+
+    ISelection selection = event.getSelection();
+    if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1)
+    {
+      Object object = ((IStructuredSelection)selection).getFirstElement();
+
+      EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+      newChildDescriptors = domain.getNewChildDescriptors(object, null);
+      newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+    }
+
+    // Generate actions for selection; populate and redraw the menus.
+    //
+    createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+    createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+    if (createChildMenuManager != null)
+    {
+      populateManager(createChildMenuManager, createChildActions, null);
+      createChildMenuManager.update(true);
+    }
+    if (createSiblingMenuManager != null)
+    {
+      populateManager(createSiblingMenuManager, createSiblingActions, null);
+      createSiblingMenuManager.update(true);
+    }
+  }
+
+	/**
+   * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+   * and returns the collection of these actions.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
-		Collection<IAction> actions = new ArrayList<IAction>();
-		if (descriptors != null) {
-			for (Object descriptor : descriptors) {
-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
-			}
-		}
-		return actions;
-	}
-
-	/**
-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
-	 * and returns the collection of these actions.
-	 * <!-- begin-user-doc -->
+    Collection<IAction> actions = new ArrayList<IAction>();
+    if (descriptors != null)
+    {
+      for (Object descriptor : descriptors)
+      {
+        actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+      }
+    }
+    return actions;
+  }
+
+	/**
+   * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+   * and returns the collection of these actions.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
-		Collection<IAction> actions = new ArrayList<IAction>();
-		if (descriptors != null) {
-			for (Object descriptor : descriptors) {
-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
-			}
-		}
-		return actions;
-	}
-
-	/**
-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
-	 * by inserting them before the specified contribution item <code>contributionID</code>.
-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
-	 * <!-- begin-user-doc -->
+    Collection<IAction> actions = new ArrayList<IAction>();
+    if (descriptors != null)
+    {
+      for (Object descriptor : descriptors)
+      {
+        actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+      }
+    }
+    return actions;
+  }
+
+	/**
+   * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+   * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+   * by inserting them before the specified contribution item <code>contributionID</code>.
+   * If <code>contributionID</code> is <code>null</code>, they are simply added.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
-		if (actions != null) {
-			for (IAction action : actions) {
-				if (contributionID != null) {
-					manager.insertBefore(contributionID, action);
-				}
-				else {
-					manager.add(action);
-				}
-			}
-		}
-	}
+    if (actions != null)
+    {
+      for (IAction action : actions)
+      {
+        if (contributionID != null)
+        {
+          manager.insertBefore(contributionID, action);
+        }
+        else
+        {
+          manager.add(action);
+        }
+      }
+    }
+  }
 		
 	/**
-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
-	 * <!-- begin-user-doc -->
+   * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+   * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
-		if (actions != null) {
-			IContributionItem[] items = manager.getItems();
-			for (int i = 0; i < items.length; i++) {
-				// Look into SubContributionItems
-				//
-				IContributionItem contributionItem = items[i];
-				while (contributionItem instanceof SubContributionItem) {
-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
-				}
-
-				// Delete the ActionContributionItems with matching action.
-				//
-				if (contributionItem instanceof ActionContributionItem) {
-					IAction action = ((ActionContributionItem)contributionItem).getAction();
-					if (actions.contains(action)) {
-						manager.remove(contributionItem);
-					}
-				}
-			}
-		}
-	}
+    if (actions != null)
+    {
+      IContributionItem[] items = manager.getItems();
+      for (int i = 0; i < items.length; i++)
+      {
+        // Look into SubContributionItems
+        //
+        IContributionItem contributionItem = items[i];
+        while (contributionItem instanceof SubContributionItem)
+        {
+          contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+        }
+
+        // Delete the ActionContributionItems with matching action.
+        //
+        if (contributionItem instanceof ActionContributionItem)
+        {
+          IAction action = ((ActionContributionItem)contributionItem).getAction();
+          if (actions.contains(action))
+          {
+            manager.remove(contributionItem);
+          }
+        }
+      }
+    }
+  }
 
 	/**
-	 * This populates the pop-up menu before it appears.
-	 * <!-- begin-user-doc -->
+   * This populates the pop-up menu before it appears.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void menuAboutToShow(IMenuManager menuManager) {
-		super.menuAboutToShow(menuManager);
-		MenuManager submenuManager = null;
+    super.menuAboutToShow(menuManager);
+    MenuManager submenuManager = null;
 
-		submenuManager = new MenuManager(BuildEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
-		populateManager(submenuManager, createChildActions, null);
-		menuManager.insertBefore("edit", submenuManager);
+    submenuManager = new MenuManager(BuildEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+    populateManager(submenuManager, createChildActions, null);
+    menuManager.insertBefore("edit", submenuManager);
 
-		submenuManager = new MenuManager(BuildEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
-		populateManager(submenuManager, createSiblingActions, null);
-		menuManager.insertBefore("edit", submenuManager);
-	}
+    submenuManager = new MenuManager(BuildEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+    populateManager(submenuManager, createSiblingActions, null);
+    menuManager.insertBefore("edit", submenuManager);
+  }
 
 	/**
-	 * This inserts global actions before the "additions-end" separator.
-	 * <!-- begin-user-doc -->
+   * This inserts global actions before the "additions-end" separator.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected void addGlobalActions(IMenuManager menuManager) {
-		menuManager.insertAfter("additions-end", new Separator("ui-actions"));
-		menuManager.insertAfter("ui-actions", showPropertiesViewAction);
+    menuManager.insertAfter("additions-end", new Separator("ui-actions"));
+    menuManager.insertAfter("ui-actions", showPropertiesViewAction);
 
-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
-		menuManager.insertAfter("ui-actions", refreshViewerAction);
+    refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+    menuManager.insertAfter("ui-actions", refreshViewerAction);
 
-		super.addGlobalActions(menuManager);
-	}
+    super.addGlobalActions(menuManager);
+  }
 
 	/**
-	 * This ensures that a delete action will clean up all references to deleted objects.
-	 * <!-- begin-user-doc -->
+   * This ensures that a delete action will clean up all references to deleted objects.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected boolean removeAllReferencesOnDelete() {
-		return true;
-	}
+    return true;
+  }
 
 }
\ No newline at end of file
Index: src/org/eclipse/amalgam/releng/build/presentation/BuildEditor.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.editor/src/org/eclipse/amalgam/releng/build/presentation/BuildEditor.java,v
retrieving revision 1.2
diff -u -r1.2 BuildEditor.java
--- src/org/eclipse/amalgam/releng/build/presentation/BuildEditor.java	13 Mar 2009 11:09:28 -0000	1.2
+++ src/org/eclipse/amalgam/releng/build/presentation/BuildEditor.java	6 Jun 2010 14:35:41 -0000
@@ -181,1646 +181,1825 @@
 	extends MultiPageEditorPart
 	implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
 	/**
-	 * This keeps track of the editing domain that is used to track all changes to the model.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the editing domain that is used to track all changes to the model.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected AdapterFactoryEditingDomain editingDomain;
 
 	/**
-	 * This is the one adapter factory used for providing views of the model.
-	 * <!-- begin-user-doc -->
+   * This is the one adapter factory used for providing views of the model.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected ComposedAdapterFactory adapterFactory;
 
 	/**
-	 * This is the content outline page.
-	 * <!-- begin-user-doc -->
+   * This is the content outline page.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected IContentOutlinePage contentOutlinePage;
 
 	/**
-	 * This is a kludge...
-	 * <!-- begin-user-doc -->
+   * This is a kludge...
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected IStatusLineManager contentOutlineStatusLineManager;
 
 	/**
-	 * This is the content outline page's viewer.
-	 * <!-- begin-user-doc -->
+   * This is the content outline page's viewer.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected TreeViewer contentOutlineViewer;
 
 	/**
-	 * This is the property sheet page.
-	 * <!-- begin-user-doc -->
+   * This is the property sheet page.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected PropertySheetPage propertySheetPage;
 
 	/**
-	 * This is the viewer that shadows the selection in the content outline.
-	 * The parent relation must be correctly defined for this to work.
-	 * <!-- begin-user-doc -->
+   * This is the viewer that shadows the selection in the content outline.
+   * The parent relation must be correctly defined for this to work.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected TreeViewer selectionViewer;
 
 	/**
-	 * This inverts the roll of parent and child in the content provider and show parents as a tree.
-	 * <!-- begin-user-doc -->
+   * This inverts the roll of parent and child in the content provider and show parents as a tree.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected TreeViewer parentViewer;
 
 	/**
-	 * This shows how a tree view works.
-	 * <!-- begin-user-doc -->
+   * This shows how a tree view works.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected TreeViewer treeViewer;
 
 	/**
-	 * This shows how a list view works.
-	 * A list viewer doesn't support icons.
-	 * <!-- begin-user-doc -->
+   * This shows how a list view works.
+   * A list viewer doesn't support icons.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected ListViewer listViewer;
 
 	/**
-	 * This shows how a table view works.
-	 * A table can be used as a list with icons.
-	 * <!-- begin-user-doc -->
+   * This shows how a table view works.
+   * A table can be used as a list with icons.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected TableViewer tableViewer;
 
 	/**
-	 * This shows how a tree view with columns works.
-	 * <!-- begin-user-doc -->
+   * This shows how a tree view with columns works.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected TreeViewer treeViewerWithColumns;
 
 	/**
-	 * This keeps track of the active viewer pane, in the book.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the active viewer pane, in the book.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected ViewerPane currentViewerPane;
 
 	/**
-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected Viewer currentViewer;
 
 	/**
-	 * This listens to which ever viewer is active.
-	 * <!-- begin-user-doc -->
+   * This listens to which ever viewer is active.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected ISelectionChangedListener selectionChangedListener;
 
 	/**
-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
-	 * <!-- begin-user-doc -->
+   * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
 
 	/**
-	 * This keeps track of the selection of the editor as a whole.
-	 * <!-- begin-user-doc -->
+   * This keeps track of the selection of the editor as a whole.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected ISelection editorSelection = StructuredSelection.EMPTY;
 
 	/**
-	 * The MarkerHelper is responsible for creating workspace resource markers presented
-	 * in Eclipse's Problems View.
-	 * <!-- begin-user-doc -->
+   * The MarkerHelper is responsible for creating workspace resource markers presented
+   * in Eclipse's Problems View.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
 
 	/**
-	 * This listens for when the outline becomes active
-	 * <!-- begin-user-doc -->
+   * This listens for when the outline becomes active
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected IPartListener partListener =
-		new IPartListener() {
-			public void partActivated(IWorkbenchPart p) {
-				if (p instanceof ContentOutline) {
-					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
-						getActionBarContributor().setActiveEditor(BuildEditor.this);
-
-						setCurrentViewer(contentOutlineViewer);
-					}
-				}
-				else if (p instanceof PropertySheet) {
-					if (((PropertySheet)p).getCurrentPage() == propertySheetPage) {
-						getActionBarContributor().setActiveEditor(BuildEditor.this);
-						handleActivate();
-					}
-				}
-				else if (p == BuildEditor.this) {
-					handleActivate();
-				}
-			}
-			public void partBroughtToTop(IWorkbenchPart p) {
-				// Ignore.
-			}
-			public void partClosed(IWorkbenchPart p) {
-				// Ignore.
-			}
-			public void partDeactivated(IWorkbenchPart p) {
-				// Ignore.
-			}
-			public void partOpened(IWorkbenchPart p) {
-				// Ignore.
-			}
-		};
+		new IPartListener()
+    {
+      public void partActivated(IWorkbenchPart p)
+      {
+        if (p instanceof ContentOutline)
+        {
+          if (((ContentOutline)p).getCurrentPage() == contentOutlinePage)
+          {
+            getActionBarContributor().setActiveEditor(BuildEditor.this);
+
+            setCurrentViewer(contentOutlineViewer);
+          }
+        }
+        else if (p instanceof PropertySheet)
+        {
+          if (((PropertySheet)p).getCurrentPage() == propertySheetPage)
+          {
+            getActionBarContributor().setActiveEditor(BuildEditor.this);
+            handleActivate();
+          }
+        }
+        else if (p == BuildEditor.this)
+        {
+          handleActivate();
+        }
+      }
+      public void partBroughtToTop(IWorkbenchPart p)
+      {
+        // Ignore.
+      }
+      public void partClosed(IWorkbenchPart p)
+      {
+        // Ignore.
+      }
+      public void partDeactivated(IWorkbenchPart p)
+      {
+        // Ignore.
+      }
+      public void partOpened(IWorkbenchPart p)
+      {
+        // Ignore.
+      }
+    };
 
 	/**
-	 * Resources that have been removed since last activation.
-	 * <!-- begin-user-doc -->
+   * Resources that have been removed since last activation.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected Collection<Resource> removedResources = new ArrayList<Resource>();
 
 	/**
-	 * Resources that have been changed since last activation.
-	 * <!-- begin-user-doc -->
+   * Resources that have been changed since last activation.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected Collection<Resource> changedResources = new ArrayList<Resource>();
 
 	/**
-	 * Resources that have been saved.
-	 * <!-- begin-user-doc -->
+   * Resources that have been saved.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected Collection<Resource> savedResources = new ArrayList<Resource>();
 
 	/**
-	 * Map to store the diagnostic associated with a resource.
-	 * <!-- begin-user-doc -->
+   * Map to store the diagnostic associated with a resource.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
 
 	/**
-	 * Controls whether the problem indication should be updated.
-	 * <!-- begin-user-doc -->
+   * Controls whether the problem indication should be updated.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected boolean updateProblemIndication = true;
 
 	/**
-	 * Adapter used to update the problem indication when resources are demanded loaded.
-	 * <!-- begin-user-doc -->
+   * Adapter used to update the problem indication when resources are demanded loaded.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected EContentAdapter problemIndicationAdapter = 
-		new EContentAdapter() {
-			@Override
-			public void notifyChanged(Notification notification) {
-				if (notification.getNotifier() instanceof Resource) {
-					switch (notification.getFeatureID(Resource.class)) {
-						case Resource.RESOURCE__IS_LOADED:
-						case Resource.RESOURCE__ERRORS:
-						case Resource.RESOURCE__WARNINGS: {
-							Resource resource = (Resource)notification.getNotifier();
-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
-							if (diagnostic.getSeverity() != Diagnostic.OK) {
-								resourceToDiagnosticMap.put(resource, diagnostic);
-							}
-							else {
-								resourceToDiagnosticMap.remove(resource);
-							}
-
-							if (updateProblemIndication) {
-								getSite().getShell().getDisplay().asyncExec
-									(new Runnable() {
-										 public void run() {
-											 updateProblemIndication();
-										 }
-									 });
-							}
-							break;
-						}
-					}
-				}
-				else {
-					super.notifyChanged(notification);
-				}
-			}
-
-			@Override
-			protected void setTarget(Resource target) {
-				basicSetTarget(target);
-			}
-
-			@Override
-			protected void unsetTarget(Resource target) {
-				basicUnsetTarget(target);
-			}
-		};
+		new EContentAdapter()
+    {
+      @Override
+      public void notifyChanged(Notification notification)
+      {
+        if (notification.getNotifier() instanceof Resource)
+        {
+          switch (notification.getFeatureID(Resource.class))
+          {
+            case Resource.RESOURCE__IS_LOADED:
+            case Resource.RESOURCE__ERRORS:
+            case Resource.RESOURCE__WARNINGS:
+            {
+              Resource resource = (Resource)notification.getNotifier();
+              Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+              if (diagnostic.getSeverity() != Diagnostic.OK)
+              {
+                resourceToDiagnosticMap.put(resource, diagnostic);
+              }
+              else
+              {
+                resourceToDiagnosticMap.remove(resource);
+              }
+
+              if (updateProblemIndication)
+              {
+                getSite().getShell().getDisplay().asyncExec
+                  (new Runnable()
+                   {
+                     public void run()
+                     {
+                       updateProblemIndication();
+                     }
+                   });
+              }
+              break;
+            }
+          }
+        }
+        else
+        {
+          super.notifyChanged(notification);
+        }
+      }
+
+      @Override
+      protected void setTarget(Resource target)
+      {
+        basicSetTarget(target);
+      }
+
+      @Override
+      protected void unsetTarget(Resource target)
+      {
+        basicUnsetTarget(target);
+      }
+    };
 
 	/**
-	 * This listens for workspace changes.
-	 * <!-- begin-user-doc -->
+   * This listens for workspace changes.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected IResourceChangeListener resourceChangeListener =
-		new IResourceChangeListener() {
-			public void resourceChanged(IResourceChangeEvent event) {
-				IResourceDelta delta = event.getDelta();
-				try {
-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {
-						protected ResourceSet resourceSet = editingDomain.getResourceSet();
-						protected Collection<Resource> changedResources = new ArrayList<Resource>();
-						protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
-						public boolean visit(IResourceDelta delta) {
-							if (delta.getResource().getType() == IResource.FILE) {
-								if (delta.getKind() == IResourceDelta.REMOVED ||
-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
-									if (resource != null) {
-										if (delta.getKind() == IResourceDelta.REMOVED) {
-											removedResources.add(resource);
-										}
-										else if (!savedResources.remove(resource)) {
-											changedResources.add(resource);
-										}
-									}
-								}
-							}
-
-							return true;
-						}
-
-						public Collection<Resource> getChangedResources() {
-							return changedResources;
-						}
-
-						public Collection<Resource> getRemovedResources() {
-							return removedResources;
-						}
-					}
-
-					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
-					delta.accept(visitor);
-
-					if (!visitor.getRemovedResources().isEmpty()) {
-						getSite().getShell().getDisplay().asyncExec
-							(new Runnable() {
-								 public void run() {
-									 removedResources.addAll(visitor.getRemovedResources());
-									 if (!isDirty()) {
-										 getSite().getPage().closeEditor(BuildEditor.this, false);
-									 }
-								 }
-							 });
-					}
-
-					if (!visitor.getChangedResources().isEmpty()) {
-						getSite().getShell().getDisplay().asyncExec
-							(new Runnable() {
-								 public void run() {
-									 changedResources.addAll(visitor.getChangedResources());
-									 if (getSite().getPage().getActiveEditor() == BuildEditor.this) {
-										 handleActivate();
-									 }
-								 }
-							 });
-					}
-				}
-				catch (CoreException exception) {
-					BuildEditorPlugin.INSTANCE.log(exception);
-				}
-			}
-		};
+		new IResourceChangeListener()
+    {
+      public void resourceChanged(IResourceChangeEvent event)
+      {
+        IResourceDelta delta = event.getDelta();
+        try
+        {
+          class ResourceDeltaVisitor implements IResourceDeltaVisitor
+          {
+            protected ResourceSet resourceSet = editingDomain.getResourceSet();
+            protected Collection<Resource> changedResources = new ArrayList<Resource>();
+            protected Collection<Resource> removedResources = new ArrayList<Resource>();
+
+            public boolean visit(IResourceDelta delta)
+            {
+              if (delta.getResource().getType() == IResource.FILE)
+              {
+                if (delta.getKind() == IResourceDelta.REMOVED ||
+                    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS)
+                {
+                  Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+                  if (resource != null)
+                  {
+                    if (delta.getKind() == IResourceDelta.REMOVED)
+                    {
+                      removedResources.add(resource);
+                    }
+                    else if (!savedResources.remove(resource))
+                    {
+                      changedResources.add(resource);
+                    }
+                  }
+                }
+              }
+
+              return true;
+            }
+
+            public Collection<Resource> getChangedResources()
+            {
+              return changedResources;
+            }
+
+            public Collection<Resource> getRemovedResources()
+            {
+              return removedResources;
+            }
+          }
+
+          final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+          delta.accept(visitor);
+
+          if (!visitor.getRemovedResources().isEmpty())
+          {
+            getSite().getShell().getDisplay().asyncExec
+              (new Runnable()
+               {
+                 public void run()
+                 {
+                   removedResources.addAll(visitor.getRemovedResources());
+                   if (!isDirty())
+                   {
+                     getSite().getPage().closeEditor(BuildEditor.this, false);
+                   }
+                 }
+               });
+          }
+
+          if (!visitor.getChangedResources().isEmpty())
+          {
+            getSite().getShell().getDisplay().asyncExec
+              (new Runnable()
+               {
+                 public void run()
+                 {
+                   changedResources.addAll(visitor.getChangedResources());
+                   if (getSite().getPage().getActiveEditor() == BuildEditor.this)
+                   {
+                     handleActivate();
+                   }
+                 }
+               });
+          }
+        }
+        catch (CoreException exception)
+        {
+          BuildEditorPlugin.INSTANCE.log(exception);
+        }
+      }
+    };
 
 	/**
-	 * Handles activation of the editor or it's associated views.
-	 * <!-- begin-user-doc -->
+   * Handles activation of the editor or it's associated views.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void handleActivate() {
-		// Recompute the read only state.
-		//
-		if (editingDomain.getResourceToReadOnlyMap() != null) {
-		  editingDomain.getResourceToReadOnlyMap().clear();
-
-		  // Refresh any actions that may become enabled or disabled.
-		  //
-		  setSelection(getSelection());
-		}
-
-		if (!removedResources.isEmpty()) {
-			if (handleDirtyConflict()) {
-				getSite().getPage().closeEditor(BuildEditor.this, false);
-			}
-			else {
-				removedResources.clear();
-				changedResources.clear();
-				savedResources.clear();
-			}
-		}
-		else if (!changedResources.isEmpty()) {
-			changedResources.removeAll(savedResources);
-			handleChangedResources();
-			changedResources.clear();
-			savedResources.clear();
-		}
-	}
+    // Recompute the read only state.
+    //
+    if (editingDomain.getResourceToReadOnlyMap() != null)
+    {
+      editingDomain.getResourceToReadOnlyMap().clear();
+
+      // Refresh any actions that may become enabled or disabled.
+      //
+      setSelection(getSelection());
+    }
+
+    if (!removedResources.isEmpty())
+    {
+      if (handleDirtyConflict())
+      {
+        getSite().getPage().closeEditor(BuildEditor.this, false);
+      }
+      else
+      {
+        removedResources.clear();
+        changedResources.clear();
+        savedResources.clear();
+      }
+    }
+    else if (!changedResources.isEmpty())
+    {
+      changedResources.removeAll(savedResources);
+      handleChangedResources();
+      changedResources.clear();
+      savedResources.clear();
+    }
+  }
 
 	/**
-	 * Handles what to do with changed resources on activation.
-	 * <!-- begin-user-doc -->
+   * Handles what to do with changed resources on activation.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void handleChangedResources() {
-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
-			if (isDirty()) {
-				changedResources.addAll(editingDomain.getResourceSet().getResources());
-			}
-			editingDomain.getCommandStack().flush();
-
-			updateProblemIndication = false;
-			for (Resource resource : changedResources) {
-				if (resource.isLoaded()) {
-					resource.unload();
-					try {
-						resource.load(Collections.EMPTY_MAP);
-					}
-					catch (IOException exception) {
-						if (!resourceToDiagnosticMap.containsKey(resource)) {
-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-						}
-					}
-				}
-			}
-
-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
-				setSelection(StructuredSelection.EMPTY);
-			}
-
-			updateProblemIndication = true;
-			updateProblemIndication();
-		}
-	}
+    if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict()))
+    {
+      if (isDirty())
+      {
+        changedResources.addAll(editingDomain.getResourceSet().getResources());
+      }
+      editingDomain.getCommandStack().flush();
+
+      updateProblemIndication = false;
+      for (Resource resource : changedResources)
+      {
+        if (resource.isLoaded())
+        {
+          resource.unload();
+          try
+          {
+            resource.load(Collections.EMPTY_MAP);
+          }
+          catch (IOException exception)
+          {
+            if (!resourceToDiagnosticMap.containsKey(resource))
+            {
+              resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+            }
+          }
+        }
+      }
+
+      if (AdapterFactoryEditingDomain.isStale(editorSelection))
+      {
+        setSelection(StructuredSelection.EMPTY);
+      }
+
+      updateProblemIndication = true;
+      updateProblemIndication();
+    }
+  }
   
 	/**
-	 * Updates the problems indication with the information described in the specified diagnostic.
-	 * <!-- begin-user-doc -->
+   * Updates the problems indication with the information described in the specified diagnostic.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void updateProblemIndication() {
-		if (updateProblemIndication) {
-			BasicDiagnostic diagnostic =
-				new BasicDiagnostic
-					(Diagnostic.OK,
-					 "org.eclipse.amalgam.releng.build.model.editor",
-					 0,
-					 null,
-					 new Object [] { editingDomain.getResourceSet() });
-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
-					diagnostic.add(childDiagnostic);
-				}
-			}
-
-			int lastEditorPage = getPageCount() - 1;
-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
-				if (diagnostic.getSeverity() != Diagnostic.OK) {
-					setActivePage(lastEditorPage);
-				}
-			}
-			else if (diagnostic.getSeverity() != Diagnostic.OK) {
-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
-				problemEditorPart.setDiagnostic(diagnostic);
-				problemEditorPart.setMarkerHelper(markerHelper);
-				try {
-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
-					setPageText(lastEditorPage, problemEditorPart.getPartName());
-					setActivePage(lastEditorPage);
-					showTabs();
-				}
-				catch (PartInitException exception) {
-					BuildEditorPlugin.INSTANCE.log(exception);
-				}
-			}
-
-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
-				markerHelper.deleteMarkers(editingDomain.getResourceSet());
-				if (diagnostic.getSeverity() != Diagnostic.OK) {
-					try {
-						markerHelper.createMarkers(diagnostic);
-					}
-					catch (CoreException exception) {
-						BuildEditorPlugin.INSTANCE.log(exception);
-					}
-				}
-			}
-		}
-	}
+    if (updateProblemIndication)
+    {
+      BasicDiagnostic diagnostic =
+        new BasicDiagnostic
+          (Diagnostic.OK,
+           "org.eclipse.amalgam.releng.build.model.editor",
+           0,
+           null,
+           new Object [] { editingDomain.getResourceSet() });
+      for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values())
+      {
+        if (childDiagnostic.getSeverity() != Diagnostic.OK)
+        {
+          diagnostic.add(childDiagnostic);
+        }
+      }
+
+      int lastEditorPage = getPageCount() - 1;
+      if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart)
+      {
+        ((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
+        if (diagnostic.getSeverity() != Diagnostic.OK)
+        {
+          setActivePage(lastEditorPage);
+        }
+      }
+      else if (diagnostic.getSeverity() != Diagnostic.OK)
+      {
+        ProblemEditorPart problemEditorPart = new ProblemEditorPart();
+        problemEditorPart.setDiagnostic(diagnostic);
+        problemEditorPart.setMarkerHelper(markerHelper);
+        try
+        {
+          addPage(++lastEditorPage, problemEditorPart, getEditorInput());
+          setPageText(lastEditorPage, problemEditorPart.getPartName());
+          setActivePage(lastEditorPage);
+          showTabs();
+        }
+        catch (PartInitException exception)
+        {
+          BuildEditorPlugin.INSTANCE.log(exception);
+        }
+      }
+
+      if (markerHelper.hasMarkers(editingDomain.getResourceSet()))
+      {
+        markerHelper.deleteMarkers(editingDomain.getResourceSet());
+        if (diagnostic.getSeverity() != Diagnostic.OK)
+        {
+          try
+          {
+            markerHelper.createMarkers(diagnostic);
+          }
+          catch (CoreException exception)
+          {
+            BuildEditorPlugin.INSTANCE.log(exception);
+          }
+        }
+      }
+    }
+  }
 
 	/**
-	 * Shows a dialog that asks if conflicting changes should be discarded.
-	 * <!-- begin-user-doc -->
+   * Shows a dialog that asks if conflicting changes should be discarded.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected boolean handleDirtyConflict() {
-		return
-			MessageDialog.openQuestion
-				(getSite().getShell(),
-				 getString("_UI_FileConflict_label"),
-				 getString("_WARN_FileConflict"));
-	}
+    return
+      MessageDialog.openQuestion
+        (getSite().getShell(),
+         getString("_UI_FileConflict_label"),
+         getString("_WARN_FileConflict"));
+  }
 
 	/**
-	 * This creates a model editor.
-	 * <!-- begin-user-doc -->
+   * This creates a model editor.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public BuildEditor() {
-		super();
-		initializeEditingDomain();
-	}
+    super();
+    initializeEditingDomain();
+  }
 
 	/**
-	 * This sets up the editing domain for the model editor.
-	 * <!-- begin-user-doc -->
+   * This sets up the editing domain for the model editor.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void initializeEditingDomain() {
-		// Create an adapter factory that yields item providers.
-		//
-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-
-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new BuildItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new ProductItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
-
-		// Create the command stack that will notify this editor as commands are executed.
-		//
-		BasicCommandStack commandStack = new BasicCommandStack();
-
-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
-		//
-		commandStack.addCommandStackListener
-			(new CommandStackListener() {
-				 public void commandStackChanged(final EventObject event) {
-					 getContainer().getDisplay().asyncExec
-						 (new Runnable() {
-							  public void run() {
-								  firePropertyChange(IEditorPart.PROP_DIRTY);
-
-								  // Try to select the affected objects.
-								  //
-								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
-								  if (mostRecentCommand != null) {
-									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());
-								  }
-								  if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {
-									  propertySheetPage.refresh();
-								  }
-							  }
-						  });
-				 }
-			 });
-
-		// Create the editing domain with a special command stack.
-		//
-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
-	}
+    // Create an adapter factory that yields item providers.
+    //
+    adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+    adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+    adapterFactory.addAdapterFactory(new BuildItemProviderAdapterFactory());
+    adapterFactory.addAdapterFactory(new ProductItemProviderAdapterFactory());
+    adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+    // Create the command stack that will notify this editor as commands are executed.
+    //
+    BasicCommandStack commandStack = new BasicCommandStack();
+
+    // Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
+    //
+    commandStack.addCommandStackListener
+      (new CommandStackListener()
+       {
+         public void commandStackChanged(final EventObject event)
+         {
+           getContainer().getDisplay().asyncExec
+             (new Runnable()
+              {
+                public void run()
+                {
+                  firePropertyChange(IEditorPart.PROP_DIRTY);
+
+                  // Try to select the affected objects.
+                  //
+                  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
+                  if (mostRecentCommand != null)
+                  {
+                    setSelectionToViewer(mostRecentCommand.getAffectedObjects());
+                  }
+                  if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed())
+                  {
+                    propertySheetPage.refresh();
+                  }
+                }
+              });
+         }
+       });
+
+    // Create the editing domain with a special command stack.
+    //
+    editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
+  }
 
 	/**
-	 * This is here for the listener to be able to call it.
-	 * <!-- begin-user-doc -->
+   * This is here for the listener to be able to call it.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 			@Override
 	protected void firePropertyChange(int action) {
-		super.firePropertyChange(action);
-	}
+    super.firePropertyChange(action);
+  }
 
 	/**
-	 * This sets the selection into whichever viewer is active.
-	 * <!-- begin-user-doc -->
+   * This sets the selection into whichever viewer is active.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setSelectionToViewer(Collection<?> collection) {
-		final Collection<?> theSelection = collection;
-		// Make sure it's okay.
-		//
-		if (theSelection != null && !theSelection.isEmpty()) {
-			Runnable runnable =
-				new Runnable() {
-					public void run() {
-						// Try to select the items in the current content viewer of the editor.
-						//
-						if (currentViewer != null) {
-							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
-						}
-					}
-				};
-			getSite().getShell().getDisplay().asyncExec(runnable);
-		}
-	}
-
-	/**
-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
-	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
-	 * <!-- begin-user-doc -->
+    final Collection<?> theSelection = collection;
+    // Make sure it's okay.
+    //
+    if (theSelection != null && !theSelection.isEmpty())
+    {
+      Runnable runnable =
+        new Runnable()
+        {
+          public void run()
+          {
+            // Try to select the items in the current content viewer of the editor.
+            //
+            if (currentViewer != null)
+            {
+              currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
+            }
+          }
+        };
+      getSite().getShell().getDisplay().asyncExec(runnable);
+    }
+  }
+
+	/**
+   * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
+   * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
+   * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EditingDomain getEditingDomain() {
-		return editingDomain;
-	}
+    return editingDomain;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
 		/**
-		 * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
-			super(adapterFactory);
-		}
+      super(adapterFactory);
+    }
 
 		/**
-		 * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		@Override
 		public Object [] getElements(Object object) {
-			Object parent = super.getParent(object);
-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
-		}
+      Object parent = super.getParent(object);
+      return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+    }
 
 		/**
-		 * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		@Override
 		public Object [] getChildren(Object object) {
-			Object parent = super.getParent(object);
-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
-		}
+      Object parent = super.getParent(object);
+      return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
+    }
 
 		/**
-		 * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		@Override
 		public boolean hasChildren(Object object) {
-			Object parent = super.getParent(object);
-			return parent != null;
-		}
+      Object parent = super.getParent(object);
+      return parent != null;
+    }
 
 		/**
-		 * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		@Override
 		public Object getParent(Object object) {
-			return null;
-		}
+      return null;
+    }
 	}
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setCurrentViewerPane(ViewerPane viewerPane) {
-		if (currentViewerPane != viewerPane) {
-			if (currentViewerPane != null) {
-				currentViewerPane.showFocus(false);
-			}
-			currentViewerPane = viewerPane;
-		}
-		setCurrentViewer(currentViewerPane.getViewer());
-	}
-
-	/**
-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
-	 * is the current one.
-	 * <!-- begin-user-doc -->
+    if (currentViewerPane != viewerPane)
+    {
+      if (currentViewerPane != null)
+      {
+        currentViewerPane.showFocus(false);
+      }
+      currentViewerPane = viewerPane;
+    }
+    setCurrentViewer(currentViewerPane.getViewer());
+  }
+
+	/**
+   * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
+   * is the current one.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setCurrentViewer(Viewer viewer) {
-		// If it is changing...
-		//
-		if (currentViewer != viewer) {
-			if (selectionChangedListener == null) {
-				// Create the listener on demand.
-				//
-				selectionChangedListener =
-					new ISelectionChangedListener() {
-						// This just notifies those things that are affected by the section.
-						//
-						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
-							setSelection(selectionChangedEvent.getSelection());
-						}
-					};
-			}
-
-			// Stop listening to the old one.
-			//
-			if (currentViewer != null) {
-				currentViewer.removeSelectionChangedListener(selectionChangedListener);
-			}
-
-			// Start listening to the new one.
-			//
-			if (viewer != null) {
-				viewer.addSelectionChangedListener(selectionChangedListener);
-			}
-
-			// Remember it.
-			//
-			currentViewer = viewer;
-
-			// Set the editors selection based on the current viewer's selection.
-			//
-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
-		}
-	}
+    // If it is changing...
+    //
+    if (currentViewer != viewer)
+    {
+      if (selectionChangedListener == null)
+      {
+        // Create the listener on demand.
+        //
+        selectionChangedListener =
+          new ISelectionChangedListener()
+          {
+            // This just notifies those things that are affected by the section.
+            //
+            public void selectionChanged(SelectionChangedEvent selectionChangedEvent)
+            {
+              setSelection(selectionChangedEvent.getSelection());
+            }
+          };
+      }
+
+      // Stop listening to the old one.
+      //
+      if (currentViewer != null)
+      {
+        currentViewer.removeSelectionChangedListener(selectionChangedListener);
+      }
+
+      // Start listening to the new one.
+      //
+      if (viewer != null)
+      {
+        viewer.addSelectionChangedListener(selectionChangedListener);
+      }
+
+      // Remember it.
+      //
+      currentViewer = viewer;
+
+      // Set the editors selection based on the current viewer's selection.
+      //
+      setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
+    }
+  }
 
 	/**
-	 * This returns the viewer as required by the {@link IViewerProvider} interface.
-	 * <!-- begin-user-doc -->
+   * This returns the viewer as required by the {@link IViewerProvider} interface.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Viewer getViewer() {
-		return currentViewer;
-	}
+    return currentViewer;
+  }
 
 	/**
-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
-	 * <!-- begin-user-doc -->
+   * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void createContextMenuFor(StructuredViewer viewer) {
-		MenuManager contextMenu = new MenuManager("#PopUp");
-		contextMenu.add(new Separator("additions"));
-		contextMenu.setRemoveAllWhenShown(true);
-		contextMenu.addMenuListener(this);
-		Menu menu= contextMenu.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
-
-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance() };
-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
-	}
+    MenuManager contextMenu = new MenuManager("#PopUp");
+    contextMenu.add(new Separator("additions"));
+    contextMenu.setRemoveAllWhenShown(true);
+    contextMenu.addMenuListener(this);
+    Menu menu= contextMenu.createContextMenu(viewer.getControl());
+    viewer.getControl().setMenu(menu);
+    getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
+
+    int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+    Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance() };
+    viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+    viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
+  }
 
 	/**
-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
-	 * <!-- begin-user-doc -->
+   * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void createModel() {
-		URI resourceURI = EditUIUtil.getURI(getEditorInput());
-		Exception exception = null;
-		Resource resource = null;
-		try {
-			// Load the resource through the editing domain.
-			//
-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
-		}
-		catch (Exception e) {
-			exception = e;
-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
-		}
-
-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
-		if (diagnostic.getSeverity() != Diagnostic.OK) {
-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
-		}
-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
-	}
-
-	/**
-	 * Returns a diagnostic describing the errors and warnings listed in the resource
-	 * and the specified exception (if any).
-	 * <!-- begin-user-doc -->
+    URI resourceURI = EditUIUtil.getURI(getEditorInput());
+    Exception exception = null;
+    Resource resource = null;
+    try
+    {
+      // Load the resource through the editing domain.
+      //
+      resource = editingDomain.getResourceSet().getResource(resourceURI, true);
+    }
+    catch (Exception e)
+    {
+      exception = e;
+      resource = editingDomain.getResourceSet().getResource(resourceURI, false);
+    }
+
+    Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
+    if (diagnostic.getSeverity() != Diagnostic.OK)
+    {
+      resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
+    }
+    editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
+  }
+
+	/**
+   * Returns a diagnostic describing the errors and warnings listed in the resource
+   * and the specified exception (if any).
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
-			BasicDiagnostic basicDiagnostic =
-				new BasicDiagnostic
-					(Diagnostic.ERROR,
-					 "org.eclipse.amalgam.releng.build.model.editor",
-					 0,
-					 getString("_UI_CreateModelError_message", resource.getURI()),
-					 new Object [] { exception == null ? (Object)resource : exception });
-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
-			return basicDiagnostic;
-		}
-		else if (exception != null) {
-			return
-				new BasicDiagnostic
-					(Diagnostic.ERROR,
-					 "org.eclipse.amalgam.releng.build.model.editor",
-					 0,
-					 getString("_UI_CreateModelError_message", resource.getURI()),
-					 new Object[] { exception });
-		}
-		else {
-			return Diagnostic.OK_INSTANCE;
-		}
-	}
+    if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
+    {
+      BasicDiagnostic basicDiagnostic =
+        new BasicDiagnostic
+          (Diagnostic.ERROR,
+           "org.eclipse.amalgam.releng.build.model.editor",
+           0,
+           getString("_UI_CreateModelError_message", resource.getURI()),
+           new Object [] { exception == null ? (Object)resource : exception });
+      basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
+      return basicDiagnostic;
+    }
+    else if (exception != null)
+    {
+      return
+        new BasicDiagnostic
+          (Diagnostic.ERROR,
+           "org.eclipse.amalgam.releng.build.model.editor",
+           0,
+           getString("_UI_CreateModelError_message", resource.getURI()),
+           new Object[] { exception });
+    }
+    else
+    {
+      return Diagnostic.OK_INSTANCE;
+    }
+  }
 
 	/**
-	 * This is the method used by the framework to install your own controls.
-	 * <!-- begin-user-doc -->
+   * This is the method used by the framework to install your own controls.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void createPages() {
-		// Creates the model from the editor input
-		//
-		createModel();
-
-		// Only creates the other pages if there is something that can be edited
-		//
-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
-			// Create a page for the selection tree view.
-			//
-			{
-				ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), BuildEditor.this) {
-						@Override
-						public Viewer createViewer(Composite composite) {
-							Tree tree = new Tree(composite, SWT.MULTI);
-							TreeViewer newTreeViewer = new TreeViewer(tree);
-							return newTreeViewer;
-						}
-						@Override
-						public void requestActivation() {
-							super.requestActivation();
-							setCurrentViewerPane(this);
-						}
-					};
-				viewerPane.createControl(getContainer());
-
-				selectionViewer = (TreeViewer)viewerPane.getViewer();
-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-
-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-				selectionViewer.setInput(editingDomain.getResourceSet());
-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
-				viewerPane.setTitle(editingDomain.getResourceSet());
-
-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
-
-				createContextMenuFor(selectionViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_SelectionPage_label"));
-			}
-
-			// Create a page for the parent tree view.
-			//
-			{
-				ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), BuildEditor.this) {
-						@Override
-						public Viewer createViewer(Composite composite) {
-							Tree tree = new Tree(composite, SWT.MULTI);
-							TreeViewer newTreeViewer = new TreeViewer(tree);
-							return newTreeViewer;
-						}
-						@Override
-						public void requestActivation() {
-							super.requestActivation();
-							setCurrentViewerPane(this);
-						}
-					};
-				viewerPane.createControl(getContainer());
-
-				parentViewer = (TreeViewer)viewerPane.getViewer();
-				parentViewer.setAutoExpandLevel(30);
-				parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
-				parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
-				createContextMenuFor(parentViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_ParentPage_label"));
-			}
-
-			// This is the page for the list viewer
-			//
-			{
-				ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), BuildEditor.this) {
-						@Override
-						public Viewer createViewer(Composite composite) {
-							return new ListViewer(composite);
-						}
-						@Override
-						public void requestActivation() {
-							super.requestActivation();
-							setCurrentViewerPane(this);
-						}
-					};
-				viewerPane.createControl(getContainer());
-				listViewer = (ListViewer)viewerPane.getViewer();
-				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-				listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
-				createContextMenuFor(listViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_ListPage_label"));
-			}
-
-			// This is the page for the tree viewer
-			//
-			{
-				ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), BuildEditor.this) {
-						@Override
-						public Viewer createViewer(Composite composite) {
-							return new TreeViewer(composite);
-						}
-						@Override
-						public void requestActivation() {
-							super.requestActivation();
-							setCurrentViewerPane(this);
-						}
-					};
-				viewerPane.createControl(getContainer());
-				treeViewer = (TreeViewer)viewerPane.getViewer();
-				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-				treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
-				new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
-
-				createContextMenuFor(treeViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_TreePage_label"));
-			}
-
-			// This is the page for the table viewer.
-			//
-			{
-				ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), BuildEditor.this) {
-						@Override
-						public Viewer createViewer(Composite composite) {
-							return new TableViewer(composite);
-						}
-						@Override
-						public void requestActivation() {
-							super.requestActivation();
-							setCurrentViewerPane(this);
-						}
-					};
-				viewerPane.createControl(getContainer());
-				tableViewer = (TableViewer)viewerPane.getViewer();
-
-				Table table = tableViewer.getTable();
-				TableLayout layout = new TableLayout();
-				table.setLayout(layout);
-				table.setHeaderVisible(true);
-				table.setLinesVisible(true);
-
-				TableColumn objectColumn = new TableColumn(table, SWT.NONE);
-				layout.addColumnData(new ColumnWeightData(3, 100, true));
-				objectColumn.setText(getString("_UI_ObjectColumn_label"));
-				objectColumn.setResizable(true);
-
-				TableColumn selfColumn = new TableColumn(table, SWT.NONE);
-				layout.addColumnData(new ColumnWeightData(2, 100, true));
-				selfColumn.setText(getString("_UI_SelfColumn_label"));
-				selfColumn.setResizable(true);
-
-				tableViewer.setColumnProperties(new String [] {"a", "b"});
-				tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-				tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
-				createContextMenuFor(tableViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_TablePage_label"));
-			}
-
-			// This is the page for the table tree viewer.
-			//
-			{
-				ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), BuildEditor.this) {
-						@Override
-						public Viewer createViewer(Composite composite) {
-							return new TreeViewer(composite);
-						}
-						@Override
-						public void requestActivation() {
-							super.requestActivation();
-							setCurrentViewerPane(this);
-						}
-					};
-				viewerPane.createControl(getContainer());
-
-				treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
-
-				Tree tree = treeViewerWithColumns.getTree();
-				tree.setLayoutData(new FillLayout());
-				tree.setHeaderVisible(true);
-				tree.setLinesVisible(true);
-
-				TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
-				objectColumn.setText(getString("_UI_ObjectColumn_label"));
-				objectColumn.setResizable(true);
-				objectColumn.setWidth(250);
-
-				TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
-				selfColumn.setText(getString("_UI_SelfColumn_label"));
-				selfColumn.setResizable(true);
-				selfColumn.setWidth(200);
-
-				treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"});
-				treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-				treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-
-				createContextMenuFor(treeViewerWithColumns);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));
-			}
-
-			getSite().getShell().getDisplay().asyncExec
-				(new Runnable() {
-					 public void run() {
-						 setActivePage(0);
-					 }
-				 });
-		}
-
-		// Ensures that this editor will only display the page's tab
-		// area if there are more than one page
-		//
-		getContainer().addControlListener
-			(new ControlAdapter() {
-				boolean guard = false;
-				@Override
-				public void controlResized(ControlEvent event) {
-					if (!guard) {
-						guard = true;
-						hideTabs();
-						guard = false;
-					}
-				}
-			 });
-
-		getSite().getShell().getDisplay().asyncExec
-			(new Runnable() {
-				 public void run() {
-					 updateProblemIndication();
-				 }
-			 });
-	}
-
-	/**
-	 * If there is just one page in the multi-page editor part,
-	 * this hides the single tab at the bottom.
-	 * <!-- begin-user-doc -->
+    // Creates the model from the editor input
+    //
+    createModel();
+
+    // Only creates the other pages if there is something that can be edited
+    //
+    if (!getEditingDomain().getResourceSet().getResources().isEmpty())
+    {
+      // Create a page for the selection tree view.
+      //
+      {
+        ViewerPane viewerPane =
+          new ViewerPane(getSite().getPage(), BuildEditor.this)
+          {
+            @Override
+            public Viewer createViewer(Composite composite)
+            {
+              Tree tree = new Tree(composite, SWT.MULTI);
+              TreeViewer newTreeViewer = new TreeViewer(tree);
+              return newTreeViewer;
+            }
+            @Override
+            public void requestActivation()
+            {
+              super.requestActivation();
+              setCurrentViewerPane(this);
+            }
+          };
+        viewerPane.createControl(getContainer());
+
+        selectionViewer = (TreeViewer)viewerPane.getViewer();
+        selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+
+        selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+        selectionViewer.setInput(editingDomain.getResourceSet());
+        selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+        viewerPane.setTitle(editingDomain.getResourceSet());
+
+        new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
+
+        createContextMenuFor(selectionViewer);
+        int pageIndex = addPage(viewerPane.getControl());
+        setPageText(pageIndex, getString("_UI_SelectionPage_label"));
+      }
+
+      // Create a page for the parent tree view.
+      //
+      {
+        ViewerPane viewerPane =
+          new ViewerPane(getSite().getPage(), BuildEditor.this)
+          {
+            @Override
+            public Viewer createViewer(Composite composite)
+            {
+              Tree tree = new Tree(composite, SWT.MULTI);
+              TreeViewer newTreeViewer = new TreeViewer(tree);
+              return newTreeViewer;
+            }
+            @Override
+            public void requestActivation()
+            {
+              super.requestActivation();
+              setCurrentViewerPane(this);
+            }
+          };
+        viewerPane.createControl(getContainer());
+
+        parentViewer = (TreeViewer)viewerPane.getViewer();
+        parentViewer.setAutoExpandLevel(30);
+        parentViewer.setContentProvider(new ReverseAdapterFactoryContentProvider(adapterFactory));
+        parentViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+        createContextMenuFor(parentViewer);
+        int pageIndex = addPage(viewerPane.getControl());
+        setPageText(pageIndex, getString("_UI_ParentPage_label"));
+      }
+
+      // This is the page for the list viewer
+      //
+      {
+        ViewerPane viewerPane =
+          new ViewerPane(getSite().getPage(), BuildEditor.this)
+          {
+            @Override
+            public Viewer createViewer(Composite composite)
+            {
+              return new ListViewer(composite);
+            }
+            @Override
+            public void requestActivation()
+            {
+              super.requestActivation();
+              setCurrentViewerPane(this);
+            }
+          };
+        viewerPane.createControl(getContainer());
+        listViewer = (ListViewer)viewerPane.getViewer();
+        listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+        listViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+        createContextMenuFor(listViewer);
+        int pageIndex = addPage(viewerPane.getControl());
+        setPageText(pageIndex, getString("_UI_ListPage_label"));
+      }
+
+      // This is the page for the tree viewer
+      //
+      {
+        ViewerPane viewerPane =
+          new ViewerPane(getSite().getPage(), BuildEditor.this)
+          {
+            @Override
+            public Viewer createViewer(Composite composite)
+            {
+              return new TreeViewer(composite);
+            }
+            @Override
+            public void requestActivation()
+            {
+              super.requestActivation();
+              setCurrentViewerPane(this);
+            }
+          };
+        viewerPane.createControl(getContainer());
+        treeViewer = (TreeViewer)viewerPane.getViewer();
+        treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+        treeViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+        new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+        createContextMenuFor(treeViewer);
+        int pageIndex = addPage(viewerPane.getControl());
+        setPageText(pageIndex, getString("_UI_TreePage_label"));
+      }
+
+      // This is the page for the table viewer.
+      //
+      {
+        ViewerPane viewerPane =
+          new ViewerPane(getSite().getPage(), BuildEditor.this)
+          {
+            @Override
+            public Viewer createViewer(Composite composite)
+            {
+              return new TableViewer(composite);
+            }
+            @Override
+            public void requestActivation()
+            {
+              super.requestActivation();
+              setCurrentViewerPane(this);
+            }
+          };
+        viewerPane.createControl(getContainer());
+        tableViewer = (TableViewer)viewerPane.getViewer();
+
+        Table table = tableViewer.getTable();
+        TableLayout layout = new TableLayout();
+        table.setLayout(layout);
+        table.setHeaderVisible(true);
+        table.setLinesVisible(true);
+
+        TableColumn objectColumn = new TableColumn(table, SWT.NONE);
+        layout.addColumnData(new ColumnWeightData(3, 100, true));
+        objectColumn.setText(getString("_UI_ObjectColumn_label"));
+        objectColumn.setResizable(true);
+
+        TableColumn selfColumn = new TableColumn(table, SWT.NONE);
+        layout.addColumnData(new ColumnWeightData(2, 100, true));
+        selfColumn.setText(getString("_UI_SelfColumn_label"));
+        selfColumn.setResizable(true);
+
+        tableViewer.setColumnProperties(new String [] {"a", "b"});
+        tableViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+        tableViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+        createContextMenuFor(tableViewer);
+        int pageIndex = addPage(viewerPane.getControl());
+        setPageText(pageIndex, getString("_UI_TablePage_label"));
+      }
+
+      // This is the page for the table tree viewer.
+      //
+      {
+        ViewerPane viewerPane =
+          new ViewerPane(getSite().getPage(), BuildEditor.this)
+          {
+            @Override
+            public Viewer createViewer(Composite composite)
+            {
+              return new TreeViewer(composite);
+            }
+            @Override
+            public void requestActivation()
+            {
+              super.requestActivation();
+              setCurrentViewerPane(this);
+            }
+          };
+        viewerPane.createControl(getContainer());
+
+        treeViewerWithColumns = (TreeViewer)viewerPane.getViewer();
+
+        Tree tree = treeViewerWithColumns.getTree();
+        tree.setLayoutData(new FillLayout());
+        tree.setHeaderVisible(true);
+        tree.setLinesVisible(true);
+
+        TreeColumn objectColumn = new TreeColumn(tree, SWT.NONE);
+        objectColumn.setText(getString("_UI_ObjectColumn_label"));
+        objectColumn.setResizable(true);
+        objectColumn.setWidth(250);
+
+        TreeColumn selfColumn = new TreeColumn(tree, SWT.NONE);
+        selfColumn.setText(getString("_UI_SelfColumn_label"));
+        selfColumn.setResizable(true);
+        selfColumn.setWidth(200);
+
+        treeViewerWithColumns.setColumnProperties(new String [] {"a", "b"});
+        treeViewerWithColumns.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+        treeViewerWithColumns.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+
+        createContextMenuFor(treeViewerWithColumns);
+        int pageIndex = addPage(viewerPane.getControl());
+        setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label"));
+      }
+
+      getSite().getShell().getDisplay().asyncExec
+        (new Runnable()
+         {
+           public void run()
+           {
+             setActivePage(0);
+           }
+         });
+    }
+
+    // Ensures that this editor will only display the page's tab
+    // area if there are more than one page
+    //
+    getContainer().addControlListener
+      (new ControlAdapter()
+       {
+        boolean guard = false;
+        @Override
+        public void controlResized(ControlEvent event)
+        {
+          if (!guard)
+          {
+            guard = true;
+            hideTabs();
+            guard = false;
+          }
+        }
+       });
+
+    getSite().getShell().getDisplay().asyncExec
+      (new Runnable()
+       {
+         public void run()
+         {
+           updateProblemIndication();
+         }
+       });
+  }
+
+	/**
+   * If there is just one page in the multi-page editor part,
+   * this hides the single tab at the bottom.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void hideTabs() {
-		if (getPageCount() <= 1) {
-			setPageText(0, "");
-			if (getContainer() instanceof CTabFolder) {
-				((CTabFolder)getContainer()).setTabHeight(1);
-				Point point = getContainer().getSize();
-				getContainer().setSize(point.x, point.y + 6);
-			}
-		}
-	}
-
-	/**
-	 * If there is more than one page in the multi-page editor part,
-	 * this shows the tabs at the bottom.
-	 * <!-- begin-user-doc -->
+    if (getPageCount() <= 1)
+    {
+      setPageText(0, "");
+      if (getContainer() instanceof CTabFolder)
+      {
+        ((CTabFolder)getContainer()).setTabHeight(1);
+        Point point = getContainer().getSize();
+        getContainer().setSize(point.x, point.y + 6);
+      }
+    }
+  }
+
+	/**
+   * If there is more than one page in the multi-page editor part,
+   * this shows the tabs at the bottom.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void showTabs() {
-		if (getPageCount() > 1) {
-			setPageText(0, getString("_UI_SelectionPage_label"));
-			if (getContainer() instanceof CTabFolder) {
-				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
-				Point point = getContainer().getSize();
-				getContainer().setSize(point.x, point.y - 6);
-			}
-		}
-	}
+    if (getPageCount() > 1)
+    {
+      setPageText(0, getString("_UI_SelectionPage_label"));
+      if (getContainer() instanceof CTabFolder)
+      {
+        ((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
+        Point point = getContainer().getSize();
+        getContainer().setSize(point.x, point.y - 6);
+      }
+    }
+  }
 
 	/**
-	 * This is used to track the active viewer.
-	 * <!-- begin-user-doc -->
+   * This is used to track the active viewer.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	protected void pageChange(int pageIndex) {
-		super.pageChange(pageIndex);
+    super.pageChange(pageIndex);
 
-		if (contentOutlinePage != null) {
-			handleContentOutlineSelection(contentOutlinePage.getSelection());
-		}
-	}
+    if (contentOutlinePage != null)
+    {
+      handleContentOutlineSelection(contentOutlinePage.getSelection());
+    }
+  }
 
 	/**
-	 * This is how the framework determines which interfaces we implement.
-	 * <!-- begin-user-doc -->
+   * This is how the framework determines which interfaces we implement.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@SuppressWarnings("unchecked")
 	@Override
 	public Object getAdapter(Class key) {
-		if (key.equals(IContentOutlinePage.class)) {
-			return showOutlineView() ? getContentOutlinePage() : null;
-		}
-		else if (key.equals(IPropertySheetPage.class)) {
-			return getPropertySheetPage();
-		}
-		else if (key.equals(IGotoMarker.class)) {
-			return this;
-		}
-		else {
-			return super.getAdapter(key);
-		}
-	}
+    if (key.equals(IContentOutlinePage.class))
+    {
+      return showOutlineView() ? getContentOutlinePage() : null;
+    }
+    else if (key.equals(IPropertySheetPage.class))
+    {
+      return getPropertySheetPage();
+    }
+    else if (key.equals(IGotoMarker.class))
+    {
+      return this;
+    }
+    else
+    {
+      return super.getAdapter(key);
+    }
+  }
 
 	/**
-	 * This accesses a cached version of the content outliner.
-	 * <!-- begin-user-doc -->
+   * This accesses a cached version of the content outliner.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public IContentOutlinePage getContentOutlinePage() {
-		if (contentOutlinePage == null) {
-			// The content outline is just a tree.
-			//
-			class MyContentOutlinePage extends ContentOutlinePage {
-				@Override
-				public void createControl(Composite parent) {
-					super.createControl(parent);
-					contentOutlineViewer = getTreeViewer();
-					contentOutlineViewer.addSelectionChangedListener(this);
-
-					// Set up the tree viewer.
-					//
-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-					contentOutlineViewer.setInput(editingDomain.getResourceSet());
-
-					// Make sure our popups work.
-					//
-					createContextMenuFor(contentOutlineViewer);
-
-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
-					  // Select the root object in the view.
-					  //
-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
-					}
-				}
-
-				@Override
-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
-					super.makeContributions(menuManager, toolBarManager, statusLineManager);
-					contentOutlineStatusLineManager = statusLineManager;
-				}
-
-				@Override
-				public void setActionBars(IActionBars actionBars) {
-					super.setActionBars(actionBars);
-					getActionBarContributor().shareGlobalActions(this, actionBars);
-				}
-			}
-
-			contentOutlinePage = new MyContentOutlinePage();
-
-			// Listen to selection so that we can handle it is a special way.
-			//
-			contentOutlinePage.addSelectionChangedListener
-				(new ISelectionChangedListener() {
-					 // This ensures that we handle selections correctly.
-					 //
-					 public void selectionChanged(SelectionChangedEvent event) {
-						 handleContentOutlineSelection(event.getSelection());
-					 }
-				 });
-		}
-
-		return contentOutlinePage;
-	}
+    if (contentOutlinePage == null)
+    {
+      // The content outline is just a tree.
+      //
+      class MyContentOutlinePage extends ContentOutlinePage
+      {
+        @Override
+        public void createControl(Composite parent)
+        {
+          super.createControl(parent);
+          contentOutlineViewer = getTreeViewer();
+          contentOutlineViewer.addSelectionChangedListener(this);
+
+          // Set up the tree viewer.
+          //
+          contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
+          contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
+          contentOutlineViewer.setInput(editingDomain.getResourceSet());
+
+          // Make sure our popups work.
+          //
+          createContextMenuFor(contentOutlineViewer);
+
+          if (!editingDomain.getResourceSet().getResources().isEmpty())
+          {
+            // Select the root object in the view.
+            //
+            contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
+          }
+        }
+
+        @Override
+        public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager)
+        {
+          super.makeContributions(menuManager, toolBarManager, statusLineManager);
+          contentOutlineStatusLineManager = statusLineManager;
+        }
+
+        @Override
+        public void setActionBars(IActionBars actionBars)
+        {
+          super.setActionBars(actionBars);
+          getActionBarContributor().shareGlobalActions(this, actionBars);
+        }
+      }
+
+      contentOutlinePage = new MyContentOutlinePage();
+
+      // Listen to selection so that we can handle it is a special way.
+      //
+      contentOutlinePage.addSelectionChangedListener
+        (new ISelectionChangedListener()
+         {
+           // This ensures that we handle selections correctly.
+           //
+           public void selectionChanged(SelectionChangedEvent event)
+           {
+             handleContentOutlineSelection(event.getSelection());
+           }
+         });
+    }
+
+    return contentOutlinePage;
+  }
 
 	/**
-	 * This accesses a cached version of the property sheet.
-	 * <!-- begin-user-doc -->
+   * This accesses a cached version of the property sheet.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public IPropertySheetPage getPropertySheetPage() {
-		if (propertySheetPage == null) {
-			propertySheetPage =
-				new ExtendedPropertySheetPage(editingDomain) {
-					@Override
-					public void setSelectionToViewer(List<?> selection) {
-						BuildEditor.this.setSelectionToViewer(selection);
-						BuildEditor.this.setFocus();
-					}
-
-					@Override
-					public void setActionBars(IActionBars actionBars) {
-						super.setActionBars(actionBars);
-						getActionBarContributor().shareGlobalActions(this, actionBars);
-					}
-				};
-			propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
-		}
-
-		return propertySheetPage;
-	}
+    if (propertySheetPage == null)
+    {
+      propertySheetPage =
+        new ExtendedPropertySheetPage(editingDomain)
+        {
+          @Override
+          public void setSelectionToViewer(List<?> selection)
+          {
+            BuildEditor.this.setSelectionToViewer(selection);
+            BuildEditor.this.setFocus();
+          }
+
+          @Override
+          public void setActionBars(IActionBars actionBars)
+          {
+            super.setActionBars(actionBars);
+            getActionBarContributor().shareGlobalActions(this, actionBars);
+          }
+        };
+      propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
+    }
+
+    return propertySheetPage;
+  }
 
 	/**
-	 * This deals with how we want selection in the outliner to affect the other views.
-	 * <!-- begin-user-doc -->
+   * This deals with how we want selection in the outliner to affect the other views.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void handleContentOutlineSelection(ISelection selection) {
-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
-			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
-			if (selectedElements.hasNext()) {
-				// Get the first selected element.
-				//
-				Object selectedElement = selectedElements.next();
-
-				// If it's the selection viewer, then we want it to select the same selection as this selection.
-				//
-				if (currentViewerPane.getViewer() == selectionViewer) {
-					ArrayList<Object> selectionList = new ArrayList<Object>();
-					selectionList.add(selectedElement);
-					while (selectedElements.hasNext()) {
-						selectionList.add(selectedElements.next());
-					}
-
-					// Set the selection to the widget.
-					//
-					selectionViewer.setSelection(new StructuredSelection(selectionList));
-				}
-				else {
-					// Set the input to the widget.
-					//
-					if (currentViewerPane.getViewer().getInput() != selectedElement) {
-						currentViewerPane.getViewer().setInput(selectedElement);
-						currentViewerPane.setTitle(selectedElement);
-					}
-				}
-			}
-		}
-	}
+    if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection)
+    {
+      Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
+      if (selectedElements.hasNext())
+      {
+        // Get the first selected element.
+        //
+        Object selectedElement = selectedElements.next();
+
+        // If it's the selection viewer, then we want it to select the same selection as this selection.
+        //
+        if (currentViewerPane.getViewer() == selectionViewer)
+        {
+          ArrayList<Object> selectionList = new ArrayList<Object>();
+          selectionList.add(selectedElement);
+          while (selectedElements.hasNext())
+          {
+            selectionList.add(selectedElements.next());
+          }
+
+          // Set the selection to the widget.
+          //
+          selectionViewer.setSelection(new StructuredSelection(selectionList));
+        }
+        else
+        {
+          // Set the input to the widget.
+          //
+          if (currentViewerPane.getViewer().getInput() != selectedElement)
+          {
+            currentViewerPane.getViewer().setInput(selectedElement);
+            currentViewerPane.setTitle(selectedElement);
+          }
+        }
+      }
+    }
+  }
 
 	/**
-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
-	 * <!-- begin-user-doc -->
+   * This is for implementing {@link IEditorPart} and simply tests the command stack.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public boolean isDirty() {
-		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
-	}
+    return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
+  }
 
 	/**
-	 * This is for implementing {@link IEditorPart} and simply saves the model file.
-	 * <!-- begin-user-doc -->
+   * This is for implementing {@link IEditorPart} and simply saves the model file.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void doSave(IProgressMonitor progressMonitor) {
-		// Save only resources that have actually changed.
-		//
-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
-
-		// Do the work within an operation because this is a long running activity that modifies the workbench.
-		//
-		WorkspaceModifyOperation operation =
-			new WorkspaceModifyOperation() {
-				// This is the method that gets invoked when the operation runs.
-				//
-				@Override
-				public void execute(IProgressMonitor monitor) {
-					// Save the resources to the file system.
-					//
-					boolean first = true;
-					for (Resource resource : editingDomain.getResourceSet().getResources()) {
-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
-							try {
-								long timeStamp = resource.getTimeStamp();
-								resource.save(saveOptions);
-								if (resource.getTimeStamp() != timeStamp) {
-									savedResources.add(resource);
-								}
-							}
-							catch (Exception exception) {
-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-							}
-							first = false;
-						}
-					}
-				}
-			};
-
-		updateProblemIndication = false;
-		try {
-			// This runs the options, and shows progress.
-			//
-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
-
-			// Refresh the necessary state.
-			//
-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
-			firePropertyChange(IEditorPart.PROP_DIRTY);
-		}
-		catch (Exception exception) {
-			// Something went wrong that shouldn't.
-			//
-			BuildEditorPlugin.INSTANCE.log(exception);
-		}
-		updateProblemIndication = true;
-		updateProblemIndication();
-	}
-
-	/**
-	 * This returns whether something has been persisted to the URI of the specified resource.
-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream. 
-	 * <!-- begin-user-doc -->
+    // Save only resources that have actually changed.
+    //
+    final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
+    saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
+
+    // Do the work within an operation because this is a long running activity that modifies the workbench.
+    //
+    WorkspaceModifyOperation operation =
+      new WorkspaceModifyOperation()
+      {
+        // This is the method that gets invoked when the operation runs.
+        //
+        @Override
+        public void execute(IProgressMonitor monitor)
+        {
+          // Save the resources to the file system.
+          //
+          boolean first = true;
+          for (Resource resource : editingDomain.getResourceSet().getResources())
+          {
+            if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource))
+            {
+              try
+              {
+                long timeStamp = resource.getTimeStamp();
+                resource.save(saveOptions);
+                if (resource.getTimeStamp() != timeStamp)
+                {
+                  savedResources.add(resource);
+                }
+              }
+              catch (Exception exception)
+              {
+                resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
+              }
+              first = false;
+            }
+          }
+        }
+      };
+
+    updateProblemIndication = false;
+    try
+    {
+      // This runs the options, and shows progress.
+      //
+      new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
+
+      // Refresh the necessary state.
+      //
+      ((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+      firePropertyChange(IEditorPart.PROP_DIRTY);
+    }
+    catch (Exception exception)
+    {
+      // Something went wrong that shouldn't.
+      //
+      BuildEditorPlugin.INSTANCE.log(exception);
+    }
+    updateProblemIndication = true;
+    updateProblemIndication();
+  }
+
+	/**
+   * This returns whether something has been persisted to the URI of the specified resource.
+   * The implementation uses the URI converter from the editor's resource set to try to open an input stream. 
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected boolean isPersisted(Resource resource) {
-		boolean result = false;
-		try {
-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
-			if (stream != null) {
-				result = true;
-				stream.close();
-			}
-		}
-		catch (IOException e) {
-			// Ignore
-		}
-		return result;
-	}
+    boolean result = false;
+    try
+    {
+      InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
+      if (stream != null)
+      {
+        result = true;
+        stream.close();
+      }
+    }
+    catch (IOException e)
+    {
+      // Ignore
+    }
+    return result;
+  }
 
 	/**
-	 * This always returns true because it is not currently supported.
-	 * <!-- begin-user-doc -->
+   * This always returns true because it is not currently supported.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public boolean isSaveAsAllowed() {
-		return true;
-	}
+    return true;
+  }
 
 	/**
-	 * This also changes the editor's input.
-	 * <!-- begin-user-doc -->
+   * This also changes the editor's input.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void doSaveAs() {
-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
-		saveAsDialog.open();
-		IPath path = saveAsDialog.getResult();
-		if (path != null) {
-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-			if (file != null) {
-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
-			}
-		}
-	}
+    SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
+    saveAsDialog.open();
+    IPath path = saveAsDialog.getResult();
+    if (path != null)
+    {
+      IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
+      if (file != null)
+      {
+        doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
+      }
+    }
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected void doSaveAs(URI uri, IEditorInput editorInput) {
-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
-		setInputWithNotify(editorInput);
-		setPartName(editorInput.getName());
-		IProgressMonitor progressMonitor =
-			getActionBars().getStatusLineManager() != null ?
-				getActionBars().getStatusLineManager().getProgressMonitor() :
-				new NullProgressMonitor();
-		doSave(progressMonitor);
-	}
+    (editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
+    setInputWithNotify(editorInput);
+    setPartName(editorInput.getName());
+    IProgressMonitor progressMonitor =
+      getActionBars().getStatusLineManager() != null ?
+        getActionBars().getStatusLineManager().getProgressMonitor() :
+        new NullProgressMonitor();
+    doSave(progressMonitor);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void gotoMarker(IMarker marker) {
-		try {
-			if (marker.getType().equals(EValidator.MARKER)) {
-				String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
-				if (uriAttribute != null) {
-					URI uri = URI.createURI(uriAttribute);
-					EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);
-					if (eObject != null) {
-					  setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));
-					}
-				}
-			}
-		}
-		catch (CoreException exception) {
-			BuildEditorPlugin.INSTANCE.log(exception);
-		}
-	}
+    try
+    {
+      if (marker.getType().equals(EValidator.MARKER))
+      {
+        String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
+        if (uriAttribute != null)
+        {
+          URI uri = URI.createURI(uriAttribute);
+          EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);
+          if (eObject != null)
+          {
+            setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));
+          }
+        }
+      }
+    }
+    catch (CoreException exception)
+    {
+      BuildEditorPlugin.INSTANCE.log(exception);
+    }
+  }
 
 	/**
-	 * This is called during startup.
-	 * <!-- begin-user-doc -->
+   * This is called during startup.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void init(IEditorSite site, IEditorInput editorInput) {
-		setSite(site);
-		setInputWithNotify(editorInput);
-		setPartName(editorInput.getName());
-		site.setSelectionProvider(this);
-		site.getPage().addPartListener(partListener);
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
-	}
+    setSite(site);
+    setInputWithNotify(editorInput);
+    setPartName(editorInput.getName());
+    site.setSelectionProvider(this);
+    site.getPage().addPartListener(partListener);
+    ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void setFocus() {
-		if (currentViewerPane != null) {
-			currentViewerPane.setFocus();
-		}
-		else {
-			getControl(getActivePage()).setFocus();
-		}
-	}
+    if (currentViewerPane != null)
+    {
+      currentViewerPane.setFocus();
+    }
+    else
+    {
+      getControl(getActivePage()).setFocus();
+    }
+  }
 
 	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
-	 * <!-- begin-user-doc -->
+   * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionChangedListeners.add(listener);
-	}
+    selectionChangedListeners.add(listener);
+  }
 
 	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
-	 * <!-- begin-user-doc -->
+   * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionChangedListeners.remove(listener);
-	}
+    selectionChangedListeners.remove(listener);
+  }
 
 	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
-	 * <!-- begin-user-doc -->
+   * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public ISelection getSelection() {
-		return editorSelection;
-	}
+    return editorSelection;
+  }
 
 	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
-	 * Calling this result will notify the listeners.
-	 * <!-- begin-user-doc -->
+   * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
+   * Calling this result will notify the listeners.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setSelection(ISelection selection) {
-		editorSelection = selection;
+    editorSelection = selection;
 
-		for (ISelectionChangedListener listener : selectionChangedListeners) {
-			listener.selectionChanged(new SelectionChangedEvent(this, selection));
-		}
-		setStatusLineManager(selection);
-	}
+    for (ISelectionChangedListener listener : selectionChangedListeners)
+    {
+      listener.selectionChanged(new SelectionChangedEvent(this, selection));
+    }
+    setStatusLineManager(selection);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void setStatusLineManager(ISelection selection) {
-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+    IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
+      contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
 
-		if (statusLineManager != null) {
-			if (selection instanceof IStructuredSelection) {
-				Collection<?> collection = ((IStructuredSelection)selection).toList();
-				switch (collection.size()) {
-					case 0: {
-						statusLineManager.setMessage(getString("_UI_NoObjectSelected"));
-						break;
-					}
-					case 1: {
-						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
-						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));
-						break;
-					}
-					default: {
-						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));
-						break;
-					}
-				}
-			}
-			else {
-				statusLineManager.setMessage("");
-			}
-		}
-	}
+    if (statusLineManager != null)
+    {
+      if (selection instanceof IStructuredSelection)
+      {
+        Collection<?> collection = ((IStructuredSelection)selection).toList();
+        switch (collection.size())
+        {
+          case 0:
+          {
+            statusLineManager.setMessage(getString("_UI_NoObjectSelected"));
+            break;
+          }
+          case 1:
+          {
+            String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
+            statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));
+            break;
+          }
+          default:
+          {
+            statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));
+            break;
+          }
+        }
+      }
+      else
+      {
+        statusLineManager.setMessage("");
+      }
+    }
+  }
 
 	/**
-	 * This looks up a string in the plugin's plugin.properties file.
-	 * <!-- begin-user-doc -->
+   * This looks up a string in the plugin's plugin.properties file.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private static String getString(String key) {
-		return BuildEditorPlugin.INSTANCE.getString(key);
-	}
+    return BuildEditorPlugin.INSTANCE.getString(key);
+  }
 
 	/**
-	 * This looks up a string in plugin.properties, making a substitution.
-	 * <!-- begin-user-doc -->
+   * This looks up a string in plugin.properties, making a substitution.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private static String getString(String key, Object s1) {
-		return BuildEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
-	}
+    return BuildEditorPlugin.INSTANCE.getString(key, new Object [] { s1 });
+  }
 
 	/**
-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
-	 * <!-- begin-user-doc -->
+   * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void menuAboutToShow(IMenuManager menuManager) {
-		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
-	}
+    ((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public EditingDomainActionBarContributor getActionBarContributor() {
-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
-	}
+    return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public IActionBars getActionBars() {
-		return getActionBarContributor().getActionBars();
-	}
+    return getActionBarContributor().getActionBars();
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public AdapterFactory getAdapterFactory() {
-		return adapterFactory;
-	}
+    return adapterFactory;
+  }
 
 	/**
-	 * <!-- begin-user-doc -->
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public void dispose() {
-		updateProblemIndication = false;
+    updateProblemIndication = false;
 
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
+    ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
 
-		getSite().getPage().removePartListener(partListener);
+    getSite().getPage().removePartListener(partListener);
 
-		adapterFactory.dispose();
+    adapterFactory.dispose();
 
-		if (getActionBarContributor().getActiveEditor() == this) {
-			getActionBarContributor().setActiveEditor(null);
-		}
+    if (getActionBarContributor().getActiveEditor() == this)
+    {
+      getActionBarContributor().setActiveEditor(null);
+    }
 
-		if (propertySheetPage != null) {
-			propertySheetPage.dispose();
-		}
+    if (propertySheetPage != null)
+    {
+      propertySheetPage.dispose();
+    }
 
-		if (contentOutlinePage != null) {
-			contentOutlinePage.dispose();
-		}
+    if (contentOutlinePage != null)
+    {
+      contentOutlinePage.dispose();
+    }
 
-		super.dispose();
-	}
+    super.dispose();
+  }
 
 	/**
-	 * Returns whether the outline view should be presented to the user.
-	 * <!-- begin-user-doc -->
+   * Returns whether the outline view should be presented to the user.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected boolean showOutlineView() {
-		return true;
-	}
+    return true;
+  }
 }
Index: src/org/eclipse/amalgam/releng/build/presentation/BuildEditorPlugin.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.editor/src/org/eclipse/amalgam/releng/build/presentation/BuildEditorPlugin.java,v
retrieving revision 1.1
diff -u -r1.1 BuildEditorPlugin.java
--- src/org/eclipse/amalgam/releng/build/presentation/BuildEditorPlugin.java	24 Nov 2008 20:38:02 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/presentation/BuildEditorPlugin.java	6 Jun 2010 14:35:41 -0000
@@ -29,77 +29,78 @@
  */
 public final class BuildEditorPlugin extends EMFPlugin {
 	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
+   * Keep track of the singleton.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static final BuildEditorPlugin INSTANCE = new BuildEditorPlugin();
 	
 	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
+   * Keep track of the singleton.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	private static Implementation plugin;
 
 	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
+   * Create the instance.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public BuildEditorPlugin() {
-		super
-			(new ResourceLocator [] {
-				ProductEditPlugin.INSTANCE,
-			});
-	}
+    super
+      (new ResourceLocator [] 
+      {
+        ProductEditPlugin.INSTANCE,
+      });
+  }
 
 	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
+   * Returns the singleton instance of the Eclipse plugin.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
+   * @return the singleton instance.
+   * @generated
+   */
 	@Override
 	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
+    return plugin;
+  }
 	
 	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
+   * Returns the singleton instance of the Eclipse plugin.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
+   * @return the singleton instance.
+   * @generated
+   */
 	public static Implementation getPlugin() {
-		return plugin;
-	}
+    return plugin;
+  }
 	
 	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
+   * The actual implementation of the Eclipse <b>Plugin</b>.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static class Implementation extends EclipseUIPlugin {
 		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
+     * Creates an instance.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		public Implementation() {
-			super();
-	
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
+      super();
+  
+      // Remember the static instance.
+      //
+      plugin = this;
+    }
 	}
 
 }
Index: src/org/eclipse/amalgam/releng/build/presentation/BuildModelWizard.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.build.model.editor/src/org/eclipse/amalgam/releng/build/presentation/BuildModelWizard.java,v
retrieving revision 1.1
diff -u -r1.1 BuildModelWizard.java
--- src/org/eclipse/amalgam/releng/build/presentation/BuildModelWizard.java	24 Nov 2008 20:38:02 -0000	1.1
+++ src/org/eclipse/amalgam/releng/build/presentation/BuildModelWizard.java	6 Jun 2010 14:35:41 -0000
@@ -104,535 +104,574 @@
  */
 public class BuildModelWizard extends Wizard implements INewWizard {
 	/**
-	 * The supported extensions for created files.
-	 * <!-- begin-user-doc -->
+   * The supported extensions for created files.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static final List<String> FILE_EXTENSIONS =
 		Collections.unmodifiableList(Arrays.asList(BuildEditorPlugin.INSTANCE.getString("_UI_BuildEditorFilenameExtensions").split("\\s*,\\s*")));
 
 	/**
-	 * A formatted list of supported file extensions, suitable for display.
-	 * <!-- begin-user-doc -->
+   * A formatted list of supported file extensions, suitable for display.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public static final String FORMATTED_FILE_EXTENSIONS =
 		BuildEditorPlugin.INSTANCE.getString("_UI_BuildEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
 
 	/**
-	 * This caches an instance of the model package.
-	 * <!-- begin-user-doc -->
+   * This caches an instance of the model package.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected BuildPackage buildPackage = BuildPackage.eINSTANCE;
 
 	/**
-	 * This caches an instance of the model factory.
-	 * <!-- begin-user-doc -->
+   * This caches an instance of the model factory.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected BuildFactory buildFactory = buildPackage.getBuildFactory();
 
 	/**
-	 * This is the file creation page.
-	 * <!-- begin-user-doc -->
+   * This is the file creation page.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected BuildModelWizardNewFileCreationPage newFileCreationPage;
 
 	/**
-	 * This is the initial object creation page.
-	 * <!-- begin-user-doc -->
+   * This is the initial object creation page.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected BuildModelWizardInitialObjectCreationPage initialObjectCreationPage;
 
 	/**
-	 * Remember the selection during initialization for populating the default container.
-	 * <!-- begin-user-doc -->
+   * Remember the selection during initialization for populating the default container.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected IStructuredSelection selection;
 
 	/**
-	 * Remember the workbench during initialization.
-	 * <!-- begin-user-doc -->
+   * Remember the workbench during initialization.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected IWorkbench workbench;
 
 	/**
-	 * Caches the names of the types that can be created as the root object.
-	 * <!-- begin-user-doc -->
+   * Caches the names of the types that can be created as the root object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected List<String> initialObjectNames;
 
 	/**
-	 * This just records the information.
-	 * <!-- begin-user-doc -->
+   * This just records the information.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.workbench = workbench;
-		this.selection = selection;
-		setWindowTitle(BuildEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(BuildEditorPlugin.INSTANCE.getImage("full/wizban/NewBuild")));
-	}
+    this.workbench = workbench;
+    this.selection = selection;
+    setWindowTitle(BuildEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
+    setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(BuildEditorPlugin.INSTANCE.getImage("full/wizban/NewBuild")));
+  }
 
 	/**
-	 * Returns the names of the types that can be created as the root object.
-	 * <!-- begin-user-doc -->
+   * Returns the names of the types that can be created as the root object.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected Collection<String> getInitialObjectNames() {
-		if (initialObjectNames == null) {
-			initialObjectNames = new ArrayList<String>();
-			for (EClassifier eClassifier : buildPackage.getEClassifiers()) {
-				if (eClassifier instanceof EClass) {
-					EClass eClass = (EClass)eClassifier;
-					if (!eClass.isAbstract()) {
-						initialObjectNames.add(eClass.getName());
-					}
-				}
-			}
-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
-		}
-		return initialObjectNames;
-	}
+    if (initialObjectNames == null)
+    {
+      initialObjectNames = new ArrayList<String>();
+      for (EClassifier eClassifier : buildPackage.getEClassifiers())
+      {
+        if (eClassifier instanceof EClass)
+        {
+          EClass eClass = (EClass)eClassifier;
+          if (!eClass.isAbstract())
+          {
+            initialObjectNames.add(eClass.getName());
+          }
+        }
+      }
+      Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+    }
+    return initialObjectNames;
+  }
 
 	/**
-	 * Create a new model.
-	 * <!-- begin-user-doc -->
+   * Create a new model.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	protected EObject createInitialModel() {
-		EClass eClass = (EClass)buildPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
-		EObject rootObject = buildFactory.create(eClass);
-		return rootObject;
-	}
+    EClass eClass = (EClass)buildPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+    EObject rootObject = buildFactory.create(eClass);
+    return rootObject;
+  }
 
 	/**
-	 * Do the work after everything is specified.
-	 * <!-- begin-user-doc -->
+   * Do the work after everything is specified.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	@Override
 	public boolean performFinish() {
-		try {
-			// Remember the file.
-			//
-			final IFile modelFile = getModelFile();
-
-			// Do the work within an operation.
-			//
-			WorkspaceModifyOperation operation =
-				new WorkspaceModifyOperation() {
-					@Override
-					protected void execute(IProgressMonitor progressMonitor) {
-						try {
-							// Create a resource set
-							//
-							ResourceSet resourceSet = new ResourceSetImpl();
-
-							// Get the URI of the model file.
-							//
-							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
-
-							// Create a resource for this file.
-							//
-							Resource resource = resourceSet.createResource(fileURI);
-
-							// Add the initial model object to the contents.
-							//
-							EObject rootObject = createInitialModel();
-							if (rootObject != null) {
-								resource.getContents().add(rootObject);
-							}
-
-							// Save the contents of the resource to the file system.
-							//
-							Map<Object, Object> options = new HashMap<Object, Object>();
-							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
-							resource.save(options);
-						}
-						catch (Exception exception) {
-							BuildEditorPlugin.INSTANCE.log(exception);
-						}
-						finally {
-							progressMonitor.done();
-						}
-					}
-				};
-
-			getContainer().run(false, false, operation);
-
-			// Select the new file resource in the current view.
-			//
-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-			IWorkbenchPage page = workbenchWindow.getActivePage();
-			final IWorkbenchPart activePart = page.getActivePart();
-			if (activePart instanceof ISetSelectionTarget) {
-				final ISelection targetSelection = new StructuredSelection(modelFile);
-				getShell().getDisplay().asyncExec
-					(new Runnable() {
-						 public void run() {
-							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
-						 }
-					 });
-			}
-
-			// Open an editor on the new file.
-			//
-			try {
-				page.openEditor
-					(new FileEditorInput(modelFile),
-					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
-			}
-			catch (PartInitException exception) {
-				MessageDialog.openError(workbenchWindow.getShell(), BuildEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
-				return false;
-			}
-
-			return true;
-		}
-		catch (Exception exception) {
-			BuildEditorPlugin.INSTANCE.log(exception);
-			return false;
-		}
-	}
+    try
+    {
+      // Remember the file.
+      //
+      final IFile modelFile = getModelFile();
+
+      // Do the work within an operation.
+      //
+      WorkspaceModifyOperation operation =
+        new WorkspaceModifyOperation()
+        {
+          @Override
+          protected void execute(IProgressMonitor progressMonitor)
+          {
+            try
+            {
+              // Create a resource set
+              //
+              ResourceSet resourceSet = new ResourceSetImpl();
+
+              // Get the URI of the model file.
+              //
+              URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+              // Create a resource for this file.
+              //
+              Resource resource = resourceSet.createResource(fileURI);
+
+              // Add the initial model object to the contents.
+              //
+              EObject rootObject = createInitialModel();
+              if (rootObject != null)
+              {
+                resource.getContents().add(rootObject);
+              }
+
+              // Save the contents of the resource to the file system.
+              //
+              Map<Object, Object> options = new HashMap<Object, Object>();
+              options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+              resource.save(options);
+            }
+            catch (Exception exception)
+            {
+              BuildEditorPlugin.INSTANCE.log(exception);
+            }
+            finally
+            {
+              progressMonitor.done();
+            }
+          }
+        };
+
+      getContainer().run(false, false, operation);
+
+      // Select the new file resource in the current view.
+      //
+      IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+      IWorkbenchPage page = workbenchWindow.getActivePage();
+      final IWorkbenchPart activePart = page.getActivePart();
+      if (activePart instanceof ISetSelectionTarget)
+      {
+        final ISelection targetSelection = new StructuredSelection(modelFile);
+        getShell().getDisplay().asyncExec
+          (new Runnable()
+           {
+             public void run()
+             {
+               ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+             }
+           });
+      }
+
+      // Open an editor on the new file.
+      //
+      try
+      {
+        page.openEditor
+          (new FileEditorInput(modelFile),
+           workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
+      }
+      catch (PartInitException exception)
+      {
+        MessageDialog.openError(workbenchWindow.getShell(), BuildEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+        return false;
+      }
+
+      return true;
+    }
+    catch (Exception exception)
+    {
+      BuildEditorPlugin.INSTANCE.log(exception);
+      return false;
+    }
+  }
 
 	/**
-	 * This is the one page of the wizard.
-	 * <!-- begin-user-doc -->
+   * This is the one page of the wizard.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public class BuildModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
 		/**
-		 * Pass in the selection.
-		 * <!-- begin-user-doc -->
+     * Pass in the selection.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		public BuildModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
-			super(pageId, selection);
-		}
+      super(pageId, selection);
+    }
 
 		/**
-		 * The framework calls this to see if the file is correct.
-		 * <!-- begin-user-doc -->
+     * The framework calls this to see if the file is correct.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		@Override
 		protected boolean validatePage() {
-			if (super.validatePage()) {
-				String extension = new Path(getFileName()).getFileExtension();
-				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";
-					setErrorMessage(BuildEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
-					return false;
-				}
-				return true;
-			}
-			return false;
-		}
+      if (super.validatePage())
+      {
+        String extension = new Path(getFileName()).getFileExtension();
+        if (extension == null || !FILE_EXTENSIONS.contains(extension))
+        {
+          String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";
+          setErrorMessage(BuildEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+          return false;
+        }
+        return true;
+      }
+      return false;
+    }
 
 		/**
-		 * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		public IFile getModelFile() {
-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
-		}
+      return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+    }
 	}
 
 	/**
-	 * This is the page where the type of object to create is selected.
-	 * <!-- begin-user-doc -->
+   * This is the page where the type of object to create is selected.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public class BuildModelWizardInitialObjectCreationPage extends WizardPage {
 		/**
-		 * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		protected Combo initialObjectField;
 
 		/**
-		 * @generated
-		 * <!-- begin-user-doc -->
+     * @generated
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 */
+     */
 		protected List<String> encodings;
 
 		/**
-		 * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		protected Combo encodingField;
 
 		/**
-		 * Pass in the selection.
-		 * <!-- begin-user-doc -->
+     * Pass in the selection.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		public BuildModelWizardInitialObjectCreationPage(String pageId) {
-			super(pageId);
-		}
+      super(pageId);
+    }
 
 		/**
-		 * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		public void createControl(Composite parent) {
-			Composite composite = new Composite(parent, SWT.NONE); {
-				GridLayout layout = new GridLayout();
-				layout.numColumns = 1;
-				layout.verticalSpacing = 12;
-				composite.setLayout(layout);
-
-				GridData data = new GridData();
-				data.verticalAlignment = GridData.FILL;
-				data.grabExcessVerticalSpace = true;
-				data.horizontalAlignment = GridData.FILL;
-				composite.setLayoutData(data);
-			}
-
-			Label containerLabel = new Label(composite, SWT.LEFT);
-			{
-				containerLabel.setText(BuildEditorPlugin.INSTANCE.getString("_UI_ModelObject"));
-
-				GridData data = new GridData();
-				data.horizontalAlignment = GridData.FILL;
-				containerLabel.setLayoutData(data);
-			}
-
-			initialObjectField = new Combo(composite, SWT.BORDER);
-			{
-				GridData data = new GridData();
-				data.horizontalAlignment = GridData.FILL;
-				data.grabExcessHorizontalSpace = true;
-				initialObjectField.setLayoutData(data);
-			}
-
-			for (String objectName : getInitialObjectNames()) {
-				initialObjectField.add(getLabel(objectName));
-			}
-
-			if (initialObjectField.getItemCount() == 1) {
-				initialObjectField.select(0);
-			}
-			initialObjectField.addModifyListener(validator);
-
-			Label encodingLabel = new Label(composite, SWT.LEFT);
-			{
-				encodingLabel.setText(BuildEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));
-
-				GridData data = new GridData();
-				data.horizontalAlignment = GridData.FILL;
-				encodingLabel.setLayoutData(data);
-			}
-			encodingField = new Combo(composite, SWT.BORDER);
-			{
-				GridData data = new GridData();
-				data.horizontalAlignment = GridData.FILL;
-				data.grabExcessHorizontalSpace = true;
-				encodingField.setLayoutData(data);
-			}
-
-			for (String encoding : getEncodings()) {
-				encodingField.add(encoding);
-			}
-
-			encodingField.select(0);
-			encodingField.addModifyListener(validator);
-
-			setPageComplete(validatePage());
-			setControl(composite);
-		}
+      Composite composite = new Composite(parent, SWT.NONE);
+      {
+        GridLayout layout = new GridLayout();
+        layout.numColumns = 1;
+        layout.verticalSpacing = 12;
+        composite.setLayout(layout);
+
+        GridData data = new GridData();
+        data.verticalAlignment = GridData.FILL;
+        data.grabExcessVerticalSpace = true;
+        data.horizontalAlignment = GridData.FILL;
+        composite.setLayoutData(data);
+      }
+
+      Label containerLabel = new Label(composite, SWT.LEFT);
+      {
+        containerLabel.setText(BuildEditorPlugin.INSTANCE.getString("_UI_ModelObject"));
+
+        GridData data = new GridData();
+        data.horizontalAlignment = GridData.FILL;
+        containerLabel.setLayoutData(data);
+      }
+
+      initialObjectField = new Combo(composite, SWT.BORDER);
+      {
+        GridData data = new GridData();
+        data.horizontalAlignment = GridData.FILL;
+        data.grabExcessHorizontalSpace = true;
+        initialObjectField.setLayoutData(data);
+      }
+
+      for (String objectName : getInitialObjectNames())
+      {
+        initialObjectField.add(getLabel(objectName));
+      }
+
+      if (initialObjectField.getItemCount() == 1)
+      {
+        initialObjectField.select(0);
+      }
+      initialObjectField.addModifyListener(validator);
+
+      Label encodingLabel = new Label(composite, SWT.LEFT);
+      {
+        encodingLabel.setText(BuildEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));
+
+        GridData data = new GridData();
+        data.horizontalAlignment = GridData.FILL;
+        encodingLabel.setLayoutData(data);
+      }
+      encodingField = new Combo(composite, SWT.BORDER);
+      {
+        GridData data = new GridData();
+        data.horizontalAlignment = GridData.FILL;
+        data.grabExcessHorizontalSpace = true;
+        encodingField.setLayoutData(data);
+      }
+
+      for (String encoding : getEncodings())
+      {
+        encodingField.add(encoding);
+      }
+
+      encodingField.select(0);
+      encodingField.addModifyListener(validator);
+
+      setPageComplete(validatePage());
+      setControl(composite);
+    }
 
 		/**
-		 * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		protected ModifyListener validator =
-			new ModifyListener() {
-				public void modifyText(ModifyEvent e) {
-					setPageComplete(validatePage());
-				}
-			};
+			new ModifyListener()
+      {
+        public void modifyText(ModifyEvent e)
+        {
+          setPageComplete(validatePage());
+        }
+      };
 
 		/**
-		 * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		protected boolean validatePage() {
-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
-		}
+      return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+    }
 
 		/**
-		 * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		@Override
 		public void setVisible(boolean visible) {
-			super.setVisible(visible);
-			if (visible) {
-				if (initialObjectField.getItemCount() == 1) {
-					initialObjectField.clearSelection();
-					encodingField.setFocus();
-				}
-				else {
-					encodingField.clearSelection();
-					initialObjectField.setFocus();
-				}
-			}
-		}
+      super.setVisible(visible);
+      if (visible)
+      {
+        if (initialObjectField.getItemCount() == 1)
+        {
+          initialObjectField.clearSelection();
+          encodingField.setFocus();
+        }
+        else
+        {
+          encodingField.clearSelection();
+          initialObjectField.setFocus();
+        }
+      }
+    }
 
 		/**
-		 * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		public String getInitialObjectName() {
-			String label = initialObjectField.getText();
+      String label = initialObjectField.getText();
 
-			for (String name : getInitialObjectNames()) {
-				if (getLabel(name).equals(label)) {
-					return name;
-				}
-			}
-			return null;
-		}
+      for (String name : getInitialObjectNames())
+      {
+        if (getLabel(name).equals(label))
+        {
+          return name;
+        }
+      }
+      return null;
+    }
 
 		/**
-		 * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		public String getEncoding() {
-			return encodingField.getText();
-		}
+      return encodingField.getText();
+    }
 
 		/**
-		 * Returns the label for the specified type name.
-		 * <!-- begin-user-doc -->
+     * Returns the label for the specified type name.
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		protected String getLabel(String typeName) {
-			try {
-				return BuildEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
-			}
-			catch(MissingResourceException mre) {
-				BuildEditorPlugin.INSTANCE.log(mre);
-			}
-			return typeName;
-		}
+      try
+      {
+        return BuildEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
+      }
+      catch(MissingResourceException mre)
+      {
+        BuildEditorPlugin.INSTANCE.log(mre);
+      }
+      return typeName;
+    }
 
 		/**
-		 * <!-- begin-user-doc -->
+     * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @generated
-		 */
+     * @generated
+     */
 		protected Collection<String> getEncodings() {
-			if (encodings == null) {
-				encodings = new ArrayList<String>();
-				for (StringTokenizer stringTokenizer = new StringTokenizer(BuildEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {
-					encodings.add(stringTokenizer.nextToken());
-				}
-			}
-			return encodings;
-		}
+      if (encodings == null)
+      {
+        encodings = new ArrayList<String>();
+        for (StringTokenizer stringTokenizer = new StringTokenizer(BuildEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); )
+        {
+          encodings.add(stringTokenizer.nextToken());
+        }
+      }
+      return encodings;
+    }
 	}
 
 	/**
-	 * The framework calls this to create the contents of the wizard.
-	 * <!-- begin-user-doc -->
+   * The framework calls this to create the contents of the wizard.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 		@Override
 	public void addPages() {
-		// Create a page, set the title, and the initial model file name.
-		//
-		newFileCreationPage = new BuildModelWizardNewFileCreationPage("Whatever", selection);
-		newFileCreationPage.setTitle(BuildEditorPlugin.INSTANCE.getString("_UI_BuildModelWizard_label"));
-		newFileCreationPage.setDescription(BuildEditorPlugin.INSTANCE.getString("_UI_BuildModelWizard_description"));
-		newFileCreationPage.setFileName(BuildEditorPlugin.INSTANCE.getString("_UI_BuildEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
-		addPage(newFileCreationPage);
-
-		// Try and get the resource selection to determine a current directory for the file dialog.
-		//
-		if (selection != null && !selection.isEmpty()) {
-			// Get the resource...
-			//
-			Object selectedElement = selection.iterator().next();
-			if (selectedElement instanceof IResource) {
-				// Get the resource parent, if its a file.
-				//
-				IResource selectedResource = (IResource)selectedElement;
-				if (selectedResource.getType() == IResource.FILE) {
-					selectedResource = selectedResource.getParent();
-				}
-
-				// This gives us a directory...
-				//
-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
-					// Set this for the container.
-					//
-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
-
-					// Make up a unique new name here.
-					//
-					String defaultModelBaseFilename = BuildEditorPlugin.INSTANCE.getString("_UI_BuildEditorFilenameDefaultBase");
-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
-					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;
-					}
-					newFileCreationPage.setFileName(modelFilename);
-				}
-			}
-		}
-		initialObjectCreationPage = new BuildModelWizardInitialObjectCreationPage("Whatever2");
-		initialObjectCreationPage.setTitle(BuildEditorPlugin.INSTANCE.getString("_UI_BuildModelWizard_label"));
-		initialObjectCreationPage.setDescription(BuildEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
-		addPage(initialObjectCreationPage);
-	}
+    // Create a page, set the title, and the initial model file name.
+    //
+    newFileCreationPage = new BuildModelWizardNewFileCreationPage("Whatever", selection);
+    newFileCreationPage.setTitle(BuildEditorPlugin.INSTANCE.getString("_UI_BuildModelWizard_label"));
+    newFileCreationPage.setDescription(BuildEditorPlugin.INSTANCE.getString("_UI_BuildModelWizard_description"));
+    newFileCreationPage.setFileName(BuildEditorPlugin.INSTANCE.getString("_UI_BuildEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
+    addPage(newFileCreationPage);
+
+    // Try and get the resource selection to determine a current directory for the file dialog.
+    //
+    if (selection != null && !selection.isEmpty())
+    {
+      // Get the resource...
+      //
+      Object selectedElement = selection.iterator().next();
+      if (selectedElement instanceof IResource)
+      {
+        // Get the resource parent, if its a file.
+        //
+        IResource selectedResource = (IResource)selectedElement;
+        if (selectedResource.getType() == IResource.FILE)
+        {
+          selectedResource = selectedResource.getParent();
+        }
+
+        // This gives us a directory...
+        //
+        if (selectedResource instanceof IFolder || selectedResource instanceof IProject)
+        {
+          // Set this for the container.
+          //
+          newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+          // Make up a unique new name here.
+          //
+          String defaultModelBaseFilename = BuildEditorPlugin.INSTANCE.getString("_UI_BuildEditorFilenameDefaultBase");
+          String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
+          String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
+          for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i)
+          {
+            modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;
+          }
+          newFileCreationPage.setFileName(modelFilename);
+        }
+      }
+    }
+    initialObjectCreationPage = new BuildModelWizardInitialObjectCreationPage("Whatever2");
+    initialObjectCreationPage.setTitle(BuildEditorPlugin.INSTANCE.getString("_UI_BuildModelWizard_label"));
+    initialObjectCreationPage.setDescription(BuildEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
+    addPage(initialObjectCreationPage);
+  }
 
 	/**
-	 * Get the file from the page.
-	 * <!-- begin-user-doc -->
+   * Get the file from the page.
+   * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
+   * @generated
+   */
 	public IFile getModelFile() {
-		return newFileCreationPage.getModelFile();
-	}
+    return newFileCreationPage.getModelFile();
+  }
 
 }
#P org.eclipse.amalgam.releng.builder
Index: model/build.ecore
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.amalgam/releng/org.eclipse.amalgam.releng.builder/model/build.ecore,v
retrieving revision 1.19
diff -u -r1.19 build.ecore
--- model/build.ecore	21 May 2009 12:57:51 -0000	1.19
+++ model/build.ecore	6 Jun 2010 14:35:46 -0000
@@ -101,17 +101,27 @@
     <eLiterals name="win32"/>
     <eLiterals name="linux" value="1"/>
     <eLiterals name="macosx" value="2"/>
+    <eLiterals name="aix" value="3"/>
+    <eLiterals name="hpux" value="4"/>
+    <eLiterals name="solaris" value="5"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="WS">
     <eLiterals name="win32"/>
     <eLiterals name="gtk" value="1"/>
     <eLiterals name="carbon" value="2"/>
     <eLiterals name="cocoa" value="3" literal="cocoa"/>
+    <eLiterals name="motif" value="4"/>
+    <eLiterals name="solaris" value="5"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="ARCH">
     <eLiterals name="x86"/>
     <eLiterals name="ppc" value="1"/>
     <eLiterals name="x86_64" value="2"/>
+    <eLiterals name="ia64_32" value="3"/>
+    <eLiterals name="ppc64" value="4"/>
+    <eLiterals name="s390" value="5"/>
+    <eLiterals name="s390x" value="6"/>
+    <eLiterals name="sparc" value="6"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="ArchiveFormat">
     <eLiterals name="zip"/>

Back to the top