Skip to content
GitLab
Commit 89a069fd authored by Romain Bioteau's avatar Romain Bioteau Committed by GitHub
Browse files

fix(autofill) create a default left operand (#248)

parent 22302b9e
Hide whitespace changes
Inline Side-by-side
bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/message/MessageIdExpressionProvider.java
View file @ 89a069fd
......@@ -5,14 +5,12 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2.0 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.bonitasoft.studio.expression.editor.message;
......@@ -30,7 +28,6 @@ import org.bonitasoft.studio.model.expression.ExpressionFactory;
import org.bonitasoft.studio.model.expression.ListExpression;
import org.bonitasoft.studio.model.expression.TableExpression;
import org.bonitasoft.studio.model.process.AbstractCatchMessageEvent;
import org.bonitasoft.studio.model.process.Element;
import org.bonitasoft.studio.model.process.Message;
import org.bonitasoft.studio.pics.Pics;
import org.bonitasoft.studio.pics.PicsConstants;
......@@ -39,48 +36,47 @@ import org.eclipse.swt.graphics.Image;
/**
* @author Romain Bioteau
*
*/
public class MessageIdExpressionProvider implements IExpressionProvider {
/* (non-Javadoc)
/*
* (non-Javadoc)
* @see org.bonitasoft.studio.expression.editor.provider.IExpressionProvider#getExpressions(org.eclipse.emf.ecore.EObject)
*/
@Override
public Set<Expression> getExpressions(EObject context) {
if(context instanceof AbstractCatchMessageEvent){
String event = ((AbstractCatchMessageEvent) context).getEvent();
if(event != null){
final Message message = ModelHelper.findEvent((Element) context, event);
if(message != null){
TableExpression throwMessageContent = message.getMessageContent();
HashSet<Expression> messageContentIds = new HashSet<Expression>();
for (int i=0;i<throwMessageContent.getExpressions().size();i++){
ListExpression row = throwMessageContent.getExpressions().get(i);
Expression id = row.getExpressions().get(0);
if (id!=null && id.getName() !=null){
messageContentIds.add(createExpression(id.getName()));
}
AbstractCatchMessageEvent catchMessageEvent = ModelHelper.getFirstContainerOfType(context,
AbstractCatchMessageEvent.class);
String event = ((AbstractCatchMessageEvent) catchMessageEvent).getEvent();
if (event != null) {
final Message message = ModelHelper.findEvent(catchMessageEvent, event);
if (message != null) {
TableExpression throwMessageContent = message.getMessageContent();
HashSet<Expression> messageContentIds = new HashSet<Expression>();
for (int i = 0; i < throwMessageContent.getExpressions().size(); i++) {
ListExpression row = throwMessageContent.getExpressions().get(i);
Expression id = row.getExpressions().get(0);
if (id != null && id.getName() != null) {
messageContentIds.add(createExpression(id.getName()));
}
return messageContentIds;
}
return messageContentIds;
}
}
return Collections.emptySet();
}
private Expression createExpression(String id) {
Expression exp = ExpressionFactory.eINSTANCE.createExpression() ;
exp.setType(getExpressionType()) ;
exp.setContent(id) ;
exp.setName(id) ;
exp.setReturnType(String.class.getName()) ;
Expression exp = ExpressionFactory.eINSTANCE.createExpression();
exp.setType(getExpressionType());
exp.setContent(id);
exp.setName(id);
exp.setReturnType(String.class.getName());
return exp;
}
/* (non-Javadoc)
/*
* (non-Javadoc)
* @see org.bonitasoft.studio.expression.editor.provider.IExpressionProvider#getExpressionType()
*/
@Override
......@@ -88,7 +84,8 @@ public class MessageIdExpressionProvider implements IExpressionProvider {
return ExpressionConstants.MESSAGE_ID_TYPE;
}
/* (non-Javadoc)
/*
* (non-Javadoc)
* @see org.bonitasoft.studio.expression.editor.provider.IExpressionProvider#getIcon(org.bonitasoft.studio.model.expression.Expression)
*/
@Override
......@@ -96,7 +93,8 @@ public class MessageIdExpressionProvider implements IExpressionProvider {
return Pics.getImage(PicsConstants.enveloppe);
}
/* (non-Javadoc)
/*
* (non-Javadoc)
* @see org.bonitasoft.studio.expression.editor.provider.IExpressionProvider#getTypeIcon()
*/
@Override
......@@ -104,7 +102,8 @@ public class MessageIdExpressionProvider implements IExpressionProvider {
return Pics.getImage(PicsConstants.enveloppe);
}
/* (non-Javadoc)
/*
* (non-Javadoc)
* @see org.bonitasoft.studio.expression.editor.provider.IExpressionProvider#getProposalLabel(org.bonitasoft.studio.model.expression.Expression)
*/
@Override
......@@ -112,12 +111,13 @@ public class MessageIdExpressionProvider implements IExpressionProvider {
return expression.getContent();
}
/* (non-Javadoc)
/*
* (non-Javadoc)
* @see org.bonitasoft.studio.expression.editor.provider.IExpressionProvider#isRelevantFor(org.eclipse.emf.ecore.EObject)
*/
@Override
public boolean isRelevantFor(EObject context) {
return context instanceof AbstractCatchMessageEvent;
return ModelHelper.getFirstContainerOfType(context, AbstractCatchMessageEvent.class) != null;
}
@Override
......@@ -126,9 +126,8 @@ public class MessageIdExpressionProvider implements IExpressionProvider {
}
@Override
public IExpressionEditor getExpressionEditor(Expression expression,EObject context) {
public IExpressionEditor getExpressionEditor(Expression expression, EObject context) {
return new MessageIdExpressionEditor();
}
}
bundles/plugins/org.bonitasoft.studio.properties/src/org/bonitasoft/studio/properties/sections/catchmessage/CatchMessageContentEventSection.java
View file @ 89a069fd
/**
* Copyright (C) 2012 BonitaSoft S.A.
* BonitaSoft, 32 rue Gustave Eiffel - 38000 Grenoble
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2.0 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.bonitasoft.studio.properties.sections.catchmessage;
......@@ -57,7 +54,7 @@ import org.eclipse.ui.IWorkbenchPart;
/**
* @author Aurelien Pupier
*@author Aurelie Zara
* @author Aurelie Zara
*/
public class CatchMessageContentEventSection extends AbstractBonitaDescriptionSection {
......@@ -73,9 +70,11 @@ public class CatchMessageContentEventSection extends AbstractBonitaDescriptionSe
mainComposite.setLayoutData(GridDataFactory.fillDefaults().grab(true, true).create());
createAutoFillButton();
validator = new MessageContentExpressionValidator();
alc = new PropertyOperationsComposite(getTabbedPropertySheetPage(), mainComposite, new AvailableExpressionTypeFilter(new String[] {
ExpressionConstants.CONSTANT_TYPE, ExpressionConstants.MESSAGE_ID_TYPE }), new AvailableExpressionTypeFilter(
new String[] { ExpressionConstants.VARIABLE_TYPE }));
alc = new PropertyOperationsComposite(getTabbedPropertySheetPage(), mainComposite,
new AvailableExpressionTypeFilter(new String[] {
ExpressionConstants.CONSTANT_TYPE, ExpressionConstants.MESSAGE_ID_TYPE }),
new AvailableExpressionTypeFilter(
new String[] { ExpressionConstants.VARIABLE_TYPE }));
alc.addActionExpressionValidator(validator);
alc.addActionExpressionValidator(validator);
alc.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).create());
......@@ -83,8 +82,10 @@ public class CatchMessageContentEventSection extends AbstractBonitaDescriptionSe
}
private void createAutoFillButton() {
final Button autoFillButton = getWidgetFactory().createButton(mainComposite, Messages.autoFillMessageContent, SWT.FLAT);
final Button autoFillButton = getWidgetFactory().createButton(mainComposite, Messages.autoFillMessageContent,
SWT.FLAT);
autoFillButton.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(final SelectionEvent e) {
BusyIndicator.showWhile(Display.getDefault(), new Runnable() {
......@@ -92,11 +93,11 @@ public class CatchMessageContentEventSection extends AbstractBonitaDescriptionSe
@Override
public void run() {
final MessageFlow incomingMessag = getCatchMessageEvent().getIncomingMessag();
if(incomingMessag != null){
if (incomingMessag != null) {
final Message message = ModelHelper.findEvent(getCatchMessageEvent(), incomingMessag.getName());
if(message != null){
if (message != null) {
mapContentForMessage(message);
/*refresh UI*/
/* refresh UI */
refreshUI();
}
}
......@@ -105,11 +106,11 @@ public class CatchMessageContentEventSection extends AbstractBonitaDescriptionSe
private void mapContentForMessage(final Message message) {
final TableExpression throwMessageContent = message.getMessageContent();
for (final ListExpression row : throwMessageContent.getExpressions()) {
final List<org.bonitasoft.studio.model.expression.Expression> col = row.getExpressions() ;
if (col.size()==2){
final List<org.bonitasoft.studio.model.expression.Expression> col = row.getExpressions();
if (col.size() == 2) {
final String throwMessageContentExpressionName = col.get(0).getName();
if(throwMessageContentExpressionName != null){
if(!isMappingAlreadyExists(throwMessageContentExpressionName)){
if (throwMessageContentExpressionName != null) {
if (!isMappingAlreadyExists(throwMessageContentExpressionName)) {
createNewMessageContentLine(throwMessageContentExpressionName);
}
}
......@@ -121,8 +122,8 @@ public class CatchMessageContentEventSection extends AbstractBonitaDescriptionSe
final EList<Operation> catchMessageContents = getCatchMessageEvent().getMessageContent();
for (final Operation messageContent : catchMessageContents) {
final Expression actionExpression = messageContent.getRightOperand();
if(actionExpression != null
&& throwMessageContentExpressionName.equals(actionExpression.getName())){
if (actionExpression != null
&& throwMessageContentExpressionName.equals(actionExpression.getName())) {
return true;
}
}
......@@ -130,28 +131,29 @@ public class CatchMessageContentEventSection extends AbstractBonitaDescriptionSe
}
});
}
private void createNewMessageContentLine(final String throwMessageContentExpressionName) {
/*add it if not*/
/* add it if not */
final Operation newActionMessageContent = ExpressionFactory.eINSTANCE.createOperation();
final Operator assignment = ExpressionFactory.eINSTANCE.createOperator();
assignment.setType(ExpressionConstants.ASSIGNMENT_OPERATOR) ;
newActionMessageContent.setOperator(assignment) ;
assignment.setType(ExpressionConstants.ASSIGNMENT_OPERATOR);
newActionMessageContent.setOperator(assignment);
final Expression createExpression = ExpressionFactory.eINSTANCE.createExpression();
createExpression.setName(throwMessageContentExpressionName);
createExpression.setContent(throwMessageContentExpressionName);
createExpression.setReturnType(String.class.getName());
createExpression.setType(ExpressionConstants.MESSAGE_ID_TYPE) ;
createExpression.setType(ExpressionConstants.MESSAGE_ID_TYPE);
newActionMessageContent.setRightOperand(createExpression);
newActionMessageContent.setLeftOperand(ExpressionFactory.eINSTANCE.createExpression());
/*check if there is a data with the same name,
* if yes, assign it*/
/*
* check if there is a data with the same name,
* if yes, assign it
*/
final List<Data> accessibleData = ModelHelper.getAccessibleData(getCatchMessageEvent());
for (final Data data : accessibleData) {
if(throwMessageContentExpressionName.equals(data.getName())){
if (throwMessageContentExpressionName.equals(data.getName())) {
final Expression dataExpression = ExpressionFactory.eINSTANCE.createExpression();
dataExpression.setName(data.getName());
dataExpression.setContent(data.getName());
......@@ -162,7 +164,8 @@ public class CatchMessageContentEventSection extends AbstractBonitaDescriptionSe
}
}
final Command addCommand = AddCommand.create(getEditingDomain(), getCatchMessageEvent(), ProcessPackage.Literals.ABSTRACT_CATCH_MESSAGE_EVENT__MESSAGE_CONTENT, newActionMessageContent);
final Command addCommand = AddCommand.create(getEditingDomain(), getCatchMessageEvent(),
ProcessPackage.Literals.ABSTRACT_CATCH_MESSAGE_EVENT__MESSAGE_CONTENT, newActionMessageContent);
getEditingDomain().getCommandStack().execute(addCommand);
}
});
......@@ -171,7 +174,7 @@ public class CatchMessageContentEventSection extends AbstractBonitaDescriptionSe
@Override
public void setInput(final IWorkbenchPart part, final ISelection selection) {
super.setInput(part, selection);
if(lastEObject == null || lastEObject != null && !lastEObject.equals(getEObject())){
if (lastEObject == null || lastEObject != null && !lastEObject.equals(getEObject())) {
lastEObject = getEObject();
refreshUI();
}
......@@ -186,8 +189,8 @@ public class CatchMessageContentEventSection extends AbstractBonitaDescriptionSe
alc.refresh();
}
private AbstractCatchMessageEvent getCatchMessageEvent(){
return (AbstractCatchMessageEvent)getEObject();
private AbstractCatchMessageEvent getCatchMessageEvent() {
return (AbstractCatchMessageEvent) getEObject();
}
@Override
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment