Skip to content
GitLab
Menu
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
9e1e332a
Commit
9e1e332a
authored
Feb 28, 2017
by
Adrien
Committed by
Romain Bioteau
Feb 28, 2017
Browse files
fix(bdm) fix issue when renaming a field present in several bo (#311)
fixes [BS-16262](
https://bonitasoft.atlassian.net/browse/BS-16262
)
parent
be2ece6e
Changes
3
Show whitespace changes
Inline
Side-by-side
bundles/plugins/org.bonitasoft.studio.businessobject/src/org/bonitasoft/studio/businessobject/ui/wizard/control/AttributesTabItemControl.java
View file @
9e1e332a
...
...
@@ -216,7 +216,7 @@ public class AttributesTabItemControl extends AbstractTabItemControl {
}
protected
String
[]
getStringLengthValues
()
{
final
List
<
String
>
values
=
new
ArrayList
<
String
>();
final
List
<
String
>
values
=
new
ArrayList
<>();
values
.
add
(
"64"
);
values
.
add
(
"128"
);
values
.
add
(
"255"
);
...
...
@@ -341,15 +341,28 @@ public class AttributesTabItemControl extends AbstractTabItemControl {
createMultipleColumn
(
featuresTableViewer
);
createMandatoryColumn
(
featuresTableViewer
);
//Resetting viewer input to avoid BS-16262
viewerObservableValue
.
addValueChangeListener
(
new
IValueChangeListener
()
{
@Override
public
void
handleValueChange
(
ValueChangeEvent
event
)
{
featuresTableViewer
.
setInput
(
fieldsList
);
}
});
fieldsList
.
addListChangeListener
(
new
IListChangeListener
()
{
@Override
public
void
handleListChange
(
final
ListChangeEvent
event
)
{
final
IObservableList
observableList
=
event
.
getObservableList
();
if
(
observableList
!=
null
&&
!
observableList
.
isEmpty
())
{
featuresTableViewer
.
getControl
().
getDisplay
().
asyncExec
(
new
Runnable
()
{
@Override
public
void
run
()
{
featuresTableViewer
.
getTable
().
select
(
0
);
}
});
}
}
});
...
...
@@ -570,7 +583,7 @@ public class AttributesTabItemControl extends AbstractTabItemControl {
}
protected
String
generateAttributeName
(
final
IViewerObservableValue
viewerObseravble
)
{
final
Set
<
String
>
existingNames
=
new
HashSet
<
String
>();
final
Set
<
String
>
existingNames
=
new
HashSet
<>();
final
BusinessObject
businessObject
=
(
BusinessObject
)
viewerObseravble
.
getValue
();
for
(
final
Field
feature
:
businessObject
.
getFields
())
{
existingNames
.
add
(
feature
.
getName
());
...
...
bundles/plugins/org.bonitasoft.studio.businessobject/src/org/bonitasoft/studio/businessobject/ui/wizard/editingsupport/FieldNameEditingSupport.java
View file @
9e1e332a
...
...
@@ -43,7 +43,8 @@ public class FieldNameEditingSupport extends ObservableValueEditingSupport {
private
final
IObservableValue
viewerObservableValue
;
public
FieldNameEditingSupport
(
final
IObservableValue
viewerObservableValue
,
final
ColumnViewer
viewer
,
final
DataBindingContext
dbc
)
{
public
FieldNameEditingSupport
(
final
IObservableValue
viewerObservableValue
,
final
ColumnViewer
viewer
,
final
DataBindingContext
dbc
)
{
super
(
viewer
,
dbc
);
this
.
dbc
=
dbc
;
this
.
viewerObservableValue
=
viewerObservableValue
;
...
...
@@ -78,9 +79,9 @@ public class FieldNameEditingSupport extends ObservableValueEditingSupport {
protected
Binding
createBinding
(
final
IObservableValue
target
,
final
IObservableValue
model
)
{
final
UpdateValueStrategy
targetToModel
=
new
UpdateValueStrategy
(
UpdateValueStrategy
.
POLICY_CONVERT
);
targetToModel
.
setAfterGetValidator
(
new
FieldNameCellEditorValidator
((
BusinessObject
)
viewerObservableValue
.
getValue
(),
targetToModel
.
setAfterGetValidator
(
new
FieldNameCellEditorValidator
((
BusinessObject
)
viewerObservableValue
.
getValue
(),
(
Field
)
((
BeanObservableValueDecorator
)
model
).
getObserved
()));
return
dbc
.
bindValue
(
target
,
model
,
targetToModel
,
null
);
}
}
bundles/plugins/org.bonitasoft.studio.businessobject/src/org/bonitasoft/studio/businessobject/ui/wizard/validator/FieldNameCellEditorValidator.java
View file @
9e1e332a
...
...
@@ -5,17 +5,18 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2.0 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package
org.bonitasoft.studio.businessobject.ui.wizard.validator
;
import
org.bonitasoft.engine.bdm.model.BusinessObject
;
import
org.bonitasoft.engine.bdm.model.field.Field
;
import
org.bonitasoft.engine.bdm.validator.SQLNameValidator
;
import
org.bonitasoft.studio.businessobject.i18n.Messages
;
import
org.bonitasoft.studio.common.jface.databinding.validator.InputLengthValidator
;
import
org.eclipse.core.databinding.validation.IValidator
;
...
...
@@ -25,13 +26,8 @@ import org.eclipse.jdt.core.JavaConventions;
import
org.eclipse.jdt.core.JavaCore
;
import
org.eclipse.jface.viewers.ICellEditorValidator
;
import
org.bonitasoft.engine.bdm.model.BusinessObject
;
import
org.bonitasoft.engine.bdm.model.field.Field
;
import
org.bonitasoft.engine.bdm.validator.SQLNameValidator
;
/**
* @author Romain Bioteau
*
*/
public
class
FieldNameCellEditorValidator
implements
ICellEditorValidator
,
IValidator
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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