Commit 258f7d70 authored by Romain Bioteau's avatar Romain Bioteau Committed by GitHub

tr(tp) update target platform to 2019-12 (#2053)

parent edb6c6c8
...@@ -61,10 +61,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ...@@ -61,10 +61,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
id="org.eclipse.jdt" id="org.eclipse.jdt"
version="0.0.0"/> version="0.0.0"/>
<includes
id="org.eclipse.emf.edapt.runtime.feature"
version="1.3.1.201812130816"/>
<includes <includes
id="org.eclipse.equinox.p2.extras.feature" id="org.eclipse.equinox.p2.extras.feature"
version="0.0.0"/> version="0.0.0"/>
...@@ -109,6 +105,26 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;. ...@@ -109,6 +105,26 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
id="org.eclipse.babel.nls_webtools_pt_BR" id="org.eclipse.babel.nls_webtools_pt_BR"
version="0.0.0"/> version="0.0.0"/>
<includes
id="de.jcup.asciidoctor.converter"
version="0.0.0"/>
<includes
id="de.jcup.asciidoctoreditor"
version="0.0.0"/>
<includes
id="markdown.editor.feature"
version="0.0.0"/>
<includes
id="de.jcup.yamleditor"
version="0.0.0"/>
<includes
id="org.eclipse.emf.edapt.runtime.feature"
version="0.0.0"/>
<requires> <requires>
<import feature="org.eclipse.rcp" version="4.10.0.v20181206-0815" match="greaterOrEqual"/> <import feature="org.eclipse.rcp" version="4.10.0.v20181206-0815" match="greaterOrEqual"/>
<import feature="platform-specific-feature" version="7.11.0" match="equivalent"/> <import feature="platform-specific-feature" version="7.11.0" match="equivalent"/>
...@@ -453,13 +469,6 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;. ...@@ -453,13 +469,6 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
fragment="true" fragment="true"
unpack="false"/> unpack="false"/>
<plugin
id="javax.wsdl"
download-size="0"
install-size="0"
version="1.5.1.v201012040544"
unpack="false"/>
<plugin <plugin
id="javax.wsdl" id="javax.wsdl"
download-size="0" download-size="0"
...@@ -474,13 +483,6 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;. ...@@ -474,13 +483,6 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
version="1.6.0.v201011041432" version="1.6.0.v201011041432"
unpack="false"/> unpack="false"/>
<plugin
id="org.apache.batik.util"
download-size="0"
install-size="0"
version="1.7.0.v201011041433"
unpack="false"/>
<plugin <plugin
id="org.bonitasoft.studio.connectors.database.drivers.prop" id="org.bonitasoft.studio.connectors.database.drivers.prop"
download-size="0" download-size="0"
...@@ -544,21 +546,5 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;. ...@@ -544,21 +546,5 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
install-size="0" install-size="0"
version="0.0.0" version="0.0.0"
unpack="false"/> unpack="false"/>
<includes
id="de.jcup.asciidoctor.converter"
version="0.0.0"/>
<includes
id="de.jcup.asciidoctoreditor"
version="0.0.0"/>
<includes
id="markdown.editor.feature"
version="0.0.0"/>
<includes
id="de.jcup.yamleditor"
version="0.0.0"/>
</feature> </feature>
...@@ -7,7 +7,6 @@ Bundle-Activator: org.bonitasoft.studio.Activator ...@@ -7,7 +7,6 @@ Bundle-Activator: org.bonitasoft.studio.Activator
Bundle-Vendor: BonitaSoft S.A. Bundle-Vendor: BonitaSoft S.A.
Require-Bundle: org.eclipse.ui, Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime, org.eclipse.core.runtime,
org.eclipse.ui.ide.application;bundle-version="1.0.0",
org.bonitasoft.studio.pics;bundle-version="1.0.0" org.bonitasoft.studio.pics;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
...@@ -66,18 +66,19 @@ Require-Bundle: org.eclipse.core.runtime, ...@@ -66,18 +66,19 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.e4.core.di.annotations, org.eclipse.e4.core.di.annotations,
org.eclipse.e4.core.commands, org.eclipse.e4.core.commands,
org.eclipse.core.expressions;bundle-version="3.6.0" org.eclipse.core.expressions;bundle-version="3.6.0"
Import-Package: org.bonitasoft.engine.api, Import-Package: javax.inject;version="1.0.0",
org.bonitasoft.engine.bpm, org.bonitasoft.engine.api,
org.bonitasoft.engine.bpm.bar, org.bonitasoft.engine.bpm,
org.bonitasoft.engine.bpm.process, org.bonitasoft.engine.bpm.bar,
org.bonitasoft.engine.exception, org.bonitasoft.engine.bpm.process,
org.bonitasoft.engine.filter, org.bonitasoft.engine.exception,
org.bonitasoft.engine.identity, org.bonitasoft.engine.filter,
org.bonitasoft.engine.profile, org.bonitasoft.engine.identity,
org.bonitasoft.engine.search, org.bonitasoft.engine.profile,
org.bonitasoft.engine.session, org.bonitasoft.engine.search,
org.bonitasoft.studio.common.jface, org.bonitasoft.engine.session,
org.bonitasoft.studio.common.jface.databinding.validator, org.bonitasoft.studio.common.jface,
org.bonitasoft.studio.expression.editor.filter org.bonitasoft.studio.common.jface.databinding.validator,
org.bonitasoft.studio.expression.editor.filter
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
...@@ -18,11 +18,13 @@ import org.bonitasoft.studio.common.perspectives.BonitaPerspectivesUtils; ...@@ -18,11 +18,13 @@ import org.bonitasoft.studio.common.perspectives.BonitaPerspectivesUtils;
import org.bonitasoft.studio.common.views.BonitaPropertiesBrowserPage; import org.bonitasoft.studio.common.views.BonitaPropertiesBrowserPage;
import org.bonitasoft.studio.model.process.diagram.part.ProcessDiagramEditor; import org.bonitasoft.studio.model.process.diagram.part.ProcessDiagramEditor;
import org.eclipse.core.runtime.Adapters; import org.eclipse.core.runtime.Adapters;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.ui.ISaveablePart; import org.eclipse.ui.ISaveablePart;
import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PlatformUI; import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.IContributedContentsView; import org.eclipse.ui.part.IContributedContentsView;
import org.eclipse.ui.part.IPage;
import org.eclipse.ui.part.IPageBookViewPage; import org.eclipse.ui.part.IPageBookViewPage;
import org.eclipse.ui.part.PageBookView; import org.eclipse.ui.part.PageBookView;
import org.eclipse.ui.views.properties.IPropertySheetPage; import org.eclipse.ui.views.properties.IPropertySheetPage;
...@@ -59,29 +61,47 @@ public abstract class BonitaPropertiesView extends PropertySheet implements ICon ...@@ -59,29 +61,47 @@ public abstract class BonitaPropertiesView extends PropertySheet implements ICon
if (part instanceof ProcessDiagramEditor) { if (part instanceof ProcessDiagramEditor) {
page = getBonitaPropertiesBrowserPage((ITabbedPropertySheetPageContributor) part); page = getBonitaPropertiesBrowserPage((ITabbedPropertySheetPageContributor) part);
} else { } else {
page = (IPropertySheetPage) Adapters.adapt(part, page = (IPropertySheetPage) Adapters.adapt(part, IPropertySheetPage.class);
IPropertySheetPage.class, false);
} }
if (page != null) { if (page != null) {
if (page instanceof IPageBookViewPage) { if (page instanceof IPageBookViewPage) {
initPage((IPageBookViewPage) page); initPage((IPageBookViewPage) page);
} }
page.createControl(getPageBook()); page.createControl(getPageBook());
page.selectionChanged(part, part.getSite().getPage().getActiveEditor().getSite().getSelectionProvider().getSelection());
return new PageRec(part, page); return new PageRec(part, page);
} }
// Use the default page // IContributedContentsView without contributed view, show default page
IContributedContentsView view = Adapters.adapt(part, IContributedContentsView.class);
if (view != null && view.getContributingPart() == null) {
return null;
}
// Only if a part is a selection provider, it could have properties for the
// default PropertySheetPage. Every part gets its own PropertySheetPage
ISelectionProvider provider = part.getSite().getSelectionProvider();
if (provider != null) {
IPage dPage = createPropertySheetPage(getPageBook());
return new PageRec(part, dPage);
}
// No properties to be shown, use the default page
return null; return null;
} }
protected abstract BonitaPropertiesBrowserPage getBonitaPropertiesBrowserPage(ITabbedPropertySheetPageContributor part); protected abstract BonitaPropertiesBrowserPage getBonitaPropertiesBrowserPage(
ITabbedPropertySheetPageContributor part);
@Override @Override
public IWorkbenchPart getContributingPart() { public IWorkbenchPart getContributingPart() {
return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
} }
@Override
protected IWorkbenchPart getBootstrapPart() {
return getContributingPart();
}
@Override @Override
protected boolean isImportant(IWorkbenchPart part) { protected boolean isImportant(IWorkbenchPart part) {
...@@ -91,20 +111,4 @@ public abstract class BonitaPropertiesView extends PropertySheet implements ICon ...@@ -91,20 +111,4 @@ public abstract class BonitaPropertiesView extends PropertySheet implements ICon
return !isPropertyView && super.isImportant(part) && !(part instanceof BonitaProjectExplorer); return !isPropertyView && super.isImportant(part) && !(part instanceof BonitaProjectExplorer);
} }
@Override
protected IWorkbenchPart getBootstrapPart() {
IWorkbenchPage page = getSite().getPage();
//TODO: find a cleaner way to initialize the multiple Property views
/*
* by setting the focus here to the editor,
* the getSelection that initialize the bootstrapSelection in the super
* will return the selection of the editor as we want instead of no selection
*/
if (page != null && page.getActiveEditor() != null) {
page.getActiveEditor().setFocus();
}
return super.getBootstrapPart();
}
} }
...@@ -98,6 +98,7 @@ Require-Bundle: org.bonitasoft.studio.engine;bundle-version="1.0.0", ...@@ -98,6 +98,7 @@ Require-Bundle: org.bonitasoft.studio.engine;bundle-version="1.0.0",
Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Import-Package: javax.activation;version="1.1.0", Import-Package: javax.activation;version="1.1.0",
javax.inject;version="1.0.0",
javax.xml.bind;version="2.2.0", javax.xml.bind;version="2.2.0",
org.bonitasoft.engine.api, org.bonitasoft.engine.api,
org.bonitasoft.engine.api.result, org.bonitasoft.engine.api.result,
......
...@@ -16,10 +16,14 @@ package org.bonitasoft.studio.businessobject.editor.editor; ...@@ -16,10 +16,14 @@ package org.bonitasoft.studio.businessobject.editor.editor;
import java.io.IOException; import java.io.IOException;
import java.util.Collection; import java.util.Collection;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import javax.xml.bind.JAXBException; import javax.xml.bind.JAXBException;
import org.bonitasoft.engine.bdm.BusinessObjectModelConverter; import org.bonitasoft.engine.bdm.BusinessObjectModelConverter;
import org.eclipse.core.databinding.validation.ValidationStatus;
import org.bonitasoft.studio.businessobject.BusinessObjectPlugin;
import org.bonitasoft.studio.businessobject.converter.BusinessDataModelConverter; import org.bonitasoft.studio.businessobject.converter.BusinessDataModelConverter;
import org.bonitasoft.studio.businessobject.core.repository.AbstractBDMFileStore; import org.bonitasoft.studio.businessobject.core.repository.AbstractBDMFileStore;
import org.bonitasoft.studio.businessobject.core.repository.BDMArtifactDescriptor; import org.bonitasoft.studio.businessobject.core.repository.BDMArtifactDescriptor;
...@@ -35,15 +39,17 @@ import org.bonitasoft.studio.businessobject.editor.model.BusinessObjectModel; ...@@ -35,15 +39,17 @@ import org.bonitasoft.studio.businessobject.editor.model.BusinessObjectModel;
import org.bonitasoft.studio.businessobject.editor.model.Package; import org.bonitasoft.studio.businessobject.editor.model.Package;
import org.bonitasoft.studio.businessobject.i18n.Messages; import org.bonitasoft.studio.businessobject.i18n.Messages;
import org.bonitasoft.studio.businessobject.validator.BusinessObjectListValidator; import org.bonitasoft.studio.businessobject.validator.BusinessObjectListValidator;
import org.bonitasoft.studio.common.log.BonitaStudioLog;
import org.bonitasoft.studio.ui.editors.xmlEditors.AbstractEditorContribution; import org.bonitasoft.studio.ui.editors.xmlEditors.AbstractEditorContribution;
import org.bonitasoft.studio.ui.editors.xmlEditors.AbstractMultiSourceFormEditor; import org.bonitasoft.studio.ui.editors.xmlEditors.AbstractMultiSourceFormEditor;
import org.bonitasoft.studio.ui.editors.xmlEditors.ReadOnlyStructuredTextEditor; import org.bonitasoft.studio.ui.editors.xmlEditors.ReadOnlyStructuredTextEditor;
import org.bonitasoft.studio.ui.util.StatusCollectors;
import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.WritableValue; import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.core.databinding.validation.ValidationStatus;
import org.eclipse.core.resources.IResourceChangeEvent; import org.eclipse.core.resources.IResourceChangeEvent;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.MultiStatus;
import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocument;
import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Display;
...@@ -160,6 +166,13 @@ public class BusinessDataModelEditorContribution extends AbstractEditorContribut ...@@ -160,6 +166,13 @@ public class BusinessDataModelEditorContribution extends AbstractEditorContribut
.map(Package::getBusinessObjects) .map(Package::getBusinessObjects)
.flatMap(Collection::stream) .flatMap(Collection::stream)
.anyMatch(bo -> validator.validate(bo).getSeverity() == ValidationStatus.ERROR)) { .anyMatch(bo -> validator.validate(bo).getSeverity() == ValidationStatus.ERROR)) {
MultiStatus status = workingCopyObservable.getValue().getPackages().stream()
.map(Package::getBusinessObjects)
.flatMap(Collection::stream)
.map(bo -> validator.validate(bo))
.collect(StatusCollectors.toMultiStatus());
BonitaStudioLog.error(Stream.of(status.getChildren()).map(Object::toString).collect(Collectors.joining("\n")), BusinessObjectPlugin.PLUGIN_ID);
MessageDialog.openError(Display.getDefault().getActiveShell(), Messages.modelNotSavableTitle, MessageDialog.openError(Display.getDefault().getActiveShell(), Messages.modelNotSavableTitle,
Messages.modelNotSavable); Messages.modelNotSavable);
} else { } else {
......
...@@ -71,7 +71,9 @@ public class FieldTypeEditingSupport extends EditingSupport { ...@@ -71,7 +71,9 @@ public class FieldTypeEditingSupport extends EditingSupport {
SWT.READ_ONLY); SWT.READ_ONLY);
cellEditor.getControl().setData(SWTBotConstants.SWTBOT_WIDGET_ID_KEY, TYPE_COMBO_EDITOR_ID); cellEditor.getControl().setData(SWTBotConstants.SWTBOT_WIDGET_ID_KEY, TYPE_COMBO_EDITOR_ID);
cellEditor.setContentProvider(ArrayContentProvider.getInstance()); cellEditor.setContentProvider(ArrayContentProvider.getInstance());
cellEditor.setActivationStyle(ComboBoxViewerCellEditor.DROP_DOWN_ON_MOUSE_ACTIVATION); // if(!GTKStyleHandler.isGTK3()) {
cellEditor.setActivationStyle(ComboBoxViewerCellEditor.DROP_DOWN_ON_MOUSE_ACTIVATION);
// }
cellEditor.getControl().addListener(SWT.Selection, e -> getViewer().getControl().getParent().setFocus()); cellEditor.getControl().addListener(SWT.Selection, e -> getViewer().getControl().getParent().setFocus());
cellEditor.setLabelProvider(labelProvider); cellEditor.setLabelProvider(labelProvider);
cellEditor.setInput(getInput()); cellEditor.setInput(getInput());
......
...@@ -50,9 +50,9 @@ import org.eclipse.core.databinding.observable.value.ComputedValue; ...@@ -50,9 +50,9 @@ import org.eclipse.core.databinding.observable.value.ComputedValue;
import org.eclipse.core.databinding.observable.value.IObservableValue; import org.eclipse.core.databinding.observable.value.IObservableValue;
import org.eclipse.core.databinding.observable.value.WritableValue; import org.eclipse.core.databinding.observable.value.WritableValue;
import org.eclipse.core.databinding.validation.IValidator; import org.eclipse.core.databinding.validation.IValidator;
import org.eclipse.jface.databinding.swt.WidgetProperties; import org.eclipse.jface.databinding.swt.typed.WidgetProperties;
import org.eclipse.jface.databinding.viewers.IViewerObservableValue; import org.eclipse.jface.databinding.viewers.IViewerObservableValue;
import org.eclipse.jface.databinding.viewers.ViewerProperties; import org.eclipse.jface.databinding.viewers.typed.ViewerProperties;
import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.layout.GridDataFactory; import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory; import org.eclipse.jface.layout.GridLayoutFactory;
......
...@@ -65,6 +65,7 @@ Export-Package: org.bonitasoft.studio.common.repository, ...@@ -65,6 +65,7 @@ Export-Package: org.bonitasoft.studio.common.repository,
org.bonitasoft.studio.common.repository.ui.wizard org.bonitasoft.studio.common.repository.ui.wizard
Bundle-ClassPath: . Bundle-ClassPath: .
Import-Package: javax.annotation;version="1.2.0", Import-Package: javax.annotation;version="1.2.0",
javax.inject;version="1.0.0",
org.bonitasoft.engine.bpm.bar, org.bonitasoft.engine.bpm.bar,
org.bonitasoft.engine.connector, org.bonitasoft.engine.connector,
org.bonitasoft.engine.filter, org.bonitasoft.engine.filter,
......
...@@ -47,11 +47,6 @@ public class BonitaBPMProjectMigrationOperation implements IWorkspaceRunnable { ...@@ -47,11 +47,6 @@ public class BonitaBPMProjectMigrationOperation implements IWorkspaceRunnable {
//In order to force the reorder of natures we must reset description //In order to force the reorder of natures we must reset description
String currentVersion = project.getDescription().getComment(); String currentVersion = project.getDescription().getComment();
if(ProductVersion.canBeMigrated(currentVersion)) { if(ProductVersion.canBeMigrated(currentVersion)) {
project.setDescription(
new ProjectDescriptionBuilder().withProjectName(project.getName())
.withComment(ProductVersion.CURRENT_VERSION).build(),
IResource.FORCE,
monitor);
project.setDescription(new ProjectDescriptionBuilder() project.setDescription(new ProjectDescriptionBuilder()
.withProjectName(project.getName()) .withProjectName(project.getName())
.withComment(ProductVersion.CURRENT_VERSION) .withComment(ProductVersion.CURRENT_VERSION)
......
...@@ -42,7 +42,7 @@ Require-Bundle: org.eclipse.core.runtime, ...@@ -42,7 +42,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.codehaus.groovy.eclipse.core, org.codehaus.groovy.eclipse.core,
org.codehaus.groovy;bundle-version="1.8.6", org.codehaus.groovy;bundle-version="1.8.6",
org.eclipse.jdt.groovy.core, org.eclipse.jdt.groovy.core,
org.codehaus.groovy.eclipse.codeassist.completion, org.codehaus.groovy.eclipse.codeassist,
org.eclipse.core.databinding.beans;bundle-version="1.2.200", org.eclipse.core.databinding.beans;bundle-version="1.2.200",
org.bonitasoft.studio.connectors.model;bundle-version="6.4.0", org.bonitasoft.studio.connectors.model;bundle-version="6.4.0",
org.eclipse.e4.core.services, org.eclipse.e4.core.services,
......
...@@ -97,6 +97,8 @@ public class BonitaPerspectivesUtils { ...@@ -97,6 +97,8 @@ public class BonitaPerspectivesUtils {
allPropertiesViews.add("org.bonitasoft.studio.views.properties.application"); allPropertiesViews.add("org.bonitasoft.studio.views.properties.application");
allPropertiesViews.add("org.bonitasoft.studio.views.properties.form.general"); allPropertiesViews.add("org.bonitasoft.studio.views.properties.form.general");
allPropertiesViews.add("org.bonitasoft.studio.views.properties.form.appearance"); allPropertiesViews.add("org.bonitasoft.studio.views.properties.form.appearance");
allPropertiesViews.add("org.bonitasoft.studio.views.properties.process.data");
allPropertiesViews.add("org.bonitasoft.studio.views.properties.process.execution");
allPropertiesViews.add("org.bonitasoft.studio.views.properties.process.appearance"); allPropertiesViews.add("org.bonitasoft.studio.views.properties.process.appearance");
allPropertiesViews.add("org.bonitasoft.studio.bpmn.palette_view"); allPropertiesViews.add("org.bonitasoft.studio.bpmn.palette_view");
allPropertiesViews.add("org.bonitasoft.studio.form.palette_view"); allPropertiesViews.add("org.bonitasoft.studio.form.palette_view");
......
...@@ -42,7 +42,8 @@ public abstract class BonitaPropertiesBrowserPage extends PropertiesBrowserPage ...@@ -42,7 +42,8 @@ public abstract class BonitaPropertiesBrowserPage extends PropertiesBrowserPage
@Override @Override
protected int getLastTabSelection(final IWorkbenchPart part, final ISelection input) { protected int getLastTabSelection(final IWorkbenchPart part, final ISelection input) {
if (registry instanceof TabbedPropertyRegistryViewAware) { if (registry instanceof TabbedPropertyRegistryViewAware) {
final ITabDescriptor[] descriptors = ((TabbedPropertyRegistryViewAware) registry).getTabDescriptors(part, input, getViewID()); final ITabDescriptor[] descriptors = ((TabbedPropertyRegistryViewAware) registry).getTabDescriptors(part,
input, getViewID());
if (descriptors.length != 0) { if (descriptors.length != 0) {
for (final Iterator iter = selectionQueue.iterator(); iter.hasNext();) { for (final Iterator iter = selectionQueue.iterator(); iter.hasNext();) {
final String text = (String) iter.next(); final String text = (String) iter.next();
...@@ -69,13 +70,13 @@ public abstract class BonitaPropertiesBrowserPage extends PropertiesBrowserPage ...@@ -69,13 +70,13 @@ public abstract class BonitaPropertiesBrowserPage extends PropertiesBrowserPage
if (selection.equals(currentSelection)) { if (selection.equals(currentSelection)) {
return; return;
} }
currentSelection = selection; currentSelection = selection;
// see if the selection provides a new contributor // see if the selection provides a new contributor
validateRegistry(selection); validateRegistry(selection);
if (part instanceof DiagramEditor) { if (part instanceof DiagramEditor) {
final ITabDescriptor[] descriptors = ((TabbedPropertyRegistryViewAware) registry).getTabDescriptors(part, final ITabDescriptor[] descriptors = ((TabbedPropertyRegistryViewAware) registry).getTabDescriptors(
part,
currentSelection, getViewID()); currentSelection, getViewID());
// If there are no descriptors for the given input we do not need to // If there are no descriptors for the given input we do not need to
// touch the tab objects. We might reuse them for the next valid // touch the tab objects. We might reuse them for the next valid
......
...@@ -58,7 +58,8 @@ Export-Package: org.bonitasoft.studio.connectors, ...@@ -58,7 +58,8 @@ Export-Package: org.bonitasoft.studio.connectors,
org.bonitasoft.studio.connectors.ui.wizard.page, org.bonitasoft.studio.connectors.ui.wizard.page,
org.bonitasoft.studio.connectors.ui.wizard.page.sqlutil, org.bonitasoft.studio.connectors.ui.wizard.page.sqlutil,
org.bonitasoft.studio.connectors.util org.bonitasoft.studio.connectors.util
Import-Package: org.bonitasoft.engine.api, Import-Package: javax.inject;version="1.0.0",
org.bonitasoft.engine.api,
org.bonitasoft.engine.bpm, org.bonitasoft.engine.bpm,
org.bonitasoft.engine.bpm.bar, org.bonitasoft.engine.bpm.bar,
org.bonitasoft.engine.bpm.connector, org.bonitasoft.engine.bpm.connector,
......
...@@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0", ...@@ -26,7 +26,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.9.0",
org.eclipse.e4.ui.workbench;bundle-version="1.2.1", org.eclipse.e4.ui.workbench;bundle-version="1.2.1",
org.eclipse.jdt.groovy.core, org.eclipse.jdt.groovy.core,
org.bonitasoft.studio.businessobject, org.bonitasoft.studio.businessobject,
org.codehaus.groovy.eclipse.codeassist.completion;bundle-version="2.8.0", org.codehaus.groovy.eclipse.codeassist;bundle-version="2.8.0",
org.eclipse.jdt;bundle-version="3.9.0", org.eclipse.jdt;bundle-version="3.9.0",
org.codehaus.groovy, org.codehaus.groovy,
org.codehaus.groovy.eclipse.core, org.codehaus.groovy.eclipse.core,
...@@ -76,6 +76,7 @@ Export-Package: org.bonitasoft.studio.contract.core, ...@@ -76,6 +76,7 @@ Export-Package: org.bonitasoft.studio.contract.core,
org.bonitasoft.studio.contract.core.validation, org.bonitasoft.studio.contract.core.validation,
org.bonitasoft.studio.contract.i18n;x-friends:="org.bonitasoft.studio.swtbot.framework,org.bonitasoft.studio.tests,org.bonitasoft.studio.validation" org.bonitasoft.studio.contract.i18n;x-friends:="org.bonitasoft.studio.swtbot.framework,org.bonitasoft.studio.tests,org.bonitasoft.studio.validation"
Import-Package: javax.annotation;version="1.2.0", Import-Package: javax.annotation;version="1.2.0",
javax.inject;version="1.0.0",
org.bonitasoft.engine.bdm, org.bonitasoft.engine.bdm,
org.bonitasoft.engine.bdm.model, org.bonitasoft.engine.bdm.model,
org.bonitasoft.engine.bdm.model.field, org.bonitasoft.engine.bdm.model.field,
......
...@@ -57,6 +57,6 @@ Export-Package: org.bonitasoft.studio.data.i18n; ...@@ -57,6 +57,6 @@ Export-Package: org.bonitasoft.studio.data.i18n;
org.bonitasoft.studio.data.provider, org.bonitasoft.studio.data.provider,
org.bonitasoft.studio.data.ui.property.section, org.bonitasoft.studio.data.ui.property.section,
org.bonitasoft.studio.data.util org.bonitasoft.studio.data.util
Import-Package: org.bonitasoft.engine.bpm.bar, Import-Package: javax.inject;version="1.0.0",
org.bonitasoft.engine.bpm.bar,
org.bonitasoft.engine.bpm.document org.bonitasoft.engine.bpm.document
...@@ -175,12 +175,14 @@ public class BusinessDataViewer extends DataViewer implements IResourceChangeLis ...@@ -175,12 +175,14 @@ public class BusinessDataViewer extends DataViewer implements IResourceChangeLis
} }
private void updateAddButtonEnableState() { private void updateAddButtonEnableState() {
boolean isEnable = store.getChild(BusinessObjectModelFileStore.BOM_FILENAME, false) != null; if(addButton != null && !addButton.isDisposed()) {
addButton.setEnabled(isEnable); boolean isEnable = store.getChild(BusinessObjectModelFileStore.BOM_FILENAME, false) != null;
addButton.getParent().setToolTipText(isEnable addButton.setEnabled(isEnable);
? "" addButton.getParent().setToolTipText(isEnable
: String.format(Messages.addBusinessDataTooltip, ? ""
org.bonitasoft.studio.businessobject.i18n.Messages.manageBusinessDataModelTitle)); : String.format(Messages.addBusinessDataTooltip,
org.bonitasoft.studio.businessobject.i18n.Messages.manageBusinessDataModelTitle));
}
} }
@Override @Override
......
...@@ -74,6 +74,7 @@ Require-Bundle: org.eclipse.ui, ...@@ -74,6 +74,7 @@ Require-Bundle: org.eclipse.ui,
Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Import-Package: javax.annotation;version="1.2.0", Import-Package: javax.annotation;version="1.2.0",
javax.inject;version="1.0.0",
org.bonitasoft.engine.bdm.model, org.bonitasoft.engine.bdm.model,
org.bonitasoft.engine.bpm.bar, org.bonitasoft.engine.bpm.bar,
org.bonitasoft.engine.bpm.bar.form.model, org.bonitasoft.engine.bpm.bar.form.model,
......
...@@ -15,7 +15,7 @@ public class BonitaExecutionPropertiesBrowserPage extends ...@@ -15,7 +15,7 @@ public class BonitaExecutionPropertiesBrowserPage extends
@Override @Override
protected String getViewID() { protected String getViewID() {
return VIEW_ID; return VIEW_ID;
} }
} }
...@@ -8,14 +8,18 @@ ...@@ -8,14 +8,18 @@
*******************************************************************************/ *******************************************************************************/
package org.bonitasoft.studio.diagram.custom.parts; package org.bonitasoft.studio.diagram.custom.parts;
import org.bonitasoft.studio.common.log.BonitaStudioLog;
import org.bonitasoft.studio.common.repository.RepositoryAccessor; import org.bonitasoft.studio.common.repository.RepositoryAccessor;
import org.bonitasoft.studio.common.repository.RepositoryManager; import org.bonitasoft.studio.common.repository.RepositoryManager;
import org.bonitasoft.studio.designer.ui.property.section.control.WebPageNameResourceChangeListener; import org.bonitasoft.studio.designer.ui.property.section.control.WebPageNameResourceChangeListener;
import org.bonitasoft.studio.diagram.custom.Activator;
import org.bonitasoft.studio.diagram.custom.repository.DiagramFileStore; import org.bonitasoft.studio.diagram.custom.repository.DiagramFileStore;
import org.bonitasoft.studio.diagram.custom.repository.DiagramRepositoryStore; import org.bonitasoft.studio.diagram.custom.repository.DiagramRepositoryStore;
import org.bonitasoft.studio.model.process.diagram.part.ProcessDiagramEditor; import org.bonitasoft.studio.model.process.diagram.part.ProcessDiagramEditor;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite; import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PartInitException; import org.eclipse.ui.PartInitException;