May 2008 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r8421 - trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2008-05-29 07:45:04 -0400 (Thu, 29 May 2008) New Revision: 8421 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 Log: http://jira.jboss.com/jira/browse/JBIDE-1189 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-05-29 11:45:04 UTC (rev 8421) @@ -0,0 +1,38 @@ +<?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"/> + </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> 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-05-29 11:45:04 UTC (rev 8421) @@ -0,0 +1,37 @@ +<?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"/> + </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>

17 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r8420 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore: pages and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2008-05-29 07:44:44 -0400 (Thu, 29 May 2008) New Revision: 8420 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/ecore/pages/PagesElement.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PagesPackage.java Log: http://jira.jboss.com/jira/browse/JBIDE-1189 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PagesElement.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PagesElement.java 2008-05-29 10:47:06 UTC (rev 8419) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PagesElement.java 2008-05-29 11:44:44 UTC (rev 8420) @@ -95,4 +95,20 @@ * @model type="Link" opposite ="fromElement" */ public EList<Link> getOutputLinks(); + + /** + * returns data of element + * @model + */ + public Object getData(); + + /** + * Sets the value of the '{@link org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement#getData Data}' attribute. + *  + *  + * @param value the new value of the 'Data' attribute. + * @see #getData() + * @generated + */ + void setData(Object value); } 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-05-29 10:47:06 UTC (rev 8419) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages/PagesPackage.java 2008-05-29 11:44:44 UTC (rev 8420) @@ -189,13 +189,22 @@ int PAGES_ELEMENT__OUTPUT_LINKS = 6; /** + * The feature id for the 'Data' attribute. + *  + *  + * @generated + * @ordered + */ + int PAGES_ELEMENT__DATA = 7; + + /** * The number of structural features of the 'Element' class. *  *  * @generated * @ordered */ - int PAGES_ELEMENT_FEATURE_COUNT = 7; + int PAGES_ELEMENT_FEATURE_COUNT = 8; /** * The meta object id for the '{@link org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PageImpl Page}' class. @@ -271,6 +280,15 @@ int PAGE__OUTPUT_LINKS = PAGES_ELEMENT__OUTPUT_LINKS; /** + * The feature id for the 'Data' attribute. + *  + *  + * @generated + * @ordered + */ + int PAGE__DATA = PAGES_ELEMENT__DATA; + + /** * The feature id for the 'Params Visible' attribute. *  *  @@ -362,6 +380,15 @@ int PAGES_MODEL__OUTPUT_LINKS = PAGES_ELEMENT__OUTPUT_LINKS; /** + * The feature id for the 'Data' attribute. + *  + *  + * @generated + * @ordered + */ + int PAGES_MODEL__DATA = PAGES_ELEMENT__DATA; + + /** * The number of structural features of the 'Model' class. *  *  @@ -444,6 +471,15 @@ int PARAM__OUTPUT_LINKS = PAGES_ELEMENT__OUTPUT_LINKS; /** + * The feature id for the 'Data' attribute. + *  + *  + * @generated + * @ordered + */ + int PARAM__DATA = PAGES_ELEMENT__DATA; + + /** * The feature id for the 'Value' attribute. *  *  @@ -535,6 +571,15 @@ int PG_EXCEPTION__OUTPUT_LINKS = PAGES_ELEMENT__OUTPUT_LINKS; /** + * The feature id for the 'Data' attribute. + *  + *  + * @generated + * @ordered + */ + int PG_EXCEPTION__DATA = PAGES_ELEMENT__DATA; + + /** * The number of structural features of the 'Pg Exception' class. *  *  @@ -727,6 +772,17 @@ EReference getPagesElement_OutputLinks(); /** + * Returns the meta object for the attribute '{@link org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement#getData Data}'. + *  + *  + * @return the meta object for the attribute 'Data'. + * @see org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement#getData() + * @see #getPagesElement() + * @generated + */ + EAttribute getPagesElement_Data(); + + /** * Returns the meta object for class '{@link org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesModel Model}'. *  *  @@ -938,6 +994,14 @@ EReference PAGES_ELEMENT__OUTPUT_LINKS = eINSTANCE.getPagesElement_OutputLinks(); /** + * The meta object literal for the 'Data' attribute feature. + *  + *  + * @generated + */ + EAttribute PAGES_ELEMENT__DATA = eINSTANCE.getPagesElement_Data(); + + /** * The meta object literal for the '{@link org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PagesModelImpl Model}' class. *  *  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-05-29 10:47:06 UTC (rev 8419) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.ecore 2008-05-29 11:44:44 UTC (rev 8420) @@ -1,37 +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"/> - </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"/> - </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="PgException" eSuperTypes="#//PagesElement"/> -</ecore:EPackage> 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-05-29 10:47:06 UTC (rev 8419) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/ecore/pages.genmodel 2008-05-29 11:44:44 UTC (rev 8420) @@ -1,36 +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"/> - </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"/> - </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>

17 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r8419 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor: figures and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2008-05-29 06:47:06 -0400 (Thu, 29 May 2008) New Revision: 8419 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/figures/NodeFigure.java Log: http://jira.jboss.com/jira/browse/JBIDE-1189 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-05-29 09:44:04 UTC (rev 8418) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java 2008-05-29 10:47:06 UTC (rev 8419) @@ -15,6 +15,7 @@ import java.util.*; import org.eclipse.draw2d.ConnectionAnchor; +import org.eclipse.draw2d.FigureUtilities; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; @@ -35,6 +36,7 @@ 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.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 { @@ -150,7 +152,10 @@ protected void refreshVisuals() { Point loc = getExceptionModel().getLocation(); - size = new Dimension(150, 21); + 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; 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-05-29 09:44:04 UTC (rev 8418) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java 2008-05-29 10:47:06 UTC (rev 8419) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.pages.editor.figures; +import org.eclipse.draw2d.FigureUtilities; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Font; @@ -63,4 +64,26 @@ .getImage("error_co.gif"); public static final int LINK_HEIGHT = 16; + + public String dottedString(String str, int availTextWidth, Font font){ + if(str == null) str = ""; + String text = new String(str); + + int tWidth = FigureUtilities.getTextExtents(text, font).width; + + if (tWidth > availTextWidth) { + String clipString = "..."; + int totalWidth; + int clipWidth = FigureUtilities.getTextExtents(clipString, font).width;; + int nChars; + for(nChars = 1; nChars < text.length(); nChars++) { + totalWidth = FigureUtilities.getTextExtents(text.substring(0,nChars), font).width+clipWidth; + if (totalWidth > availTextWidth) { + break; + } + } + text = text.substring(0, nChars) + clipString; + } + return text; + } } \ No newline at end of file

17 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r8418 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor: figures and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2008-05-29 05:44:04 -0400 (Thu, 29 May 2008) New Revision: 8418 Added: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFeedbackFigure.java Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesXYLayoutEditPolicy.java Log: http://jira.jboss.com/jira/browse/JBIDE-1189 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-05-29 09:15:17 UTC (rev 8417) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesXYLayoutEditPolicy.java 2008-05-29 09:44:04 UTC (rev 8418) @@ -32,6 +32,8 @@ 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.figures.ExceptionFeedbackFigure; import org.jboss.tools.seam.ui.pages.editor.figures.NodeFigure; import org.jboss.tools.seam.ui.pages.editor.figures.PageFeedbackFigure; @@ -106,6 +108,8 @@ if (modelPart instanceof Page) figure = new PageFeedbackFigure(); + else if (modelPart instanceof PgException) + figure = new ExceptionFeedbackFigure(); else { figure = new RectangleFigure(); ((RectangleFigure) figure).setXOR(true); Added: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFeedbackFigure.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFeedbackFigure.java (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFeedbackFigure.java 2008-05-29 09:44:04 UTC (rev 8418) @@ -0,0 +1,36 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.seam.ui.pages.editor.figures; + +import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.geometry.Rectangle; + +/** + * @author Daniel + * + */ +public class ExceptionFeedbackFigure extends ExceptionFigure { + public ExceptionFeedbackFigure(){ + super(null); + } + + protected void paintFigure(Graphics g) { + g.setXORMode(true); + g.setForegroundColor(whiteColor); + g.setBackgroundColor(ghostFillColor); + + Rectangle r = getBounds().getCopy(); + g.translate(r.getLocation()); + + g.fillRectangle(1,1,r.width-2,r.height-2); + } + +}

17 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r8417 - trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2008-05-29 05:15:17 -0400 (Thu, 29 May 2008) New Revision: 8417 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java Log: http://jira.jboss.com/jira/browse/JBIDE-1189 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-05-29 09:00:48 UTC (rev 8416) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2008-05-29 09:15:17 UTC (rev 8417) @@ -33,6 +33,7 @@ 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.figures.NodeFigure; import org.jboss.tools.seam.ui.pages.editor.figures.PageFigure; public class PageEditPart extends PagesEditPart implements PropertyChangeListener, EditPartListener, Adapter { @@ -152,7 +153,12 @@ protected void refreshVisuals() { Point loc = getPageModel().getLocation(); - size = new Dimension(50, 40); + int height = 23 + getPageModel().getOutputLinks().size()*NodeFigure.LINK_HEIGHT; + + if(getPageModel().getOutputLinks().size() == 0) + height = 23+NodeFigure.LINK_HEIGHT; + + size = new Dimension(50, height); loc.x -= loc.x % 8; loc.y -= loc.y % 8;

17 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r8416 - trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2008-05-29 05:00:48 -0400 (Thu, 29 May 2008) New Revision: 8416 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/PageEditPart.java trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java Log: http://jira.jboss.com/jira/browse/JBIDE-1189 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-05-29 08:26:34 UTC (rev 8415) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java 2008-05-29 09:00:48 UTC (rev 8416) @@ -211,6 +211,13 @@ super.activate(); } + public void deactivate(){ + if (!isActive()) + return; + ((Notifier) getModel()).eAdapters().remove(this); + super.deactivate(); + } + /** * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification) */ 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-05-29 08:26:34 UTC (rev 8415) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2008-05-29 09:00:48 UTC (rev 8416) @@ -213,6 +213,13 @@ super.activate(); } + public void deactivate(){ + if (!isActive()) + return; + ((Notifier) getModel()).eAdapters().remove(this); + super.deactivate(); + } + /** * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification) */ Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java 2008-05-29 08:26:34 UTC (rev 8415) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java 2008-05-29 09:00:48 UTC (rev 8416) @@ -14,9 +14,24 @@ import java.util.ArrayList; import java.util.List; -import org.eclipse.draw2d.*; -import org.eclipse.gef.*; - +import org.eclipse.draw2d.ConnectionAnchor; +import org.eclipse.draw2d.FreeformViewport; +import org.eclipse.draw2d.IFigure; +import org.eclipse.emf.common.notify.Adapter; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.notify.Notifier; +import org.eclipse.gef.AccessibleEditPart; +import org.eclipse.gef.CompoundSnapToHelper; +import org.eclipse.gef.ConnectionEditPart; +import org.eclipse.gef.DragTracker; +import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; +import org.eclipse.gef.LayerConstants; +import org.eclipse.gef.Request; +import org.eclipse.gef.SnapToGeometry; +import org.eclipse.gef.SnapToGrid; +import org.eclipse.gef.SnapToGuides; +import org.eclipse.gef.SnapToHelper; import org.eclipse.gef.requests.SelectionRequest; import org.eclipse.gef.rulers.RulerProvider; import org.eclipse.gef.tools.DeselectAllTracker; @@ -27,7 +42,7 @@ import org.jboss.tools.seam.ui.pages.editor.figures.DiagramFigure; public class PagesDiagramEditPart extends ContainerEditPart implements - LayerConstants, PagesModelListener { + LayerConstants, PagesModelListener, Adapter { /* * */ @@ -249,4 +264,52 @@ } return super.getAdapter(adapter); } + + /** + * @see org.eclipse.gef.EditPart#activate() + */ + public void activate() { + if (isActive()) + return; + ((Notifier) getModel()).eAdapters().add(this); + super.activate(); + } + + public void deactivate(){ + if (!isActive()) + return; + ((Notifier) getModel()).eAdapters().remove(this); + super.deactivate(); + } + + /** + * @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification) + */ + public void notifyChanged(Notification notification) { + refresh(); + refreshVisuals(); + } + /** + * ) + * + * @see org.eclipse.emf.common.notify.Adapter#getTarget() + */ + public Notifier getTarget() { + + return null; + } + + /** + * @see org.eclipse.emf.common.notify.Adapter#isAdapterForType(java.lang.Object) + */ + public boolean isAdapterForType(Object type) { + return false; + } + + /** + * @see org.eclipse.emf.common.notify.Adapter#setTarget(org.eclipse.emf.common.notify.Notifier) + */ + public void setTarget(Notifier newTarget) { + } + }

17 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r8415 - trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2008-05-29 04:26:34 -0400 (Thu, 29 May 2008) New Revision: 8415 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java Log: http://jira.jboss.com/jira/browse/JBIDE-1189 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-05-29 06:58:32 UTC (rev 8414) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java 2008-05-29 08:26:34 UTC (rev 8415) @@ -101,6 +101,7 @@ c = new FixedConnectionAnchor(this); c.offsetV = 10; + c.offsetH = -1; c.leftToRight = false; connectionAnchors.put("1_OUT", c); outputConnectionAnchors.addElement(c); @@ -130,8 +131,6 @@ Rectangle r = getBounds().getCopy(); g.translate(r.getLocation()); - int start = 0; - if (exc != null) { g.setBackgroundColor(exceptionBackgroundColor); g.setForegroundColor(exceptionForegroundColor); @@ -139,14 +138,14 @@ g.setBackgroundColor(lightGrayColor); } - g.fillRectangle(0, 0, r.width, r.height); + g.fillRectangle(1, 1, r.width-2, r.height-2); g.setBackgroundColor(whiteColor); - g.fillRectangle(start + 1, 1, 22, 19); + g.fillRectangle(1, 1, 22, 19); if (icon != null) - g.drawImage(icon, start + 4, 2); + g.drawImage(icon, 4, 2); if(exc != null){ g.setFont(exceptionFont);

17 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r8414 - in trunk: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2008-05-29 02:58:32 -0400 (Thu, 29 May 2008) New Revision: 8414 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ArchivesBuildListener.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/DataSourceXmlDeployer.java Log: JBIDE-2267 - removing useless api's Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ArchivesBuildListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ArchivesBuildListener.java 2008-05-29 02:16:41 UTC (rev 8413) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/ArchivesBuildListener.java 2008-05-29 06:58:32 UTC (rev 8414) @@ -23,22 +23,25 @@ import java.util.ArrayList; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.IServerWorkingCopy; import org.eclipse.wst.server.core.ServerCore; import org.eclipse.wst.server.core.internal.ModuleFactory; import org.eclipse.wst.server.core.internal.ServerPlugin; -import org.eclipse.wst.server.core.model.ServerBehaviourDelegate; import org.jboss.ide.eclipse.archives.core.model.ArchivesModel; import org.jboss.ide.eclipse.archives.core.model.IArchive; import org.jboss.ide.eclipse.archives.core.model.IArchiveBuildListener; import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet; import org.jboss.ide.eclipse.archives.core.model.IArchiveModelListener; import org.jboss.ide.eclipse.archives.core.model.IArchiveNodeDelta; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.modules.PackageModuleFactory.PackagedModuleDelegate; import org.jboss.ide.eclipse.as.core.server.IDeployableServer; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; @@ -92,10 +95,24 @@ DeployableServerBehavior[] serverBehaviors = ArchivesBuildListener.getServers(servers); if( serverBehaviors != null ) { for( int i = 0; i < serverBehaviors.length; i++ ) { - serverBehaviors[i].publishOneModule(publishType, module, ServerBehaviourDelegate.CHANGED, new NullProgressMonitor()); + publish(serverBehaviors[i].getServer(), publishType, module ); } } } + + protected static IStatus publish(IServer server, int publishType, IModule[] module ) { + try { + IServerWorkingCopy copy = server.createWorkingCopy(); + copy.modifyModules(module, new IModule[0], new NullProgressMonitor()); + IServer saved = copy.save(false, new NullProgressMonitor()); + saved.publish(IServer.PUBLISH_INCREMENTAL, new NullProgressMonitor()); + } catch( CoreException ce ) { + return new Status(Status.ERROR, JBossServerCorePlugin.PLUGIN_ID, + "Cannot deploy file " + module[0].getName(), ce); + } + return Status.OK_STATUS; + + } protected static IModule[] getModule(IArchive node) { ModuleFactory factory = ServerPlugin.findModuleFactory("org.jboss.ide.eclipse.as.core.PackageModuleFactory"); IModule mod = factory.findModule(PackageModuleFactory.getID(node), new NullProgressMonitor()); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2008-05-29 02:16:41 UTC (rev 8413) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2008-05-29 06:58:32 UTC (rev 8414) @@ -21,30 +21,13 @@ */ package org.jboss.ide.eclipse.as.core.server.internal; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.MultiStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.wst.common.componentcore.ModuleCoreNature; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.IServerWorkingCopy; -import org.eclipse.wst.server.core.ServerUtil; -import org.eclipse.wst.server.core.internal.IModuleVisitor; -import org.eclipse.wst.server.core.internal.ProgressUtil; -import org.eclipse.wst.server.core.internal.Server; -import org.eclipse.wst.server.core.internal.ServerPlugin; -import org.eclipse.wst.server.core.model.PublishOperation; import org.eclipse.wst.server.core.model.ServerBehaviourDelegate; -import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel; import org.jboss.ide.eclipse.as.core.extensions.events.EventLogModel.EventLogTreeItem; import org.jboss.ide.eclipse.as.core.modules.PackageModuleFactory; @@ -180,99 +163,4 @@ public void setServerStopping() { setServerState(IServer.STATE_STOPPING); } - - - // Basically stolen from RunOnServerActionDelegate - @Deprecated - public IStatus publishOneModule(int kind, IModule[] module, int deltaKind, IProgressMonitor monitor) { - return publishOneModule(module, kind, deltaKind, true, monitor); - } - - /* - * hack for eclipse bug 169570 - */ - public IStatus publishOneModule(IModule[] module, int kind, int deltaKind, boolean recurse, IProgressMonitor monitor) { - try { - - // add it to the server first - if( module.length == 1 ) - addAndRemoveModules(module, deltaKind); - - ArrayList moduleList = new ArrayList(); - ArrayList deltaKindList = new ArrayList(); - fillPublishOneModuleLists(module, moduleList, deltaKindList, deltaKind, recurse); - - ((Server)getServer()).getServerPublishInfo().startCaching(); - - - PublishOperation[] tasks = getTasks(kind, moduleList, deltaKindList); - MultiStatus tempMulti = new MultiStatus(ServerPlugin.PLUGIN_ID, 0, "", null); - publishStart(ProgressUtil.getSubMonitorFor(monitor, 1000)); - performTasks(tasks, monitor); - publishServer(kind, ProgressUtil.getSubMonitorFor(monitor, 1000)); - publishModules(kind, moduleList, deltaKindList, tempMulti, monitor); - publishFinish(ProgressUtil.getSubMonitorFor(monitor, 500)); - - final List modules2 = new ArrayList(); - ((Server)getServer()).visit(new IModuleVisitor() { - public boolean visit(IModule[] module) { - if (((Server)getServer()).getModulePublishState(module) == IServer.PUBLISH_STATE_NONE) - ((Server)getServer()).getServerPublishInfo().fill(module); - - modules2.add(module); - return true; - } - }, monitor); - - ((Server)getServer()).getServerPublishInfo().removeDeletedModulePublishInfo(((Server)getServer()), modules2); - ((Server)getServer()).getServerPublishInfo().clearCache(); - ((Server)getServer()).getServerPublishInfo().save(); - - return Status.OK_STATUS; - - } catch( CoreException e ) { - IStatus s = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, - "Unexpected Exception publishing one module: ", e); - JBossServerCorePlugin.getDefault().getLog().log(s); - return s; - } - } - - protected void fillPublishOneModuleLists(IModule[] module, ArrayList moduleList, ArrayList deltaKindList, int deltaKind, boolean recurse) { - moduleList.add(module); - deltaKindList.add(new Integer(deltaKind)); - if( recurse ) { - ArrayList tmp = new ArrayList(); - IModule[] children = getServer().getChildModules(module, new NullProgressMonitor()); - if( children != null ) { - for( int i = 0; i < children.length; i++ ) { - tmp = new ArrayList(); - tmp.addAll(Arrays.asList(module)); - tmp.add(children[i]); - fillPublishOneModuleLists((IModule[]) tmp.toArray(new IModule[tmp.size()]), moduleList, deltaKindList, deltaKind, recurse); - } - } - } - - // if removing, we must remove child first - if( deltaKind == ServerBehaviourDelegate.REMOVED ) { - Collections.reverse(moduleList); - Collections.reverse(deltaKindList); - } - } - - protected void addAndRemoveModules(IModule[] module, int deltaKind) throws CoreException { - if( getServer() == null ) return; - boolean contains = ServerUtil.containsModule(getServer(), module[0], new NullProgressMonitor()); - - if( !contains && (deltaKind == ServerBehaviourDelegate.ADDED) || (deltaKind == ServerBehaviourDelegate.CHANGED)) { - IServerWorkingCopy wc = getServer().createWorkingCopy(); - ServerUtil.modifyModules(wc, module, new IModule[0], new NullProgressMonitor()); - wc.save(false, new NullProgressMonitor()); - } else if( contains && deltaKind == ServerBehaviourDelegate.REMOVED) { - IServerWorkingCopy wc = getServer().createWorkingCopy(); - ServerUtil.modifyModules(wc, new IModule[0], module, new NullProgressMonitor()); - wc.save(false, new NullProgressMonitor()); - } - } } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/DataSourceXmlDeployer.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/DataSourceXmlDeployer.java 2008-05-29 02:16:41 UTC (rev 8413) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/DataSourceXmlDeployer.java 2008-05-29 06:58:32 UTC (rev 8414) @@ -10,16 +10,21 @@ ******************************************************************************/ package org.jboss.tools.seam.internal.core.project.facet; +import java.util.ArrayList; + import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.model.ServerBehaviourDelegate; +import org.eclipse.wst.server.core.IServerWorkingCopy; +import org.eclipse.wst.server.core.IServer.IOperationListener; import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; import org.jboss.tools.seam.core.SeamCoreMessages; @@ -70,14 +75,17 @@ IPath append = projectPath.append(deploy); //$NON-NLS-1$ if (SingleDeployableFactory.makeDeployable(append)) { - - IModule module = SingleDeployableFactory.findModule(append); - - // custom API to deploy / publish only one module. - IStatus t = deployer.publishOneModule(IServer.PUBLISH_FULL, - new IModule[] { module }, ServerBehaviourDelegate.ADDED, - monitor); - return t; + try { + IModule module = SingleDeployableFactory.findModule(append); + IServerWorkingCopy copy = s.createWorkingCopy(); + copy.modifyModules(new IModule[]{module}, new IModule[0], new NullProgressMonitor()); + IServer saved = copy.save(false, new NullProgressMonitor()); + saved.publish(IServer.PUBLISH_INCREMENTAL, new NullProgressMonitor()); + } catch( CoreException ce ) { + return new Status(Status.WARNING, SeamCorePlugin.PLUGIN_ID, + SeamCoreMessages.DATA_SOURCE_XML_DEPLOYER_COULD_NOT_DEPLOY_DATASOURCE + append, ce); + } + return Status.OK_STATUS; } else { return new Status(Status.WARNING, SeamCorePlugin.PLUGIN_ID, SeamCoreMessages.DATA_SOURCE_XML_DEPLOYER_COULD_NOT_DEPLOY_DATASOURCE + append); //$NON-NLS-1$

17 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r8412 - trunk/jst/plugins/org.jboss.tools.jst.web.tiles.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2008-05-28 19:44:23 -0400 (Wed, 28 May 2008) New Revision: 8412 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/plugin.xml Log: test poll scm hudson feature Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/plugin.xml 2008-05-28 20:51:17 UTC (rev 8411) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/plugin.xml 2008-05-28 23:44:23 UTC (rev 8412) @@ -82,7 +82,6 @@ class="org.jboss.tools.jst.web.tiles.model.handlers.CreateTilesSupport"/> </extension> - <extension point="org.eclipse.wst.xml.core.catalogContributions"> <catalogContribution id="default"> <public

17 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r8411 - trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2008-05-28 16:51:17 -0400 (Wed, 28 May 2008) New Revision: 8411 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlImgTemplate.java Log: Fixed compilation error for Java 1.5 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlImgTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlImgTemplate.java 2008-05-28 17:30:26 UTC (rev 8410) +++ trunk/vpe/plugins/org.jboss.tools.vpe.html/src/org/jboss/tools/vpe/html/template/HtmlImgTemplate.java 2008-05-28 20:51:17 UTC (rev 8411) @@ -35,7 +35,6 @@ /* (non-Javadoc) * @see org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.tools.vpe.editor.context.VpePageContext, org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument) */ - @Override public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) {

17 years, 7 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits May 2008