September 2008 - jbosstools-commits

JBoss Tools SVN: r10338 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor: ecore and 5 other directories.

by jbosstools-commits＠lists.jboss.org

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 Confirmed}' attribute. + *  + *  + * @param value the new value of the 'Confirmed' 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 'Pg Exception'. + * Returns a new object of class 'Page Exception'. *  *  - * @return a new object of class 'Pg Exception'. + * @return a new object of class 'Page Exception'. * @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 'Confirmed' attribute. + *  + *  + * @generated + * @ordered + */ + int PAGE__CONFIRMED = PAGES_ELEMENT_FEATURE_COUNT + 1; + + /** * The number of structural features of the 'Page' class. *  *  * @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 Model}' 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 Pg Exception}' class. + * The meta object id for the '{@link org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PageExceptionImpl Page Exception}' class. *  *  * @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 'Name' 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 'Location' 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 'Size' 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 'Children' 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 'Parent' 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 'Input Links' 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 'Output Links' 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 'Data' 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 'Pg Exception' class. + * The number of structural features of the 'Page Exception' class. *  *  * @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 'Point' 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 Confirmed}'. + *  + *  + * @return the meta object for the attribute 'Confirmed'. + * @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 Element}'. *  *  @@ -834,14 +854,14 @@ EAttribute getParam_Value(); /** - * Returns the meta object for class '{@link org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException Pg Exception}'. + * Returns the meta object for class '{@link org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException Page Exception}'. *  *  - * @return the meta object for class 'Pg Exception'. + * @return the meta object for class 'Page Exception'. * @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 Point}'. @@ -956,6 +976,14 @@ EAttribute PAGE__PARAMS_VISIBLE = eINSTANCE.getPage_ParamsVisible(); /** + * The meta object literal for the 'Confirmed' attribute feature. + *  + *  + * @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 Element}' class. *  *  @@ -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 Pg Exception}' class. + * The meta object literal for the '{@link org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PageExceptionImpl Page Exception}' class. *  *  * @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 'Point' 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 Params Visible}</li> + * <li>{@link org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PageImpl#isConfirmed Confirmed}</li> * </ul> * * @@ -63,10 +65,30 @@ protected boolean paramsVisible = PARAMS_VISIBLE_EDEFAULT; /** + * The default value of the '{@link #isConfirmed() Confirmed}' attribute. *  *  + * @see #isConfirmed() * @generated + * @ordered */ + protected static final boolean CONFIRMED_EDEFAULT = false; + + /** + * The cached value of the '{@link #isConfirmed() Confirmed}' attribute. + *  + *  + * @see #isConfirmed() + * @generated + * @ordered + */ + protected boolean confirmed = CONFIRMED_EDEFAULT; + + /** + *  + *  + * @generated + */ protected PageImpl() { super(); } @@ -107,11 +129,34 @@ *  * @generated */ + public boolean isConfirmed() { + return confirmed; + } + + /** + *  + *  + * @generated + */ + public void setConfirmed(boolean newConfirmed) { + boolean oldConfirmed = confirmed; + confirmed = newConfirmed; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, PagesPackage.PAGE__CONFIRMED, oldConfirmed, confirmed)); + } + + /** + *  + *  + * @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 @@ *  * @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 @@ *  * @generated */ - private EClass pgExceptionEClass = null; + private EClass pageExceptionEClass = null; /** *  @@ -234,6 +234,15 @@ *  * @generated */ + public EAttribute getPage_Confirmed() { + return (EAttribute)pageEClass.getEStructuralFeatures().get(1); + } + + /** + *  + *  + * @generated + */ public EClass getPagesElement() { return pagesElementEClass; } @@ -342,8 +351,8 @@ *  * @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 Pg Exception}'. + * Creates a new adapter for an object of class '{@link org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException Page Exception}'. *  * 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 'Pg Exception'. + * Returns the result of interpreting the object as an instance of 'Page Exception'. *  * This implementation returns null; * returning a non-null result will terminate the switch. *  * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Pg Exception'. + * @return the result of interpreting the object as an instance of 'Page Exception'. * @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); }

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r10336 - in trunk/documentation/jbosstools-jdocbook-style/src/main: org/css/css and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: smukhina Date: 2008-09-17 10:57:54 -0400 (Wed, 17 Sep 2008) New Revision: 10336 Modified: trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css/tools.css trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css Log: https://jira.jboss.org/jira/browse/JBDS-213 - link font for pdf version is corrected Modified: trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css/tools.css =================================================================== --- trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css/tools.css 2008-09-17 14:57:11 UTC (rev 10335) +++ trunk/documentation/jbosstools-jdocbook-style/src/main/com/css/css/tools.css 2008-09-17 14:57:54 UTC (rev 10336) @@ -58,6 +58,10 @@ margin-left:50px; } +div.abstract { +font-size:10px; +} + ul.docnav { margin:0px; width: 70em; Modified: trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css =================================================================== --- trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css 2008-09-17 14:57:11 UTC (rev 10335) +++ trunk/documentation/jbosstools-jdocbook-style/src/main/org/css/css/tools.css 2008-09-17 14:57:54 UTC (rev 10336) @@ -71,6 +71,11 @@ width: 57em; } +div.abstract { +font-size:10px; +} + + ul.docnav { margin:0px; width: 57em;

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r10335 - trunk/documentation/development.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2008-09-17 10:57:11 -0400 (Wed, 17 Sep 2008) New Revision: 10335 Added: trunk/documentation/development/.classpath Modified: trunk/documentation/development/.project Log: had to make dev doc a java project to make eclipse pickup eclipse files Added: trunk/documentation/development/.classpath =================================================================== --- trunk/documentation/development/.classpath (rev 0) +++ trunk/documentation/development/.classpath 2008-09-17 14:57:11 UTC (rev 10335) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin"/> +</classpath> Modified: trunk/documentation/development/.project =================================================================== --- trunk/documentation/development/.project 2008-09-17 14:12:27 UTC (rev 10334) +++ trunk/documentation/development/.project 2008-09-17 14:57:11 UTC (rev 10335) @@ -4,8 +4,14 @@ <comment></comment> <projects> </projects> - <buildSpec> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>org.eclipse.jdt.core.javanature</nature> </natures> </projectDescription>

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r10334 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2008-09-17 10:12:27 -0400 (Wed, 17 Sep 2008) New Revision: 10334 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java Log: =JBIDE-2521 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2008-09-17 13:44:33 UTC (rev 10333) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2008-09-17 14:12:27 UTC (rev 10334) @@ -14,7 +14,6 @@ import java.util.List; import java.util.Map; import java.util.Set; - import org.jboss.tools.jst.jsp.preferences.VpePreference; import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.context.VpePageContext; @@ -44,6 +43,7 @@ static final String VAL_DISPLAY_NONE = "none"; private boolean caseSensitive; + private VpeExpression tagForDisplayExpr; private VpeExpression displayExpr; private VpeExpression valueExpr; private VpeExpression borderExpr; @@ -56,6 +56,7 @@ private List propertyCreators; private Set dependencySet; + private String tagForDisplayStr; private String displayStr; private String valueStr; private String borderStr; @@ -71,6 +72,19 @@ } private void build(Element element, VpeDependencyMap dependencyMap) { + Attr tagForDisplay = element.getAttributeNode(VpeTemplateManager.ATTR_ANY_TAG_FOR_DISPLAY); + if (tagForDisplay != null) { + try { + tagForDisplayStr = tagForDisplay.getNodeValue(); + VpeExpressionInfo info = VpeExpressionBuilder.buildCompletedExpression(tagForDisplayStr,caseSensitive); + tagForDisplayExpr = info.getExpression(); + dependencySet = info.getDependencySet(); + dependencyMap.setCreator(this, info.getDependencySet()); + } catch(VpeExpressionBuilderException ex) { + VpePlugin.reportProblem(ex); + } + } + Attr displayAttr = element.getAttributeNode(VpeTemplateManager.ATTR_ANY_DISPLAY); if (displayAttr != null) { try { @@ -277,7 +291,7 @@ public VpeAnyData getAnyData() { return new VpeAnyData( displayStr, - "", + tagForDisplayStr, valueStr, borderStr, valueColorStr, Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java 2008-09-17 13:44:33 UTC (rev 10333) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyData.java 2008-09-17 14:12:27 UTC (rev 10334) @@ -13,6 +13,8 @@ public class VpeAnyData extends VpeTemplateData { private String uri; private String tagForDisplay; + private boolean showIcon; + private String display; private String value; private String border; @@ -20,8 +22,9 @@ private String valueBackgroundColor; private String backgroundColor; private String borderColor; - private boolean showIcon; + + public VpeAnyData(String name) { super(name); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2008-09-17 13:44:33 UTC (rev 10333) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2008-09-17 14:12:27 UTC (rev 10334) @@ -56,6 +56,7 @@ private Combo cbDisplay; private Combo cbTagForDisplay; private int displayIndexMem; + private int tagNameItemIndex; private Text txtValue; private Text txtBorder; private ColorControl ctlValueColor; @@ -117,7 +118,11 @@ gd.horizontalSpan=2; cbTagForDisplay.setLayoutData(gd); cbTagForDisplay.setItems(displayTags.toArray(new String[displayTags.size()])); - cbTagForDisplay.select(0); + tagNameItemIndex = displayTags.indexOf(data.getTagForDisplay()); + if(tagNameItemIndex==-1) { + tagNameItemIndex=0; + } + cbTagForDisplay.select(tagNameItemIndex); // ctlCaseSensitive = new CheckControl(composite, "Case sensitive", data.isCaseSensitive()); @@ -202,7 +207,10 @@ data.setChanged(true); data.setDisplay(display); } - + if(tagNameItemIndex!=cbTagForDisplay.getSelectionIndex()) { + data.setChanged(true); + data.setTagForDisplay(displayTags.get(cbTagForDisplay.getSelectionIndex())); + } data.setChanged(isChanged(data, data.getValue(), txtValue.getText())); data.setValue(txtValue.getText().trim()); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-09-17 13:44:33 UTC (rev 10333) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-09-17 14:12:27 UTC (rev 10334) @@ -184,6 +184,7 @@ }; static final String ATTR_ANY_DISPLAY = "display"; //$NON-NLS-1$ + static final String ATTR_ANY_TAG_FOR_DISPLAY="tag-for-display"; //$NON-NLS-1$ static final String ATTR_ANY_ICON = "icon"; //$NON-NLS-1$ static final String ATTR_ANY_VALUE = "value"; //$NON-NLS-1$ static final String ATTR_ANY_BORDER = "border"; //$NON-NLS-1$ @@ -602,6 +603,11 @@ Element anyNode = getChildNode(templateNode, TAG_ANY); if (anyNode != null) { + attr = anyNode.getAttributeNode(ATTR_ANY_TAG_FOR_DISPLAY); + if(attr!=null) { + anyData.setTagForDisplay(attr.getNodeValue()); + } + attr = anyNode.getAttributeNode(ATTR_TEMPLATE_CHILDREN); if (attr != null) { anyData.setChildren(ATTR_VALUE_YES.equalsIgnoreCase(attr.getNodeValue())); @@ -729,6 +735,9 @@ newTagElement.appendChild(newTemplateElement); Element newAnyElement = document.createElement(TAG_ANY); + + if(data.getTagForDisplay()!=null&& data.getTagForDisplay().length() > 0) + newAnyElement.setAttribute(ATTR_ANY_TAG_FOR_DISPLAY, data.getTagForDisplay()); if (data.getDisplay() != null && data.getDisplay().length() > 0) newAnyElement.setAttribute(ATTR_ANY_DISPLAY, data.getDisplay()); if (data.getValue() != null && data.getValue().length() > 0)

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r10333 - in trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model: impl and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2008-09-17 09:44:33 -0400 (Wed, 17 Sep 2008) New Revision: 10333 Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/impl/ReferenceObjectImpl.java Log: JBIDE-2780 model will fire event. Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-09-17 12:20:46 UTC (rev 10332) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/helpers/SeamPagesDiagramHelper.java 2008-09-17 13:44:33 UTC (rev 10333) @@ -189,7 +189,11 @@ } gs = (ReferenceObjectImpl[])targets.values().toArray(new ReferenceObjectImpl[0]); for (int i = 0; i < gs.length; i++) { + long ts = gs[i].getTimeStamp(); + boolean hadReference = gs[i].getReference() != null; gs[i].setReference(null); + gs[i].setAttributeValue("params", ""); + XModelObject[] os = gs[i].getChildren(ENT_DIAGRAM_ITEM_OUTPUT); for (int j = 0; j < os.length; j++) { if(SUBTYPE_CUSTOM.equals(os[j].getAttributeValue(ATTR_SUBTYPE))) { @@ -198,6 +202,10 @@ gs[i].removeChild(os[j]); } updatePageItem(gs[i]); + if(hadReference && ts == gs[i].getTimeStamp()) { + System.out.println("fire " + gs[i].getPath()); + gs[i].fireReferenceChanged(); + } } } Modified: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/impl/ReferenceObjectImpl.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/impl/ReferenceObjectImpl.java 2008-09-17 12:20:46 UTC (rev 10332) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/src/org/jboss/tools/seam/pages/xml/model/impl/ReferenceObjectImpl.java 2008-09-17 13:44:33 UTC (rev 10333) @@ -98,5 +98,9 @@ super.set(name, value); } + public void fireReferenceChanged() { + changeTimeStamp(); + fireObjectChanged("reference"); + } }

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r10332 - trunk/documentation/development/setup/workingsets.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2008-09-17 08:20:46 -0400 (Wed, 17 Sep 2008) New Revision: 10332 Modified: trunk/documentation/development/setup/workingsets/readme.txt Log: added description of using the workingsets. Modified: trunk/documentation/development/setup/workingsets/readme.txt =================================================================== --- trunk/documentation/development/setup/workingsets/readme.txt 2008-09-17 12:16:37 UTC (rev 10331) +++ trunk/documentation/development/setup/workingsets/readme.txt 2008-09-17 12:20:46 UTC (rev 10332) @@ -6,6 +6,9 @@ Both ways assumes you have already checked out JBoss tools plugins in your workspace. +After you used one of the below methods you can in Package Explorer set Top Level Elements to Working Sets +to get the plugins grouped according to the workingset. + Method #1 (command-line) ======================== This replaces any existing workingset definition in your workspace (take a backup if you don't feel safe doing this ;)

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r10331 - trunk/common/plugins/org.jboss.tools.common.el.core/.settings.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2008-09-17 08:16:37 -0400 (Wed, 17 Sep 2008) New Revision: 10331 Removed: trunk/common/plugins/org.jboss.tools.common.el.core/.settings/org.eclipse.jdt.core.prefs Log: bogus .settings file Deleted: trunk/common/plugins/org.jboss.tools.common.el.core/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/.settings/org.eclipse.jdt.core.prefs 2008-09-17 12:15:45 UTC (rev 10330) +++ trunk/common/plugins/org.jboss.tools.common.el.core/.settings/org.eclipse.jdt.core.prefs 2008-09-17 12:16:37 UTC (rev 10331) @@ -1,7 +0,0 @@ -#Mon Sep 01 14:25:08 EEST 2008 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r10330 - trunk/documentation/development/setup.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2008-09-17 08:15:45 -0400 (Wed, 17 Sep 2008) New Revision: 10330 Removed: trunk/documentation/development/setup/.project Log: Deleted: trunk/documentation/development/setup/.project =================================================================== --- trunk/documentation/development/setup/.project 2008-09-17 12:02:16 UTC (rev 10329) +++ trunk/documentation/development/setup/.project 2008-09-17 12:15:45 UTC (rev 10330) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>jbosstools-setup</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - </buildSpec> - <natures> - </natures> -</projectDescription>

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r10329 - in trunk: common/plugins/org.jboss.tools.common.resref.core and 11 other directories.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2008-09-17 08:02:16 -0400 (Wed, 17 Sep 2008) New Revision: 10329 Modified: trunk/common/plugins/org.jboss.tools.common.el.ui/ trunk/common/plugins/org.jboss.tools.common.resref.core/ trunk/common/plugins/org.jboss.tools.common.resref.ui/ trunk/smooks/plugins/org.jboss.tools.smooks.graphicalInfo/ trunk/smooks/plugins/org.jboss.tools.smooks.javabean/ trunk/smooks/plugins/org.jboss.tools.smooks.model.edit/ trunk/smooks/plugins/org.jboss.tools.smooks.model/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/ trunk/smooks/plugins/org.jboss.tools.smooks.xml/ trunk/smooks/plugins/org.jboss.tools.smooks.xml2java/ trunk/smooks/tests/org.jboss.tools.smooks.test/ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/ trunk/vpe/plugins/org.jboss.tools.vpe.resref/ Log: root doc folder for larger documentation efforts like movies etc. Property changes on: trunk/common/plugins/org.jboss.tools.common.el.ui ___________________________________________________________________ Name: svn:ignore + bin Property changes on: trunk/common/plugins/org.jboss.tools.common.resref.core ___________________________________________________________________ Name: svn:ignore + bin Property changes on: trunk/common/plugins/org.jboss.tools.common.resref.ui ___________________________________________________________________ Name: svn:ignore + bin Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.graphicalInfo ___________________________________________________________________ Name: svn:ignore + bin Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.javabean ___________________________________________________________________ Name: svn:ignore + bin Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.model ___________________________________________________________________ Name: svn:ignore + bin Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.model.edit ___________________________________________________________________ Name: svn:ignore + bin Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui ___________________________________________________________________ Name: svn:ignore + bin Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.xml ___________________________________________________________________ Name: svn:ignore + bin Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.xml2java ___________________________________________________________________ Name: svn:ignore + bin Property changes on: trunk/smooks/tests/org.jboss.tools.smooks.test ___________________________________________________________________ Name: svn:ignore + bin Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.docbook ___________________________________________________________________ Name: svn:ignore + bin Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe.resref ___________________________________________________________________ Name: svn:ignore + bin

15 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r10328 - trunk/documentation/development/setup/workingsets.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2008-09-17 07:40:44 -0400 (Wed, 17 Sep 2008) New Revision: 10328 Modified: trunk/documentation/development/setup/workingsets/readme.txt Log: dev setup files Modified: trunk/documentation/development/setup/workingsets/readme.txt =================================================================== --- trunk/documentation/development/setup/workingsets/readme.txt 2008-09-17 11:19:30 UTC (rev 10327) +++ trunk/documentation/development/setup/workingsets/readme.txt 2008-09-17 11:40:44 UTC (rev 10328) @@ -24,3 +24,7 @@ 3) Select jbosstools.wst +4) Press Finish + + +

15 years, 9 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits September 2008