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

Merge remote-tracking branch 'origin/release-7.6.0'

parents f0aec288 1fc28875
......@@ -509,6 +509,7 @@ public class Repository implements IRepository, IJavaContainer {
for (final IRepositoryFileStore fs : store.getChildren()) {
if (fs.canBeExported()) {
fileStores.add(fs);
fileStores.addAll(fs.getRelatedFileStore());
}
}
}
......
......@@ -184,7 +184,7 @@ saturday=Samedi
sunday=Dimanche
defaultValue=Valeur par d\u00e9faut
emptyField={0} est obligatoire
fieldIsTooLong={0} est trop long. Le nombre maximal de caract\u00e8res est {1}
fieldIsTooLong={0} ne peut pas d\u00e9passer {1} caract\u00e8res
containsNonUTF8Characters={0} contient des caract\u00e8res non UTF-8
containsInvalidCharacters={0} contient un caract\u00e8re non valide \: {1}
diagram=Diagramme
......@@ -215,7 +215,7 @@ toolAlignHorizontal=Aligner horizontalement
toolAlignHorizontalDesc=S\u00e9lectionnez les \u00e9l\u00e9ments \u00e0 aligner sur l'axe horizontal.
toolAlignVertical=Aligner verticalement
toolAlignVerticalDesc=S\u00e9lectionnez les \u00e9l\u00e9ments \u00e0 aligner sur l'axe vertical.
fieldIsTooShort={0} est trop court. Le nombre de caract\u00e8res minimum est {1}
fieldIsTooShort={0} doit contenir au moins {1} caract\u00e8res
currentScript=Source originale
refactoredScript=Source modifi\u00e9e
refactorTitle=Renommer {0}
......
......@@ -42,4 +42,6 @@ scanningWorkspace=Scanning workspace...
importingWorkspace=Importing workspace...
repositoryImported='%s' has been imported successfully.
exportingWorkspace=Retrieving data from `%s`...
workspaceTips=A workspace is made of one or more repositories.\nImport a workspace means import all the repositories from this workspace in your current workspace.
\ No newline at end of file
workspaceTips=A workspace is made of one or more repositories.\nImport a workspace means import all the repositories from this workspace in your current workspace.
importWorkspaceOverwriteBehavior=We assume your current workspace is empty, this is why we overwrite.To view the differences between the current workspace content and what is imported, import each repository one by one using the "File>Import> BOS archive" menu option.
moreInfo=More information
\ No newline at end of file
......@@ -70,5 +70,7 @@ public class Messages extends NLS {
public static String repositoryImported;
public static String exportingWorkspace;
public static String workspaceTips;
public static String importWorkspaceOverwriteBehavior;
public static String moreInfo;
}
......@@ -27,9 +27,6 @@ import org.bonitasoft.studio.common.repository.RepositoryAccessor;
import org.bonitasoft.studio.designer.core.repository.WebFragmentRepositoryStore;
import org.bonitasoft.studio.diagram.custom.repository.DiagramRepositoryStore;
import org.bonitasoft.studio.importer.bos.i18n.Messages;
import org.codehaus.groovy.eclipse.dsl.DSLPreferences;
import org.codehaus.groovy.eclipse.dsl.DSLPreferencesInitializer;
import org.codehaus.groovy.eclipse.dsl.GroovyDSLCoreActivator;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
......@@ -38,7 +35,6 @@ import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.emf.edapt.migration.MigrationException;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.ui.PlatformUI;
public class ImportWorkspaceApplication implements IApplication {
......@@ -124,16 +120,6 @@ public class ImportWorkspaceApplication implements IApplication {
return "Community";
}
private void disableGroovyDSL() {
final IPreferenceStore groovyDSLstore = GroovyDSLCoreActivator.getDefault().getPreferenceStore();
groovyDSLstore.setDefault(DSLPreferencesInitializer.AUTO_ADD_DSL_SUPPORT, false);
groovyDSLstore.setValue(DSLPreferencesInitializer.AUTO_ADD_DSL_SUPPORT, false);
groovyDSLstore.setDefault(DSLPreferencesInitializer.DSLD_DISABLED, true);
groovyDSLstore.setValue(DSLPreferencesInitializer.DSLD_DISABLED, true);
groovyDSLstore.setDefault(DSLPreferences.DISABLED_SCRIPTS, false);
groovyDSLstore.setValue(DSLPreferences.DISABLED_SCRIPTS, false);
}
private Predicate<? super IProject> hasBonitaNature() {
return project -> {
final boolean closed = !project.isOpen();
......
......@@ -137,7 +137,7 @@ public class ScanWorkspaceOperation implements IRunnableWithProgress {
final String[] scannedRepo = text.replace("$SCAN_PROGRESS_", "").split(":");
final String repoName = scannedRepo[0];
final String repoVersion = scannedRepo[1];
final String repoEdition = scannedRepo[2];
final String repoEdition = scannedRepo[2].trim();
final ImportRepositoryModel repositoryModel = new ImportRepositoryModel(repoName, repoVersion, repoEdition);
final MultiStatus repoStatus = new MultiStatus(BosArchiveImporterPlugin.PLUGIN_ID, 0, "", null);
if (!ProductVersion.canBeImported(repoVersion)) {
......
......@@ -101,6 +101,19 @@ public class ImportWorkspaceControlSupplier implements ControlSupplier {
Label workspaceTips = new Label(mainComposite, SWT.NONE);
workspaceTips.setLayoutData(GridDataFactory.fillDefaults().create());
workspaceTips.setText(Messages.workspaceTips);
final Section section = new Section(mainComposite, Section.TREE_NODE | Section.CLIENT_INDENT);
section.setLayout(GridLayoutFactory.fillDefaults().margins(0, 0).create());
section.setLayoutData(
GridDataFactory.swtDefaults().align(SWT.FILL, SWT.TOP).hint(200, SWT.DEFAULT)
.grab(true, false).create());
section.setText(Messages.moreInfo);
Label label = new Label(section, SWT.WRAP);
label.setLayoutData(GridDataFactory.swtDefaults().create());
label.setText(Messages.importWorkspaceOverwriteBehavior);
section.setClient(label);
section.setExpanded(false);
section.addExpansionListener(new UpdateLayoutListener(mainComposite));
}
private Section createStatusSection(Composite parent) {
......
......@@ -190,7 +190,7 @@
<div id="news">
<h2><contentProvider id="106,Blog" class="org.bonitasoft.studio.intro.content.OpenBrowserProvider" pluginId="org.bonitasoft.studio.intro"/></h2>
<contentProvider id="5,7-0-blogs" pluginId="org.bonitasoft.studio.intro"/>
<contentProvider id="5,7-0-blogs" class="org.bonitasoft.studio.intro.content.RssContentProvider" pluginId="org.bonitasoft.studio.intro"/>
</div>
</div>
<div class="right">
......
......@@ -76,7 +76,7 @@ public class LogoProvider implements IIntroXHTMLContentProvider {
Document dom = parent.getOwnerDocument();
Element a = dom.createElement("a");
try {
a.setAttribute("href", redirectUrl("99", ProductVersion.majorVersion()));
a.setAttribute("href", redirectUrl(id, ProductVersion.majorVersion()));
} catch (DOMException | UnsupportedEncodingException e) {
BonitaStudioLog.error(e);
}
......
......@@ -14,6 +14,7 @@
*/
package org.bonitasoft.studio.la.ui.control;
import org.bonitasoft.studio.common.jface.SWTBotConstants;
import org.bonitasoft.studio.common.repository.RepositoryAccessor;
import org.bonitasoft.studio.common.repository.model.IRepositoryFileStore;
import org.bonitasoft.studio.common.repository.model.IRepositoryStore;
......@@ -25,13 +26,17 @@ import org.eclipse.swt.widgets.Composite;
public class SelectionSinglePage<T extends IRepositoryStore<? extends IRepositoryFileStore>> extends SelectionPage<T> {
public static final String TABLE_ID = "org.bonitasoft.studio.la.ui.control.SelectionSinglePageTable";
public SelectionSinglePage(RepositoryAccessor repositoryAccessor, Class<T> type, FileStoreLabelProvider provider) {
super(repositoryAccessor, type, provider);
}
@Override
protected TableViewer createTableViewer(Composite mainComposite) {
return new TableViewer(mainComposite, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
TableViewer viewer = new TableViewer(mainComposite, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
viewer.getControl().setData(SWTBotConstants.SWTBOT_WIDGET_ID_KEY, TABLE_ID);
return viewer;
}
public IRepositoryFileStore getSingleSelection() {
......
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