Commit 1fc28875 authored by Romain Bioteau's avatar Romain Bioteau Committed by Adrien
Browse files

fix(workspace) add related fileStore at repository export (#820)

Closes BS-17487
parent 45407958
......@@ -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());
}
}
}
......
......@@ -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)) {
......
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