Author: dazarov
Date: 2008-09-17 12:04:26 -0400 (Wed, 17 Sep 2008)
New Revision: 10338
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.ecore
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.genmodel
Removed:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.ecore
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.genmodel
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/Page.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PagesFactory.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PagesPackage.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageExceptionImpl.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesFactoryImpl.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesPackageImpl.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/util/PagesAdapterFactory.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/util/PagesSwitch.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2780
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java 2008-09-17
15:56:10 UTC (rev 10337)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java 2008-09-17
16:04:26 UTC (rev 10338)
@@ -30,7 +30,7 @@
int x = Integer.parseInt(p.getProperty("mouse.x"));
int y = Integer.parseInt(p.getProperty("mouse.y"));
- PageException newException = PagesFactoryImpl.eINSTANCE.createPgException();
+ PageException newException = PagesFactoryImpl.eINSTANCE.createPageException();
newException.setName("<initialize>");
newException.setLocation(new Point(x,y));
part.getPagesModel().getChildren().add(newException);
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/Page.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/Page.java 2008-09-17
15:56:10 UTC (rev 10337)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/Page.java 2008-09-17
16:04:26 UTC (rev 10338)
@@ -8,7 +8,24 @@
* @model
*/
public interface Page extends PagesElement{
+
/**
+ * returns true if page view has page element
+ * @model
+ */
+ public boolean isConfirmed();
+
+ /**
+ * Sets the value of the '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page#isConfirmed
<em>Confirmed</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Confirmed</em>'
attribute.
+ * @see #isConfirmed()
+ * @generated
+ */
+ void setConfirmed(boolean value);
+
+ /**
* returns true if params are visible
* @model
*/
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PagesFactory.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PagesFactory.java 2008-09-17
15:56:10 UTC (rev 10337)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PagesFactory.java 2008-09-17
16:04:26 UTC (rev 10338)
@@ -62,13 +62,13 @@
Param createParam();
/**
- * Returns a new object of class '<em>Pg Exception</em>'.
+ * Returns a new object of class '<em>Page Exception</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return a new object of class '<em>Pg Exception</em>'.
+ * @return a new object of class '<em>Page Exception</em>'.
* @generated
*/
- PageException createPgException();
+ PageException createPageException();
/**
* Returns the package supported by this factory.
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PagesPackage.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PagesPackage.java 2008-09-17
15:56:10 UTC (rev 10337)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PagesPackage.java 2008-09-17
16:04:26 UTC (rev 10338)
@@ -307,13 +307,22 @@
int PAGE__PARAMS_VISIBLE = PAGES_ELEMENT_FEATURE_COUNT + 0;
/**
+ * The feature id for the '<em><b>Confirmed</b></em>'
attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int PAGE__CONFIRMED = PAGES_ELEMENT_FEATURE_COUNT + 1;
+
+ /**
* The number of structural features of the '<em>Page</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int PAGE_FEATURE_COUNT = PAGES_ELEMENT_FEATURE_COUNT + 1;
+ int PAGE_FEATURE_COUNT = PAGES_ELEMENT_FEATURE_COUNT + 2;
/**
* The meta object id for the '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PagesModelImpl
<em>Model</em>}' class.
@@ -507,14 +516,14 @@
int PARAM_FEATURE_COUNT = PAGES_ELEMENT_FEATURE_COUNT + 1;
/**
- * The meta object id for the '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PageExceptionImpl <em>Pg
Exception</em>}' class.
+ * The meta object id for the '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PageExceptionImpl <em>Page
Exception</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PageExceptionImpl
- * @see
org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PagesPackageImpl#getPgException()
+ * @see
org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PagesPackageImpl#getPageException()
* @generated
*/
- int PG_EXCEPTION = 5;
+ int PAGE_EXCEPTION = 5;
/**
* The feature id for the '<em><b>Name</b></em>'
attribute.
@@ -523,7 +532,7 @@
* @generated
* @ordered
*/
- int PG_EXCEPTION__NAME = PAGES_ELEMENT__NAME;
+ int PAGE_EXCEPTION__NAME = PAGES_ELEMENT__NAME;
/**
* The feature id for the '<em><b>Location</b></em>'
attribute.
@@ -532,7 +541,7 @@
* @generated
* @ordered
*/
- int PG_EXCEPTION__LOCATION = PAGES_ELEMENT__LOCATION;
+ int PAGE_EXCEPTION__LOCATION = PAGES_ELEMENT__LOCATION;
/**
* The feature id for the '<em><b>Size</b></em>'
attribute.
@@ -541,7 +550,7 @@
* @generated
* @ordered
*/
- int PG_EXCEPTION__SIZE = PAGES_ELEMENT__SIZE;
+ int PAGE_EXCEPTION__SIZE = PAGES_ELEMENT__SIZE;
/**
* The feature id for the '<em><b>Children</b></em>'
reference list.
@@ -550,7 +559,7 @@
* @generated
* @ordered
*/
- int PG_EXCEPTION__CHILDREN = PAGES_ELEMENT__CHILDREN;
+ int PAGE_EXCEPTION__CHILDREN = PAGES_ELEMENT__CHILDREN;
/**
* The feature id for the '<em><b>Parent</b></em>'
reference.
@@ -559,7 +568,7 @@
* @generated
* @ordered
*/
- int PG_EXCEPTION__PARENT = PAGES_ELEMENT__PARENT;
+ int PAGE_EXCEPTION__PARENT = PAGES_ELEMENT__PARENT;
/**
* The feature id for the '<em><b>Input Links</b></em>'
reference list.
@@ -568,7 +577,7 @@
* @generated
* @ordered
*/
- int PG_EXCEPTION__INPUT_LINKS = PAGES_ELEMENT__INPUT_LINKS;
+ int PAGE_EXCEPTION__INPUT_LINKS = PAGES_ELEMENT__INPUT_LINKS;
/**
* The feature id for the '<em><b>Output Links</b></em>'
reference list.
@@ -577,7 +586,7 @@
* @generated
* @ordered
*/
- int PG_EXCEPTION__OUTPUT_LINKS = PAGES_ELEMENT__OUTPUT_LINKS;
+ int PAGE_EXCEPTION__OUTPUT_LINKS = PAGES_ELEMENT__OUTPUT_LINKS;
/**
* The feature id for the '<em><b>Data</b></em>'
attribute.
@@ -586,16 +595,16 @@
* @generated
* @ordered
*/
- int PG_EXCEPTION__DATA = PAGES_ELEMENT__DATA;
+ int PAGE_EXCEPTION__DATA = PAGES_ELEMENT__DATA;
/**
- * The number of structural features of the '<em>Pg Exception</em>'
class.
+ * The number of structural features of the '<em>Page
Exception</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int PG_EXCEPTION_FEATURE_COUNT = PAGES_ELEMENT_FEATURE_COUNT + 0;
+ int PAGE_EXCEPTION_FEATURE_COUNT = PAGES_ELEMENT_FEATURE_COUNT + 0;
/**
* The meta object id for the '<em>Point</em>' data type.
@@ -705,6 +714,17 @@
EAttribute getPage_ParamsVisible();
/**
+ * Returns the meta object for the attribute '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page#isConfirmed
<em>Confirmed</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Confirmed</em>'.
+ * @see org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page#isConfirmed()
+ * @see #getPage()
+ * @generated
+ */
+ EAttribute getPage_Confirmed();
+
+ /**
* Returns the meta object for class '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement
<em>Element</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -834,14 +854,14 @@
EAttribute getParam_Value();
/**
- * Returns the meta object for class '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException <em>Pg
Exception</em>}'.
+ * Returns the meta object for class '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException <em>Page
Exception</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for class '<em>Pg Exception</em>'.
+ * @return the meta object for class '<em>Page Exception</em>'.
* @see org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException
* @generated
*/
- EClass getPgException();
+ EClass getPageException();
/**
* Returns the meta object for data type '{@link org.eclipse.draw2d.geometry.Point
<em>Point</em>}'.
@@ -956,6 +976,14 @@
EAttribute PAGE__PARAMS_VISIBLE = eINSTANCE.getPage_ParamsVisible();
/**
+ * The meta object literal for the
'<em><b>Confirmed</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute PAGE__CONFIRMED = eINSTANCE.getPage_Confirmed();
+
+ /**
* The meta object literal for the '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PagesElementImpl
<em>Element</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1058,14 +1086,14 @@
EAttribute PARAM__VALUE = eINSTANCE.getParam_Value();
/**
- * The meta object literal for the '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PageExceptionImpl <em>Pg
Exception</em>}' class.
+ * The meta object literal for the '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PageExceptionImpl <em>Page
Exception</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PageExceptionImpl
- * @see
org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PagesPackageImpl#getPgException()
+ * @see
org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PagesPackageImpl#getPageException()
* @generated
*/
- EClass PG_EXCEPTION = eINSTANCE.getPgException();
+ EClass PAGE_EXCEPTION = eINSTANCE.getPageException();
/**
* The meta object literal for the '<em>Point</em>' data type.
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageExceptionImpl.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageExceptionImpl.java 2008-09-17
15:56:10 UTC (rev 10337)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageExceptionImpl.java 2008-09-17
16:04:26 UTC (rev 10338)
@@ -41,7 +41,7 @@
*/
@Override
protected EClass eStaticClass() {
- return PagesPackage.Literals.PG_EXCEPTION;
+ return PagesPackage.Literals.PAGE_EXCEPTION;
}
/**
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java 2008-09-17
15:56:10 UTC (rev 10337)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageImpl.java 2008-09-17
16:04:26 UTC (rev 10338)
@@ -18,6 +18,7 @@
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.jst.web.model.ReferenceObject;
import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement;
@@ -33,6 +34,7 @@
* The following features are implemented:
* <ul>
* <li>{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PageImpl#isParamsVisible
<em>Params Visible</em>}</li>
+ * <li>{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PageImpl#isConfirmed
<em>Confirmed</em>}</li>
* </ul>
* </p>
*
@@ -63,10 +65,30 @@
protected boolean paramsVisible = PARAMS_VISIBLE_EDEFAULT;
/**
+ * The default value of the '{@link #isConfirmed()
<em>Confirmed</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @see #isConfirmed()
* @generated
+ * @ordered
*/
+ protected static final boolean CONFIRMED_EDEFAULT = false;
+
+ /**
+ * The cached value of the '{@link #isConfirmed()
<em>Confirmed</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #isConfirmed()
+ * @generated
+ * @ordered
+ */
+ protected boolean confirmed = CONFIRMED_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
protected PageImpl() {
super();
}
@@ -107,11 +129,34 @@
* <!-- end-user-doc -->
* @generated
*/
+ public boolean isConfirmed() {
+ return confirmed;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setConfirmed(boolean newConfirmed) {
+ boolean oldConfirmed = confirmed;
+ confirmed = newConfirmed;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, PagesPackage.PAGE__CONFIRMED,
oldConfirmed, confirmed));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case PagesPackage.PAGE__PARAMS_VISIBLE:
return isParamsVisible() ? Boolean.TRUE : Boolean.FALSE;
+ case PagesPackage.PAGE__CONFIRMED:
+ return isConfirmed() ? Boolean.TRUE : Boolean.FALSE;
}
return super.eGet(featureID, resolve, coreType);
}
@@ -127,6 +172,9 @@
case PagesPackage.PAGE__PARAMS_VISIBLE:
setParamsVisible(((Boolean)newValue).booleanValue());
return;
+ case PagesPackage.PAGE__CONFIRMED:
+ setConfirmed(((Boolean)newValue).booleanValue());
+ return;
}
super.eSet(featureID, newValue);
}
@@ -142,6 +190,9 @@
case PagesPackage.PAGE__PARAMS_VISIBLE:
setParamsVisible(PARAMS_VISIBLE_EDEFAULT);
return;
+ case PagesPackage.PAGE__CONFIRMED:
+ setConfirmed(CONFIRMED_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -156,6 +207,8 @@
switch (featureID) {
case PagesPackage.PAGE__PARAMS_VISIBLE:
return paramsVisible != PARAMS_VISIBLE_EDEFAULT;
+ case PagesPackage.PAGE__CONFIRMED:
+ return confirmed != CONFIRMED_EDEFAULT;
}
return super.eIsSet(featureID);
}
@@ -172,6 +225,8 @@
StringBuffer result = new StringBuffer(super.toString());
result.append(" (paramsVisible: ");
result.append(paramsVisible);
+ result.append(", confirmed: ");
+ result.append(confirmed);
result.append(')');
return result.toString();
}
@@ -205,6 +260,15 @@
if (shape != null && shape.length >= 4) {
setSize(new Dimension(shape[2], shape[3]));
}
+
+ boolean confirmed = true;
+
+ if(getData() != null && getData() instanceof ReferenceObject &&
((ReferenceObject)getData()).getReference() == null){
+ confirmed = false;
+ }
+
+ if(isConfirmed() != confirmed)
+ setConfirmed(confirmed);
String newParams = item.getAttributeValue("params");
if (newParams == null)
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesFactoryImpl.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesFactoryImpl.java 2008-09-17
15:56:10 UTC (rev 10337)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesFactoryImpl.java 2008-09-17
16:04:26 UTC (rev 10338)
@@ -68,7 +68,7 @@
case PagesPackage.PAGE: return createPage();
case PagesPackage.PAGES_MODEL: return createPagesModel();
case PagesPackage.PARAM: return createParam();
- case PagesPackage.PG_EXCEPTION: return createPgException();
+ case PagesPackage.PAGE_EXCEPTION: return createPageException();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() +
"' is not a valid classifier");
}
@@ -153,9 +153,9 @@
* <!-- end-user-doc -->
* @generated
*/
- public PageException createPgException() {
- PageExceptionImpl pgException = new PageExceptionImpl();
- return pgException;
+ public PageException createPageException() {
+ PageExceptionImpl pageException = new PageExceptionImpl();
+ return pageException;
}
/**
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java 2008-09-17
15:56:10 UTC (rev 10337)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java 2008-09-17
16:04:26 UTC (rev 10338)
@@ -236,7 +236,7 @@
page.dataChanged();
getChildren().add(page);
} else if(SeamPagesConstants.TYPE_EXCEPTION.equals(type)) {
- PageException exc = PagesFactory.eINSTANCE.createPgException();
+ PageException exc = PagesFactory.eINSTANCE.createPageException();
bindElement(item, exc);
exc.dataChanged();
getChildren().add(exc);
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesPackageImpl.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesPackageImpl.java 2008-09-17
15:56:10 UTC (rev 10337)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesPackageImpl.java 2008-09-17
16:04:26 UTC (rev 10338)
@@ -73,7 +73,7 @@
* <!-- end-user-doc -->
* @generated
*/
- private EClass pgExceptionEClass = null;
+ private EClass pageExceptionEClass = null;
/**
* <!-- begin-user-doc -->
@@ -234,6 +234,15 @@
* <!-- end-user-doc -->
* @generated
*/
+ public EAttribute getPage_Confirmed() {
+ return (EAttribute)pageEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getPagesElement() {
return pagesElementEClass;
}
@@ -342,8 +351,8 @@
* <!-- end-user-doc -->
* @generated
*/
- public EClass getPgException() {
- return pgExceptionEClass;
+ public EClass getPageException() {
+ return pageExceptionEClass;
}
/**
@@ -401,6 +410,7 @@
pageEClass = createEClass(PAGE);
createEAttribute(pageEClass, PAGE__PARAMS_VISIBLE);
+ createEAttribute(pageEClass, PAGE__CONFIRMED);
pagesElementEClass = createEClass(PAGES_ELEMENT);
createEAttribute(pagesElementEClass, PAGES_ELEMENT__NAME);
@@ -417,7 +427,7 @@
paramEClass = createEClass(PARAM);
createEAttribute(paramEClass, PARAM__VALUE);
- pgExceptionEClass = createEClass(PG_EXCEPTION);
+ pageExceptionEClass = createEClass(PAGE_EXCEPTION);
// Create data types
pointEDataType = createEDataType(POINT);
@@ -455,7 +465,7 @@
pageEClass.getESuperTypes().add(this.getPagesElement());
pagesModelEClass.getESuperTypes().add(this.getPagesElement());
paramEClass.getESuperTypes().add(this.getPagesElement());
- pgExceptionEClass.getESuperTypes().add(this.getPagesElement());
+ pageExceptionEClass.getESuperTypes().add(this.getPagesElement());
// Initialize classes and features; add operations and parameters
initEClass(linkEClass, Link.class, "Link", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
@@ -467,6 +477,7 @@
initEClass(pageEClass, Page.class, "Page", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getPage_ParamsVisible(), ecorePackage.getEBoolean(),
"paramsVisible", null, 0, 1, Page.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPage_Confirmed(), ecorePackage.getEBoolean(), "confirmed",
null, 0, 1, Page.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(pagesElementEClass, PagesElement.class, "PagesElement",
IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getPagesElement_Name(), ecorePackage.getEString(), "name",
null, 0, 1, PagesElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -483,7 +494,7 @@
initEClass(paramEClass, Param.class, "Param", !IS_ABSTRACT, !IS_INTERFACE,
IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getParam_Value(), ecorePackage.getEString(), "value", null, 0,
1, Param.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(pgExceptionEClass, PageException.class, "PgException",
!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEClass(pageExceptionEClass, PageException.class, "PageException",
!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
// Initialize data types
initEDataType(pointEDataType, Point.class, "Point", IS_SERIALIZABLE,
!IS_GENERATED_INSTANCE_CLASS);
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/util/PagesAdapterFactory.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/util/PagesAdapterFactory.java 2008-09-17
15:56:10 UTC (rev 10337)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/util/PagesAdapterFactory.java 2008-09-17
16:04:26 UTC (rev 10338)
@@ -92,8 +92,8 @@
return createParamAdapter();
}
@Override
- public Adapter casePgException(PageException object) {
- return createPgExceptionAdapter();
+ public Adapter casePageException(PageException object) {
+ return createPageExceptionAdapter();
}
@Override
public Adapter defaultCase(EObject object) {
@@ -186,7 +186,7 @@
}
/**
- * Creates a new adapter for an object of class '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException <em>Pg
Exception</em>}'.
+ * Creates a new adapter for an object of class '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException <em>Page
Exception</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.
@@ -195,7 +195,7 @@
* @see org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException
* @generated
*/
- public Adapter createPgExceptionAdapter() {
+ public Adapter createPageExceptionAdapter() {
return null;
}
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/util/PagesSwitch.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/util/PagesSwitch.java 2008-09-17
15:56:10 UTC (rev 10337)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/util/PagesSwitch.java 2008-09-17
16:04:26 UTC (rev 10338)
@@ -120,10 +120,10 @@
if (result == null) result = defaultCase(theEObject);
return result;
}
- case PagesPackage.PG_EXCEPTION: {
- PageException pgException = (PageException)theEObject;
- T result = casePgException(pgException);
- if (result == null) result = casePagesElement(pgException);
+ case PagesPackage.PAGE_EXCEPTION: {
+ PageException pageException = (PageException)theEObject;
+ T result = casePageException(pageException);
+ if (result == null) result = casePagesElement(pageException);
if (result == null) result = defaultCase(theEObject);
return result;
}
@@ -207,17 +207,17 @@
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Pg
Exception</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Page
Exception</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>Pg
Exception</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Page
Exception</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
- public T casePgException(PageException object) {
+ public T casePageException(PageException object) {
return null;
}
Deleted:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.ecore
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.ecore 2008-09-17
15:56:10 UTC (rev 10337)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.ecore 2008-09-17
16:04:26 UTC (rev 10338)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-
xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="pages"
- nsURI="http:///org/jboss/tools/seam/ui/pages/editor/ecore/pages.ecore"
nsPrefix="org.jboss.tools.seam.ui.pages.editor.ecore.pages">
- <eClassifiers xsi:type="ecore:EClass" name="Link">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name"
eType="ecore:EDataType
http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference"
name="fromElement" eType="#//PagesElement"
- eOpposite="#//PagesElement/outputLinks"/>
- <eStructuralFeatures xsi:type="ecore:EReference"
name="toElement" eType="#//PagesElement"
- eOpposite="#//PagesElement/inputLinks"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute"
name="shortcut" eType="ecore:EDataType
http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="data"
eType="ecore:EDataType
http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Page"
eSuperTypes="#//PagesElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute"
name="paramsVisible" eType="ecore:EDataType
http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PagesElement"
abstract="true">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name"
eType="ecore:EDataType
http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute"
name="location" eType="#//Point"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="size"
eType="#//Dimension"/>
- <eStructuralFeatures xsi:type="ecore:EReference"
name="children" upperBound="-1"
- eType="#//PagesElement"
eOpposite="#//PagesElement/parent"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="parent"
eType="#//PagesElement"
- eOpposite="#//PagesElement/children"/>
- <eStructuralFeatures xsi:type="ecore:EReference"
name="inputLinks" upperBound="-1"
- eType="#//Link" eOpposite="#//Link/toElement"/>
- <eStructuralFeatures xsi:type="ecore:EReference"
name="outputLinks" upperBound="-1"
- eType="#//Link" eOpposite="#//Link/fromElement"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="data"
eType="ecore:EDataType
http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PagesModel"
eSuperTypes="#//PagesElement"/>
- <eClassifiers xsi:type="ecore:EClass" name="Param"
eSuperTypes="#//PagesElement">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value"
eType="ecore:EDataType
http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EDataType" name="Point"
instanceClassName="org.eclipse.draw2d.geometry.Point"/>
- <eClassifiers xsi:type="ecore:EDataType" name="Dimension"
instanceClassName="org.eclipse.draw2d.geometry.Dimension"/>
- <eClassifiers xsi:type="ecore:EClass" name="PageException"
eSuperTypes="#//PagesElement"/>
-</ecore:EPackage>
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.ecore
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.ecore
(rev 0)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.ecore 2008-09-17
16:04:26 UTC (rev 10338)
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+
xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="pages"
+ nsURI="http:///org/jboss/tools/seam/ui/pages/editor/ecore/pages.ecore"
nsPrefix="org.jboss.tools.seam.ui.pages.editor.ecore.pages">
+ <eClassifiers xsi:type="ecore:EClass" name="Link">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name"
eType="ecore:EDataType
http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference"
name="fromElement" eType="#//PagesElement"
+ eOpposite="#//PagesElement/outputLinks"/>
+ <eStructuralFeatures xsi:type="ecore:EReference"
name="toElement" eType="#//PagesElement"
+ eOpposite="#//PagesElement/inputLinks"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute"
name="shortcut" eType="ecore:EDataType
http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="data"
eType="ecore:EDataType
http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Page"
eSuperTypes="#//PagesElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute"
name="paramsVisible" eType="ecore:EDataType
http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute"
name="confirmed" eType="ecore:EDataType
http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PagesElement"
abstract="true">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name"
eType="ecore:EDataType
http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute"
name="location" eType="#//Point"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="size"
eType="#//Dimension"/>
+ <eStructuralFeatures xsi:type="ecore:EReference"
name="children" upperBound="-1"
+ eType="#//PagesElement"
eOpposite="#//PagesElement/parent"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="parent"
eType="#//PagesElement"
+ eOpposite="#//PagesElement/children"/>
+ <eStructuralFeatures xsi:type="ecore:EReference"
name="inputLinks" upperBound="-1"
+ eType="#//Link" eOpposite="#//Link/toElement"/>
+ <eStructuralFeatures xsi:type="ecore:EReference"
name="outputLinks" upperBound="-1"
+ eType="#//Link" eOpposite="#//Link/fromElement"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="data"
eType="ecore:EDataType
http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PagesModel"
eSuperTypes="#//PagesElement"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Param"
eSuperTypes="#//PagesElement">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value"
eType="ecore:EDataType
http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EDataType" name="Point"
instanceClassName="org.eclipse.draw2d.geometry.Point"/>
+ <eClassifiers xsi:type="ecore:EDataType" name="Dimension"
instanceClassName="org.eclipse.draw2d.geometry.Dimension"/>
+ <eClassifiers xsi:type="ecore:EClass" name="PageException"
eSuperTypes="#//PagesElement"/>
+</ecore:EPackage>
Property changes on:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.ecore
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.genmodel
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.genmodel 2008-09-17
15:56:10 UTC (rev 10337)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.genmodel 2008-09-17
16:04:26 UTC (rev 10338)
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-
xmlns:xmi="http://www.omg.org/XMI"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
modelDirectory="/org.jboss.tools.seam.ui.pages/src"
- modelPluginID="org.jboss.tools.seam.ui.pages" modelName="Pages"
importerID="org.eclipse.emf.importer.java"
- complianceLevel="5.0" copyrightFields="false">
- <foreignModel>@model</foreignModel>
- <genPackages prefix="Pages"
basePackage="org.jboss.tools.seam.ui.pages.editor.ecore"
- disposableProviderFactory="true"
ecorePackage="pages.ecore#/">
- <genDataTypes ecoreDataType="pages.ecore#//Point"/>
- <genDataTypes ecoreDataType="pages.ecore#//Dimension"/>
- <genClasses ecoreClass="pages.ecore#//Link">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//Link/name"/>
- <genFeatures notify="false" createChild="false"
propertySortChoices="true" ecoreFeature="ecore:EReference
pages.ecore#//Link/fromElement"/>
- <genFeatures notify="false" createChild="false"
propertySortChoices="true" ecoreFeature="ecore:EReference
pages.ecore#//Link/toElement"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//Link/shortcut"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//Link/data"/>
- </genClasses>
- <genClasses ecoreClass="pages.ecore#//Page">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//Page/paramsVisible"/>
- </genClasses>
- <genClasses image="false"
ecoreClass="pages.ecore#//PagesElement">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//PagesElement/name"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//PagesElement/location"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//PagesElement/size"/>
- <genFeatures notify="false" createChild="false"
propertySortChoices="true" ecoreFeature="ecore:EReference
pages.ecore#//PagesElement/children"/>
- <genFeatures notify="false" createChild="false"
propertySortChoices="true" ecoreFeature="ecore:EReference
pages.ecore#//PagesElement/parent"/>
- <genFeatures notify="false" createChild="false"
propertySortChoices="true" ecoreFeature="ecore:EReference
pages.ecore#//PagesElement/inputLinks"/>
- <genFeatures notify="false" createChild="false"
propertySortChoices="true" ecoreFeature="ecore:EReference
pages.ecore#//PagesElement/outputLinks"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//PagesElement/data"/>
- </genClasses>
- <genClasses ecoreClass="pages.ecore#//PagesModel"/>
- <genClasses ecoreClass="pages.ecore#//Param">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//Param/value"/>
- </genClasses>
- <genClasses ecoreClass="pages.ecore#//PageException"/>
- </genPackages>
-</genmodel:GenModel>
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.genmodel
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.genmodel
(rev 0)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.genmodel 2008-09-17
16:04:26 UTC (rev 10338)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0"
+
xmlns:xmi="http://www.omg.org/XMI"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+
xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel"
modelDirectory="/org.jboss.tools.seam.ui.pages/src"
+ modelPluginID="org.jboss.tools.seam.ui.pages" modelName="Pages"
importerID="org.eclipse.emf.importer.java"
+ complianceLevel="5.0" copyrightFields="false">
+ <foreignModel>@model</foreignModel>
+ <genPackages prefix="Pages"
basePackage="org.jboss.tools.seam.ui.pages.editor.ecore"
+ disposableProviderFactory="true"
ecorePackage="pages.ecore#/">
+ <genDataTypes ecoreDataType="pages.ecore#//Point"/>
+ <genDataTypes ecoreDataType="pages.ecore#//Dimension"/>
+ <genClasses ecoreClass="pages.ecore#//Link">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//Link/name"/>
+ <genFeatures notify="false" createChild="false"
propertySortChoices="true" ecoreFeature="ecore:EReference
pages.ecore#//Link/fromElement"/>
+ <genFeatures notify="false" createChild="false"
propertySortChoices="true" ecoreFeature="ecore:EReference
pages.ecore#//Link/toElement"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//Link/shortcut"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//Link/data"/>
+ </genClasses>
+ <genClasses ecoreClass="pages.ecore#//Page">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//Page/paramsVisible"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//Page/confirmed"/>
+ </genClasses>
+ <genClasses image="false"
ecoreClass="pages.ecore#//PagesElement">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//PagesElement/name"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//PagesElement/location"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//PagesElement/size"/>
+ <genFeatures notify="false" createChild="false"
propertySortChoices="true" ecoreFeature="ecore:EReference
pages.ecore#//PagesElement/children"/>
+ <genFeatures notify="false" createChild="false"
propertySortChoices="true" ecoreFeature="ecore:EReference
pages.ecore#//PagesElement/parent"/>
+ <genFeatures notify="false" createChild="false"
propertySortChoices="true" ecoreFeature="ecore:EReference
pages.ecore#//PagesElement/inputLinks"/>
+ <genFeatures notify="false" createChild="false"
propertySortChoices="true" ecoreFeature="ecore:EReference
pages.ecore#//PagesElement/outputLinks"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//PagesElement/data"/>
+ </genClasses>
+ <genClasses ecoreClass="pages.ecore#//PagesModel"/>
+ <genClasses ecoreClass="pages.ecore#//Param">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute
pages.ecore#//Param/value"/>
+ </genClasses>
+ <genClasses ecoreClass="pages.ecore#//PageException"/>
+ </genPackages>
+</genmodel:GenModel>
Property changes on:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.genmodel
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2008-09-17
15:56:10 UTC (rev 10337)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2008-09-17
16:04:26 UTC (rev 10338)
@@ -300,6 +300,7 @@
public void notifyChanged(Notification notification) {
refresh();
refreshVisuals();
+ getPageFigure().repaint();
PagesDiagramEditPart diagram =
(PagesDiagramEditPart)getParent().getRoot().getViewer().getEditPartRegistry().get(getPageModel().getParent());
if(diagram != null) diagram.refresh();
}
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java 2008-09-17
15:56:10 UTC (rev 10337)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ConnectionFigure.java 2008-09-17
16:04:26 UTC (rev 10338)
@@ -100,7 +100,7 @@
if(link != null && link.getFromElement() instanceof Page)
page = (Page)link.getFromElement();
- if(page != null && page.getData() != null && page.getData() instanceof
ReferenceObject && ((ReferenceObject)page.getData()).getReference() == null){
+ if(page != null && !page.isConfirmed()){
g.setLineDash(new int[]{3,3});
g.setLineStyle(SWT.LINE_CUSTOM);
}
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java 2008-09-17
15:56:10 UTC (rev 10337)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java 2008-09-17
16:04:26 UTC (rev 10338)
@@ -233,7 +233,7 @@
int height = r.height - 1;
// if page has not page element
- if(page != null && page.getData() != null && page.getData() instanceof
ReferenceObject && ((ReferenceObject)page.getData()).getReference() == null){
+ if(page != null && !page.isConfirmed()){
graphics.setLineDash(new int[]{3,3});
graphics.setLineStyle(SWT.LINE_CUSTOM);
}