Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GLSP-1398: Properly configure default types #245

Merged
merged 2 commits into from
Aug 30, 2024
Merged

GLSP-1398: Properly configure default types #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
468de1b
GLSP-1398: Properly configure default types
tortmayr Aug 28, 2024
e5b99d7
Address review feedback
tortmayr Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions plugins/org.eclipse.glsp.graph/model/glsp-graph.ecore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,4 +136,7 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="resizeLocations" upperBound="-1"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="GForeignObjectElement" eSuperTypes="#//GShapePreRenderedElement">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="namespace" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
</ecore:EPackage>
3 changes: 3 additions & 0 deletions plugins/org.eclipse.glsp.graph/model/glsp-graph.genmodel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,8 @@
<genClasses ecoreClass="glsp-graph.ecore#//GResizable">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EAttribute glsp-graph.ecore#//GResizable/resizeLocations"/>
</genClasses>
<genClasses ecoreClass="glsp-graph.ecore#//GForeignObjectElement">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute glsp-graph.ecore#//GForeignObjectElement/namespace"/>
</genClasses>
</genPackages>
</genmodel:GenModel>
58 changes: 58 additions & 0 deletions plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GForeignObjectElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/**
* Copyright (c) 2019-2022 EclipseSource and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
* https://www.eclipse.org/legal/epl-2.0.
*
* This Source Code may also be made available under the following Secondary
* Licenses when the conditions for such availability set forth in the Eclipse
* Public License v. 2.0 are satisfied: GNU General Public License, version 2
* with the GNU Classpath Exception which is available at
* https://www.gnu.org/software/classpath/license.html.
*
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
* ********************************************************************************
*/
package org.eclipse.glsp.graph;

/**
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>GForeign Object Element</b></em>'.
* <!-- end-user-doc -->
*
* <p>
* The following features are supported:
* </p>
* <ul>
* <li>{@link org.eclipse.glsp.graph.GForeignObjectElement#getNamespace <em>Namespace</em>}</li>
* </ul>
*
* @see org.eclipse.glsp.graph.GraphPackage#getGForeignObjectElement()
* @model
* @generated
*/
public interface GForeignObjectElement extends GShapePreRenderedElement {
/**
* Returns the value of the '<em><b>Namespace</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the value of the '<em>Namespace</em>' attribute.
* @see #setNamespace(String)
* @see org.eclipse.glsp.graph.GraphPackage#getGForeignObjectElement_Namespace()
* @model
* @generated
*/
String getNamespace();

/**
* Sets the value of the '{@link org.eclipse.glsp.graph.GForeignObjectElement#getNamespace <em>Namespace</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @param value the new value of the '<em>Namespace</em>' attribute.
* @see #getNamespace()
* @generated
*/
void setNamespace(String value);

} // GForeignObjectElement
9 changes: 9 additions & 0 deletions plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GraphFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,15 @@ public interface GraphFactory extends EFactory {
*/
GResizable createGResizable();

/**
* Returns a new object of class '<em>GForeign Object Element</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return a new object of class '<em>GForeign Object Element</em>'.
* @generated
*/
GForeignObjectElement createGForeignObjectElement();

/**
* Returns the package supported by this factory.
* <!-- begin-user-doc -->
Expand Down
168 changes: 167 additions & 1 deletion plugins/org.eclipse.glsp.graph/src-gen/org/eclipse/glsp/graph/GraphPackage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2438,6 +2438,133 @@ public interface GraphPackage extends EPackage {
*/
int GRESIZABLE_OPERATION_COUNT = 0;

/**
* The meta object id for the '{@link org.eclipse.glsp.graph.impl.GForeignObjectElementImpl <em>GForeign Object Element</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.eclipse.glsp.graph.impl.GForeignObjectElementImpl
* @see org.eclipse.glsp.graph.impl.GraphPackageImpl#getGForeignObjectElement()
* @generated
*/
int GFOREIGN_OBJECT_ELEMENT = 27;

/**
* The feature id for the '<em><b>Args</b></em>' map.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int GFOREIGN_OBJECT_ELEMENT__ARGS = GSHAPE_PRE_RENDERED_ELEMENT__ARGS;

/**
* The feature id for the '<em><b>Id</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int GFOREIGN_OBJECT_ELEMENT__ID = GSHAPE_PRE_RENDERED_ELEMENT__ID;

/**
* The feature id for the '<em><b>Css Classes</b></em>' attribute list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int GFOREIGN_OBJECT_ELEMENT__CSS_CLASSES = GSHAPE_PRE_RENDERED_ELEMENT__CSS_CLASSES;

/**
* The feature id for the '<em><b>Children</b></em>' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int GFOREIGN_OBJECT_ELEMENT__CHILDREN = GSHAPE_PRE_RENDERED_ELEMENT__CHILDREN;

/**
* The feature id for the '<em><b>Parent</b></em>' container reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int GFOREIGN_OBJECT_ELEMENT__PARENT = GSHAPE_PRE_RENDERED_ELEMENT__PARENT;

/**
* The feature id for the '<em><b>Trace</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int GFOREIGN_OBJECT_ELEMENT__TRACE = GSHAPE_PRE_RENDERED_ELEMENT__TRACE;

/**
* The feature id for the '<em><b>Type</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int GFOREIGN_OBJECT_ELEMENT__TYPE = GSHAPE_PRE_RENDERED_ELEMENT__TYPE;

/**
* The feature id for the '<em><b>Code</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int GFOREIGN_OBJECT_ELEMENT__CODE = GSHAPE_PRE_RENDERED_ELEMENT__CODE;

/**
* The feature id for the '<em><b>Position</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int GFOREIGN_OBJECT_ELEMENT__POSITION = GSHAPE_PRE_RENDERED_ELEMENT__POSITION;

/**
* The feature id for the '<em><b>Size</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int GFOREIGN_OBJECT_ELEMENT__SIZE = GSHAPE_PRE_RENDERED_ELEMENT__SIZE;

/**
* The feature id for the '<em><b>Namespace</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int GFOREIGN_OBJECT_ELEMENT__NAMESPACE = GSHAPE_PRE_RENDERED_ELEMENT_FEATURE_COUNT + 0;

/**
* The number of structural features of the '<em>GForeign Object Element</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int GFOREIGN_OBJECT_ELEMENT_FEATURE_COUNT = GSHAPE_PRE_RENDERED_ELEMENT_FEATURE_COUNT + 1;

/**
* The number of operations of the '<em>GForeign Object Element</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
int GFOREIGN_OBJECT_ELEMENT_OPERATION_COUNT = GSHAPE_PRE_RENDERED_ELEMENT_OPERATION_COUNT + 0;

/**
* The meta object id for the '{@link org.eclipse.glsp.graph.GSeverity <em>GSeverity</em>}' enum.
* <!-- begin-user-doc -->
Expand All @@ -2446,7 +2573,7 @@ public interface GraphPackage extends EPackage {
* @see org.eclipse.glsp.graph.impl.GraphPackageImpl#getGSeverity()
* @generated
*/
int GSEVERITY = 27;
int GSEVERITY = 28;

/**
* Returns the meta object for class '{@link org.eclipse.glsp.graph.GModelElement <em>GModel Element</em>}'.
Expand Down Expand Up @@ -3193,6 +3320,27 @@ public interface GraphPackage extends EPackage {
*/
EAttribute getGResizable_ResizeLocations();

/**
* Returns the meta object for class '{@link org.eclipse.glsp.graph.GForeignObjectElement <em>GForeign Object Element</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>GForeign Object Element</em>'.
* @see org.eclipse.glsp.graph.GForeignObjectElement
* @generated
*/
EClass getGForeignObjectElement();

/**
* Returns the meta object for the attribute '{@link org.eclipse.glsp.graph.GForeignObjectElement#getNamespace <em>Namespace</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Namespace</em>'.
* @see org.eclipse.glsp.graph.GForeignObjectElement#getNamespace()
* @see #getGForeignObjectElement()
* @generated
*/
EAttribute getGForeignObjectElement_Namespace();

/**
* Returns the meta object for enum '{@link org.eclipse.glsp.graph.GSeverity <em>GSeverity</em>}'.
* <!-- begin-user-doc -->
Expand Down Expand Up @@ -3840,6 +3988,24 @@ interface Literals {
*/
EAttribute GRESIZABLE__RESIZE_LOCATIONS = eINSTANCE.getGResizable_ResizeLocations();

/**
* The meta object literal for the '{@link org.eclipse.glsp.graph.impl.GForeignObjectElementImpl <em>GForeign Object Element</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.eclipse.glsp.graph.impl.GForeignObjectElementImpl
* @see org.eclipse.glsp.graph.impl.GraphPackageImpl#getGForeignObjectElement()
* @generated
*/
EClass GFOREIGN_OBJECT_ELEMENT = eINSTANCE.getGForeignObjectElement();

/**
* The meta object literal for the '<em><b>Namespace</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
EAttribute GFOREIGN_OBJECT_ELEMENT__NAMESPACE = eINSTANCE.getGForeignObjectElement_Namespace();

/**
* The meta object literal for the '{@link org.eclipse.glsp.graph.GSeverity <em>GSeverity</em>}' enum.
* <!-- begin-user-doc -->
Expand Down
Loading
Loading