July 2009 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r16543 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: edimap and 9 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2009-07-13 04:56:40 -0400 (Mon, 13 Jul 2009) New Revision: 16543 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/AbstractEDIMappingEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIDataContainerEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIDataEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIMappingNodeEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDITreeContainerEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIDataContainerGraphModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIDataGraphModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIMappingNodeContainerGraphModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIMappingNodeGraphModel.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIEdiPartDirectEditManager.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIEditPartFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDISegementsEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDITreeNodeEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/common/SmooksGraphicalMenuContextProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeContainerEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editpolicy/TreeNodeGraphicalNodeEditPolicy.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/LeftOrRightAnchor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeContainerFigure.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeNodeFigure.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeModel.java Log: JBIDE-4592 1. Create connections model 2. Make the node can drag line to link each other. 3. Record the graphical informations of graph model. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-07-13 01:44:56 UTC (rev 16542) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -30,6 +30,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; +import org.eclipse.draw2d.IFigure; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EObject; @@ -40,6 +41,7 @@ import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor.PropertyValueWrapper; +import org.eclipse.gef.EditPart; import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; @@ -118,6 +120,9 @@ import org.jboss.tools.smooks.configuration.editors.javabean.JavaMethodsSelectionDialog; import org.jboss.tools.smooks.configuration.editors.javabean.JavaPropertiesSelectionDialog; import org.jboss.tools.smooks.core.SmooksCoreActivator; +import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart; +import org.jboss.tools.smooks.gef.tree.figures.TreeNodeFigure; +import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; import org.jboss.tools.smooks.model.freemarker.BindTo; import org.jboss.tools.smooks.model.freemarker.Freemarker; import org.jboss.tools.smooks.model.freemarker.Use; @@ -2104,10 +2109,22 @@ input = GraphFactory.eINSTANCE.createInputType(); } input.setType(type); - ParamType param = GraphFactory.eINSTANCE.createParamType(); - param.setValue(value); - param.setName(SmooksModelUtils.PARAM_NAME_PATH); - input.getParam().add(param); + ParamType pathParam = null; + List<ParamType> paramList = input.getParam(); + for (Iterator<?> iterator = paramList.iterator(); iterator.hasNext();) { + ParamType paramType = (ParamType) iterator.next(); + if (SmooksModelUtils.PARAM_NAME_PATH.equals(paramType.getName())) { + pathParam = paramType; + break; + } + } + if (pathParam == null) { + pathParam = GraphFactory.eINSTANCE.createParamType(); + pathParam.setName(SmooksModelUtils.PARAM_NAME_PATH); + } + pathParam.setValue(value); + + input.getParam().add(pathParam); List<ParamType> params = generateExtParams(type, path, properties); input.getParam().addAll(params); extType.getInput().add(input); @@ -2125,6 +2142,49 @@ } } + public static void expandGraphTree(List<TreeNodeModel> expandNodes, TreeNodeEditPart rootEditPart) { + for (Iterator<?> iterator = expandNodes.iterator(); iterator.hasNext();) { + TreeNodeModel treeNodeModel = (TreeNodeModel) iterator.next(); + TreeNodeModel parent = treeNodeModel; + if (parent == null) + continue; + List<TreeNodeModel> parentList = new ArrayList<TreeNodeModel>(); + boolean canExpand = true; + while (parent != rootEditPart.getModel()) { + parent = parent.getParent(); + if (parent == null) { + canExpand = false; + break; + } + parentList.add(parent); + } + if (!canExpand) { + parentList.clear(); + parentList = null; + continue; + } + parentList.remove(parentList.size() - 1); + ((TreeNodeEditPart) rootEditPart).expandNode(); + for (int i = parentList.size() - 1; i >= 0; i--) { + boolean expanded = false; + TreeNodeModel parentNode = parentList.get(i); + List<?> editParts = rootEditPart.getChildren(); + for (Iterator<?> iterator2 = editParts.iterator(); iterator2.hasNext();) { + EditPart editPart = (EditPart) iterator2.next(); + if (editPart instanceof TreeNodeEditPart && editPart.getModel() == parentNode) { + ((TreeNodeEditPart) editPart).expandNode(); + rootEditPart = (TreeNodeEditPart) editPart; + expanded = true; + break; + } + } + if (!expanded) { + break; + } + } + } + } + public static List<ParamType> generateExtParams(String type, String path, Properties properties) { List<ParamType> lists = new ArrayList<ParamType>(); if (properties != null) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIEdiPartDirectEditManager.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIEdiPartDirectEditManager.java 2009-07-13 01:44:56 UTC (rev 16542) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIEdiPartDirectEditManager.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -34,7 +34,7 @@ public class EDIEdiPartDirectEditManager extends DirectEditManager { Font scaledFont; protected VerifyListener verifyListener; - protected Label activityLabel; + protected Label textLabel; /** * Creates a new ActivityDirectEditManager with the given attributes. @@ -49,7 +49,7 @@ public EDIEdiPartDirectEditManager(GraphicalEditPart source, Class editorType, CellEditorLocator locator, Label label) { super(source, editorType, locator); - activityLabel = label; + textLabel = label; } /** @@ -88,7 +88,7 @@ if(model instanceof TreeNodeModel){ model = ((TreeNodeModel)model).getData(); } - String initialLabelText = activityLabel.getText(); + String initialLabelText = textLabel.getText(); if(model instanceof MappingNode){ initialLabelText = ((MappingNode)model).getXmltag(); } @@ -100,7 +100,7 @@ scaledFont = figure.getFont(); FontData data = scaledFont.getFontData()[0]; Dimension fontSize = new Dimension(0, data.getHeight()); - activityLabel.translateToAbsolute(fontSize); + textLabel.translateToAbsolute(fontSize); data.setHeight(fontSize.height); scaledFont = new Font(null, data); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIEditPartFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIEditPartFactory.java 2009-07-13 01:44:56 UTC (rev 16542) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIEditPartFactory.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -12,39 +12,59 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartFactory; +import org.jboss.tools.smooks.configuration.editors.xml.TagObject; +import org.jboss.tools.smooks.edimap.editparts.EDIDataContainerEditPart; +import org.jboss.tools.smooks.edimap.editparts.EDIDataEditPart; +import org.jboss.tools.smooks.edimap.editparts.EDIMappingNodeEditPart; +import org.jboss.tools.smooks.edimap.models.EDIDataContainerGraphModel; +import org.jboss.tools.smooks.edimap.models.EDIDataGraphModel; +import org.jboss.tools.smooks.edimap.models.EDIMappingNodeGraphModel; +import org.jboss.tools.smooks.edimap.models.EDIMappingNodeContainerGraphModel; import org.jboss.tools.smooks.gef.common.RootModel; import org.jboss.tools.smooks.gef.tree.editparts.RootEditPart; import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeConnectionEditPart; import org.jboss.tools.smooks.gef.tree.model.TreeContainerModel; import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection; import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; +import org.jboss.tools.smooks.model.medi.Segments; /** * @author Dart (dpeng(a)redhat.com) - * + * */ -public class EDIEditPartFactory implements EditPartFactory{ +public class EDIEditPartFactory implements EditPartFactory { - /* (non-Javadoc) - * @see org.eclipse.gef.EditPartFactory#createEditPart(org.eclipse.gef.EditPart, java.lang.Object) + /* + * (non-Javadoc) + * + * @see + * org.eclipse.gef.EditPartFactory#createEditPart(org.eclipse.gef.EditPart, + * java.lang.Object) */ public EditPart createEditPart(EditPart context, Object model) { EditPart editPart = null; - if(model instanceof RootModel){ + if (model instanceof RootModel) { editPart = new RootEditPart(); } - if(model.getClass() == TreeNodeModel.class){ - editPart = new EDITreeNodeEditPart(); - }if(model.getClass() == TreeContainerModel.class){ + if (model instanceof EDIMappingNodeGraphModel) { + editPart = new EDIMappingNodeEditPart(); + } + if (model instanceof EDIDataGraphModel) { + editPart = new EDIDataEditPart(); + } + if(model instanceof EDIMappingNodeContainerGraphModel){ editPart = new EDISegementsEditPart(); } - if(model.getClass() == TreeNodeConnection.class){ + if(model instanceof EDIDataContainerGraphModel){ + editPart = new EDIDataContainerEditPart(); + } + if (model.getClass() == TreeNodeConnection.class) { editPart = new TreeNodeConnectionEditPart(); } - if(editPart != null){ + if (editPart != null) { editPart.setModel(model); } return editPart; } - + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java 2009-07-13 01:44:56 UTC (rev 16542) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -10,8 +10,10 @@ ******************************************************************************/ package org.jboss.tools.smooks.edimap.editor; +import java.io.File; import java.io.IOException; import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; import java.util.Collections; import java.util.EventObject; import java.util.Iterator; @@ -79,16 +81,19 @@ import org.jboss.tools.smooks.edimap.actions.AddFieldAction; import org.jboss.tools.smooks.edimap.actions.AddSegmentAction; import org.jboss.tools.smooks.edimap.actions.AddSubComponentAction; +import org.jboss.tools.smooks.edimap.models.EDIDataContainerGraphModel; +import org.jboss.tools.smooks.edimap.models.EDIMappingNodeContainerGraphModel; import org.jboss.tools.smooks.editor.ISmooksModelProvider; import org.jboss.tools.smooks.gef.common.RootModel; +import org.jboss.tools.smooks.gef.tree.editparts.RootEditPart; import org.jboss.tools.smooks.gef.tree.figures.IMoveableModel; -import org.jboss.tools.smooks.gef.tree.model.TreeContainerModel; import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection; import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; import org.jboss.tools.smooks.model.graphics.ext.FigureType; import org.jboss.tools.smooks.model.graphics.ext.GraphType; import org.jboss.tools.smooks.model.graphics.ext.ISmooksGraphChangeListener; import org.jboss.tools.smooks.model.graphics.ext.InputType; +import org.jboss.tools.smooks.model.graphics.ext.ParamType; import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType; import org.jboss.tools.smooks.model.medi.Delimiters; import org.jboss.tools.smooks.model.medi.Description; @@ -102,7 +107,7 @@ * */ public class EDIMapFormPage extends FormPage implements ISmooksModelValidateListener, ISmooksGraphChangeListener, - ISelectionChangedListener { + ISelectionChangedListener, ModifyListener { private ISmooksModelProvider modelProvider; @@ -213,17 +218,45 @@ DocumentRoot root = (DocumentRoot) modelProvider.getSmooksModel(); Segments segments = root.getEdimap().getSegments(); - TreeContainerModel container = new TreeContainerModel(segments, new AdapterFactoryContentProvider(editingDomain - .getAdapterFactory()), new EDIGraphicalTreeLabelProvider(editingDomain.getAdapterFactory())); + EDIMappingNodeContainerGraphModel container = new EDIMappingNodeContainerGraphModel(segments, new AdapterFactoryContentProvider( + editingDomain.getAdapterFactory()), + new EDIGraphicalTreeLabelProvider(editingDomain.getAdapterFactory())); container.setHeaderVisable(true); - graphicalRootModel.getChildren().add(container); + graphicalRootModel.addTreeNode(container); + this.ediFilePath = getEDIFilePath(); + + createEDIDataGraphModel(); + + List<TreeNodeModel> linkedSourceModel = createLinkModel(); + SmooksGraphicsExtType exttype = this.modelProvider.getSmooksGraphicsExt(); initModelGraphicsInformation(exttype); getGraphicalViewer().setContents(graphicalRootModel); + + expandSegmentNode(linkedSourceModel); + } + private void expandSegmentNode(List<TreeNodeModel> linkedSourceModel) { + EditPart editPart = getGraphicalViewer().getContents(); + EDISegementsEditPart segmentsPart = null; + if (editPart instanceof RootEditPart) { + List<?> children = ((RootEditPart) editPart).getChildren(); + for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) { + Object object = (Object) iterator.next(); + if (object instanceof EDISegementsEditPart) { + segmentsPart = (EDISegementsEditPart) object; + break; + } + } + } + if (segmentsPart != null) { + SmooksUIUtils.expandGraphTree(linkedSourceModel, segmentsPart); + } + } + protected void initializeGraphicalViewer() { initGraphicalModel(); } @@ -321,20 +354,18 @@ modelProvider, getEditor()); } descriptorComposite.getParent().layout(); - + disposeCompositeControls(delimitersComposite, null); - + AttributeFieldEditPart pathEditPart = SmooksUIUtils.createFileSelectionTextFieldEditor("EDI Mapping File", delimitersComposite, editingDomain, toolkit, null, null, SmooksUIUtils.VALUE_TYPE_TEXT, null, null); final Text ediFileText = (Text) pathEditPart.getContentControl(); - ediFileText.addModifyListener(new ModifyListener() { + String filePath = getEDIFilePath(); + if (filePath != null) { + ediFileText.setText(filePath); + } + ediFileText.addModifyListener(this); - public void modifyText(ModifyEvent e) { - ediFilePath = ediFileText.getText(); - setDataViewerModel(); - } - }); - if (delimitersCreator != null) { IItemPropertySource itemPropertySource = (IItemPropertySource) editingDomain.getAdapterFactory().adapt( delimiters, IItemPropertySource.class); @@ -345,6 +376,39 @@ initGraphicalModel(); } + private void removeEDIGraphModel() { + List<TreeNodeModel> children = this.graphicalRootModel.getChildren(); + List<TreeNodeModel> temp = new ArrayList<TreeNodeModel>(children); + for (Iterator<?> iterator = temp.iterator(); iterator.hasNext();) { + TreeNodeModel treeNodeModel = (TreeNodeModel) iterator.next(); + if (treeNodeModel.getData() instanceof TagObject) { + graphicalRootModel.removeTreeNode(treeNodeModel); + } + } + temp.clear(); + temp = null; + } + + private String getEDIFilePath() { + if (modelProvider != null) { + SmooksGraphicsExtType ext = modelProvider.getSmooksGraphicsExt(); + List<InputType> inputList = ext.getInput(); + for (Iterator<?> iterator = inputList.iterator(); iterator.hasNext();) { + InputType inputType = (InputType) iterator.next(); + if (SmooksModelUtils.INPUT_TYPE_EDI.equals(inputType.getType())) { + List<ParamType> paramList = inputType.getParam(); + for (Iterator<?> iterator2 = paramList.iterator(); iterator2.hasNext();) { + ParamType paramType = (ParamType) iterator2.next(); + if (SmooksModelUtils.PARAM_NAME_PATH.equals(paramType.getName())) { + return paramType.getValue(); + } + } + } + } + } + return null; + } + private ActionRegistry getActionRegistry() { if (actionRegistry == null) actionRegistry = new ActionRegistry(); @@ -493,11 +557,10 @@ GridLayout gridLayout = new GridLayout(); gridLayout.marginHeight = 13; gridLayout.numColumns = 2; - // gridLayout.makeColumnsEqualWidth = true; + gridLayout.makeColumnsEqualWidth = true; form.getBody().setLayout(gridLayout); - Section descriptionSection = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.TWISTIE - | Section.EXPANDED | Section.DESCRIPTION); + Section descriptionSection = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.DESCRIPTION); GridData gd = new GridData(GridData.FILL_HORIZONTAL); gd.verticalAlignment = GridData.BEGINNING; descriptionSection.setLayoutData(gd); @@ -515,8 +578,7 @@ descriptionCreator.createModelPanel(toolkit, descriptorComposite, modelProvider, getEditor()); } - Section delimiterSection = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.TWISTIE - | Section.EXPANDED | Section.DESCRIPTION); + Section delimiterSection = toolkit.createSection(form.getBody(), Section.TITLE_BAR | Section.DESCRIPTION); gd = new GridData(GridData.FILL_HORIZONTAL); gd.verticalAlignment = GridData.BEGINNING; gd.verticalSpan = 2; @@ -534,14 +596,12 @@ AttributeFieldEditPart pathEditPart = SmooksUIUtils.createFileSelectionTextFieldEditor("EDI Mapping File", delimitersComposite, editingDomain, toolkit, null, null, SmooksUIUtils.VALUE_TYPE_TEXT, null, null); final Text ediFileText = (Text) pathEditPart.getContentControl(); - ediFileText.addModifyListener(new ModifyListener() { + String filePath = getEDIFilePath(); + if (filePath != null) { + ediFileText.setText(filePath); + } + ediFileText.addModifyListener(this); - public void modifyText(ModifyEvent e) { - ediFilePath = ediFileText.getText(); - setDataViewerModel(); - } - }); - if (delimitersCreator != null) { delimitersCreator.createModelPanel(toolkit, delimitersComposite, modelProvider, getEditor()); } @@ -606,19 +666,17 @@ sashForm.setWeights(new int[] { 10, 3 }); } - private void setDataViewerModel() { - if (delimiters != null && ediFilePath != null) { - InputType inputType1 = null; - List<InputType> list = modelProvider.getSmooksGraphicsExt().getInput(); - for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) { - InputType inputType = (InputType) iterator.next(); - if (SmooksModelUtils.INPUT_TYPE_EDI.equals(inputType.getType())) { - inputType1 = inputType; - break; + private void createEDIDataGraphModel() { + if (ediFilePath != null) { + try { + if (!new File(SmooksUIUtils.parseFilePath(ediFilePath)).exists()) { + return; } + } catch (Throwable t) { + return; } - SmooksUIUtils.recordInputDataInfomation(inputType1, modelProvider.getSmooksGraphicsExt(), - SmooksModelUtils.INPUT_TYPE_EDI, ediFilePath, null); + } + if (delimiters != null && ediFilePath != null) { String segment = delimiters.getSegment(); String field = delimiters.getField(); String component = delimiters.getComponent(); @@ -653,13 +711,11 @@ List<?> children = tl.getChildren(); for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) { Object object = (Object) iterator.next(); - TreeContainerModel container = new TreeContainerModel(object, + EDIDataContainerGraphModel container = new EDIDataContainerGraphModel(object, new XMLStructuredDataContentProvider(), new XMLStructuredDataLabelProvider()); container.setHeaderVisable(true); graphicalRootModel.addTreeNode(container); } - - linkNode(); } catch (InvocationTargetException e) { e.printStackTrace(); } catch (IOException e) { @@ -668,24 +724,72 @@ } } - private void linkNode() { + private void disconnectSegement(List<Segment> segmentList) { + for (Iterator<?> iterator = segmentList.iterator(); iterator.hasNext();) { + Segment segment = (Segment) iterator.next(); + TreeNodeModel segmentGraphicalModel = findSegmentGraphicalModel(segment); + List<TreeNodeConnection> sourceConnections = segmentGraphicalModel.getSourceConnections(); + List<TreeNodeConnection> targetConnections = segmentGraphicalModel.getTargetConnections(); + List<TreeNodeConnection> sourceConnectionsTemp = new ArrayList<TreeNodeConnection>(sourceConnections); + List<TreeNodeConnection> targetConnectionsTemp = new ArrayList<TreeNodeConnection>(targetConnections); + for (Iterator<?> iterator2 = targetConnectionsTemp.iterator(); iterator2.hasNext();) { + TreeNodeConnection treeNodeConnection = (TreeNodeConnection) iterator2.next(); + treeNodeConnection.disconnect(); + } + targetConnectionsTemp.clear(); + targetConnectionsTemp = null; + + for (Iterator<?> iterator2 = sourceConnectionsTemp.iterator(); iterator2.hasNext();) { + TreeNodeConnection treeNodeConnection = (TreeNodeConnection) iterator2.next(); + treeNodeConnection.disconnect(); + } + sourceConnectionsTemp.clear(); + sourceConnectionsTemp = null; + + disconnectSegement(segment.getSegment()); + } + } + + private void disconnectSegements() { if (graphicalRootModel != null && segments != null) { List<Segment> segmentList = segments.getSegment(); - linkNode(segmentList); + disconnectSegement(segmentList); } } - private void linkNode(List<Segment> segmentList) { + private List<TreeNodeModel> createLinkModel() { + if (graphicalRootModel != null && segments != null) { + List<Segment> segmentList = segments.getSegment(); + return linkNode(segmentList); + } + return Collections.emptyList(); + } + + private List<TreeNodeModel> linkNode(List<Segment> segmentList) { + List<TreeNodeModel> sourceLinkedModel = new ArrayList<TreeNodeModel>(); for (Iterator<?> iterator = segmentList.iterator(); iterator.hasNext();) { Segment segment = (Segment) iterator.next(); TreeNodeModel segmentGraphicalModel = findSegmentGraphicalModel(segment); String code = segment.getSegcode(); TreeNodeModel model = findEDIDataGraphicalModel(code); - new TreeNodeConnection(model, segmentGraphicalModel).connect(); - linkNode(segment.getSegment()); + if (segmentGraphicalModel == null || model == null) + continue; + new TreeNodeConnection(segmentGraphicalModel, model).connect(); + sourceLinkedModel.add(segmentGraphicalModel); + List<TreeNodeModel> linkedModel = linkNode(segment.getSegment()); + if (linkedModel != null) { + sourceLinkedModel.addAll(linkedModel); + } } + return sourceLinkedModel; } + /** + * it's dangerous , the method is dangerous + * + * @param segment + * @return + */ private TreeNodeModel findSegmentGraphicalModel(Segment segment) { if (graphicalRootModel != null) { List<TreeNodeModel> treeNodeList = graphicalRootModel.getChildren(); @@ -785,4 +889,28 @@ updateSelectionActions(); } } + + public void modifyText(ModifyEvent e) { + Text ediFileText = (Text) e.getSource(); + ediFilePath = ediFileText.getText(); + InputType inputType1 = null; + SmooksGraphicsExtType ext = modelProvider.getSmooksGraphicsExt(); + List<InputType> list = ext.getInput(); + for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) { + InputType inputType = (InputType) iterator.next(); + if (SmooksModelUtils.INPUT_TYPE_EDI.equals(inputType.getType())) { + inputType1 = inputType; + break; + } + } + SmooksUIUtils.recordInputDataInfomation(inputType1, modelProvider.getSmooksGraphicsExt(), + SmooksModelUtils.INPUT_TYPE_EDI, ediFilePath, null); + + disconnectSegements(); + removeEDIGraphModel(); + createEDIDataGraphModel(); + initModelGraphicsInformation(ext); + List<TreeNodeModel> sourceLinkedModel = this.createLinkModel(); + expandSegmentNode(sourceLinkedModel); + } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDISegementsEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDISegementsEditPart.java 2009-07-13 01:44:56 UTC (rev 16542) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDISegementsEditPart.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -10,66 +10,13 @@ ******************************************************************************/ package org.jboss.tools.smooks.edimap.editor; -import java.beans.PropertyChangeEvent; +import org.jboss.tools.smooks.edimap.editparts.EDITreeContainerEditPart; -import org.eclipse.draw2d.geometry.Rectangle; -import org.eclipse.gef.DefaultEditDomain; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.forms.editor.FormPage; -import org.jboss.tools.smooks.editor.ISmooksModelProvider; -import org.jboss.tools.smooks.gef.tree.editparts.TreeContainerEditPart; -import org.jboss.tools.smooks.gef.tree.figures.IMoveableModel; -import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; -import org.jboss.tools.smooks.model.graphics.ext.FigureType; -import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType; -import org.jboss.tools.smooks.model.medi.Segments; /** * @author Dart (dpeng(a)redhat.com) * */ -public class EDISegementsEditPart extends TreeContainerEditPart { +public class EDISegementsEditPart extends EDITreeContainerEditPart { - public void propertyChange(PropertyChangeEvent evt) { - super.propertyChange(evt); - if (IMoveableModel.PRO_BOUNDS_CHANGED.equals(evt.getPropertyName())) { - DefaultEditDomain domain = (DefaultEditDomain) getViewer().getEditDomain(); - IEditorPart editor = domain.getEditorPart(); - if((editor instanceof FormPage)){ - editor = ((FormPage)editor).getEditor(); - } - - if(editor instanceof ISmooksModelProvider && getModel() instanceof IMoveableModel){ - SmooksGraphicsExtType graph = ((ISmooksModelProvider)editor).getSmooksGraphicsExt(); - Rectangle rect = ((IMoveableModel)getModel()).getBounds(); - recordBounds(graph,rect); - } - } - } - - - /* (non-Javadoc) - * @see org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart#recordFigureBounds(org.jboss.tools.smooks.model.graphics.ext.FigureType, org.eclipse.draw2d.geometry.Rectangle) - */ - @Override - protected void recordFigureBounds(FigureType figureType, Rectangle bounds) { - figureType.setX(String.valueOf(bounds.getLocation().x)); - figureType.setY(String.valueOf(bounds.getLocation().y)); - } - - public static String generateFigureId(Object data){ - if(data instanceof Segments){ -// String xml = ((MappingNode)data).getXmltag(); -// return "segments_" + xml; - return "segments"; - } - return null; - } - - - protected String generateFigureID(){ - TreeNodeModel model = (TreeNodeModel) getModel(); - Object data = model.getData(); - return generateFigureId(data); - } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDITreeNodeEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDITreeNodeEditPart.java 2009-07-13 01:44:56 UTC (rev 16542) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDITreeNodeEditPart.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -10,9 +10,7 @@ ******************************************************************************/ package org.jboss.tools.smooks.edimap.editor; -import org.eclipse.draw2d.Label; import org.eclipse.emf.edit.command.DeleteCommand; -import org.eclipse.emf.edit.command.SetCommand; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.gef.DefaultEditDomain; import org.eclipse.gef.EditPolicy; @@ -20,108 +18,57 @@ import org.eclipse.gef.commands.Command; import org.eclipse.gef.editparts.AbstractGraphicalEditPart; import org.eclipse.gef.editpolicies.ComponentEditPolicy; -import org.eclipse.gef.editpolicies.DirectEditPolicy; -import org.eclipse.gef.requests.DirectEditRequest; import org.eclipse.gef.requests.GroupRequest; -import org.eclipse.gef.tools.DirectEditManager; -import org.eclipse.jface.viewers.TextCellEditor; import org.eclipse.ui.IEditorPart; import org.jboss.tools.smooks.edimap.actions.DeleteEDIModelCommand; -import org.jboss.tools.smooks.edimap.actions.RenameXmlTagNameCommand; +import org.jboss.tools.smooks.edimap.editparts.AbstractEDIMappingEditPart; import org.jboss.tools.smooks.editor.ISmooksModelProvider; import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart; -import org.jboss.tools.smooks.gef.tree.figures.TreeNodeFigure; import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; -import org.jboss.tools.smooks.model.medi.MEdiPackage; import org.jboss.tools.smooks.model.medi.MappingNode; /** * @author Dart (dpeng(a)redhat.com) * */ -public class EDITreeNodeEditPart extends TreeNodeEditPart { +public class EDITreeNodeEditPart extends AbstractEDIMappingEditPart { - private DirectEditManager manager; - /* * (non-Javadoc) * * @see - * org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart#performDirectEdit + * org.jboss.tools.smooks.edimap.editor.AbstractEDIMappingEditPart#canDirectEdit * () */ @Override - protected void performDirectEdit() { - if (manager == null) { - Label l = ((TreeNodeFigure) getFigure()).getLabel(); - manager = new EDIEdiPartDirectEditManager(this, TextCellEditor.class, new EDILabelCellEditorLocator(l), l); + protected boolean canDirectEdit() { + TreeNodeModel model = (TreeNodeModel) getModel(); + if (model.getData() instanceof MappingNode) { + return true; } - manager.show(); + return false; } /* * (non-Javadoc) * * @see + * org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart#isDragLink() + */ + protected boolean isDragLink() { + return true; + } + + /* + * (non-Javadoc) + * + * @see * org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart#createEditPolicies * () */ @Override protected void createEditPolicies() { - installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new DirectEditPolicy() { - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.gef.editpolicies.DirectEditPolicy#getDirectEditCommand - * (org.eclipse.gef.requests.DirectEditRequest) - */ - @Override - protected Command getDirectEditCommand(DirectEditRequest request) { - TreeNodeModel node = (TreeNodeModel) getHost().getModel(); - GraphicalViewer viewer = (GraphicalViewer) ((AbstractGraphicalEditPart) getHost()).getViewer(); - DefaultEditDomain domain = (DefaultEditDomain) viewer.getEditDomain(); - IEditorPart part = domain.getEditorPart(); - if (part instanceof EDIMapFormPage) { - part = ((EDIMapFormPage) part).getEditor(); - } - if (part instanceof ISmooksModelProvider) { - EditingDomain ed = ((ISmooksModelProvider) part).getEditingDomain(); - Object feature = null; - Object owner = node.getData(); - if (owner instanceof MappingNode) { - feature = MEdiPackage.Literals.MAPPING_NODE__XMLTAG; - } - org.eclipse.emf.common.command.Command command = SetCommand.create(ed, node.getData(), feature, - request.getCellEditor().getValue()); - if (command != null) { - return new RenameXmlTagNameCommand((TreeNodeEditPart) getHost(), ed, command); - } - } - return null; - // RenameActivityCommand cmd = new RenameActivityCommand(); - // cmd.setSource((Activity)getHost().getModel()); - // cmd.setOldName(((Activity)getHost().getModel()).getName()); - // cmd.setName((String)request.getCellEditor().getValue()); - // return cmd; - } - - /* - * (non-Javadoc) - * - * @see - * org.eclipse.gef.editpolicies.DirectEditPolicy#showCurrentEditValue - * (org.eclipse.gef.requests.DirectEditRequest) - */ - @Override - protected void showCurrentEditValue(DirectEditRequest request) { - - } - - }); - installEditPolicy(EditPolicy.COMPONENT_ROLE, new ComponentEditPolicy() { /* Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/AbstractEDIMappingEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/AbstractEDIMappingEditPart.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/AbstractEDIMappingEditPart.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -0,0 +1,132 @@ +/******************************************************************************* + * Copyright (c) 2008 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.edimap.editparts; + +import org.eclipse.draw2d.Label; +import org.eclipse.emf.edit.command.SetCommand; +import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.gef.DefaultEditDomain; +import org.eclipse.gef.EditPolicy; +import org.eclipse.gef.GraphicalViewer; +import org.eclipse.gef.commands.Command; +import org.eclipse.gef.editparts.AbstractGraphicalEditPart; +import org.eclipse.gef.editpolicies.DirectEditPolicy; +import org.eclipse.gef.requests.DirectEditRequest; +import org.eclipse.gef.tools.DirectEditManager; +import org.eclipse.jface.viewers.TextCellEditor; +import org.eclipse.ui.IEditorPart; +import org.jboss.tools.smooks.edimap.actions.RenameXmlTagNameCommand; +import org.jboss.tools.smooks.edimap.editor.EDIEdiPartDirectEditManager; +import org.jboss.tools.smooks.edimap.editor.EDILabelCellEditorLocator; +import org.jboss.tools.smooks.edimap.editor.EDIMapFormPage; +import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart; +import org.jboss.tools.smooks.gef.tree.figures.TreeNodeFigure; +import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; +import org.jboss.tools.smooks.model.medi.MEdiPackage; +import org.jboss.tools.smooks.model.medi.MappingNode; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class AbstractEDIMappingEditPart extends TreeNodeEditPart { + private DirectEditManager manager; + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart#performDirectEdit + * () + */ + @Override + protected void performDirectEdit() { + if (canDirectEdit()) { + if (manager == null) { + Label l = ((TreeNodeFigure) getFigure()).getLabel(); + manager = new EDIEdiPartDirectEditManager(this, TextCellEditor.class, new EDILabelCellEditorLocator(l), + l); + } + manager.show(); + } + } + + protected boolean canDirectEdit() { + return false; + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart#createEditPolicies + * () + */ + @Override + protected void createEditPolicies() { + + installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new DirectEditPolicy() { + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.gef.editpolicies.DirectEditPolicy#getDirectEditCommand + * (org.eclipse.gef.requests.DirectEditRequest) + */ + @Override + protected Command getDirectEditCommand(DirectEditRequest request) { + TreeNodeModel node = (TreeNodeModel) getHost().getModel(); + GraphicalViewer viewer = (GraphicalViewer) ((AbstractGraphicalEditPart) getHost()).getViewer(); + DefaultEditDomain domain = (DefaultEditDomain) viewer.getEditDomain(); + IEditorPart part = domain.getEditorPart(); + if (part instanceof EDIMapFormPage) { + part = ((EDIMapFormPage) part).getEditor(); + } + if (part instanceof ISmooksModelProvider) { + EditingDomain ed = ((ISmooksModelProvider) part).getEditingDomain(); + Object feature = null; + Object owner = node.getData(); + if (owner instanceof MappingNode) { + feature = MEdiPackage.Literals.MAPPING_NODE__XMLTAG; + } + org.eclipse.emf.common.command.Command command = SetCommand.create(ed, node.getData(), feature, + request.getCellEditor().getValue()); + if (command != null) { + return new RenameXmlTagNameCommand((TreeNodeEditPart) getHost(), ed, command); + } + } + return null; + // RenameActivityCommand cmd = new RenameActivityCommand(); + // cmd.setSource((Activity)getHost().getModel()); + // cmd.setOldName(((Activity)getHost().getModel()).getName()); + // cmd.setName((String)request.getCellEditor().getValue()); + // return cmd; + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.gef.editpolicies.DirectEditPolicy#showCurrentEditValue + * (org.eclipse.gef.requests.DirectEditRequest) + */ + @Override + protected void showCurrentEditValue(DirectEditRequest request) { + + } + + }); + + super.createEditPolicies(); + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/AbstractEDIMappingEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIDataContainerEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIDataContainerEditPart.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIDataContainerEditPart.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -0,0 +1,19 @@ +/******************************************************************************* + * Copyright (c) 2008 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.edimap.editparts; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class EDIDataContainerEditPart extends EDITreeContainerEditPart { + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIDataContainerEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIDataEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIDataEditPart.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIDataEditPart.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -0,0 +1,45 @@ +/******************************************************************************* + * Copyright (c) 2008 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.edimap.editparts; + +import org.jboss.tools.smooks.edimap.editor.EDITreeNodeEditPart; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class EDIDataEditPart extends EDITreeNodeEditPart{ + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.edimap.editor.EDITreeNodeEditPart#canDirectEdit() + */ + @Override + protected boolean canDirectEdit() { + return false; + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.edimap.editor.EDITreeNodeEditPart#isDragLink() + */ + @Override + protected boolean isDragLink() { + return false; + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.edimap.editor.EDITreeNodeEditPart#createEditPolicies() + */ + @Override + protected void createEditPolicies() { + super.createEditPolicies(); + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIDataEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIMappingNodeEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIMappingNodeEditPart.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIMappingNodeEditPart.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -0,0 +1,53 @@ +/******************************************************************************* + * Copyright (c) 2008 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.edimap.editparts; + +import org.jboss.tools.smooks.edimap.editor.EDITreeNodeEditPart; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class EDIMappingNodeEditPart extends EDITreeNodeEditPart { + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.edimap.editor.EDITreeNodeEditPart#canDirectEdit() + */ + @Override + protected boolean canDirectEdit() { + return true; + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.edimap.editor.EDITreeNodeEditPart#isDragLink() + */ + @Override + protected boolean isDragLink() { + return true; + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.edimap.editor.EDITreeNodeEditPart#createEditPolicies + * () + */ + @Override + protected void createEditPolicies() { + super.createEditPolicies(); + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDIMappingNodeEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDITreeContainerEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDITreeContainerEditPart.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDITreeContainerEditPart.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -0,0 +1,189 @@ +/******************************************************************************* + * Copyright (c) 2008 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.edimap.editparts; + +import java.beans.PropertyChangeEvent; + +import org.eclipse.draw2d.Label; +import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.emf.edit.command.SetCommand; +import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.gef.DefaultEditDomain; +import org.eclipse.gef.EditPolicy; +import org.eclipse.gef.GraphicalViewer; +import org.eclipse.gef.commands.Command; +import org.eclipse.gef.editparts.AbstractGraphicalEditPart; +import org.eclipse.gef.editpolicies.DirectEditPolicy; +import org.eclipse.gef.requests.DirectEditRequest; +import org.eclipse.gef.tools.DirectEditManager; +import org.eclipse.jface.viewers.TextCellEditor; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.forms.editor.FormPage; +import org.jboss.tools.smooks.configuration.editors.xml.TagObject; +import org.jboss.tools.smooks.edimap.actions.RenameXmlTagNameCommand; +import org.jboss.tools.smooks.edimap.editor.EDIEdiPartDirectEditManager; +import org.jboss.tools.smooks.edimap.editor.EDILabelCellEditorLocator; +import org.jboss.tools.smooks.edimap.editor.EDIMapFormPage; +import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.gef.tree.editparts.TreeContainerEditPart; +import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart; +import org.jboss.tools.smooks.gef.tree.figures.IMoveableModel; +import org.jboss.tools.smooks.gef.tree.figures.TreeContainerFigure; +import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; +import org.jboss.tools.smooks.model.graphics.ext.FigureType; +import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType; +import org.jboss.tools.smooks.model.medi.MEdiPackage; +import org.jboss.tools.smooks.model.medi.MappingNode; +import org.jboss.tools.smooks.model.medi.Segments; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class EDITreeContainerEditPart extends TreeContainerEditPart { + + private DirectEditManager manager; + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart#performDirectEdit + * () + */ + @Override + protected void performDirectEdit() { + if (canDirectEdit()) { + if (manager == null) { + Label l = ((TreeContainerFigure) getFigure()).getLabel(); + manager = new EDIEdiPartDirectEditManager(this, TextCellEditor.class, new EDILabelCellEditorLocator(l), + l); + } + manager.show(); + } + } + + protected boolean canDirectEdit() { + TreeNodeModel model = (TreeNodeModel) getModel(); + if (model.getData() instanceof MappingNode) { + return true; + } + return false; + } + + + public void propertyChange(PropertyChangeEvent evt) { + super.propertyChange(evt); + if (IMoveableModel.PRO_BOUNDS_CHANGED.equals(evt.getPropertyName())) { + DefaultEditDomain domain = (DefaultEditDomain) getViewer().getEditDomain(); + IEditorPart editor = domain.getEditorPart(); + if((editor instanceof FormPage)){ + editor = ((FormPage)editor).getEditor(); + } + + if(editor instanceof ISmooksModelProvider && getModel() instanceof IMoveableModel){ + SmooksGraphicsExtType graph = ((ISmooksModelProvider)editor).getSmooksGraphicsExt(); + Rectangle rect = ((IMoveableModel)getModel()).getBounds(); + recordBounds(graph,rect); + } + } + } + + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart#recordFigureBounds(org.jboss.tools.smooks.model.graphics.ext.FigureType, org.eclipse.draw2d.geometry.Rectangle) + */ + @Override + protected void recordFigureBounds(FigureType figureType, Rectangle bounds) { + figureType.setX(String.valueOf(bounds.getLocation().x)); + figureType.setY(String.valueOf(bounds.getLocation().y)); + } + + public static String generateFigureId(Object data){ + if(data instanceof Segments){ +// String xml = ((MappingNode)data).getXmltag(); +// return "segments_" + xml; + return "segments"; + } + if(data instanceof TagObject){ + return "edi_" + ((TagObject)data).getName(); + } + return null; + } + + + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.gef.tree.editparts.TreeContainerEditPart#createEditPolicies() + */ + @Override + protected void createEditPolicies() { + installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new DirectEditPolicy() { + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.gef.editpolicies.DirectEditPolicy#getDirectEditCommand + * (org.eclipse.gef.requests.DirectEditRequest) + */ + @Override + protected Command getDirectEditCommand(DirectEditRequest request) { + TreeNodeModel node = (TreeNodeModel) getHost().getModel(); + GraphicalViewer viewer = (GraphicalViewer) ((AbstractGraphicalEditPart) getHost()).getViewer(); + DefaultEditDomain domain = (DefaultEditDomain) viewer.getEditDomain(); + IEditorPart part = domain.getEditorPart(); + if (part instanceof EDIMapFormPage) { + part = ((EDIMapFormPage) part).getEditor(); + } + if (part instanceof ISmooksModelProvider) { + EditingDomain ed = ((ISmooksModelProvider) part).getEditingDomain(); + Object feature = null; + Object owner = node.getData(); + if (owner instanceof MappingNode) { + feature = MEdiPackage.Literals.MAPPING_NODE__XMLTAG; + } + org.eclipse.emf.common.command.Command command = SetCommand.create(ed, node.getData(), feature, + request.getCellEditor().getValue()); + if (command != null) { + return new RenameXmlTagNameCommand((TreeNodeEditPart) getHost(), ed, command); + } + } + return null; + // RenameActivityCommand cmd = new RenameActivityCommand(); + // cmd.setSource((Activity)getHost().getModel()); + // cmd.setOldName(((Activity)getHost().getModel()).getName()); + // cmd.setName((String)request.getCellEditor().getValue()); + // return cmd; + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.gef.editpolicies.DirectEditPolicy#showCurrentEditValue + * (org.eclipse.gef.requests.DirectEditRequest) + */ + @Override + protected void showCurrentEditValue(DirectEditRequest request) { + + } + + }); + super.createEditPolicies(); + } + + protected String generateFigureID(){ + TreeNodeModel model = (TreeNodeModel) getModel(); + Object data = model.getData(); + return generateFigureId(data); + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editparts/EDITreeContainerEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIDataContainerGraphModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIDataContainerGraphModel.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIDataContainerGraphModel.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -0,0 +1,54 @@ +package org.jboss.tools.smooks.edimap.models; + +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.jboss.tools.smooks.gef.tree.model.TreeContainerModel; +import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; + +public class EDIDataContainerGraphModel extends TreeContainerModel { + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#createChildModel( + * java.lang.Object, org.eclipse.jface.viewers.ITreeContentProvider, + * org.eclipse.jface.viewers.ILabelProvider) + */ + @Override + protected TreeNodeModel createChildModel(Object model, ITreeContentProvider contentProvider, + ILabelProvider labelProvider) { + // TODO Auto-generated method stub + return new EDIDataGraphModel(model, contentProvider, labelProvider); + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#canLinkWithSource + * (java.lang.Object) + */ + @Override + public boolean canLinkWithSource(Object model) { + if(model instanceof EDIMappingNodeGraphModel){ + return true; + } + return false; + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#canLinkWithTarget + * (java.lang.Object) + */ + @Override + public boolean canLinkWithTarget(Object model) { + return false; + } + + public EDIDataContainerGraphModel(Object data, ITreeContentProvider contentProvider, ILabelProvider labelProvider) { + super(data, contentProvider, labelProvider); + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIDataContainerGraphModel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIDataGraphModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIDataGraphModel.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIDataGraphModel.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -0,0 +1,49 @@ +package org.jboss.tools.smooks.edimap.models; + +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; + +public class EDIDataGraphModel extends TreeNodeModel { + + public EDIDataGraphModel(Object data, ITreeContentProvider contentProvider, ILabelProvider labelProvider) { + super(data, contentProvider, labelProvider); + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#createChildModel( + * java.lang.Object, org.eclipse.jface.viewers.ITreeContentProvider, + * org.eclipse.jface.viewers.ILabelProvider) + */ + @Override + protected TreeNodeModel createChildModel(Object model, ITreeContentProvider contentProvider, + ILabelProvider labelProvider) { + return new EDIDataGraphModel(model, contentProvider, labelProvider); + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#canLinkWithSource(java.lang.Object) + */ + @Override + public boolean canLinkWithSource(Object model) { + // TODO Auto-generated method stub + return super.canLinkWithSource(model); + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#canLinkWithTarget(java.lang.Object) + */ + @Override + public boolean canLinkWithTarget(Object model) { + // TODO Auto-generated method stub + return super.canLinkWithTarget(model); + } + + + + + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIDataGraphModel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIMappingNodeContainerGraphModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIMappingNodeContainerGraphModel.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIMappingNodeContainerGraphModel.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -0,0 +1,54 @@ +package org.jboss.tools.smooks.edimap.models; + +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.jboss.tools.smooks.gef.tree.model.TreeContainerModel; +import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; + +public class EDIMappingNodeContainerGraphModel extends TreeContainerModel { + + public EDIMappingNodeContainerGraphModel(Object data, ITreeContentProvider contentProvider, ILabelProvider labelProvider) { + super(data, contentProvider, labelProvider); + // TODO Auto-generated constructor stub + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#createChildModel( + * java.lang.Object, org.eclipse.jface.viewers.ITreeContentProvider, + * org.eclipse.jface.viewers.ILabelProvider) + */ + @Override + protected TreeNodeModel createChildModel(Object model, ITreeContentProvider contentProvider, + ILabelProvider labelProvider) { + // TODO Auto-generated method stub + return new EDIMappingNodeGraphModel(model, contentProvider, labelProvider); + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#canLinkWithSource + * (java.lang.Object) + */ + @Override + public boolean canLinkWithSource(Object model) { + return false; + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#canLinkWithTarget + * (java.lang.Object) + */ + @Override + public boolean canLinkWithTarget(Object model) { + return false; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIMappingNodeContainerGraphModel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIMappingNodeGraphModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIMappingNodeGraphModel.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIMappingNodeGraphModel.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -0,0 +1,75 @@ +/******************************************************************************* + * Copyright (c) 2008 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.edimap.models; + +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; +import org.jboss.tools.smooks.model.medi.Segment; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class EDIMappingNodeGraphModel extends TreeNodeModel { + + public EDIMappingNodeGraphModel(Object data, ITreeContentProvider contentProvider, ILabelProvider labelProvider) { + super(data, contentProvider, labelProvider); + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#createChildModel(java.lang.Object, org.eclipse.jface.viewers.ITreeContentProvider, org.eclipse.jface.viewers.ILabelProvider) + */ + @Override + protected TreeNodeModel createChildModel(Object model, ITreeContentProvider contentProvider, + ILabelProvider labelProvider) { + return new EDIMappingNodeGraphModel(model, contentProvider, labelProvider); + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#canLinkWithSource(java.lang.Object) + */ + @Override + public boolean canLinkWithSource(Object model) { + return false; + } + + + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#isLinkable() + */ + @Override + public boolean isLinkable() { + Object nodeModel = getData(); + if(!(nodeModel instanceof Segment)){ + return false; + } + return super.isLinkable(); + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#canLinkWithTarget(java.lang.Object) + */ + @Override + public boolean canLinkWithTarget(Object model) { + Object nodeModel = getData(); + if(!(nodeModel instanceof Segment)){ + return false; + } + if(model instanceof EDIDataContainerGraphModel){ + return true; + } + return false; + } + + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/models/EDIMappingNodeGraphModel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2009-07-13 01:44:56 UTC (rev 16542) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -371,6 +371,7 @@ monitor.beginTask("Saving Smooks config file", resourceList.size()); for (Iterator<Resource> iterator = resourceList.iterator(); iterator.hasNext();) { + handleEMFModelChange = true; Resource resource = (Resource) iterator.next(); resource.save(options); monitor.worked(1); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/common/SmooksGraphicalMenuContextProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/common/SmooksGraphicalMenuContextProvider.java 2009-07-13 01:44:56 UTC (rev 16542) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/common/SmooksGraphicalMenuContextProvider.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -56,10 +56,10 @@ menu.add(new Separator(GROUP_CUSTOME)); GEFActionConstants.addStandardActionGroups(menu); IAction action; - action = getActionRegistry().getAction(ActionFactory.UNDO.getId()); - menu.appendToGroup(GEFActionConstants.GROUP_UNDO, action); - action = getActionRegistry().getAction(ActionFactory.REDO.getId()); - menu.appendToGroup(GEFActionConstants.GROUP_UNDO, action); +// action = getActionRegistry().getAction(ActionFactory.UNDO.getId()); +// menu.appendToGroup(GEFActionConstants.GROUP_UNDO, action); +// action = getActionRegistry().getAction(ActionFactory.REDO.getId()); +// menu.appendToGroup(GEFActionConstants.GROUP_UNDO, action); action = getActionRegistry().getAction(ActionFactory.DELETE.getId()); if (action.isEnabled()) Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeContainerEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeContainerEditPart.java 2009-07-13 01:44:56 UTC (rev 16542) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeContainerEditPart.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -6,17 +6,13 @@ import java.beans.PropertyChangeEvent; import java.util.List; -import org.eclipse.draw2d.ChopboxAnchor; import org.eclipse.draw2d.ColorConstants; -import org.eclipse.draw2d.ConnectionAnchor; import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; -import org.eclipse.gef.ConnectionEditPart; import org.eclipse.gef.EditPolicy; import org.eclipse.gef.GraphicalEditPart; -import org.eclipse.gef.Request; import org.jboss.tools.smooks.gef.tree.editpolicy.TreeNodeGraphicalNodeEditPolicy; import org.jboss.tools.smooks.gef.tree.figures.IMoveableModel; import org.jboss.tools.smooks.gef.tree.figures.TreeContainerFigure; @@ -48,17 +44,17 @@ figure.setText(text); } boolean isSource = this.isSourceLinkNodeEditPart(); - if(!isSource){ + if (!isSource) { IFigure figure = getFigure(); - if(figure instanceof TreeContainerFigure){ - ((TreeContainerFigure)figure).setHeaderColor(ColorConstants.orange); + if (figure instanceof TreeContainerFigure) { + ((TreeContainerFigure) figure).setHeaderColor(ColorConstants.orange); } } Point location = model.getLocation(); Dimension size = getFigure().getPreferredSize(); try { - ((GraphicalEditPart) this.getParent()).setLayoutConstraint(this, this - .getFigure(),new Rectangle(location,size)); + ((GraphicalEditPart) this.getParent()).setLayoutConstraint(this, this.getFigure(), new Rectangle(location, + size)); } catch (Exception e) { e.printStackTrace(); } @@ -68,19 +64,19 @@ if (getFigure() instanceof TreeContainerFigure) { TreeContainerFigure t = (TreeContainerFigure) getFigure(); return t.getContentFigure(); - }else{ + } else { return getFigure(); } } - - public TreeContainerEditPart getTreeContainerEditPart(){ + + public TreeContainerEditPart getTreeContainerEditPart() { return this; } - - public boolean isSourceLinkNodeEditPart(){ + + public boolean isSourceLinkNodeEditPart() { Object model = getModel(); - if(model != null && model instanceof TreeContainerModel){ - return ((TreeContainerModel)model).isSourceLinkNode(); + if (model != null && model instanceof TreeContainerModel) { + return ((TreeContainerModel) model).isSourceLinkNode(); } return false; } @@ -91,51 +87,49 @@ refresh(); } } - + @Override protected void createEditPolicies() { this.installEditPolicy(EditPolicy.NODE_ROLE, new TreeNodeGraphicalNodeEditPolicy()); } - - - @Override - public ConnectionAnchor getSourceConnectionAnchor( - ConnectionEditPart connection) { - return new ChopboxAnchor(getFigure()); - } + // @Override + // public ConnectionAnchor getSourceConnectionAnchor( + // ConnectionEditPart connection) { + // return new ChopboxAnchor(getFigure()); + // } + // + // @Override + // public ConnectionAnchor getSourceConnectionAnchor(Request request) { + // return new ChopboxAnchor(getFigure()); + // } + // + // @Override + // public ConnectionAnchor getTargetConnectionAnchor( + // ConnectionEditPart connection) { + // return new ChopboxAnchor(getFigure()); + // } + // + // @Override + // public ConnectionAnchor getTargetConnectionAnchor(Request request) { + // return new ChopboxAnchor(getFigure()); + // } @Override - public ConnectionAnchor getSourceConnectionAnchor(Request request) { - return new ChopboxAnchor(getFigure()); - } - - @Override - public ConnectionAnchor getTargetConnectionAnchor( - ConnectionEditPart connection) { - return new ChopboxAnchor(getFigure()); - } - - @Override - public ConnectionAnchor getTargetConnectionAnchor(Request request) { - return new ChopboxAnchor(getFigure()); - } - - @Override public List<?> getModelChildren() { TreeNodeModel node = (TreeNodeModel) getModel(); return node.getChildren(); -// return super.getModelChildren(); + // return super.getModelChildren(); } @Override public void treeCollapsed(TreeFigureExpansionEvent event) { - super.treeCollapsed(event); + // super.treeCollapsed(event); } @Override public void treeExpanded(TreeFigureExpansionEvent event) { - super.treeExpanded(event); + // super.treeExpanded(event); } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java 2009-07-13 01:44:56 UTC (rev 16542) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -38,7 +38,13 @@ TreeNodeConnection model = (TreeNodeConnection) getModel(); TreeNodeModel sourceModel = model.getSourceNode(); TreeNodeModel targetModel = model.getTargetNode(); - PolylineConnection connection1 = new PolylineConnection(); + PolylineConnection connection1 = new PolylineConnection(){ + @Override + public void paintFigure(Graphics graphics) { + graphics.setAlpha(alpha); + super.paintFigure(graphics); + } + }; if (sourceModel instanceof TreeContainerModel || targetModel instanceof TreeContainerModel) { // connection1.setConnectionRouter(new ManhattanConnectionRouter()); connection1.setTargetDecoration(new PolygonDecoration()); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeEditPart.java 2009-07-13 01:44:56 UTC (rev 16542) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeEditPart.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -13,15 +13,18 @@ import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.ConnectionEditPart; +import org.eclipse.gef.DragTracker; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; import org.eclipse.gef.NodeEditPart; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; +import org.eclipse.gef.tools.ConnectionDragCreationTool; import org.jboss.tools.smooks.gef.tree.editpolicy.TreeNodeGraphicalNodeEditPolicy; import org.jboss.tools.smooks.gef.tree.editpolicy.TreeNodeSelectEditPolicy; import org.jboss.tools.smooks.gef.tree.figures.ITreeFigureListener; import org.jboss.tools.smooks.gef.tree.figures.LeftOrRightAnchor; +import org.jboss.tools.smooks.gef.tree.figures.TreeContainerFigure; import org.jboss.tools.smooks.gef.tree.figures.TreeFigureExpansionEvent; import org.jboss.tools.smooks.gef.tree.figures.TreeNodeFigure; import org.jboss.tools.smooks.gef.tree.model.IConnectableNode; @@ -50,6 +53,30 @@ return figure; } + /** + * @return the dragLink + */ + protected boolean isDragLink() { + return false; + } + + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.gef.editparts.AbstractGraphicalEditPart#getDragTracker(org + * .eclipse.gef.Request) + */ + public DragTracker getDragTracker(Request request) { + if (isDragLink()) { + getViewer().select(this); + return new ConnectionDragCreationTool(); + } else { + return super.getDragTracker(request); + } + } + public TreeContainerEditPart getTreeContainerEditPart() { EditPart parent = this.getParent(); while (parent != null && (parent.getClass() != TreeContainerEditPart.class)) { @@ -61,6 +88,20 @@ return null; } + public void expandNode() { + IFigure figure1 = getFigure(); + if (figure1 instanceof TreeNodeFigure) { + ((TreeNodeFigure) figure1).expandNode(); + } + } + + public void collapsedNode() { + IFigure figure1 = getFigure(); + if (figure1 instanceof TreeNodeFigure) { + ((TreeNodeFigure) figure1).collapsedNode(); + } + } + public boolean isSourceLinkNodeEditPart() { TreeContainerEditPart container = getTreeContainerEditPart(); if (container != null) @@ -145,35 +186,35 @@ refreshTargetConnections(); } } - - protected void recordBounds(SmooksGraphicsExtType graphicsExt,Rectangle bounds){ + + protected void recordBounds(SmooksGraphicsExtType graphicsExt, Rectangle bounds) { GraphType graph = graphicsExt.getGraph(); - if(graph == null ){ + if (graph == null) { graph = GraphFactory.eINSTANCE.createGraphType(); graphicsExt.setGraph(graph); } String figureId = generateFigureID(); - if(figureId == null) return; + if (figureId == null) + return; FigureType figure = SmooksModelUtils.findFigureType(graph, figureId); - - if(figure == null){ + + if (figure == null) { figure = GraphFactory.eINSTANCE.createFigureType(); figure.setId(figureId); graph.getFigure().add(figure); } - recordFigureBounds(figure,bounds); + recordFigureBounds(figure, bounds); } - - protected void recordFigureBounds(FigureType figureType,Rectangle bounds){ + + protected void recordFigureBounds(FigureType figureType, Rectangle bounds) { figureType.setX(String.valueOf(bounds.getLocation().x)); figureType.setY(String.valueOf(bounds.getLocation().y)); - + figureType.setHeight(String.valueOf(bounds.getSize().height)); figureType.setWidth(String.valueOf(bounds.getSize().width)); } - - - protected String generateFigureID(){ + + protected String generateFigureID() { return null; } @@ -182,11 +223,12 @@ return anchorFigure; else { IFigure figure = getFigure(); + anchorFigure = figure; + if (figure instanceof TreeContainerFigure) { + anchorFigure = ((TreeContainerFigure) figure).getLabel(); + } if (figure instanceof TreeNodeFigure) { anchorFigure = ((TreeNodeFigure) figure).getLabel(); - return anchorFigure; - } else { - anchorFigure = getFigure(); } } return anchorFigure; @@ -196,9 +238,9 @@ anchorFigure = null; EditPart parent = getParent(); List<TreeNodeEditPart> parentList = new ArrayList<TreeNodeEditPart>(); - while (parent != null && parent.getClass() == TreeNodeEditPart.class) { + while (parent != null && parent instanceof TreeNodeEditPart) { parentList.add((TreeNodeEditPart) parent); - if (parent.getParent() == null || parent.getParent().getClass() != TreeNodeEditPart.class) { + if (parent.getParent() == null || !(parent.getParent() instanceof TreeNodeEditPart)) { break; } parent = parent.getParent(); @@ -235,7 +277,7 @@ List<?> childrenEditParts = getChildren(); for (Iterator<?> iterator = childrenEditParts.iterator(); iterator.hasNext();) { EditPart child = (EditPart) iterator.next(); - if (child.getClass() == TreeNodeEditPart.class) { + if (child instanceof TreeNodeEditPart) { ((TreeNodeEditPart) child).caculateAnchorFigure(); } } @@ -269,20 +311,18 @@ } public ConnectionAnchor getSourceConnectionAnchor(ConnectionEditPart connection) { - return new LeftOrRightAnchor(getAnchorFigure(), false); + return new LeftOrRightAnchor(getAnchorFigure()); } public ConnectionAnchor getSourceConnectionAnchor(Request request) { - return new LeftOrRightAnchor(getAnchorFigure(), false); + return new LeftOrRightAnchor(getAnchorFigure()); } public ConnectionAnchor getTargetConnectionAnchor(ConnectionEditPart connection) { - boolean isLeft = !isSourceLinkNodeEditPart(); - return new LeftOrRightAnchor(getAnchorFigure(), isLeft); + return new LeftOrRightAnchor(getAnchorFigure()); } public ConnectionAnchor getTargetConnectionAnchor(Request request) { - boolean isLeft = !isSourceLinkNodeEditPart(); - return new LeftOrRightAnchor(getAnchorFigure(), isLeft); + return new LeftOrRightAnchor(getAnchorFigure()); } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editpolicy/TreeNodeGraphicalNodeEditPolicy.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editpolicy/TreeNodeGraphicalNodeEditPolicy.java 2009-07-13 01:44:56 UTC (rev 16542) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editpolicy/TreeNodeGraphicalNodeEditPolicy.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -13,51 +13,68 @@ /** * @author DartPeng - * + * */ public class TreeNodeGraphicalNodeEditPolicy extends GraphicalNodeEditPolicy { - /* (non-Javadoc) - * @see org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy#getConnectionCompleteCommand(org.eclipse.gef.requests.CreateConnectionRequest) + /* + * (non-Javadoc) + * + * @seeorg.eclipse.gef.editpolicies.GraphicalNodeEditPolicy# + * getConnectionCompleteCommand + * (org.eclipse.gef.requests.CreateConnectionRequest) */ @Override - protected Command getConnectionCompleteCommand( - CreateConnectionRequest request) { + protected Command getConnectionCompleteCommand(CreateConnectionRequest request) { Command command = request.getStartCommand(); - if(command != null && command instanceof CreateConnectionCommand){ + if (command != null && command instanceof CreateConnectionCommand) { Object targetModel = request.getTargetEditPart().getModel(); - if(targetModel instanceof TreeNodeModel){ - if(!((TreeNodeModel)targetModel).isLinkable()) return null; - ((CreateConnectionCommand)command).setTarget((TreeNodeModel)targetModel); + if (targetModel instanceof TreeNodeModel) { + if (!((TreeNodeModel) targetModel).canLinkWithSource(((CreateConnectionCommand) command).getSource())) + return null; + Object source = ((CreateConnectionCommand) command).getSource(); + if(source instanceof TreeNodeModel){ + if (!((TreeNodeModel) source).canLinkWithTarget(targetModel)) + return null; + } + ((CreateConnectionCommand) command).setTarget((TreeNodeModel) targetModel); return command; } } return null; } - /* (non-Javadoc) - * @see org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy#getConnectionCreateCommand(org.eclipse.gef.requests.CreateConnectionRequest) + /* + * (non-Javadoc) + * + * @seeorg.eclipse.gef.editpolicies.GraphicalNodeEditPolicy# + * getConnectionCreateCommand + * (org.eclipse.gef.requests.CreateConnectionRequest) */ @Override protected Command getConnectionCreateCommand(CreateConnectionRequest request) { EditPart sourceEditpart = request.getSourceEditPart(); Object model = null; - if(sourceEditpart == null){ + if (sourceEditpart == null) { sourceEditpart = getHost(); } model = sourceEditpart.getModel(); - if(model != null && model instanceof TreeNodeModel){ - if(!((TreeNodeModel)model).isLinkable()) return null; + if (model != null && model instanceof TreeNodeModel) { + if (!((TreeNodeModel) model).isLinkable()) + return null; CreateConnectionCommand command = new CreateConnectionCommand(); - command.setSource((TreeNodeModel)model); + command.setSource((TreeNodeModel) model); request.setStartCommand(command); return command; } return null; } - /* (non-Javadoc) - * @see org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy#getReconnectSourceCommand(org.eclipse.gef.requests.ReconnectRequest) + /* + * (non-Javadoc) + * + * @seeorg.eclipse.gef.editpolicies.GraphicalNodeEditPolicy# + * getReconnectSourceCommand(org.eclipse.gef.requests.ReconnectRequest) */ @Override protected Command getReconnectSourceCommand(ReconnectRequest request) { @@ -65,8 +82,11 @@ return null; } - /* (non-Javadoc) - * @see org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy#getReconnectTargetCommand(org.eclipse.gef.requests.ReconnectRequest) + /* + * (non-Javadoc) + * + * @seeorg.eclipse.gef.editpolicies.GraphicalNodeEditPolicy# + * getReconnectTargetCommand(org.eclipse.gef.requests.ReconnectRequest) */ @Override protected Command getReconnectTargetCommand(ReconnectRequest request) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/LeftOrRightAnchor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/LeftOrRightAnchor.java 2009-07-13 01:44:56 UTC (rev 16542) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/LeftOrRightAnchor.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -6,20 +6,13 @@ public class LeftOrRightAnchor extends ChopboxAnchor { - private boolean isLeft = false; - public LeftOrRightAnchor(IFigure owner , boolean isLeft) { + public LeftOrRightAnchor(IFigure owner) { super(owner); - this.isLeft = isLeft; } public Point getReferencePoint(){ - Point point = super.getReferencePoint(); - if(isLeft){ - return new Point(point.x + 30,point.y); - }else{ - return new Point(point.x - 30,point.y); - } + return super.getReferencePoint(); } public Point getLocation(Point reference) { @@ -34,6 +27,13 @@ } p = getOwner().getBounds().getCenter(); getOwner().translateToAbsolute(p); + Point referencePoint = reference; + boolean isLeft = false; + if(referencePoint.x > p.x){ + isLeft = false; + }else{ + isLeft = true; + } if (isLeft){ p = getOwner().getBounds().getLeft(); p.x = parent.getBounds().getLeft().x - 2; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeContainerFigure.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeContainerFigure.java 2009-07-13 01:44:56 UTC (rev 16542) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeContainerFigure.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -70,6 +70,20 @@ this.setLayoutManager(new ToolbarLayout()); } + /** + * @return the label + */ + public Label getLabel() { + return label; + } + + /** + * @param label the label to set + */ + public void setLabel(Label label) { + this.label = label; + } + public IFigure getContentFigure() { return contentFigure; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeNodeFigure.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeNodeFigure.java 2009-07-13 01:44:56 UTC (rev 16542) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeNodeFigure.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -321,6 +321,16 @@ graphics.popState(); } } + + public void expandNode(){ + expand = false; + changeTreeExpansionState(); + } + + public void collapsedNode(){ + expand = true; + changeTreeExpansionState(); + } private void changeTreeExpansionState() { try { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeModel.java 2009-07-13 01:44:56 UTC (rev 16542) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeModel.java 2009-07-13 08:56:40 UTC (rev 16543) @@ -85,6 +85,11 @@ this.labelProvider = labelProvider; } + protected TreeNodeModel createChildModel(Object model, ITreeContentProvider contentProvider, + ILabelProvider labelProvider) { + return new TreeNodeModel(model, contentProvider, labelProvider); + } + public List<TreeNodeModel> getChildren() { if (children == null) { if (this.contentProvider != null && data != null) { @@ -93,8 +98,9 @@ children = new ArrayList<TreeNodeModel>(); for (int i = 0; i < models.length; i++) { Object model = models[i]; - TreeNodeModel n = new TreeNodeModel(model, contentProvider, labelProvider); + TreeNodeModel n = createChildModel(model, contentProvider, labelProvider); children.add(n); + n.setParent(this); } return children; } @@ -107,9 +113,9 @@ for (int i = 0; i < models.length; i++) { Object model = models[i]; if (!childExsit(model)) { - TreeNodeModel n = new TreeNodeModel(model, contentProvider, labelProvider); -// this.addChild(n); + TreeNodeModel n = createChildModel(model, contentProvider, labelProvider); children.add(n); + n.setParent(this); } } List<TreeNodeModel> temp = new ArrayList<TreeNodeModel>(children); @@ -117,8 +123,8 @@ TreeNodeModel node = (TreeNodeModel) iterator.next(); Object data = node.getData(); if (!graphicalChildExist(data, models)) { -// this.removeChild(node); children.remove(node); + node.setParent(null); } } temp.clear(); @@ -240,6 +246,14 @@ this.linkable = linkable; } + public boolean canLinkWithSource(Object model) { + return true; + } + + public boolean canLinkWithTarget(Object model) { + return true; + } + public void setText(String text) { // if (text != null && !text.equals(this.text)) { // String oldtext = this.text;

16 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r16542 - in trunk/bpel/plugins: org.eclipse.bpel.apache.ode.deploy.ui/META-INF and 5 other directories.

by jbosstools-commits＠lists.jboss.org

Author: Grid.Qian Date: 2009-07-12 21:44:56 -0400 (Sun, 12 Jul 2009) New Revision: 16542 Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF Log: JBIDE-4605: when use eclipse bpel editor in JBDS , there is a linkage error Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF 2009-07-12 13:43:37 UTC (rev 16541) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF 2009-07-13 01:44:56 UTC (rev 16542) @@ -16,5 +16,5 @@ org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)", org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)", org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)", - javax.wsdl;bundle-version="[1.4.0,1.6.0)" + javax.wsdl;bundle-version="[1.5.0,1.6.0)" Eclipse-LazyStart: true Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF 2009-07-12 13:43:37 UTC (rev 16541) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF 2009-07-13 01:44:56 UTC (rev 16542) @@ -15,7 +15,7 @@ org.eclipse.bpel.model;bundle-version="0.4.0", org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)", org.eclipse.xsd;bundle-version="[2.4.0,3.0.0)", - javax.wsdl;bundle-version="1.4.0", + javax.wsdl;bundle-version="[1.5.0,1.6.0)", org.eclipse.core.databinding;bundle-version="[1.1.0,2.0.0)", org.eclipse.jface.databinding;bundle-version="[1.2.0,2.0.0)", org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)", Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF 2009-07-12 13:43:37 UTC (rev 16541) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF 2009-07-13 01:44:56 UTC (rev 16542) @@ -23,7 +23,7 @@ org.eclipse.jst.server.ui;bundle-version="[1.0.303,2.0.0)", org.eclipse.jst.common.project.facet.core;bundle-version="[1.3.0,2.0.0)", org.eclipse.jst.server.core;bundle-version="[1.1.0,2.0.0)", - javax.wsdl;bundle-version="1.4.0", + javax.wsdl;bundle-version="[1.5.0,1.6.0)", org.eclipse.bpel.apache.ode.deploy.model;bundle-version="0.4.0" Bundle-Activator: org.eclipse.bpel.apache.ode.runtime.OdePlugin Export-Package: org.eclipse.bpel.apache.ode.runtime Modified: trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF 2009-07-12 13:43:37 UTC (rev 16541) +++ trunk/bpel/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF 2009-07-13 01:44:56 UTC (rev 16542) @@ -13,7 +13,7 @@ org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)", org.apache.xerces;bundle-version="[2.9.0,3.0.0)", org.eclipse.bpel.common.model;bundle-version="0.4.0", - javax.wsdl;bundle-version="[1.4.0,1.6.0)" + javax.wsdl;bundle-version="[1.5.0,1.6.0)" Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.bpel.model, org.eclipse.bpel.model.adapters, Modified: trunk/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF 2009-07-12 13:43:37 UTC (rev 16541) +++ trunk/bpel/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF 2009-07-13 01:44:56 UTC (rev 16542) @@ -21,7 +21,7 @@ org.eclipse.bpel.model;bundle-version="0.4.0", org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)", org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)", - javax.wsdl;bundle-version="[1.4.0,1.6.0)" + javax.wsdl;bundle-version="[1.5.0,1.6.0)" Eclipse-LazyStart: true Export-Package: org.eclipse.bpel.runtimes, org.eclipse.bpel.runtimes.facets, Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2009-07-12 13:43:37 UTC (rev 16541) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2009-07-13 01:44:56 UTC (rev 16542) @@ -24,7 +24,7 @@ org.eclipse.bpel.wsil.model;bundle-version="0.4.0", org.eclipse.wst.sse.ui;bundle-version="[1.1.0,2.0.0)", org.eclipse.wst.sse.core;bundle-version="[1.1.300,2.0.0)", - javax.wsdl;bundle-version="[1.4.0,1.6.0)", + javax.wsdl;bundle-version="[1.5.0,1.6.0)", org.eclipse.wst.xsd.ui;bundle-version="[1.2.101,2.0.0)", org.eclipse.wst.wsdl.ui;bundle-version="[1.2.100,2.0.0)", org.eclipse.wst.xml.ui;bundle-version="[1.0.400,2.0.0)" Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF 2009-07-12 13:43:37 UTC (rev 16541) +++ trunk/bpel/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF 2009-07-13 01:44:56 UTC (rev 16542) @@ -17,7 +17,7 @@ org.eclipse.wst.wsdl.validation;bundle-version="[1.1.301,2.0.0)", org.eclipse.wst.xml.core;bundle-version="[1.1.300,2.0.0)", org.eclipse.bpel.xpath10;bundle-version="0.4.0", - javax.wsdl;bundle-version="[1.4.0,1.6.0)" + javax.wsdl;bundle-version="[1.5.0,1.6.0)" Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: bin,

16 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r16540 - in trunk/documentation/whatsnew: core and 9 other directories.

by jbosstools-commits＠lists.jboss.org

Author: max.andersen(a)jboss.com Date: 2009-07-10 15:45:00 -0400 (Fri, 10 Jul 2009) New Revision: 16540 Added: trunk/documentation/whatsnew/images/el_rendered.png trunk/documentation/whatsnew/images/el_rendered_001.png trunk/documentation/whatsnew/images/el_validator_prefs.png trunk/documentation/whatsnew/images/hideselectionbar_in_view.png trunk/documentation/whatsnew/images/m2_facet.png trunk/documentation/whatsnew/images/profiler_preferred_launcher.png trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M2.html trunk/documentation/whatsnew/profiler/profiler-news-1.1.0.M3.html trunk/documentation/whatsnew/seam/seam-news-3.1.0.M2.html Modified: trunk/documentation/whatsnew/core/core-news-3.1.0.M2.html trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M2.html trunk/documentation/whatsnew/index.html trunk/documentation/whatsnew/jst/jst-news-3.1.0.M2.html trunk/documentation/whatsnew/maven/maven-news-1.0.0.M2.html trunk/documentation/whatsnew/profiler/profiler-news-1.1.0.M2.html trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M2.html trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.M2.html Log: what is new Modified: trunk/documentation/whatsnew/core/core-news-3.1.0.M2.html =================================================================== --- trunk/documentation/whatsnew/core/core-news-3.1.0.M2.html 2009-07-10 19:41:25 UTC (rev 16539) +++ trunk/documentation/whatsnew/core/core-news-3.1.0.M2.html 2009-07-10 19:45:00 UTC (rev 16540) @@ -12,11 +12,36 @@ <h1>What's New Core/General</h1> <p align="right"><a href="../index.html">< Main Index</a> <a - href="../as/as-news-3.1.0.M1.html">AS Tools ></a></p> + href="../jst/jst-news-3.1.0.M2.html">JST Tools ></a></p> <table border="0" cellpadding="10" cellspacing="0" width="80%"> <tr> <td colspan="2"> <hr /> + <h3>Update site</h3> + <hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Archived download option</b></td> + <td valign="top"> + <p>Instead of the *ALL* zip downloads we know provide a zipped updatesite that can used on all platforms.</p> + + <p>This means you use Eclipse P2 Update manager to install instead of the no longer recommended way of unzipping into a dropins folder.</p> + + <p>For this release we still provide the platform + specific zip files - but we would like to hear if you have problems + using the single zip updatesite, since we plan on only providing the + updatesite archive going forward.</p> + + <p><small><a + href="https://jira.jboss.org/jira/browse/JBIDE-4590">Related Jira</a></small></p> + + </td> + </tr> + + <tr> + <td colspan="2"> + <hr /> <h3>Properties editor</h3> <hr /> </td> Modified: trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M2.html =================================================================== --- trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M2.html 2009-07-10 19:41:25 UTC (rev 16539) +++ trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M2.html 2009-07-10 19:45:00 UTC (rev 16540) @@ -11,7 +11,7 @@ <body> <h1>Hibernate tools 3.3.0.M2 What's New</h1> -<p align="right"><a href="../index.html">< Main Index</a> <a href="../examples/examples-news-1.1.0.M1.html">Project Examples ></a></p> +<p align="right"><a href="../index.html">< Main Index</a> <a href="../maven/maven-news-1.0.0.M2.html">Maven Tools ></a></p> <table border="0" cellpadding="10" cellspacing="0" width="80%"> Added: trunk/documentation/whatsnew/images/el_rendered.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/el_rendered.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/el_rendered_001.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/el_rendered_001.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/el_validator_prefs.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/el_validator_prefs.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/hideselectionbar_in_view.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/hideselectionbar_in_view.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/m2_facet.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/m2_facet.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/whatsnew/images/profiler_preferred_launcher.png =================================================================== (Binary files differ) Property changes on: trunk/documentation/whatsnew/images/profiler_preferred_launcher.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/documentation/whatsnew/index.html =================================================================== --- trunk/documentation/whatsnew/index.html 2009-07-10 19:41:25 UTC (rev 16539) +++ trunk/documentation/whatsnew/index.html 2009-07-10 19:45:00 UTC (rev 16540) @@ -27,12 +27,12 @@ <p align="right"><b>3.1.0.M2</b> <td valign="top"> <p><a href="core/core-news-3.1.0.M2.html">Core/General</a></p> - <p><a href="profiler/profiler-news-1.0.0.M2.html">Profiler</a></p> <p><a href="jst/jst-news-3.1.0.M1.html">JST/JSF Tools</a></p> <p><a href="smooks/smooks-news-1.1.0.M2.html">Smooks Tools</a></p> <p><a href="hibernate/hibernate-news-3.3.0.M2.html">Hibernate Tools</a></p> <p><a href="maven/maven-news-1.0.0.M2.html">Maven Tools</a></p> <p><a href="vpe/vpe-news-3.1.0.M2.html">Visual Page Editor</a></p> + <p><a href="jbpm/jbpm-news-3.2.0.M2.html">jBPM Tools</a></p> </td> </tr> @@ -75,10 +75,10 @@ <p><a href="examples/examples-news-1.0.0.GA-full.html">Project Examples</a></p> <p><a href="hibernate/hibernate-news-3.2.4.GA-full.html">Hibernate Tools</a></p> <p><a href="jbpm/jbpm-news-3.1.7.GA-full.html">jBPM Tools</a></p> - <p><a href="jmx/jmx-news-0.5.0.GA-full.html">JMX Tools</a></p> - <p><a href="jst/jst-news-2.0.0.GA-full.html">JST/JSF tools</a></p> + <p><a href="jmx/jmx-news-1.0.0.GA-full.html">JMX Tools</a></p> + <p><a href="jst/jst-news-3.0.0.GA-full.html">JST/JSF tools</a></p> <p><a href="portlet/portlet-news-1.0.0.GA-full.html">Portal tools</a></p> - <p><a href="seam/seam-news-2.0.0.GA-full.html">Seam Tools</a></p> + <p><a href="seam/seam-news-3.0.0.GA-full.html">Seam Tools</a></p> <p><a href="smooks/smooks-news-1.0.0.GA-full.html">Smooks Tools</a></p> <p><a href="vpe/vpe-news-3.0.0.GA-full.html">Visual Page Editor</a></p> <p><a href="ws/ws-news-1.0.0.GA-full.html">JBoss Webservice Tools</a></p> @@ -99,8 +99,8 @@ <p align="right"><b>3.0.0.GA</b> <td valign="top"> <p><a href="as/as-news-2.0.0.GA.html">JBoss AS Tools</a></p> - <p><a href="seam/seam-news-2.0.0.GA.html">Seam Tools</a></p> - <p><a href="jst/jst-news-2.0.0.GA.html">JST/JSF Tools</a></p> + <p><a href="seam/seam-news-3.0.0.GA.html">Seam Tools</a></p> + <p><a href="jst/jst-news-3.0.0.GA.html">JST/JSF Tools</a></p> <p><a href="examples/examples-news-1.0.0.GA.html">Examples</a></p> </td> </tr> Added: trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M2.html =================================================================== --- trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M2.html (rev 0) +++ trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M2.html 2009-07-10 19:45:00 UTC (rev 16540) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css"/> +<title>jBPM Tools 3.2.0.M2 What's New</title> +</head> +<body> +<h1>jBPM Tools 3.2.0.M2 What's New</h1> + + <p align="right"><a href="../index.html">< Main Index</a> <a href="../core/core-news-3.1.0.M2.html">Core Tools ></a> + + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + + <tr> + <td colspan="2"> + <hr/> + <h3>jbpm 4</h3> + <hr/> + </td> + </tr> + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>New jbpm4 plugin</b></td> + <td valign="top"> + <p>The newly released jbpm4 plugin that supports jbpm4 with a better jPDL editor with BPMN based graphics is included in this release.</p> + <p>It can coexist with the jbpm3 plugin but some actions/wizards will overlap but that will be merged before the final release</p> + </td> + </tr> + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> +</table> + +</body> + +</html> + + Modified: trunk/documentation/whatsnew/jst/jst-news-3.1.0.M2.html =================================================================== --- trunk/documentation/whatsnew/jst/jst-news-3.1.0.M2.html 2009-07-10 19:41:25 UTC (rev 16539) +++ trunk/documentation/whatsnew/jst/jst-news-3.1.0.M2.html 2009-07-10 19:45:00 UTC (rev 16540) @@ -11,7 +11,7 @@ <body> <h1>JST/JSF 3.1.0.M1 What's New</h1> -<p align="right"><a href="../index.html">< Main Index</a> <a href="../hibernate/hibernate-news-3.3.0.M1.html">Hibernate Tools News ></a></p> +<p align="right"><a href="../index.html">< Main Index</a> <a href="../smooks/smooks-news-1.1.0.M2.html">Smooks Tools News ></a></p> <table border="0" cellpadding="10" cellspacing="0" width="80%"> <tr> Modified: trunk/documentation/whatsnew/maven/maven-news-1.0.0.M2.html =================================================================== --- trunk/documentation/whatsnew/maven/maven-news-1.0.0.M2.html 2009-07-10 19:41:25 UTC (rev 16539) +++ trunk/documentation/whatsnew/maven/maven-news-1.0.0.M2.html 2009-07-10 19:45:00 UTC (rev 16540) @@ -12,7 +12,7 @@ <h1>Maven Tools</h1> <p align="right"><a href="../index.html">< Main Index</a> <a - href="../seam/seam-news-3.1.0.M1.html">Seam Tools ></a></p> + href="../vpe/vpe-news-3.1.0.M2.html">VPE Tools ></a></p> <table border="0" cellpadding="10" cellspacing="0" width="80%"> <tr> <td colspan="2"> @@ -26,10 +26,19 @@ <td valign="top"> <p>This release introduces an optional integration with m2eclipse to provide Maven support for projects created by JBoss Tools and to some extent core WTP projects too.</p> +<p><img src="../images/m2_facet.png"/></p> + <p>The first integration is to provide a Maven facet for WTP projects which for now just integrates with the Seam facet to let Maven get the libraries instead of using the Seam runtime.</p> -<p><img src="../images/"/></p> +<p>Here is a screencast showing it in action for Seam projects: <a href="http://screencast.com/t/bOv02ocE">Screencast showing Maven</a></p> +<p>Note: shortly before M2 release, m2eclipse released a 0.9.9 on their +update-dev updatesite which changed the API we dependent on. We have +fixed that in M3/trunk build, so for M2 it is important to use +m2eclipse <a href="http://m2eclipse.sonatype.org/update/">stable updatesite</a> or the <a href="http://m2eclipse.sonatype.org/releases/0.9.9.200906081351">latest integration build</a> we +developed M2 against. +</p> + <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-3874">Related Jira</a></small></p> </td> Modified: trunk/documentation/whatsnew/profiler/profiler-news-1.1.0.M2.html =================================================================== --- trunk/documentation/whatsnew/profiler/profiler-news-1.1.0.M2.html 2009-07-10 19:41:25 UTC (rev 16539) +++ trunk/documentation/whatsnew/profiler/profiler-news-1.1.0.M2.html 2009-07-10 19:45:00 UTC (rev 16540) @@ -31,6 +31,7 @@ <p>It is available as a Profile launch configuration which currently works for Java application launches.</p> +<p><img src="../images/profiler_preferred_launcher.png"/></p> </td> </tr> Added: trunk/documentation/whatsnew/profiler/profiler-news-1.1.0.M3.html =================================================================== --- trunk/documentation/whatsnew/profiler/profiler-news-1.1.0.M3.html (rev 0) +++ trunk/documentation/whatsnew/profiler/profiler-news-1.1.0.M3.html 2009-07-10 19:45:00 UTC (rev 16540) @@ -0,0 +1,51 @@ +<html> + +<head> +<link rel="stylesheet" href="../whatsnew.css"> +<title>JBoss Profiler Tools 1.0.0.M2 News</title> +</head> + +<body> + +<h1>JBoss Profiler Tools 1.0.0.M2 - New and Noteworthy</h1> + + <p align="right"><a href="../index.html">< Main Index</a> <a href="../vpe/vpe-news-3.1.0.M1.html">Visual Page Editor ></a></p> + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + + <tr> + <td colspan="2"> + <hr/> + <h3>Profiler</h3> + <hr/> + </td> + </tr> + + <tr> + <td valign="top" align="left"> + <p align="right"> + <b>JBoss Profiler</b></td> + <td valign="top"> + <p>There is now a basic integration of JBoss Profiler available.</p> + + <p>It is available as a Profile launch configuration which + currently works for Java application launches.</p> + +<p><img src="../images/profiler_preferred_launcher.png"/></p> + </td> + </tr> + + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + + +</table> + +</body> + +</html> + + Added: trunk/documentation/whatsnew/seam/seam-news-3.1.0.M2.html =================================================================== --- trunk/documentation/whatsnew/seam/seam-news-3.1.0.M2.html (rev 0) +++ trunk/documentation/whatsnew/seam/seam-news-3.1.0.M2.html 2009-07-10 19:45:00 UTC (rev 16540) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css"/> +<title>Seam tools 3.1.0.M2 What's New</title> +</head> +<body> +<h1>Seam tools 3.1.0.M2 What's New</h1> + +<p align="right"><a href="../index.html">< Main Index</a> <a href="../jst/jst-news-3.1.0.M1.html">JST/JSF Tools News ></a></p> + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + <tr> + <td colspan="2"> + <hr/> + <h3>Validation</h3> + <hr/> + </td> + </tr> + <tr> + <td valign="top" align="left"> + <p><b>Speed improvements</b></p></td> + <td valign="top"> + <p>We improved the incremental validation for xhtml pages, so validation no longer take long periods.</p> + + <p>We also added a setting allowing you to disable the + incremental validation in case your project is still having issues.</p> + <p><img src="../images/el_validator_prefs.png"/></p> + + <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-4514">Related Jira</a></small></p> + </td> + </tr> + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + + +</table> + +</body> + +</html> Modified: trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M2.html =================================================================== --- trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M2.html 2009-07-10 19:41:25 UTC (rev 16539) +++ trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M2.html 2009-07-10 19:45:00 UTC (rev 16540) @@ -12,7 +12,7 @@ <h1>Smooks tools 1.1.0.M2 What's New</h1> <p align="right"><a href="../index.html">< Main Index</a> <a - href="../core/core-news-3.1.0.M1.html">Core ></a></p> + href="../hibernate/hibernate-news-3.3.0.M2.html">Hibernate ></a></p> <table border="0" cellpadding="10" cellspacing="0" width="80%"> Modified: trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.M2.html =================================================================== --- trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.M2.html 2009-07-10 19:41:25 UTC (rev 16539) +++ trunk/documentation/whatsnew/vpe/vpe-news-3.1.0.M2.html 2009-07-10 19:45:00 UTC (rev 16540) @@ -12,7 +12,7 @@ <h1>What's New Visual Page Editor</h1> <p align="right"><a href="../index.html">< Main Index</a> <a - href="../seam/seam-news-3.1.0.M1.html">Seam Tools ></a></p> + href="../jbpm/jbpm-news-3.2.0.M2.html">jBPM Tools ></a></p> <table border="0" cellpadding="10" cellspacing="0" width="80%"> <tr> <td colspan="2"> @@ -41,9 +41,9 @@ <tr> <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>Rendered attributes obey EL variables</b></td> <td valign="top"> - <p>Tags that has a rendered attribute to decide if it is shown or not will now obey dependent on EL variables setup by user.</p> + <p>Tags that has a rendered attribute to decide if it is shown or not will now obey EL expressions setup by user.</p> -<p><img src="../images/"/></p> +<p><img src="../images/el_rendered_001.png"/></p> <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-4179">Related Jira</a></small></p> @@ -59,7 +59,7 @@ <td valign="top"> <p>The Hide/Show Selection button has been moved to the editor/view menu.</p> -<p><img src="../images/"/></p> +<p><img src="../images/hideselectionbar_in_view.png"/></p> <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-3895">Related Jira</a></small></p> @@ -99,7 +99,6 @@ </ul> </p> -<p><img src="../images/"/></p> <p><small><a href="https://jira.jboss.org/jira/browse/JBIDE-3697">Related Jira</a></small></p>

16 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r16539 - tags.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2009-07-10 15:41:25 -0400 (Fri, 10 Jul 2009) New Revision: 16539 Added: tags/jbosstools-3.1.0.M2/ Log: tag as M2 Copied: tags/jbosstools-3.1.0.M2 (from rev 16538, branches/jbosstools-3.1.0.M2)

16 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r16538 - in trunk/hibernatetools: plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2009-07-10 12:41:55 -0400 (Fri, 10 Jul 2009) New Revision: 16538 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmImageMap.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelProvider.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingDiagramTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-4285 - junit tests fix Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java 2009-07-10 14:40:35 UTC (rev 16537) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java 2009-07-10 16:41:55 UTC (rev 16538) @@ -32,7 +32,6 @@ import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.views.contentoutline.IContentOutlinePage; import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.mapping.Column; import org.hibernate.mapping.RootClass; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.editors.actions.AutoLayoutAction; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmImageMap.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmImageMap.java 2009-07-10 14:40:35 UTC (rev 16537) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmImageMap.java 2009-07-10 16:41:55 UTC (rev 16538) @@ -11,6 +11,7 @@ package org.jboss.tools.hibernate.ui.view; import org.eclipse.jface.resource.ImageDescriptor; +import org.hibernate.MappingException; import org.hibernate.mapping.Any; import org.hibernate.mapping.Array; import org.hibernate.mapping.Bag; @@ -30,6 +31,7 @@ import org.hibernate.mapping.SimpleValue; import org.hibernate.mapping.Table; import org.hibernate.mapping.Value; +import org.hibernate.type.Type; import org.jboss.tools.hibernate.ui.diagram.UiPlugin; /** @@ -117,24 +119,32 @@ str = "Image_PersistentFieldMany-to-one"; //$NON-NLS-1$ } else if (value instanceof Any) { str = "Image_PersistentFieldAny"; //$NON-NLS-1$ - } else if (field.getType() != null && field.getType().isCollectionType()) { - if (value instanceof PrimitiveArray) { - str = "Image_Collection_primitive_array"; //$NON-NLS-1$ - } else if (value instanceof Array) { - str = "Image_Collection_array"; //$NON-NLS-1$ - } else if (value instanceof List) { - str = "Image_Collection_list"; //$NON-NLS-1$ - } else if (value instanceof Set) { - str = "Image_Collection_set"; //$NON-NLS-1$ - } else if (value instanceof Map) { - str = "Image_Collection_map"; //$NON-NLS-1$ - } else if (value instanceof Bag) { - str = "Image_Collection_bag"; //$NON-NLS-1$ - } else if (value instanceof IdentifierBag) { - str = "Image_Collection_idbag"; //$NON-NLS-1$ - } else { - str = "Image_Collection"; //$NON-NLS-1$ + } else { + Type type = null; + try { + type = field.getType(); + } catch (MappingException ex) { + // ignore it } + if (type != null && type.isCollectionType()) { + if (value instanceof PrimitiveArray) { + str = "Image_Collection_primitive_array"; //$NON-NLS-1$ + } else if (value instanceof Array) { + str = "Image_Collection_array"; //$NON-NLS-1$ + } else if (value instanceof List) { + str = "Image_Collection_list"; //$NON-NLS-1$ + } else if (value instanceof Set) { + str = "Image_Collection_set"; //$NON-NLS-1$ + } else if (value instanceof Map) { + str = "Image_Collection_map"; //$NON-NLS-1$ + } else if (value instanceof Bag) { + str = "Image_Collection_bag"; //$NON-NLS-1$ + } else if (value instanceof IdentifierBag) { + str = "Image_Collection_idbag"; //$NON-NLS-1$ + } else { + str = "Image_Collection"; //$NON-NLS-1$ + } + } } } else if ("parent".equals(field.getName())) { //$NON-NLS-1$ str = "Image_PersistentFieldParent"; //$NON-NLS-1$ Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelProvider.java 2009-07-10 14:40:35 UTC (rev 16537) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelProvider.java 2009-07-10 16:41:55 UTC (rev 16538) @@ -23,6 +23,7 @@ import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; +import org.hibernate.MappingException; import org.hibernate.cfg.Configuration; import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; @@ -131,9 +132,18 @@ } } } - sqlType = column.getSqlType(dialect, mapping); - column.setSqlType(sqlType); - return true; + if (dialect != null) { + try { + sqlType = column.getSqlType(dialect, mapping); + } catch (MappingException ex) { + // ignore it + } + } + if (sqlType != null) { + column.setSqlType(sqlType); + return true; + } + return false; } } \ No newline at end of file Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingDiagramTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingDiagramTest.java 2009-07-10 14:40:35 UTC (rev 16537) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingDiagramTest.java 2009-07-10 16:41:55 UTC (rev 16538) @@ -71,7 +71,7 @@ if (persClasses.length > 0){ for (int i = 0; i < persClasses.length; i++) { - assertTrue(persClasses[0] instanceof PersistentClass); + assertTrue(persClasses[i] instanceof PersistentClass); PersistentClass persClass = (PersistentClass) persClasses[i]; IEditorPart editor = null; @@ -81,7 +81,9 @@ } catch (PartInitException e) { ex = e; } - if (ex == null ) ex = Utils.getExceptionIfItOccured(editor); + if (ex == null ) { + ex = Utils.getExceptionIfItOccured(editor); + } if (ex != null) { String out = NLS.bind(ConsoleTestMessages.OpenMappingDiagramTest_mapping_diagram_for_not_opened, new Object[]{persClass.getClassName(), ex.getMessage()});

16 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r16537 - in trunk/hibernatetools: tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2009-07-10 10:40:35 -0400 (Fri, 10 Jul 2009) New Revision: 16537 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-4285 - update test Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java 2009-07-10 14:36:53 UTC (rev 16536) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java 2009-07-10 14:40:35 UTC (rev 16537) @@ -130,7 +130,7 @@ editorPart = OpenMappingUtils.openFileInEditor(file); boolean updateRes = updateEditorSelection(editorPart, selection); if (!updateRes && selectionParent != null) { - // if it is not possible to select object, try to select it's child + // if it is not possible to select object, try to select it's parent updateRes = updateEditorSelection(editorPart, selectionParent); } } Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java 2009-07-10 14:36:53 UTC (rev 16536) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/OpenMappingFileTest.java 2009-07-10 14:40:35 UTC (rev 16537) @@ -144,7 +144,7 @@ IEditorPart editor = null; Throwable ex = null; try { - editor = OpenMappingAction.run(consCFG, selection); + editor = OpenMappingAction.run(consCFG, selection, null); boolean highlighted = Utils.hasSelection(editor); if (!highlighted) { String out = NLS.bind(ConsoleTestMessages.OpenMappingFileTest_highlighted_region_for_is_empty_package,

16 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r16536 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-07-10 10:36:53 -0400 (Fri, 10 Jul 2009) New Revision: 16536 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java Log: https://jira.jboss.org/jira/browse/JBIDE-4572 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java 2009-07-10 14:36:04 UTC (rev 16535) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/propertieseditor/PropertiesEditor.java 2009-07-10 14:36:53 UTC (rev 16536) @@ -18,6 +18,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.regex.Pattern; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; @@ -32,6 +33,8 @@ import org.eclipse.jface.viewers.TableViewer; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; @@ -96,7 +99,9 @@ private QualifiedName filterOpenedId = new QualifiedName("", "filterOpened"); //$NON-NLS-1$ //$NON-NLS-2$ private QualifiedName nameFilterId = new QualifiedName("", "nameFilter"); //$NON-NLS-1$ //$NON-NLS-2$ private QualifiedName valueFilterId = new QualifiedName("", "valueFilter"); //$NON-NLS-1$ //$NON-NLS-2$ + private QualifiedName isFilterExpressionId = new QualifiedName("", "isFilterExpression"); //$NON-NLS-1$ //$NON-NLS-2$ private boolean filterOpened = false; + private boolean isFilterExpression = false; public PropertiesEditor() { @@ -164,16 +169,28 @@ vsupport.fillComposite(vg); vsupport.addPropertyChangeListener(pHelper); - fake = new Button(g1, SWT.NONE); - fake.setText(ADD); + fake = new Button(g1, SWT.CHECK); + fake.setText(UIMessages.PROPERTIES_EDITOR_EXPRESSION); GridData fd = new GridData(); fd.widthHint = convertHorizontalDLUsToPixels(g1, IDialogConstants.BUTTON_WIDTH); fake.setLayoutData(fd); - fake.setVisible(false); + fake.setSelection(isFilterExpression); + fake.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + isFilterExpression = fake.getSelection(); + pHelper.applyFilters(); + refresh(); + } + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + }); +// fake.setVisible(false); statistics = new Label(panel, SWT.NONE); statistics.setVisible(false); GridData d = new GridData(GridData.FILL_HORIZONTAL); + d.horizontalSpan = 2; d.heightHint = 1; statistics.setLayoutData(d); @@ -184,7 +201,7 @@ menu.setViewer(xtable.getViewer()); xtable.getViewer().getTable().addMouseListener(menu); getControl().addMouseListener(menu); - + return panel; } @@ -284,6 +301,7 @@ pHelper.valueFilter = f.getPersistentProperty(valueFilterId); if(pHelper.nameFilter == null) pHelper.nameFilter = ""; //$NON-NLS-1$ if(pHelper.valueFilter == null) pHelper.valueFilter = ""; //$NON-NLS-1$ + isFilterExpression = "true".equals(f.getPersistentProperty(isFilterExpressionId)); //$NON-NLS-1$ } catch (CoreException e) { //ignore } @@ -295,6 +313,7 @@ f.setPersistentProperty(filterOpenedId, "" + filterOpened); //$NON-NLS-1$ f.setPersistentProperty(nameFilterId, pHelper.nameFilter); f.setPersistentProperty(valueFilterId, "" + pHelper.valueFilter); //$NON-NLS-1$ + f.setPersistentProperty(isFilterExpressionId, "" + isFilterExpression); //$NON-NLS-1$ } catch (CoreException e) { //ignore } @@ -440,17 +459,24 @@ void validateStatistics() { int filtered = pHelper.filteredChildren.length; int total = pHelper.getModelObject().getChildren().length; - boolean mod = (filtered != total) != statistics.isVisible(); + boolean errors = pHelper.compileError.length() > 0; + boolean visible = (filtered != total || errors); + boolean mod = visible != statistics.isVisible(); if(mod) { - statistics.setVisible(filtered != total); + statistics.setVisible(visible); GridData d = (GridData)statistics.getLayoutData(); - d.heightHint = (filtered != total) ? SWT.DEFAULT : 1; - panel.update(); - panel.layout(); + d.heightHint = visible ? SWT.DEFAULT : 1; } if(filtered != total) { statistics.setText(NLS.bind(UIMessages.PROPERTIES_EDITOR_FILTER_MATCHES, filtered, total)); + } else if(errors) { + statistics.setText(pHelper.compileError); } + statistics.update(); + panel.update(); + panel.layout(); + panel.getParent().update(); + panel.getParent().layout(); } public void dispose() { @@ -466,6 +492,7 @@ PropertiesEditor pe; String nameFilter = ""; //$NON-NLS-1$ String valueFilter = ""; //$NON-NLS-1$ + String compileError = ""; //$NON-NLS-1$ XModelObject[] filteredChildren = new XModelObject[0]; long ts = -1; @@ -476,21 +503,54 @@ void applyFilters() { ts = object == null ? -1 : object.getTimeStamp(); + compileError = ""; //$NON-NLS-1$ if(object == null) { filteredChildren = new XModelObject[0]; } else if(nameFilter.length() == 0 && valueFilter.length() == 0) { filteredChildren = object.getChildren(); + } else if(pe.fake.getSelection()) { + filteredChildren = object.getChildren(); + Pattern pn = null, pv = null; + if(nameFilter.length() > 0) try { + pn = Pattern.compile(nameFilter); + } catch (Exception e) { + compileError = NLS.bind(UIMessages.PROPERTIES_EDITOR_ILLEGAL_NAME_EXPRESSION, e.getMessage()); + return; + } + if(valueFilter.length() > 0) try { + pv = Pattern.compile(valueFilter); + } catch (Exception e) { + compileError = NLS.bind(UIMessages.PROPERTIES_EDITOR_ILLEGAL_VALUE_EXPRESSION, e.getMessage()); + return; + } + XModelObject[] children = object.getChildren(); + List<XModelObject> list = new ArrayList<XModelObject>(); + for (XModelObject c: children) { + String n = c.getAttributeValue(PropertiesEditor.ATTR_NAME); + String v = c.getAttributeValue(PropertiesEditor.ATTR_VALUE); + if(pn != null && !pn.matcher(n).find()) { + continue; + } + if(pv != null && !pv.matcher(v).find()) { + continue; + } + + list.add(c); + } + filteredChildren = list.toArray(new XModelObject[0]); } else { + String lowNameFilter = nameFilter.toLowerCase(); + String lowValueFilter = valueFilter.toLowerCase(); XModelObject[] children = object.getChildren(); List<XModelObject> list = new ArrayList<XModelObject>(); for (XModelObject c: children) { String n = c.getAttributeValue(PropertiesEditor.ATTR_NAME); String v = c.getAttributeValue(PropertiesEditor.ATTR_VALUE); if(nameFilter.length() > 0) { - if(n.indexOf(nameFilter) < 0) continue; //TODO improve + if(n.toLowerCase().indexOf(lowNameFilter) < 0) continue; //TODO improve } if(valueFilter.length() > 0) { - if(v.indexOf(valueFilter) < 0) continue; //TODO improve + if(v.toLowerCase().indexOf(lowValueFilter) < 0) continue; //TODO improve } list.add(c);

16 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r16535 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-07-10 10:36:04 -0400 (Fri, 10 Jul 2009) New Revision: 16535 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/UIMessages.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/messages.properties Log: https://jira.jboss.org/jira/browse/JBIDE-4572 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/UIMessages.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/UIMessages.java 2009-07-10 13:26:50 UTC (rev 16534) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/UIMessages.java 2009-07-10 14:36:04 UTC (rev 16535) @@ -23,4 +23,7 @@ public static String CANNOT_DISPLAY_DOCUMENT_CONTENTS; public static String PROPERTIES_EDITOR_FILTER; public static String PROPERTIES_EDITOR_FILTER_MATCHES; + public static String PROPERTIES_EDITOR_EXPRESSION; + public static String PROPERTIES_EDITOR_ILLEGAL_NAME_EXPRESSION; + public static String PROPERTIES_EDITOR_ILLEGAL_VALUE_EXPRESSION; } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/messages.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/messages.properties 2009-07-10 13:26:50 UTC (rev 16534) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/messages/messages.properties 2009-07-10 14:36:04 UTC (rev 16535) @@ -1,3 +1,6 @@ CANNOT_DISPLAY_DOCUMENT_CONTENTS=Cannot display document contents. PROPERTIES_EDITOR_FILTER=Filter -PROPERTIES_EDITOR_FILTER_MATCHES=Filter matched {0} out of {1} items. \ No newline at end of file +PROPERTIES_EDITOR_EXPRESSION=Expression +PROPERTIES_EDITOR_ILLEGAL_NAME_EXPRESSION=Illegal name expression: {0} +PROPERTIES_EDITOR_ILLEGAL_VALUE_EXPRESSION=Illegal value expression: {0} +PROPERTIES_EDITOR_FILTER_MATCHES=Filter matched {0} out of {1} items. \ No newline at end of file

16 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r16534 - trunk/hibernatetools/plugins.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2009-07-10 09:26:50 -0400 (Fri, 10 Jul 2009) New Revision: 16534 Removed: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/ Log: https://jira.jboss.org/jira/browse/JBIDE-4524 - delete veditor & view

16 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r16533 - in trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt: org/jboss/tools and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: chukhutsina Date: 2009-07-10 09:17:19 -0400 (Fri, 10 Jul 2009) New Revision: 16533 Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl Log: <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif"> <p>https://jira.jboss.org/jira/browse/JBDS-770- Fixed the problem with some chapters' numeration (pagination).</p> </body></html> Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl 2009-07-10 13:16:35 UTC (rev 16532) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl 2009-07-10 13:17:19 UTC (rev 16533) @@ -71,7 +71,7 @@ </xsl:when> - <xsl:when test="$sequence = 'blank' and $position = 'left'"> +  </xsl:choose> </fo:block> @@ -191,6 +191,7 @@ <xsl:text>no-force</xsl:text> </xsl:template>  + <xsl:template name="process.image">   @@ -394,4 +395,88 @@ </xsl:otherwise> </xsl:choose> </xsl:template> + + <xsl:template name="process.menuchoice"> + <xsl:param name="nodelist" select="guibutton|guiicon|guilabel|guimenu|guimenuitem|guisubmenu|interface"/> + <xsl:param name="count" select="1"/> + + <xsl:variable name="mm.separator"> + <xsl:choose> + <xsl:when test="($fop.extensions != 0 or $fop1.extensions != 0 ) and + contains($menuchoice.menu.separator, '→')"> + <fo:inline font-family="Symbol" font-weight="normal"> + <xsl:copy-of select="$menuchoice.menu.separator"/> + </fo:inline> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$menuchoice.menu.separator"/> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <xsl:choose> + <xsl:when test="$count>count($nodelist)"></xsl:when> + <xsl:when test="$count=1"> + <xsl:apply-templates select="$nodelist[$count=position()]"/> + <xsl:call-template name="process.menuchoice"> + <xsl:with-param name="nodelist" select="$nodelist"/> + <xsl:with-param name="count" select="$count+1"/> + </xsl:call-template> + </xsl:when> + <xsl:otherwise> + <xsl:variable name="node" select="$nodelist[$count=position()]"/> + <xsl:choose> + <xsl:when test="local-name($node)='guimenuitem' + or local-name($node)='guisubmenu'"> + <xsl:copy-of select="$mm.separator"/> + </xsl:when> + <xsl:otherwise> + <xsl:copy-of select="$menuchoice.separator"/> + </xsl:otherwise> + </xsl:choose> + <xsl:apply-templates select="$node"/> + <xsl:call-template name="process.menuchoice"> + <xsl:with-param name="nodelist" select="$nodelist"/> + <xsl:with-param name="count" select="$count+1"/> + </xsl:call-template> + </xsl:otherwise> + </xsl:choose> + </xsl:template> +  + <xsl:template name="initial.page.number"> + <xsl:param name="element" select="local-name(.)"/> + <xsl:param name="master-reference" select="''"/> + +  + <xsl:variable name="first.book.content" + select="ancestor::book/*[ + not(self::title or + self::subtitle or + self::titleabbrev or + self::bookinfo or + self::info or + self::dedication or + self::preface or + self::toc or + self::lot)][1]"/> + <xsl:choose> + <xsl:when test="$element = 'toc'">auto</xsl:when> + <xsl:when test="$element = 'book'">1</xsl:when> + <xsl:when test="$element = 'preface'">auto</xsl:when> + <xsl:when test="($element = 'dedication' or $element = 'article') and + not(preceding::chapter + or preceding::preface + or preceding::appendix + or preceding::article + or preceding::dedication + or parent::part + or parent::reference)">1</xsl:when> + <xsl:when test="generate-id($first.book.content) = + generate-id(.)">1</xsl:when> + + <xsl:otherwise>auto</xsl:otherwise> + </xsl:choose> + </xsl:template> + </xsl:stylesheet> Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl 2009-07-10 13:16:35 UTC (rev 16532) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/org/jboss/tools/pdf.xsl 2009-07-10 13:17:19 UTC (rev 16533) @@ -282,7 +282,7 @@ </xsl:when> - <xsl:when test="$sequence = 'blank' and $position = 'left'"> +  </xsl:choose> </fo:block> @@ -616,5 +616,40 @@ </xsl:otherwise> </xsl:choose> </xsl:template> - +  + <xsl:template name="initial.page.number"> + <xsl:param name="element" select="local-name(.)"/> + <xsl:param name="master-reference" select="''"/> + +  + <xsl:variable name="first.book.content" + select="ancestor::book/*[ + not(self::title or + self::subtitle or + self::titleabbrev or + self::bookinfo or + self::info or + self::dedication or + self::preface or + self::toc or + self::lot)][1]"/> + <xsl:choose> + <xsl:when test="$element = 'toc'">auto</xsl:when> + <xsl:when test="$element = 'book'">1</xsl:when> + <xsl:when test="$element = 'preface'">auto</xsl:when> + <xsl:when test="($element = 'dedication' or $element = 'article') and + not(preceding::chapter + or preceding::preface + or preceding::appendix + or preceding::article + or preceding::dedication + or parent::part + or parent::reference)">1</xsl:when> + <xsl:when test="generate-id($first.book.content) = + generate-id(.)">1</xsl:when> + + <xsl:otherwise>auto</xsl:otherwise> + </xsl:choose> + </xsl:template> </xsl:stylesheet>

16 years, 9 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits July 2009