Commit edd2b5ca authored by Romain Bioteau's avatar Romain Bioteau
Browse files

Merge remote-tracking branch 'origin/master' into DataManagement

Conflicts:
	bundles/plugins/org.bonitasoft.studio.common.repository/src/org/bonitasoft/studio/common/repository/store/AbstractEMFRepositoryStore.java
parents 0b8ab89a ef9a7f26

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -19,5 +19,5 @@
<target name="p2AllInOne">
<P2AllInOneBundleInfo installLocation="${root.dir}" />
</target>
</target>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.bonitasoft.studio.bundles</groupId>
<artifactId>features</artifactId>
<version>6.3.0-SNAPSHOT</version>
</parent>
<groupId>org.bonitasoft.studio.bundles.features</groupId>
<artifactId>bos-branding-feature</artifactId>
<version>6.3.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.bonitasoft.studio.bundles</groupId>
<artifactId>features</artifactId>
<version>6.3.0-SNAPSHOT</version>
</parent>
<groupId>org.bonitasoft.studio.bundles.features</groupId>
<artifactId>bos-branding-feature</artifactId>
<version>6.3.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>platform-specific-feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>platform-specific-feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>rootfiles-feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>rootfiles-feature</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.pde.FeatureBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
/generationWorkspace
/generationWorkspace
eclipse.preferences.version=1
generate_rcp=false
ignore_gmfgen_validation=false
ignore_mapmodel_validation=false
use_in_transfo_code_gen=true
use_map_mode=true
use_runtime_figures=true
eclipse.preferences.version=1
generate_rcp=false
ignore_gmfgen_validation=false
ignore_mapmodel_validation=false
use_in_transfo_code_gen=true
use_map_mode=true
use_runtime_figures=true
eclipse.preferences.version=1
generate_rcp=false
ignore_gmfgen_validation=true
ignore_mapmodel_validation=false
use_in_transfo_code_gen=true
use_map_mode=true
use_runtime_figures=true
eclipse.preferences.version=1
generate_rcp=false
ignore_gmfgen_validation=true
ignore_mapmodel_validation=false
use_in_transfo_code_gen=true
use_map_mode=true
use_runtime_figures=true
/*
* Copyright (C) 2010 BonitaSoft S.A.
* BonitaSoft, 31 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
* 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/>.
* Contributors:
* Aurelien Pupier
*
*/
«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«AROUND refreshSemanticMethod FOR gmfgen::GenChildContainer-»
/**
* @generated by Bonitasoft
*/
protected void refreshSemantic() {
if (resolveSemanticElement() == null) {
return;
}
«EXPAND CodeStyle::newGenericInstance('createdViews', 'java.util.LinkedList', 'org.eclipse.core.runtime.IAdaptable')»();
«EXPAND impl::diagram::update::CanonicalUpdate::refreshSemanticChildren('createdViews', getDiagram().editorGen.diagramUpdater)-»
«EXPAND impl::diagram::update::CanonicalUpdate::executeLayoutCommand('createdViews')-»
makeViewsImmutable(createdViews);
«REM» It doesn't work with this new implementation of GMF 2.3 (over 2.2),
we just have to add a call to super at the end of the method«ENDREM»
super.refreshSemantic();
}
/*
* Copyright (C) 2010 BonitaSoft S.A.
* BonitaSoft, 31 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
* 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/>.
* Contributors:
* Aurelien Pupier
*
*/
«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«AROUND refreshSemanticMethod FOR gmfgen::GenChildContainer-»
/**
* @generated by Bonitasoft
*/
protected void refreshSemantic() {
if (resolveSemanticElement() == null) {
return;
}
«EXPAND CodeStyle::newGenericInstance('createdViews', 'java.util.LinkedList', 'org.eclipse.core.runtime.IAdaptable')»();
«EXPAND impl::diagram::update::CanonicalUpdate::refreshSemanticChildren('createdViews', getDiagram().editorGen.diagramUpdater)-»
«EXPAND impl::diagram::update::CanonicalUpdate::executeLayoutCommand('createdViews')-»
makeViewsImmutable(createdViews);
«REM» It doesn't work with this new implementation of GMF 2.3 (over 2.2),
we just have to add a call to super at the end of the method«ENDREM»
super.refreshSemantic();
}
«ENDAROUND»
\ No newline at end of file
/*
* Copyright (C) 2010 BonitaSoft S.A.
* BonitaSoft, 31 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
* 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/>.
*/
«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«EXTENSION xpt::diagram::ViewmapAttributesUtils»
«EXTENSION xpt::diagram::editparts::Utils»
«EXTENSION xpt::diagram::Utils»
«AROUND addFixedChild FOR gmfgen::GenNode-»
/*
* @generated by BonitaSoft
*/
protected boolean addFixedChild(org.eclipse.gef.EditPart childEditPart) {
«FOREACH getInnerFixedLabels(self) AS label»«LET label.viewmap.oclAsType(gmfgen::ParentAssignedViewmap) AS childViewmap-»
if (childEditPart instanceof «label.getEditPartQualifiedClassName()») {
((«label.getEditPartQualifiedClassName()») childEditPart).«EXPAND impl::diagram::editparts::TextAware::labelSetterName FOR childViewmap»(getPrimaryShape().«childViewmap.getterName»());
return true;
}
«ENDLET»«ENDFOREACH-»
«FOREACH getPinnedCompartments(self) AS compartment»«LET compartment.viewmap.oclAsType(gmfgen::ParentAssignedViewmap) AS childViewmap-»
if (childEditPart instanceof «compartment.getEditPartQualifiedClassName()») {
org.eclipse.draw2d.IFigure pane = getPrimaryShape().«childViewmap.getterName»();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way
pane.add(((«compartment.getEditPartQualifiedClassName()») childEditPart).getFigure());
return true;
}
«ENDLET»«ENDFOREACH-»
«REM»For affixed children use a custom borderItemLocator«ENDREM»
«FOREACH getSideAffixedChildren(self) AS child-»
if (childEditPart instanceof «child.getEditPartQualifiedClassName()») {
org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator locator = new org.bonitasoft.studio.common.gmf.ActivityBorderItemLocator(getMainFigure(), org.eclipse.draw2d.PositionConstants.«child.preferredSideName»);
getBorderedFigure().getBorderItemContainer().add(((«child.getEditPartQualifiedClassName()») childEditPart).getFigure(), locator);
return true;
}
«ENDFOREACH-»
return false;
}
«ENDAROUND»
«DEFINE getPrimaryDragEditPolicy FOR gmfgen::GenChildSideAffixedNode-»
public org.eclipse.gef.EditPolicy getPrimaryDragEditPolicy() {
return new org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy(){
@Override
protected void showPrimarySelection() {
super.showPrimarySelection();
hideSelection() ;
org.eclipse.draw2d.IFigure layer = getLayer(org.eclipse.gef.LayerConstants.HANDLE_LAYER) ;
layer.setBackgroundColor(org.eclipse.draw2d.ColorConstants.black) ;
layer.setVisible(true) ;
for(Object f : layer.getChildren()){
((org.eclipse.draw2d.IFigure)f).setBackgroundColor(org.eclipse.draw2d.ColorConstants.black) ;
((org.eclipse.draw2d.IFigure)f).setVisible(true) ;
}
}
@Override
protected org.eclipse.draw2d.IFigure createDragSourceFeedbackFigure() {
org.eclipse.draw2d.IFigure r = org.bonitasoft.studio.common.diagram.tools.FiguresHelper.getSelectedFigure(resolveSemanticElement().eClass(), -1,-1, null, null) ;
addFeedback(r);
return r;
}
};
}
«ENDDEFINE»
«DEFINE borderItemSelectionEditPolicy FOR gmfgen::GenNode-»
«REM»do not reset selection edit policy on child«ENDREM»
/*
* Copyright (C) 2010 BonitaSoft S.A.
* BonitaSoft, 31 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
* 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/>.
*/
«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«EXTENSION xpt::diagram::ViewmapAttributesUtils»
«EXTENSION xpt::diagram::editparts::Utils»
«EXTENSION xpt::diagram::Utils»
«AROUND addFixedChild FOR gmfgen::GenNode-»
/*
* @generated by BonitaSoft
*/
protected boolean addFixedChild(org.eclipse.gef.EditPart childEditPart) {
«FOREACH getInnerFixedLabels(self) AS label»«LET label.viewmap.oclAsType(gmfgen::ParentAssignedViewmap) AS childViewmap-»
if (childEditPart instanceof «label.getEditPartQualifiedClassName()») {
((«label.getEditPartQualifiedClassName()») childEditPart).«EXPAND impl::diagram::editparts::TextAware::labelSetterName FOR childViewmap»(getPrimaryShape().«childViewmap.getterName»());
return true;
}
«ENDLET»«ENDFOREACH-»
«FOREACH getPinnedCompartments(self) AS compartment»«LET compartment.viewmap.oclAsType(gmfgen::ParentAssignedViewmap) AS childViewmap-»
if (childEditPart instanceof «compartment.getEditPartQualifiedClassName()») {
org.eclipse.draw2d.IFigure pane = getPrimaryShape().«childViewmap.getterName»();
setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way
pane.add(((«compartment.getEditPartQualifiedClassName()») childEditPart).getFigure());
return true;
}
«ENDLET»«ENDFOREACH-»
«REM»For affixed children use a custom borderItemLocator«ENDREM»
«FOREACH getSideAffixedChildren(self) AS child-»
if (childEditPart instanceof «child.getEditPartQualifiedClassName()») {
org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator locator = new org.bonitasoft.studio.common.gmf.ActivityBorderItemLocator(getMainFigure(), org.eclipse.draw2d.PositionConstants.«child.preferredSideName»);
getBorderedFigure().getBorderItemContainer().add(((«child.getEditPartQualifiedClassName()») childEditPart).getFigure(), locator);
return true;
}
«ENDFOREACH-»
return false;
}
«ENDAROUND»
«DEFINE getPrimaryDragEditPolicy FOR gmfgen::GenChildSideAffixedNode-»
public org.eclipse.gef.EditPolicy getPrimaryDragEditPolicy() {
return new org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy(){
@Override
protected void showPrimarySelection() {
super.showPrimarySelection();
hideSelection() ;
org.eclipse.draw2d.IFigure layer = getLayer(org.eclipse.gef.LayerConstants.HANDLE_LAYER) ;
layer.setBackgroundColor(org.eclipse.draw2d.ColorConstants.black) ;
layer.setVisible(true) ;
for(Object f : layer.getChildren()){
((org.eclipse.draw2d.IFigure)f).setBackgroundColor(org.eclipse.draw2d.ColorConstants.black) ;
((org.eclipse.draw2d.IFigure)f).setVisible(true) ;
}
}
@Override
protected org.eclipse.draw2d.IFigure createDragSourceFeedbackFigure() {
org.eclipse.draw2d.IFigure r = org.bonitasoft.studio.common.diagram.tools.FiguresHelper.getSelectedFigure(resolveSemanticElement().eClass(), -1,-1, null, null) ;
addFeedback(r);
return r;
}
};
}
«ENDDEFINE»
«DEFINE borderItemSelectionEditPolicy FOR gmfgen::GenNode-»
«REM»do not reset selection edit policy on child«ENDREM»
«ENDDEFINE»
\ No newline at end of file
/*
* Copyright (C) 2009 BonitaSoft S.A.
* BonitaSoft, 31 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
* 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/>.
*/
«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«EXTENSION xpt::diagram::editparts::Utils»
«REM»
Replace the extended class to PaletteToolEntry to activate Drag'N'Drop feature
«ENDREM»
«AROUND nodeToolEntry FOR OclAny»
«EXPAND xpt::Common::generatedClassComment»
private static class NodeToolEntry extends org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteToolEntry {
«EXPAND xpt::Common::generatedMemberComment»
private final java.util.List elementTypes;
«EXPAND xpt::Common::generatedMemberComment»
private NodeToolEntry(String title, String description, java.util.List elementTypes) {
super(null,org.bonitasoft.studio.common.NamingUtils.getPaletteTitle(elementTypes), null);
super.setDescription(org.bonitasoft.studio.common.NamingUtils.getPaletteDescription(elementTypes)) ;
this.elementTypes = elementTypes;
}
/**
* Used a custom tool to have a better feedback.
* @generated
*/
public org.eclipse.gef.Tool createTool() {
«REM»Use a custom tool for palette to have better feedback«ENDREM»
org.eclipse.gef.Tool tool = new org.bonitasoft.studio.common.diagram.tools.BonitaUnspecifiedTypeProcessCreationTool(org.bonitasoft.studio.common.diagram.tools.BonitaConnectionTypes.getTypesFor(elementTypes));
tool.setProperties(getToolProperties());
return tool;
}
}
«ENDAROUND»
«AROUND linkToolEntry FOR OclAny»
«EXPAND xpt::Common::generatedClassComment»
private static class LinkToolEntry extends org.eclipse.gef.palette.ToolEntry {
«EXPAND xpt::Common::generatedMemberComment»
private final java.util.List relationshipTypes;
«EXPAND xpt::Common::generatedMemberComment»
private LinkToolEntry(String title, String description, java.util.List relationshipTypes) {
super(org.bonitasoft.studio.common.NamingUtils.getPaletteTitle(relationshipTypes),
org.bonitasoft.studio.common.NamingUtils.getPaletteDescription(relationshipTypes), null, null);
this.relationshipTypes = relationshipTypes;
}
«EXPAND xpt::Common::generatedMemberComment»
public org.eclipse.gef.Tool createTool() {
«REM»Use a custom tool for palette to have better feedback«ENDREM»
org.eclipse.gef.Tool tool = new org.bonitasoft.studio.common.diagram.tools.BonitaUnspecifiedTypeConnectionTool(org.bonitasoft.studio.common.diagram.tools.BonitaConnectionTypes.getRelationTypes());
tool.setProperties(getToolProperties());
return tool;
}
}
«ENDAROUND»
«AROUND addEntry(varName : String) FOR gmfgen::Separator-»
«varName».add(new org.eclipse.gef.palette.PaletteSeparator("separator"));
/*
* Copyright (C) 2009 BonitaSoft S.A.
* BonitaSoft, 31 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
* 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/>.
*/
«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«EXTENSION xpt::diagram::editparts::Utils»
«REM»
Replace the extended class to PaletteToolEntry to activate Drag'N'Drop feature
«ENDREM»
«AROUND nodeToolEntry FOR OclAny»
«EXPAND xpt::Common::generatedClassComment»
private static class NodeToolEntry extends org.eclipse.gmf.runtime.diagram.ui.internal.services.palette.PaletteToolEntry {
«EXPAND xpt::Common::generatedMemberComment»
private final java.util.List elementTypes;
«EXPAND xpt::Common::generatedMemberComment»
private NodeToolEntry(String title, String description, java.util.List elementTypes) {
super(null,org.bonitasoft.studio.common.NamingUtils.getPaletteTitle(elementTypes), null);
super.setDescription(org.bonitasoft.studio.common.NamingUtils.getPaletteDescription(elementTypes)) ;
this.elementTypes = elementTypes;
}
/**
* Used a custom tool to have a better feedback.
* @generated
*/
public org.eclipse.gef.Tool createTool() {
«REM»Use a custom tool for palette to have better feedback«ENDREM»
org.eclipse.gef.Tool tool = new org.bonitasoft.studio.common.diagram.tools.BonitaUnspecifiedTypeProcessCreationTool(org.bonitasoft.studio.common.diagram.tools.BonitaConnectionTypes.getTypesFor(elementTypes));
tool.setProperties(getToolProperties());
return tool;
}
}
«ENDAROUND»
«AROUND linkToolEntry FOR OclAny»
«EXPAND xpt::Common::generatedClassComment»
private static class LinkToolEntry extends org.eclipse.gef.palette.ToolEntry {
«EXPAND xpt::Common::generatedMemberComment»
private final java.util.List relationshipTypes;
«EXPAND xpt::Common::generatedMemberComment»
private LinkToolEntry(String title, String description, java.util.List relationshipTypes) {
super(org.bonitasoft.studio.common.NamingUtils.getPaletteTitle(relationshipTypes),
org.bonitasoft.studio.common.NamingUtils.getPaletteDescription(relationshipTypes), null, null);
this.relationshipTypes = relationshipTypes;
}
«EXPAND xpt::Common::generatedMemberComment»
public org.eclipse.gef.Tool createTool() {
«REM»Use a custom tool for palette to have better feedback«ENDREM»
org.eclipse.gef.Tool tool = new org.bonitasoft.studio.common.diagram.tools.BonitaUnspecifiedTypeConnectionTool(org.bonitasoft.studio.common.diagram.tools.BonitaConnectionTypes.getRelationTypes());
tool.setProperties(getToolProperties());
return tool;
}
}
«ENDAROUND»
«AROUND addEntry(varName : String) FOR gmfgen::Separator-»
«varName».add(new org.eclipse.gef.palette.PaletteSeparator("separator"));
«ENDAROUND»
\ No newline at end of file
/*
* Copyright (C) 2010 BonitaSoft S.A.
* BonitaSoft, 31 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
* 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/>.
*/
«IMPORT 'http://www.eclipse.org/gmf/2009/GenModel'»
«IMPORT 'http://www.eclipse.org/emf/2002/GenModel'»