Commit 45caf8d2 authored by Bonita CI's avatar Bonita CI
Browse files

Merge branch 'master' into 'Inno_sprint_7-1'

parents 4a3525a0 5e659333
/**
* Copyright (C) 2011-2013 BonitaSoft S.A.
* Copyright (C) 2011-2015 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
......@@ -25,10 +25,12 @@ import java.net.URLConnection;
import org.bonitasoft.studio.application.ApplicationPlugin;
import org.bonitasoft.studio.common.FileUtil;
import org.bonitasoft.studio.common.ProductVersion;
import org.bonitasoft.studio.common.log.BonitaStudioLog;
import org.bonitasoft.studio.common.platform.tools.PlatformUtil;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.Platform;
import org.osgi.framework.Version;
/**
* @author Romain Bioteau
......@@ -136,30 +138,50 @@ public class UpdateRSSContribution implements IPreStartupContribution {
public void execute() {
new UpdateRSSThread(
"7-0-community",
"http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=163&bos_redirect_product=bos&bos_redirect_major_version=7.0&bos_redirect_minor_version=2",
"http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=163&bos_redirect_product=bos&bos_redirect_major_version=" + getMajorVersion()
+ "&bos_redirect_minor_version=" + getMinorVersion(),
getClass()).start();
new UpdateRSSThread(
"7-0-blogs",
"http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=152&bos_redirect_product=bos&bos_redirect_major_version=7.0&bos_redirect_minor_version=2",
"http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=152&bos_redirect_product=bos&bos_redirect_major_version=" + getMajorVersion()
+ "&bos_redirect_minor_version=" + getMinorVersion(),
getClass()).start();
new UpdateRSSThread(
"7-0-documentation",
"http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=158&bos_redirect_product=bos&bos_redirect_major_version=7.0&bos_redirect_minor_version=2",
"http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=158&bos_redirect_product=bos&bos_redirect_major_version=" + getMajorVersion()
+ "&bos_redirect_minor_version=" + getMinorVersion(),
getClass()).start();
new UpdateRSSThread(
"7-0-examples-community",
"http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=159&bos_redirect_product=bos&bos_redirect_major_version=7.0&bos_redirect_minor_version=2",
"http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=159&bos_redirect_product=bos&bos_redirect_major_version=" + getMajorVersion()
+ "&bos_redirect_minor_version=" + getMinorVersion(),
getClass()).start();
new UpdateRSSThread(
"7-0-training",
"http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=153&bos_redirect_product=bos&bos_redirect_major_version=7.0&bos_redirect_minor_version=2",
"http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=153&bos_redirect_product=bos&bos_redirect_major_version=" + getMajorVersion()
+ "&bos_redirect_minor_version=" + getMinorVersion(),
getClass()).start();
new UpdateRSSThread(
"7-0-videos-community",
"http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=154&bos_redirect_product=bos&bos_redirect_major_version=7.0&bos_redirect_minor_version=2",
"http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=154&bos_redirect_product=bos&bos_redirect_major_version=" + getMajorVersion()
+ "&bos_redirect_minor_version=" + getMinorVersion(),
getClass()).start();
}
protected Version getProductVersion() {
return new Version(ProductVersion.CURRENT_VERSION);
}
protected String getMajorVersion() {
final Version version = getProductVersion();
return version.getMajor() + "." + version.getMinor();
}
protected String getMinorVersion() {
final Version version = getProductVersion();
return Integer.toString(version.getMicro());
}
/*
* (non-Javadoc)
* @see org.bonitasoft.studio.application.contribution.IPreStartupContribution#canExecute()
......
......@@ -59,7 +59,7 @@ attributeName = Attribute name
warningAddFromData_noDataAvailable=Please create first a business variable from Data view.
warningAddFromData_noDataSelected=Please select a business variable in the list.
reminderForStepMessage=Contract elements and mapping operations will be generated and can be edited manually. Storage operations to update business variables can also be generated.\nSelect the option that suits your needs:
reminderForProcessMessage=Contract elements will be generated and can be edited manually. The groovy script to initialize business variables can also be generated.\nSelect the option that best suits your needs:
reminderForProcessMessage=Contract elements will be generated and can be edited manually.\nThe groovy script to initialize business variables can also be generated.\nSelect the option that best suits your needs:
contractInputDescriptionTooltip=Used in the automatically generated forms as user hint
errorTitle=Error
contractFromDataCreationErrorMessage=An error occurred while generating the contract from a data.
......
......@@ -68,8 +68,10 @@ import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.ISharedImages;
......@@ -137,7 +139,9 @@ public class CreateContractInputFromBusinessObjectWizardPage extends WizardPage
private void createReminderText(final EMFDataBindingContext dbc, final Composite composite) {
final CLabel reminder = new CLabel(composite, SWT.NONE);
reminder.setImage(sharedImagesService.getImage(ISharedImages.IMG_OBJS_WARN_TSK));
final Display d = Display.getCurrent();
final Image img = d.getSystemImage(SWT.ICON_WARNING);
reminder.setImage(img);
reminder.setLayoutData(GridDataFactory.fillDefaults().hint(600, SWT.DEFAULT).create());
final Button autoGeneratedOperationButton = new Button(composite, SWT.RADIO);
final Button manuallyDefinedOperationButton = new Button(composite, SWT.RADIO);
......@@ -150,15 +154,12 @@ public class CreateContractInputFromBusinessObjectWizardPage extends WizardPage
autoGeneratedOperationButton.setText(Messages.autoGeneratedOperationStepButton);
manuallyDefinedOperationButton.setText(Messages.manuallyDefinedOperationStepButton);
dbc.bindValue(actionObservable, PojoObservables.observeValue(this, "isAutogeneratedOperation"));
} else {
reminder.setText(Messages.reminderForProcessMessage);
autoGeneratedOperationButton.setText(Messages.autoGeneratedOperationProcessButton);
manuallyDefinedOperationButton.setText(Messages.manuallyDefinedOperationProcessButton);
dbc.bindValue(actionObservable, PojoObservables.observeValue(this, "isAutogeneratedScript"));
}
}
/**
......
......@@ -89,7 +89,7 @@
</div>
<div class="logo">
<a href="http://org.eclipse.ui.intro/runAction?pluginId=org.bonitasoft.studio.intro&amp;class=org.bonitasoft.studio.intro.actions.OpenInExternalBrowserIntroAction&amp;url=http%3A//www.bonitasoft.com/bos_redirect.php%3Fbos_redirect_id%3D99%26bos_redirect_product%3Dbos%26bos_redirect_major_version%3D7.0%26bos_redirect_minor_version%3D2">
<a href="http://org.eclipse.ui.intro/runAction?pluginId=org.bonitasoft.studio.intro&amp;class=org.bonitasoft.studio.intro.actions.OpenInExternalBrowserIntroAction&amp;url=http%3A//www.bonitasoft.com/bos_redirect.php%3Fbos_redirect_id%3D99%26bos_redirect_product%3Dbos%26bos_redirect_major_version%3D7.1%26bos_redirect_minor_version%3D0">
<img src="images/logo-community.png" />
</a>
</div>
......@@ -118,11 +118,11 @@
<div class="block-second">
<div id="video">
<h2><a href="http://org.eclipse.ui.intro/runAction?pluginId=org.bonitasoft.studio.intro&amp;class=org.bonitasoft.studio.intro.actions.OpenInExternalBrowserIntroAction&amp;url=http%3A//www.bonitasoft.com/bos_redirect.php%3Fbos_redirect_id%3D141%26bos_redirect_product%3Dbos%26bos_redirect_major_version%3D7.0%26bos_redirect_minor_version%3D2">Videos</a></h2>
<h2><a href="http://org.eclipse.ui.intro/runAction?pluginId=org.bonitasoft.studio.intro&amp;class=org.bonitasoft.studio.intro.actions.OpenInExternalBrowserIntroAction&amp;url=http%3A//www.bonitasoft.com/bos_redirect.php%3Fbos_redirect_id%3D141%26bos_redirect_product%3Dbos%26bos_redirect_major_version%3D7.1%26bos_redirect_minor_version%3D0">Videos</a></h2>
<contentProvider id="4,7-0-videos-community,http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=154&amp;bos_redirect_product=bos&amp;bos_redirect_major_version=7.0&amp;bos_redirect_minor_version=2" class="org.bonitasoft.studio.intro.content.RssContentProvider" pluginId="org.bonitasoft.studio.intro"/>
</div>
<div id="documentation">
<h2><a href="http://org.eclipse.ui.intro/runAction?pluginId=org.bonitasoft.studio.intro&amp;class=org.bonitasoft.studio.intro.actions.OpenInExternalBrowserIntroAction&amp;url=http%3A//www.bonitasoft.com/bos_redirect.php%3Fbos_redirect_id%3D74%26bos_redirect_product%3Dbos%26bos_redirect_major_version%3D7.0%26bos_redirect_minor_version%3D2">Documentation</a></h2>
<h2><a href="http://org.eclipse.ui.intro/runAction?pluginId=org.bonitasoft.studio.intro&amp;class=org.bonitasoft.studio.intro.actions.OpenInExternalBrowserIntroAction&amp;url=http%3A//www.bonitasoft.com/bos_redirect.php%3Fbos_redirect_id%3D74%26bos_redirect_product%3Dbos%26bos_redirect_major_version%3D7.1%26bos_redirect_minor_version%3D0">Documentation</a></h2>
<div class="search">
<form action="http://org.eclipse.ui.intro/runAction" method="get" accept-charset="UTF-8" >
<input id="edit-keys" title="Enter the terms you wish to search for." onclick="this.value='';" type="text" name="keys" value="Search Documentation" size="50" maxlength="128" style="width: 215px; margin-left: 10px; border: 0px; background-color:transparent; margin-top: 2px; float:left; color: #1B465F" />
......@@ -137,7 +137,7 @@
</div>
<div id="training">
<h2><a href="http://org.eclipse.ui.intro/runAction?pluginId=org.bonitasoft.studio.intro&amp;class=org.bonitasoft.studio.intro.actions.OpenInExternalBrowserIntroAction&amp;url=http%3A//www.bonitasoft.com/bos_redirect.php%3Fbos_redirect_id%3D75%26bos_redirect_product%3Dbos%26bos_redirect_major_version%3D7.0%26bos_redirect_minor_version%3D2">Training</a></h2>
<h2><a href="http://org.eclipse.ui.intro/runAction?pluginId=org.bonitasoft.studio.intro&amp;class=org.bonitasoft.studio.intro.actions.OpenInExternalBrowserIntroAction&amp;url=http%3A//www.bonitasoft.com/bos_redirect.php%3Fbos_redirect_id%3D75%26bos_redirect_product%3Dbos%26bos_redirect_major_version%3D7.1%26bos_redirect_minor_version%3D0">Training</a></h2>
<contentProvider id="4,7-0-training,http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=153&amp;bos_redirect_product=bos&amp;bos_redirect_major_version=7.0&amp;bos_redirect_minor_version=2" class="org.bonitasoft.studio.intro.content.RssContentProvider" pluginId="org.bonitasoft.studio.intro"/>
</div>
......@@ -184,17 +184,17 @@
<div class="block-third">
<div id="example">
<h2><a href="http://org.eclipse.ui.intro/runAction?pluginId=org.bonitasoft.studio.intro&amp;class=org.bonitasoft.studio.intro.actions.OpenInExternalBrowserIntroAction&amp;url=http%3A//www.bonitasoft.com/bos_redirect.php%3Fbos_redirect_id%3D97%26bos_redirect_product%3Dbos%26bos_redirect_major_version%3D7.0%26bos_redirect_minor_version%3D2">Examples</a></h2>
<h2><a href="http://org.eclipse.ui.intro/runAction?pluginId=org.bonitasoft.studio.intro&amp;class=org.bonitasoft.studio.intro.actions.OpenInExternalBrowserIntroAction&amp;url=http%3A//www.bonitasoft.com/bos_redirect.php%3Fbos_redirect_id%3D97%26bos_redirect_product%3Dbos%26bos_redirect_major_version%3D7.1%26bos_redirect_minor_version%3D0">Examples</a></h2>
<contentProvider id="4,7-0-examples-community,http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=159&amp;bos_redirect_product=bos&amp;bos_redirect_major_version=7.0&amp;bos_redirect_minor_version=2" class="org.bonitasoft.studio.intro.content.RssContentProvider" pluginId="org.bonitasoft.studio.intro"/>
</div>
<div id="forums">
<h2><a href="http://org.eclipse.ui.intro/runAction?pluginId=org.bonitasoft.studio.intro&amp;class=org.bonitasoft.studio.intro.actions.OpenInExternalBrowserIntroAction&amp;url=http%3A//www.bonitasoft.com/bos_redirect.php%3Fbos_redirect_id%3D76%26bos_redirect_product%3Dbos%26bos_redirect_major_version%3D7.0%26bos_redirect_minor_version%3D2">Community</a></h2>
<h2><a href="http://org.eclipse.ui.intro/runAction?pluginId=org.bonitasoft.studio.intro&amp;class=org.bonitasoft.studio.intro.actions.OpenInExternalBrowserIntroAction&amp;url=http%3A//www.bonitasoft.com/bos_redirect.php%3Fbos_redirect_id%3D76%26bos_redirect_product%3Dbos%26bos_redirect_major_version%3D7.1%26bos_redirect_minor_version%3D0">Community</a></h2>
<contentProvider id="4,7-0-community,http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=163&amp;bos_redirect_product=bos&amp;bos_redirect_major_version=7.0&amp;bos_redirect_minor_version=2" class="org.bonitasoft.studio.intro.content.RssContentProvider" pluginId="org.bonitasoft.studio.intro"/>
</div>
<div id="news">
<h2><a href="http://org.eclipse.ui.intro/runAction?pluginId=org.bonitasoft.studio.intro&amp;class=org.bonitasoft.studio.intro.actions.OpenInExternalBrowserIntroAction&amp;url=http%3A//www.bonitasoft.com/bos_redirect.php%3Fbos_redirect_id%3D106%26bos_redirect_product%3Dbos%26bos_redirect_major_version%3D7.0%26bos_redirect_minor_version%3D2">Blog</a></h2>
<h2><a href="http://org.eclipse.ui.intro/runAction?pluginId=org.bonitasoft.studio.intro&amp;class=org.bonitasoft.studio.intro.actions.OpenInExternalBrowserIntroAction&amp;url=http%3A//www.bonitasoft.com/bos_redirect.php%3Fbos_redirect_id%3D106%26bos_redirect_product%3Dbos%26bos_redirect_major_version%3D7.1%26bos_redirect_minor_version%3D0">Blog</a></h2>
<contentProvider id="5,7-0-blogs,http://www.bonitasoft.com/bos_redirect.php?bos_redirect_id=152&amp;bos_redirect_product=bos&amp;bos_redirect_major_version=7.0&amp;bos_redirect_minor_version=2" class="org.bonitasoft.studio.intro.content.RssContentProvider" pluginId="org.bonitasoft.studio.intro"/>
</div>
</div>
......
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