Commit 2f6c59c8 authored by Thomas Bouffard's avatar Thomas Bouffard

Merge branch 'master' into dev

parents bdf94ca7 810cdf77
......@@ -65,7 +65,8 @@ public class BusinessObjectDataStyledLabelProvider extends DataStyledTreeLabelPr
}
protected boolean businessObjectDefinitionExists(final BusinessObjectData data) {
return store.getChildByQualifiedName(data.getClassName()).isPresent();
String className = data.getClassName();
return className != null && store != null && store.getChildByQualifiedName(className).isPresent();
}
}
......@@ -12,7 +12,6 @@ Require-Bundle: org.bonitasoft.studio.model;bundle-version="1.0.0",
org.eclipse.ui;bundle-version="3.106.0",
org.bonitasoft.studio.pics;bundle-version="7.6.0",
org.bonitasoft.studio.condition.ui
Export-Package: org.bonitasoft.studio.decision.core,
org.bonitasoft.studio.decision.i18n,
Export-Package: org.bonitasoft.studio.decision.i18n,
org.bonitasoft.studio.decision.ui,
org.bonitasoft.studio.decision.ui.condition
......@@ -15,14 +15,13 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.bonitasoft.studio.decision.core;
package org.bonitasoft.studio.engine.export;
import java.util.ArrayList;
import java.util.List;
import org.bonitasoft.studio.common.ExpressionConstants;
import org.bonitasoft.studio.common.emf.tools.ExpressionHelper;
import org.bonitasoft.studio.decision.i18n.Messages;
import org.bonitasoft.studio.model.expression.Expression;
import org.bonitasoft.studio.model.expression.ExpressionFactory;
import org.bonitasoft.studio.model.parameter.Parameter;
......@@ -33,13 +32,8 @@ import org.bonitasoft.studio.model.process.decision.DecisionTableLine;
import org.bonitasoft.studio.model.process.decision.transitions.TakeTransitionAction;
import org.eclipse.emf.ecore.EObject;
/**
* @author Mickael Istria
*
*/
public class DecisionTableUtil {
public static final String DECISION_TABLE = Messages.editDecisionTable;
private static final String CONDITION_SEPARATOR = " && ";
/**
......
......@@ -17,7 +17,7 @@
package org.bonitasoft.studio.engine.export.builder;
import org.bonitasoft.engine.bpm.process.impl.FlowElementBuilder;
import org.bonitasoft.studio.decision.core.DecisionTableUtil;
import org.bonitasoft.studio.engine.export.DecisionTableUtil;
import org.bonitasoft.studio.engine.export.EngineExpressionUtil;
import org.bonitasoft.studio.engine.i18n.Messages;
import org.bonitasoft.studio.model.expression.Expression;
......
......@@ -15,7 +15,7 @@
package org.bonitasoft.studio.tests.conditions;
import org.bonitasoft.studio.common.ExpressionConstants;
import org.bonitasoft.studio.decision.core.DecisionTableUtil;
import org.bonitasoft.studio.engine.export.DecisionTableUtil;
import org.bonitasoft.studio.model.expression.Expression;
import org.bonitasoft.studio.model.expression.ExpressionFactory;
import org.bonitasoft.studio.model.process.decision.DecisionFactory;
......
Markdown is supported
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