Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
bonita
bonita-studio
Commits
5f8ea2d0
Commit
5f8ea2d0
authored
Nov 04, 2014
by
Romain Bioteau
Browse files
BS-10726
parent
ce53ef28
Changes
8
Hide whitespace changes
Inline
Side-by-side
bundles/plugins/org.bonitasoft.studio.connectors.model.edit/src/org/bonitasoft/studio/connector/model/definition/wizard/PageComponentSwitchBuilder.java
View file @
5f8ea2d0
...
...
@@ -443,8 +443,7 @@ public class PageComponentSwitchBuilder {
if
(
parameter
!=
null
)
{
createFieldLabel
(
composite
,
SWT
.
CENTER
,
object
.
getId
(),
input
.
isMandatory
());
final
ExpressionViewer
viewer
=
new
GroovyOnlyExpressionViewer
(
composite
,
SWT
.
BORDER
,
ConnectorConfigurationPackage
.
Literals
.
CONNECTOR_PARAMETER__EXPRESSION
);
final
ExpressionViewer
viewer
=
new
GroovyOnlyExpressionViewer
(
composite
,
SWT
.
BORDER
|
SWT
.
SHORT
);
viewer
.
setIsPageFlowContext
(
isPageFlowContext
);
viewer
.
getControl
().
setLayoutData
(
GridDataFactory
.
fillDefaults
().
grab
(
true
,
false
).
create
());
viewer
.
setContext
(
container
);
...
...
bundles/plugins/org.bonitasoft.studio.connectors/plugin.xml
View file @
5f8ea2d0
...
...
@@ -215,4 +215,16 @@
name=
"DBConnectors"
>
</page>
</extension>
<extension
point=
"org.bonitasoft.studio.connectors.connectorWizard"
>
<connectorWizard
DefinitionId=
"scripting-groovy-script"
priority=
"1"
useDefaultGeneratedPages=
"false"
useDefaultOutputPage=
"true"
>
<configurationPage
page=
"org.bonitasoft.studio.connectors.ui.wizard.custom.GroovyScriptConfigurationWizardPage"
>
</configurationPage>
</connectorWizard>
</extension>
</plugin>
bundles/plugins/org.bonitasoft.studio.connectors/pom.xml
View file @
5f8ea2d0
...
...
@@ -400,6 +400,13 @@
<classifier>
connector
</classifier>
<type>
zip
</type>
</artifactItem>
<artifactItem>
<groupId>
org.bonitasoft.connectors
</groupId>
<artifactId>
bonita-connector-scripting-groovy-script-impl
</artifactId>
<version>
1.0.0
</version>
<classifier>
connector
</classifier>
<type>
zip
</type>
</artifactItem>
<artifactItem>
<groupId>
org.bonitasoft.connectors
</groupId>
<artifactId>
bonita-connector-scripting-shell-impl
</artifactId>
...
...
bundles/plugins/org.bonitasoft.studio.connectors/src/org/bonitasoft/studio/connectors/ui/wizard/custom/GroovyScriptConfigurationWizardPage.java
View file @
5f8ea2d0
...
...
@@ -83,8 +83,7 @@ public class GroovyScriptConfigurationWizardPage extends AbstractConnectorConfig
final
ConnectorParameter
dependenciesParameter
=
getConnectorParameter
(
getInput
(
DEPENDENCIES_INPUT_NAME
));
final
ConnectorParameter
parameter
=
buildScriptConnectorParameter
();
builder
.
createFieldLabel
(
composite
,
SWT
.
CENTER
,
SCRIPT_INPUT_NAME
,
true
);
final
ExpressionViewer
viewer
=
new
GroovyOnlyExpressionViewer
(
composite
,
SWT
.
BORDER
,
ConnectorConfigurationPackage
.
Literals
.
CONNECTOR_PARAMETER__EXPRESSION
);
final
ExpressionViewer
viewer
=
new
GroovyOnlyExpressionViewer
(
composite
,
SWT
.
BORDER
|
SWT
.
SHORT
);
viewer
.
setIsPageFlowContext
(
isPageFlowContext
());
viewer
.
getControl
().
setLayoutData
(
GridDataFactory
.
fillDefaults
().
grab
(
true
,
false
).
create
());
viewer
.
setContext
(
getElementContainer
());
...
...
bundles/plugins/org.bonitasoft.studio.document/src-test/java/org/bonitasoft/studio/document/ui/DocumentWizardPageTest.java
View file @
5f8ea2d0
...
...
@@ -68,7 +68,7 @@ public class DocumentWizardPageTest {
doReturn
(
expressionViewerMock
).
when
(
documentWizardPageUnderTest
).
createExpressionViewer
(
Mockito
.
any
(
Composite
.
class
),
Mockito
.
any
(
EReference
.
class
));
when
(
groovyOnlyExpressionViewerMock
.
getControl
()).
thenReturn
(
mock
(
Control
.
class
));
doReturn
(
groovyOnlyExpressionViewerMock
).
when
(
documentWizardPageUnderTest
).
createExpressionViewerWit
r
hGroovyScriptOnly
(
Mockito
.
any
(
Composite
.
class
));
doReturn
(
groovyOnlyExpressionViewerMock
).
when
(
documentWizardPageUnderTest
).
createExpressionViewerWithGroovyScriptOnly
(
Mockito
.
any
(
Composite
.
class
));
}
...
...
@@ -99,7 +99,7 @@ public class DocumentWizardPageTest {
@Test
public
void
should_createDocumentInitialMultipleContent_should_create_ExpressionViwer_with_filter_accepting_only_Groovy_script
()
throws
Exception
{
documentWizardPageUnderTest
.
createDocumentInitialMultipleContent
(
mock
(
Composite
.
class
));
verify
(
documentWizardPageUnderTest
).
createExpressionViewerWit
r
hGroovyScriptOnly
(
Mockito
.
any
(
Composite
.
class
));
verify
(
documentWizardPageUnderTest
).
createExpressionViewerWithGroovyScriptOnly
(
Mockito
.
any
(
Composite
.
class
));
}
}
bundles/plugins/org.bonitasoft.studio.document/src/org/bonitasoft/studio/document/ui/DocumentWizardPage.java
View file @
5f8ea2d0
...
...
@@ -259,9 +259,8 @@ public class DocumentWizardPage extends WizardPage {
return
new
ExpressionViewer
(
parent
,
SWT
.
BORDER
);
}
protected
GroovyOnlyExpressionViewer
createExpressionViewerWitrhGroovyScriptOnly
(
final
Composite
parent
)
{
return
new
GroovyOnlyExpressionViewer
(
parent
,
SWT
.
READ_ONLY
|
SWT
.
BORDER
,
ProcessPackage
.
Literals
.
DOCUMENT__INITIAL_MULTIPLE_CONTENT
);
protected
GroovyOnlyExpressionViewer
createExpressionViewerWithGroovyScriptOnly
(
final
Composite
parent
)
{
return
new
GroovyOnlyExpressionViewer
(
parent
,
SWT
.
READ_ONLY
|
SWT
.
BORDER
);
}
private
void
createDocumentManageMimeTypeLink
(
final
Composite
detailsComposite
)
{
...
...
@@ -408,7 +407,7 @@ public class DocumentWizardPage extends WizardPage {
}
protected
void
createDocumentInitialMultipleContent
(
final
Composite
parent
)
{
multipleInitialContentExpressionViewer
=
createExpressionViewerWit
r
hGroovyScriptOnly
(
parent
);
multipleInitialContentExpressionViewer
=
createExpressionViewerWithGroovyScriptOnly
(
parent
);
multipleInitialContentExpressionViewer
.
getControl
().
setLayoutData
(
GridDataFactory
.
fillDefaults
().
grab
(
true
,
false
).
create
());
multipleInitialContentExpressionViewer
.
setInput
(
document
);
}
...
...
bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/viewer/GroovyOnlyEditExpressionDialog.java
View file @
5f8ea2d0
...
...
@@ -30,16 +30,16 @@ import org.eclipse.swt.widgets.Shell;
*/
public
class
GroovyOnlyEditExpressionDialog
extends
EditExpressionDialog
{
protected
GroovyOnlyEditExpressionDialog
(
Shell
parentShell
,
boolean
isPassword
,
Expression
inputExpression
,
EObject
context
,
EditingDomain
domain
,
ViewerFilter
[]
viewerTypeFilters
,
ExpressionViewer
expressionViewer
)
{
protected
GroovyOnlyEditExpressionDialog
(
final
Shell
parentShell
,
final
boolean
isPassword
,
final
Expression
inputExpression
,
final
EObject
context
,
final
EditingDomain
domain
,
final
ViewerFilter
[]
viewerTypeFilters
,
final
ExpressionViewer
expressionViewer
)
{
super
(
parentShell
,
isPassword
,
inputExpression
,
context
,
domain
,
viewerTypeFilters
,
expressionViewer
);
this
.
inputExpression
.
setType
(
ExpressionConstants
.
SCRIPT_TYPE
)
;
}
@Override
protected
void
createExpressionTypePanel
(
Composite
parentForm
)
{
protected
void
createExpressionTypePanel
(
final
Composite
parentForm
)
{
}
@Override
public
void
create
()
{
super
.
create
();
...
...
@@ -47,4 +47,9 @@ public class GroovyOnlyEditExpressionDialog extends EditExpressionDialog {
getShell
().
layout
(
true
,
true
);
}
public
void
setShowScriptHeader
(
final
boolean
displayHeader
)
{
// TODO Auto-generated method stub
}
}
bundles/plugins/org.bonitasoft.studio.expression.editor/src/org/bonitasoft/studio/expression/editor/viewer/GroovyOnlyExpressionViewer.java
View file @
5f8ea2d0
...
...
@@ -18,9 +18,9 @@ package org.bonitasoft.studio.expression.editor.viewer;
import
org.bonitasoft.studio.common.ExpressionConstants
;
import
org.eclipse.emf.ecore.EObject
;
import
org.eclipse.emf.ecore.EReference
;
import
org.eclipse.emf.ecore.util.EcoreUtil
;
import
org.eclipse.jface.viewers.ViewerFilter
;
import
org.eclipse.swt.SWT
;
import
org.eclipse.swt.widgets.Composite
;
/**
...
...
@@ -29,16 +29,22 @@ import org.eclipse.swt.widgets.Composite;
*/
public
class
GroovyOnlyExpressionViewer
extends
ExpressionViewer
{
public
GroovyOnlyExpressionViewer
(
final
Composite
composite
,
final
int
style
,
final
EReference
expressionReference
)
{
super
(
composite
,
style
,
expressionReference
);
private
final
boolean
displayHeader
;
public
GroovyOnlyExpressionViewer
(
final
Composite
composite
,
final
int
style
)
{
super
(
composite
,
style
);
displayHeader
=
(
style
&
SWT
.
SHORT
)
==
0
;
getContentAssistText
().
getToolbar
().
getItem
(
0
).
setEnabled
(
false
);
}
@Override
protected
EditExpressionDialog
createEditDialog
(
final
EObject
editInput
)
{
return
new
GroovyOnlyEditExpressionDialog
(
control
.
getShell
(),
isPassword
,
EcoreUtil
.
copy
(
getSelectedExpression
()),
editInput
,
getEditingDomain
(),
final
GroovyOnlyEditExpressionDialog
groovyOnlyEditExpressionDialog
=
new
GroovyOnlyEditExpressionDialog
(
control
.
getShell
(),
isPassword
,
EcoreUtil
.
copy
(
getSelectedExpression
()),
editInput
,
getEditingDomain
(),
filters
.
toArray
(
new
ViewerFilter
[
filters
.
size
()]),
this
);
groovyOnlyEditExpressionDialog
.
setShowScriptHeader
(
displayHeader
);
return
groovyOnlyEditExpressionDialog
;
}
@Override
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment