From 022d71e1d73915af29b214998bb9078d3d59076f Mon Sep 17 00:00:00 2001 From: Romain Bioteau Date: Tue, 1 Mar 2016 10:59:53 +0100 Subject: [PATCH] Disale groovy dsl --- .../META-INF/MANIFEST.MF | 3 ++- .../studio/application/ApplicationPlugin.java | 11 +++++++++++ .../preferences/PreferenceInitializerTest.java | 12 ------------ .../studio/preferences/PreferenceInitializer.java | 12 ------------ 4 files changed, 13 insertions(+), 25 deletions(-) diff --git a/bundles/plugins/org.bonitasoft.studio.application/META-INF/MANIFEST.MF b/bundles/plugins/org.bonitasoft.studio.application/META-INF/MANIFEST.MF index c356c555ea..a008bf9f97 100644 --- a/bundles/plugins/org.bonitasoft.studio.application/META-INF/MANIFEST.MF +++ b/bundles/plugins/org.bonitasoft.studio.application/META-INF/MANIFEST.MF @@ -66,7 +66,8 @@ Require-Bundle: org.bonitasoft.studio.diagram, org.bonitasoft.studio.tests-utils;bundle-version="6.4.1";resolution:=optional, org.codehaus.groovy.eclipse.ui, org.eclipse.debug.ui, - org.eclipse.core.databinding.beans + org.eclipse.core.databinding.beans, + org.codehaus.groovy.eclipse.dsl;bundle-version="2.9.2" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Import-Package: javax.inject;version="1.0.0", diff --git a/bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/ApplicationPlugin.java b/bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/ApplicationPlugin.java index 8afb8c216f..18384d2d4c 100644 --- a/bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/ApplicationPlugin.java +++ b/bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/ApplicationPlugin.java @@ -17,7 +17,11 @@ package org.bonitasoft.studio.application; import org.bonitasoft.studio.common.log.BonitaStudioLog; import org.bonitasoft.studio.debug.DebugPlugin; import org.bonitasoft.studio.validation.ValidationPlugin; +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.runtime.CoreException; +import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -60,6 +64,13 @@ public class ApplicationPlugin extends AbstractUIPlugin { try { DebugPlugin.getDefault().getBundle().start(); ValidationPlugin.getDefault().getBundle().start(); + 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); } catch (final BundleException e) { BonitaStudioLog.error(e); } diff --git a/bundles/plugins/org.bonitasoft.studio.preferences/src-test/java/org/bonitasoft/studio/preferences/PreferenceInitializerTest.java b/bundles/plugins/org.bonitasoft.studio.preferences/src-test/java/org/bonitasoft/studio/preferences/PreferenceInitializerTest.java index 1c424580c7..e8a94a4bfa 100644 --- a/bundles/plugins/org.bonitasoft.studio.preferences/src-test/java/org/bonitasoft/studio/preferences/PreferenceInitializerTest.java +++ b/bundles/plugins/org.bonitasoft.studio.preferences/src-test/java/org/bonitasoft/studio/preferences/PreferenceInitializerTest.java @@ -21,7 +21,6 @@ import static org.mockito.Mockito.verify; import java.util.Locale; -import org.codehaus.groovy.eclipse.dsl.DSLPreferencesInitializer; import org.eclipse.jdt.ui.PreferenceConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.junit.Test; @@ -55,23 +54,12 @@ public class PreferenceInitializerTest { verify(jdtPrefStore).setValue(PreferenceConstants.EDITOR_MARK_OCCURRENCES, Boolean.FALSE); } - @Test - public void should_disable_groovy_dsl_support() throws Exception { - final PreferenceInitializer preferenceInitializer = spy(new PreferenceInitializer()); - setupMocks(preferenceInitializer); - - preferenceInitializer.initializeDefaultPreferences(); - - verify(dslPreferenceStore).setValue(DSLPreferencesInitializer.AUTO_ADD_DSL_SUPPORT, Boolean.FALSE); - verify(dslPreferenceStore).setValue(DSLPreferencesInitializer.DSLD_DISABLED, Boolean.TRUE); - } private void setupMocks(final PreferenceInitializer preferenceInitializer) { doReturn(apiPrefStore).when(preferenceInitializer).getAPIPreferenceStore(); doReturn(webPrefStore).when(preferenceInitializer).getWebBrowserPreferenceStore(); doReturn(bonitaPrefStore).when(preferenceInitializer).getBonitaPreferenceStore(); doReturn(jdtPrefStore).when(preferenceInitializer).getJDTPreferenceStore(); - doReturn(dslPreferenceStore).when(preferenceInitializer).getGroovyDSLPreferenceStore(); doReturn(new Locale[] {}).when(preferenceInitializer).getStudioLocales(); doNothing().when(preferenceInitializer).setUTF8DefaultEncoding(); doNothing().when(preferenceInitializer).initDefaultDebugPreferences(); diff --git a/bundles/plugins/org.bonitasoft.studio.preferences/src/org/bonitasoft/studio/preferences/PreferenceInitializer.java b/bundles/plugins/org.bonitasoft.studio.preferences/src/org/bonitasoft/studio/preferences/PreferenceInitializer.java index 06669c8e25..630053996d 100644 --- a/bundles/plugins/org.bonitasoft.studio.preferences/src/org/bonitasoft/studio/preferences/PreferenceInitializer.java +++ b/bundles/plugins/org.bonitasoft.studio.preferences/src/org/bonitasoft/studio/preferences/PreferenceInitializer.java @@ -16,8 +16,6 @@ package org.bonitasoft.studio.preferences; import java.util.Locale; -import org.codehaus.groovy.eclipse.dsl.DSLPreferencesInitializer; -import org.codehaus.groovy.eclipse.dsl.GroovyDSLCoreActivator; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer; import org.eclipse.core.runtime.preferences.DefaultScope; @@ -71,16 +69,6 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer impleme final IPreferenceStore jdtUIStore = getJDTPreferenceStore(); jdtUIStore.setValue(PreferenceConstants.EDITOR_MARK_OCCURRENCES, Boolean.FALSE); - - final IPreferenceStore groovyDSLstore = getGroovyDSLPreferenceStore(); - 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); - } - - protected IPreferenceStore getGroovyDSLPreferenceStore() { - return GroovyDSLCoreActivator.getDefault().getPreferenceStore(); } protected IPreferenceStore getJDTPreferenceStore() { -- GitLab