Author: max.andersen(a)jboss.com
Date: 2008-06-06 06:00:24 -0400 (Fri, 06 Jun 2008)
New Revision: 8601
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PageException.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageExceptionImpl.java
Removed:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PgException.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PgExceptionImpl.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesGuiEditor.java
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
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/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/ExceptionEditPart.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/GraphicalPartFactory.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/edit/PagesEditPart.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesXYLayoutEditPolicy.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/FigureFactory.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java
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/ParamFigure.java
Log:
JBIDE-2280 cleanup of constants, arrow for links and PgException -> PageException
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesGuiEditor.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesGuiEditor.java 2008-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesGuiEditor.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -34,7 +34,7 @@
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesFactory;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesModel;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PgException;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException;
public class SeamPagesGuiEditor extends AbstractSectionEditor {
private PagesEditor gui = null;
Copied:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PageException.java
(from rev 8594,
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PgException.java)
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PageException.java
(rev 0)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PageException.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -0,0 +1,12 @@
+package org.jboss.tools.seam.ui.pages.editor.ecore.pages;
+
+/**
+ * @author daniel
+ *
+ * Exception model interface
+ *
+ * @model
+ */
+public interface PageException extends PagesElement{
+
+}
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-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PagesFactory.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -68,7 +68,7 @@
* @return a new object of class '<em>Pg Exception</em>'.
* @generated
*/
- PgException createPgException();
+ PageException createPgException();
/**
* 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-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PagesPackage.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -507,10 +507,10 @@
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.PgExceptionImpl <em>Pg
Exception</em>}' class.
+ * The meta object id for the '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PageExceptionImpl <em>Pg
Exception</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PgExceptionImpl
+ * @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()
* @generated
*/
@@ -834,11 +834,11 @@
EAttribute getParam_Value();
/**
- * Returns the meta object for class '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.PgException <em>Pg
Exception</em>}'.
+ * Returns the meta object for class '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException <em>Pg
Exception</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for class '<em>Pg Exception</em>'.
- * @see org.jboss.tools.seam.ui.pages.editor.ecore.pages.PgException
+ * @see org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException
* @generated
*/
EClass getPgException();
@@ -1058,10 +1058,10 @@
EAttribute PARAM__VALUE = eINSTANCE.getParam_Value();
/**
- * The meta object literal for the '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PgExceptionImpl <em>Pg
Exception</em>}' class.
+ * The meta object literal for the '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PageExceptionImpl <em>Pg
Exception</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PgExceptionImpl
+ * @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()
* @generated
*/
Deleted:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PgException.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PgException.java 2008-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PgException.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -1,12 +0,0 @@
-package org.jboss.tools.seam.ui.pages.editor.ecore.pages;
-
-/**
- * @author daniel
- *
- * Exception model interface
- *
- * @model
- */
-public interface PgException extends PagesElement{
-
-}
Copied:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageExceptionImpl.java
(from rev 8594,
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PgExceptionImpl.java)
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageExceptionImpl.java
(rev 0)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PageExceptionImpl.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -0,0 +1,68 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl;
+
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EClass;
+
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesPackage;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Pg
Exception</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * </p>
+ *
+ * @generated
+ */
+public class PageExceptionImpl extends PagesElementImpl implements PageException {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected PageExceptionImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return PagesPackage.Literals.PG_EXCEPTION;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated NOT
+ */
+ public void dataChanged() {
+ XModelObject item = getModelObject();
+ SeamPagesDiagramStructureHelper h = SeamPagesDiagramStructureHelper.getInstance();
+
+ setName(item.getPresentationString());
+ int[] shape = h.asIntArray(item, "shape");
+ if(shape != null && shape.length >= 2) {
+ setLocation(new Point(shape[0],shape[1]));
+ } else {
+ setLocation(new Point(0,0));
+ }
+ if(shape != null && shape.length >= 4) {
+ setSize(new Dimension(shape[2],shape[3]));
+ }
+ }
+
+} //PgExceptionImpl
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-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesFactoryImpl.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -153,8 +153,8 @@
* <!-- end-user-doc -->
* @generated
*/
- public PgException createPgException() {
- PgExceptionImpl pgException = new PgExceptionImpl();
+ public PageException createPgException() {
+ PageExceptionImpl pgException = new PageExceptionImpl();
return pgException;
}
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-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesModelImpl.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -26,7 +26,7 @@
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesFactory;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesModel;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesPackage;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PgException;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException;
/**
* <!-- begin-user-doc -->
@@ -233,7 +233,7 @@
page.dataChanged();
getChildren().add(page);
} else if(SeamPagesConstants.TYPE_EXCEPTION.equals(type)) {
- PgException exc = PagesFactory.eINSTANCE.createPgException();
+ PageException exc = PagesFactory.eINSTANCE.createPgException();
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-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PagesPackageImpl.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -24,7 +24,7 @@
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesModel;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesPackage;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Param;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PgException;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException;
/**
* <!-- begin-user-doc -->
@@ -483,7 +483,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, PgException.class, "PgException", !IS_ABSTRACT,
!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEClass(pgExceptionEClass, PageException.class, "PgException",
!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
// Initialize data types
initEDataType(pointEDataType, Point.class, "Point", IS_SERIALIZABLE,
!IS_GENERATED_INSTANCE_CLASS);
Deleted:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PgExceptionImpl.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PgExceptionImpl.java 2008-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/impl/PgExceptionImpl.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -1,68 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.emf.ecore.EClass;
-
-import org.jboss.tools.common.model.XModelObject;
-import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramStructureHelper;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesPackage;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PgException;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Pg
Exception</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class PgExceptionImpl extends PagesElementImpl implements PgException {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected PgExceptionImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return PagesPackage.Literals.PG_EXCEPTION;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public void dataChanged() {
- XModelObject item = getModelObject();
- SeamPagesDiagramStructureHelper h = SeamPagesDiagramStructureHelper.getInstance();
-
- setName(item.getPresentationString());
- int[] shape = h.asIntArray(item, "shape");
- if(shape != null && shape.length >= 2) {
- setLocation(new Point(shape[0],shape[1]));
- } else {
- setLocation(new Point(0,0));
- }
- if(shape != null && shape.length >= 4) {
- setSize(new Dimension(shape[2],shape[3]));
- }
- }
-
-} //PgExceptionImpl
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-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/util/PagesAdapterFactory.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -92,7 +92,7 @@
return createParamAdapter();
}
@Override
- public Adapter casePgException(PgException object) {
+ public Adapter casePgException(PageException object) {
return createPgExceptionAdapter();
}
@Override
@@ -186,13 +186,13 @@
}
/**
- * Creates a new adapter for an object of class '{@link
org.jboss.tools.seam.ui.pages.editor.ecore.pages.PgException <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>Pg
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.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see org.jboss.tools.seam.ui.pages.editor.ecore.pages.PgException
+ * @see org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException
* @generated
*/
public Adapter createPgExceptionAdapter() {
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-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/util/PagesSwitch.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -121,7 +121,7 @@
return result;
}
case PagesPackage.PG_EXCEPTION: {
- PgException pgException = (PgException)theEObject;
+ PageException pgException = (PageException)theEObject;
T result = casePgException(pgException);
if (result == null) result = casePagesElement(pgException);
if (result == null) result = defaultCase(theEObject);
@@ -217,7 +217,7 @@
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
- public T casePgException(PgException object) {
+ public T casePgException(PageException object) {
return null;
}
Modified:
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-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.ecore 2008-06-06
10:00:24 UTC (rev 8601)
@@ -1,39 +1,39 @@
-<?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:EClass" name="PgException"
eSuperTypes="#//PagesElement"/>
- <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"/>
-</ecore:EPackage>
+<?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>
Modified:
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-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.genmodel 2008-06-06
10:00:24 UTC (rev 8601)
@@ -1,38 +1,38 @@
-<?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#//PgException"/>
- </genPackages>
-</genmodel:GenModel>
+<?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>
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java 2008-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -10,9 +10,8 @@
******************************************************************************/
package org.jboss.tools.seam.ui.pages.editor.edit;
-import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.util.*;
+import java.util.List;
import org.eclipse.draw2d.ConnectionAnchor;
import org.eclipse.draw2d.FigureUtilities;
@@ -23,24 +22,23 @@
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.Notifier;
-import org.jboss.tools.common.model.ui.dnd.DnDUtil;
-import org.eclipse.gef.*;
+import org.eclipse.gef.AccessibleEditPart;
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartListener;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gef.Request;
import org.eclipse.gef.requests.DropRequest;
import org.eclipse.swt.accessibility.AccessibleControlEvent;
import org.eclipse.swt.accessibility.AccessibleEvent;
-
-import org.jboss.tools.common.meta.action.XAction;
-import org.jboss.tools.common.model.XModelException;
-import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PgException;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException;
import org.jboss.tools.seam.ui.pages.editor.figures.ExceptionFigure;
import org.jboss.tools.seam.ui.pages.editor.figures.NodeFigure;
-import org.jboss.tools.seam.ui.pages.editor.figures.PageFigure;
public class ExceptionEditPart extends PagesEditPart implements PropertyChangeListener,
EditPartListener, Adapter {
- private ExceptionFigure fig = null;
+ private NodeFigure fig = null;
private boolean single = true;
@@ -142,8 +140,8 @@
*
* @return Model of this as an LED.
*/
- public PgException getExceptionModel() {
- return (PgException) getModel();
+ public PageException getExceptionModel() {
+ return (PageException) getModel();
}
Dimension size;
@@ -154,10 +152,9 @@
Point loc = getExceptionModel().getLocation();
String text = getExceptionModel().getName();
if(text == null) text="Exception";
- int width = 30+FigureUtilities.getTextExtents(text, NodeFigure.exceptionFont).width;
- size = new Dimension(width, 21);
- loc.x -= loc.x % 8;
- loc.y -= loc.y % 8;
+ int width = getIconWidth()+FigureUtilities.getTextExtents(text,
NodeFigure.exceptionFont).width;
+ size = new Dimension(width, getVisualHeight());
+ adjustForGrid(loc);
Rectangle r = new Rectangle(loc, size);
@@ -165,6 +162,16 @@
getFigure(), r);
}
+
+
+ private int getVisualHeight() {
+ return 21;
+ }
+
+ private int getIconWidth() {
+ return 30;
+ }
+
public ConnectionAnchor getTargetConnectionAnchor(
ConnectionEditPart connEditPart) {
ConnectionAnchor anc = getNodeFigure().getConnectionAnchor("1_IN");
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/GraphicalPartFactory.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/GraphicalPartFactory.java 2008-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/GraphicalPartFactory.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -16,7 +16,7 @@
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesModel;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Param;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PgException;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException;
public class GraphicalPartFactory implements EditPartFactory {
@@ -29,7 +29,7 @@
child = new PagesDiagramEditPart();
else if (model instanceof Page)
child = new PageEditPart();
- else if (model instanceof PgException)
+ else if (model instanceof PageException)
child = new ExceptionEditPart();
else if (model instanceof PageWrapper)
child = new ParamListEditPart();
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-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -166,8 +166,7 @@
height = 23 + NodeFigure.LINK_HEIGHT;
size = new Dimension(50, height);
- loc.x -= loc.x % 8;
- loc.y -= loc.y % 8;
+ adjustForGrid(loc);
Rectangle r = new Rectangle(loc, size);
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesEditPart.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesEditPart.java 2008-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesEditPart.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -273,4 +273,14 @@
connection.setTarget(null);
primRemoveTargetConnection(connection);
}
+
+
+ /** Adjust the location to lock into a Grid
+ * TODO: I don't think the editPart should have to do this ?
+ **/
+ protected void adjustForGrid(Point loc) {
+ loc.x -= loc.x % 8;
+ loc.y -= loc.y % 8;
+ }
+
}
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesXYLayoutEditPolicy.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesXYLayoutEditPolicy.java 2008-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesXYLayoutEditPolicy.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -32,7 +32,7 @@
import org.jboss.tools.seam.ui.pages.editor.commands.SetConstraintCommand;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PgException;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException;
import org.jboss.tools.seam.ui.pages.editor.figures.ExceptionFeedbackFigure;
import org.jboss.tools.seam.ui.pages.editor.figures.NodeFigure;
import org.jboss.tools.seam.ui.pages.editor.figures.PageFeedbackFigure;
@@ -108,7 +108,7 @@
if (modelPart instanceof Page)
figure = new PageFeedbackFigure();
- else if (modelPart instanceof PgException)
+ else if (modelPart instanceof PageException)
figure = new ExceptionFeedbackFigure();
else {
figure = new RectangleFigure();
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java 2008-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -34,7 +34,7 @@
import org.eclipse.swt.accessibility.AccessibleEvent;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Param;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PgException;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException;
import org.jboss.tools.seam.ui.pages.editor.figures.ExceptionFigure;
import org.jboss.tools.seam.ui.pages.editor.figures.NodeFigure;
import org.jboss.tools.seam.ui.pages.editor.figures.ParamFigure;
@@ -154,10 +154,9 @@
Point loc = getExceptionModel().getLocation();
String text = getExceptionModel().getName();
if(text == null) text="Exception";
- int width = 30+FigureUtilities.getTextExtents(text, NodeFigure.exceptionFont).width;
- size = new Dimension(width, 21);
- loc.x -= loc.x % 8;
- loc.y -= loc.y % 8;
+ int width = getIconWidth()+FigureUtilities.getTextExtents(text,
NodeFigure.exceptionFont).width;
+ size = new Dimension(width, getVisualHeight());
+ adjustForGrid(loc);
Rectangle r = new Rectangle(loc, size);
@@ -165,6 +164,14 @@
getFigure(), r);
}
+ private int getVisualHeight() {
+ return 21;
+ }
+
+ private int getIconWidth() {
+ return 30;
+ }
+
public ConnectionAnchor getTargetConnectionAnchor(
ConnectionEditPart connEditPart) {
ConnectionAnchor anc = getNodeFigure().getConnectionAnchor("1_IN");
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java 2008-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -33,7 +33,7 @@
import org.eclipse.swt.accessibility.AccessibleControlEvent;
import org.eclipse.swt.accessibility.AccessibleEvent;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PgException;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException;
import org.jboss.tools.seam.ui.pages.editor.figures.ExceptionFigure;
import org.jboss.tools.seam.ui.pages.editor.figures.NodeFigure;
import org.jboss.tools.seam.ui.pages.editor.figures.ParamListFigure;
@@ -144,8 +144,7 @@
protected void refreshVisuals() {
Point loc = new Point(1,1);
size = new Dimension(10, 10);
- loc.x -= loc.x % 8;
- loc.y -= loc.y % 8;
+ adjustForGrid(loc);
Rectangle r = new Rectangle(loc, size);
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java 2008-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -22,7 +22,7 @@
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.gef.GEFGraphicalViewer;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PgException;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException;
import org.jboss.tools.seam.ui.pages.editor.edit.ExceptionEditPart;
import org.jboss.tools.seam.ui.pages.editor.figures.xpl.FixedConnectionAnchor;
import org.jboss.tools.seam.ui.pages.editor.print.PrintIconHelper;
@@ -32,7 +32,7 @@
private Image icon = null;
- public PgException exc;
+ public PageException exc;
ExceptionEditPart editPart;
@@ -48,42 +48,7 @@
icon = PrintIconHelper.getPrintImage(i);
}
- public void init(int number) {
- FixedConnectionAnchor c;
- if (number == 0)
- number = 1;
- for (int i = 0; i < number; i++) {
- c = new FixedConnectionAnchor(this);
- c.offsetV = 32 + LINK_HEIGHT * i;
- c.leftToRight = false;
- connectionAnchors.put((i + 1) + "_OUT", c);
- outputConnectionAnchors.addElement(c);
- }
- }
-
- public void addConnectionAnchor(int number) {
- FixedConnectionAnchor c;
- if (number == 1)
- return;
- c = new FixedConnectionAnchor(this);
- c.offsetV = 32 + LINK_HEIGHT * (number - 1);
- // c.offsetH = -1;
- c.leftToRight = false;
- connectionAnchors.put(number + "_OUT", c);
- outputConnectionAnchors.addElement(c);
- }
-
- public void removeConnectionAnchor() {
- if (outputConnectionAnchors.size() == 1)
- return;
- outputConnectionAnchors.remove(outputConnectionAnchors.size() - 1);
- }
-
- public void removeAllConnectionAnchor() {
- outputConnectionAnchors.removeAllElements();
- }
-
- public ExceptionFigure(PgException group) {
+ public ExceptionFigure(PageException group) {
this.exc = group;
if (group != null) {
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/FigureFactory.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/FigureFactory.java 2008-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/FigureFactory.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -56,6 +56,13 @@
conn.setConnectionRouter(new PagesConnectionRouter());
conn.setForegroundColor(selectedColor);
+ PolygonDecoration decor = new PolygonDecoration();
+ decor.setBackgroundColor(NodeFigure.whiteColor);
+ decor.setTemplate(TRIANGLE_TIP);
+ decor.setScale(1, 1);
+
+ conn.setTargetDecoration(decor);
+
return conn;
}
}
\ No newline at end of file
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java 2008-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -17,6 +17,7 @@
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.common.gef.figures.xpl.BaseNodeFigure;
import org.jboss.tools.common.model.ui.ModelUIImages;
+import org.jboss.tools.seam.ui.pages.editor.figures.xpl.FixedConnectionAnchor;
public class NodeFigure extends
BaseNodeFigure {
@@ -91,4 +92,31 @@
}
return text;
}
+
+ final public void initConnectionAnchors(int numberOfAnchors) {
+ if (numberOfAnchors == 0)
+ numberOfAnchors = 1;
+ for (int i = 0; i < numberOfAnchors; i++) {
+ addConnectionAnchor(i);
+ }
+ }
+
+ final public void addConnectionAnchor(int index) {
+ FixedConnectionAnchor c;
+ c = new FixedConnectionAnchor(this);
+ c.offsetV = 32 + LINK_HEIGHT * index;
+ c.leftToRight = false;
+ connectionAnchors.put((index + 1) + "_OUT", c);
+ outputConnectionAnchors.addElement(c);
+ }
+
+ final public void removeConnectionAnchor() {
+ if (outputConnectionAnchors.size() == 1)
+ return;
+ outputConnectionAnchors.remove(outputConnectionAnchors.size() - 1);
+ }
+
+ final public void removeAllConnectionAnchor() {
+ outputConnectionAnchors.removeAllElements();
+ }
}
\ No newline at end of file
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-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -102,48 +102,14 @@
label.setLocation(new Point(getLocation().x - 5,
getLocation().y - 20));
}
-
- public void init(int number) {
- FixedConnectionAnchor c;
- if (number == 0)
- number = 1;
- for (int i = 0; i < number; i++) {
- c = new FixedConnectionAnchor(this);
- c.offsetV = 32 + LINK_HEIGHT * i;
- c.leftToRight = false;
- connectionAnchors.put((i + 1) + "_OUT", c);
- outputConnectionAnchors.addElement(c);
- }
- }
-
- public void addConnectionAnchor(int number) {
- FixedConnectionAnchor c;
- //if (number == 1)
- //return;
- c = new FixedConnectionAnchor(this);
- c.offsetV = 32 + LINK_HEIGHT * number;
- c.leftToRight = false;
- connectionAnchors.put((number + 1) + "_OUT", c);
- outputConnectionAnchors.addElement(c);
- }
-
- public void removeConnectionAnchor() {
- if (outputConnectionAnchors.size() == 1)
- return;
- outputConnectionAnchors.remove(outputConnectionAnchors.size() - 1);
- }
-
- public void removeAllConnectionAnchor() {
- outputConnectionAnchors.removeAllElements();
- }
-
+
public PageFigure(Page group) {
this.page = group;
if (group != null) {
setIcon(group.getImage());
setPath(group.getName());
- init(group.getOutputLinks().size());
+ initConnectionAnchors(group.getOutputLinks().size());
}
setOpaque(false);
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java 2008-06-06
09:57:23 UTC (rev 8600)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java 2008-06-06
10:00:24 UTC (rev 8601)
@@ -47,42 +47,6 @@
//icon = PrintIconHelper.getPrintImage(i);
}
-
- public void init(int number) {
- FixedConnectionAnchor c;
- if (number == 0)
- number = 1;
- for (int i = 0; i < number; i++) {
- c = new FixedConnectionAnchor(this);
- c.offsetV = 32 + LINK_HEIGHT * i;
- c.leftToRight = false;
- connectionAnchors.put((i + 1) + "_OUT", c);
- outputConnectionAnchors.addElement(c);
- }
- }
-
- public void addConnectionAnchor(int number) {
- FixedConnectionAnchor c;
- if (number == 1)
- return;
- c = new FixedConnectionAnchor(this);
- c.offsetV = 32 + LINK_HEIGHT * (number - 1);
- // c.offsetH = -1;
- c.leftToRight = false;
- connectionAnchors.put(number + "_OUT", c);
- outputConnectionAnchors.addElement(c);
- }
-
- public void removeConnectionAnchor() {
- if (outputConnectionAnchors.size() == 1)
- return;
- outputConnectionAnchors.remove(outputConnectionAnchors.size() - 1);
- }
-
- public void removeAllConnectionAnchor() {
- outputConnectionAnchors.removeAllElements();
- }
-
public ParamFigure(Param group) {
this.exc = group;