Enrich the preferences model

1 files changed, 16 insertions, 28 deletions

diff --git a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferenceNode.java b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferenceNode.java
index 9b24a2c5d4..9c1674f3b0 100644
--- a/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferenceNode.java
+++ b/plugins/org.eclipse.emf.cdo.releng.preferences/src/org/eclipse/emf/cdo/releng/preferences/PreferenceNode.java
@@ -11,7 +11,6 @@
 package org.eclipse.emf.cdo.releng.preferences;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
 
 /**
  * <!-- begin-user-doc -->
@@ -21,10 +20,9 @@ import org.eclipse.emf.ecore.EObject;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.emf.cdo.releng.preferences.PreferenceNode#getChildren <em>Children</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.releng.preferences.PreferenceNode#getParent <em>Parent</em>}</li>
+ *   <li>{@link org.eclipse.emf.cdo.releng.preferences.PreferenceNode#getChildren <em>Children</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.releng.preferences.PreferenceNode#getProperties <em>Properties</em>}</li>
- *   <li>{@link org.eclipse.emf.cdo.releng.preferences.PreferenceNode#getName <em>Name</em>}</li>
  *   <li>{@link org.eclipse.emf.cdo.releng.preferences.PreferenceNode#getLocation <em>Location</em>}</li>
  * </ul>
  * </p>
@@ -33,7 +31,7 @@ import org.eclipse.emf.ecore.EObject;
  * @model
  * @generated
  */
-public interface PreferenceNode extends EObject
+public interface PreferenceNode extends PreferenceItem
 {
   /**
    * Returns the value of the '<em><b>Children</b></em>' containment reference list.
@@ -48,7 +46,7 @@ public interface PreferenceNode extends EObject
    * @return the value of the '<em>Children</em>' containment reference list.
    * @see org.eclipse.emf.cdo.releng.preferences.PreferencesPackage#getPreferenceNode_Children()
    * @see org.eclipse.emf.cdo.releng.preferences.PreferenceNode#getParent
-   * @model opposite="parent" containment="true" keys="name"
+   * @model opposite="parent" containment="true"
    * @generated
    */
   EList<PreferenceNode> getChildren();
@@ -100,45 +98,35 @@ public interface PreferenceNode extends EObject
   EList<Property> getProperties();
 
   /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * Returns the value of the '<em><b>Location</b></em>' attribute.
    * <!-- begin-user-doc -->
    * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
+   * 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>Name</em>' attribute.
-   * @see #setName(String)
-   * @see org.eclipse.emf.cdo.releng.preferences.PreferencesPackage#getPreferenceNode_Name()
-   * @model required="true"
+   * @return the value of the '<em>Location</em>' attribute.
+   * @see org.eclipse.emf.cdo.releng.preferences.PreferencesPackage#getPreferenceNode_Location()
+   * @model transient="true" changeable="false" volatile="true" derived="true"
    * @generated
    */
-  String getName();
+  String getLocation();
 
   /**
-   * Sets the value of the '{@link org.eclipse.emf.cdo.releng.preferences.PreferenceNode#getName <em>Name</em>}' attribute.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #getName()
+   * @model
    * @generated
    */
-  void setName(String value);
+  PreferenceNode getNode(String name);
 
   /**
-   * 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 org.eclipse.emf.cdo.releng.preferences.PreferencesPackage#getPreferenceNode_Location()
-   * @model transient="true" changeable="false" volatile="true" derived="true"
+   * @model
    * @generated
    */
-  String getLocation();
+  Property getProperty(String name);
 
   /**
    * <!-- begin-user-doc -->
@@ -146,14 +134,14 @@ public interface PreferenceNode extends EObject
    * @model
    * @generated
    */
-  PreferenceNode getNode(String name);
+  PreferenceNode getInScope(String scopeName);
 
   /**
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @model
+   * @model kind="operation"
    * @generated
    */
-  Property getProperty(String name);
+  PreferenceNode getInScope();
 
 } // PreferenceNode