Commit d756ad4c authored by Romain Bioteau's avatar Romain Bioteau Committed by GitHub

feat(eclipseUpdate) update target platform to 7.6 (#604)

* update target platform to e4.7

Closes BS-16807
parent 65c890b6

Too many changes to show.

To preserve performance only 166 of 166+ files are displayed.
......@@ -9,6 +9,9 @@
<launcherArgs>
<programArgs>--launcher.XXMaxPermSize512m
</programArgs>
<programArgsLin>--launcher.GTK_version
2
</programArgsLin>
<vmArgs>-Xmx512m -Xms512m -Dosgi.requiredJavaVersion=1.8 -Dfile.encoding=UTF8 -Dtomcat.extra.params=&quot;-DnoCacheCustomPage=true&quot;
</vmArgs>
<vmArgsLin>-Djava.endorsed.dirs=endorsed
......@@ -28,7 +31,6 @@
startupForegroundColor="FFFCFC" />
<launcher name="BonitaStudioCommunity">
<macosx icon="icons/bonitasoft-icon-128-128-transparent.icns"/>
<solaris/>
<win useIco="true">
<ico path="icons/bonitasoft.ico"/>
<bmp/>
......@@ -67,13 +69,12 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
<features>
<feature id="studio-feature"/>
<feature id="org.eclipse.rcp"/>
<feature id="studio-bos-specific-feature"/>
<feature id="bos-branding-feature"/>
<feature id="rootfiles-feature"/>
<feature id="org.eclipse.babel.nls_eclipse_es" version="4.4.0.v20141223043836"/>
<feature id="org.eclipse.babel.nls_eclipse_fr" version="4.4.0.v20141223043836"/>
<feature id="org.eclipse.babel.nls_eclipse_ja" version="4.4.0.v20141223043836"/>
<feature id="org.eclipse.babel.nls_eclipse_es" version="4.6.0.v20161126060001"/>
<feature id="org.eclipse.babel.nls_eclipse_fr" version="4.6.0.v20161126060001"/>
<feature id="org.eclipse.babel.nls_eclipse_ja" version="4.6.0.v20161126060001"/>
</features>
<configurations>
......
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.bonitasoft.eclipse.platform.patch</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.bonitasoft.eclipse.platform.patch"
label="Eclipse Platform patch"
version="7.4.0.qualifier"
provider-name="Bonitasoft S.A.">
<description>
Patch of Eclipse platform feature to patch org.eclipse.ui.views.properties.tabbed
</description>
<copyright>
Copyright (C) 2015 Bonitasoft S.A.
Bonitasoft, 32 rue Gustave Eiffel - 38000 Grenoble
This program is free software: you can redistribute it and/or
modify
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 &lt;http://www.gnu.org/licenses/&gt;.
</copyright>
<license url="">
Copyright (C) 2015 Bonitasoft S.A.
Bonitasoft, 31 rue Gustave Eiffel - 38000 Grenoble
This program is free software: you can redistribute it and/or modify
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 &lt;http://www.gnu.org/licenses/&gt;.
</license>
<requires>
<import feature="org.eclipse.platform" version="4.4.0.v20140925-0400" patch="true"/>
</requires>
<plugin
id="org.eclipse.ui.views.properties.tabbed"
download-size="0"
install-size="0"
version="3.6.100.v20140519-0906"
unpack="false"/>
</feature>
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.bonitasoft.studio.bundles</groupId>
<version>7.3.1-SNAPSHOT</version>
<artifactId>features</artifactId>
</parent>
<groupId>org.bonitasoft.studio.bundles.features</groupId>
<artifactId>org.bonitasoft.eclipse.platform.patch</artifactId>
<packaging>eclipse-feature</packaging>
</project>
......@@ -45,30 +45,36 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
</license>
<includes
id="org.codehaus.groovy24.feature"
version="0.0.0"/>
<includes
id="org.codehaus.groovy.jdt.patch"
version="0.0.0"/>
<includes
id="org.codehaus.groovy.compilerless.feature"
version="0.0.0"/>
<includes
id="org.eclipse.jdt"
version="0.0.0"/>
<includes
id="org.eclipse.emf.edapt.runtime.feature"
version="1.2.2.201705070604"/>
<requires>
<import feature="org.eclipse.rcp" version="4.3.1.v20130911-1000" match="greaterOrEqual"/>
<import feature="org.eclipse.rcp" version="4.7.0.v20170612-1255" match="greaterOrEqual"/>
<import feature="platform-specific-feature" version="7.6.0" match="equivalent"/>
<import feature="org.eclipse.m2m.qvt.oml" version="3.4.0.v20140610-1621"/>
<import feature="org.eclipse.m2m.qvt.oml.runtime" version="3.4.0.v20140610-1621"/>
<import feature="org.eclipse.wst.web_ui.feature" version="3.6.1.v201409112028"/>
<import feature="org.eclipse.e4.rcp" version="1.3.100.v20140909-1633"/>
<import feature="org.eclipse.gmf" version="1.8.1.201408201453"/>
<import feature="org.eclipse.m2m.qvt.oml" version="3.7.0.v20170604-1316"/>
<import feature="org.eclipse.m2m.qvt.oml.runtime" version="3.7.0.v20170604-1316"/>
<import feature="org.eclipse.wst.web_ui.feature" version="3.9.0.v201706011953"/>
<import feature="org.eclipse.e4.rcp" version="1.6.0.v20170612-1255"/>
<import feature="org.eclipse.gmf" version="1.11.0.201706061437"/>
</requires>
<plugin
id="org.eclipse.jdt.groovy.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.emf.edapt.migration"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.bonitasoft.studio"
download-size="0"
......@@ -440,19 +446,6 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
version="0.0.0"
unpack="false"/>
<plugin
id="org.codehaus.groovy.eclipse.dsl"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
id="org.codehaus.groovy"
download-size="0"
install-size="0"
version="2.4.300.xx-201509250011-e44"/>
<plugin
id="org.objectweb.asm"
download-size="0"
......@@ -474,20 +467,6 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.emf.edapt.common"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="org.eclipse.osgi.compatibility.plugins"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
<plugin
id="org.eclipse.osgi.compatibility.state"
download-size="0"
......@@ -578,7 +557,7 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
id="org.eclipse.ui.views.properties.tabbed"
download-size="0"
install-size="0"
version="3.6.100.v20140519-0906"
version="3.8.0.v20170516-1617"
unpack="false"/>
<plugin
......
......@@ -38,7 +38,7 @@
</property>
<property
name="startupMessageRect"
value="223,220,250,25">
value="0,0,0,0">
</property>
<property
name="cssTheme"
......
......@@ -177,8 +177,7 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
c.dispose();
}
refreshMembershipTab();
} else
if (item.equals(customTab)) {
} else if (item.equals(customTab)) {
for (final Control c : tab.getChildren()) {
c.dispose();
}
......@@ -260,9 +259,11 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
getViewer().setInput(userList);
if (customUserInfoTable != null) {
if (organization.getCustomUserInfoDefinitions() == null) {
organization.setCustomUserInfoDefinitions(OrganizationFactory.eINSTANCE.createCustomUserInfoDefinitions());
organization
.setCustomUserInfoDefinitions(OrganizationFactory.eINSTANCE.createCustomUserInfoDefinitions());
}
customUserInfoObservableList = EMFProperties.list(OrganizationPackage.Literals.CUSTOM_USER_INFO_DEFINITIONS__CUSTOM_USER_INFO_DEFINITION)
customUserInfoObservableList = EMFProperties
.list(OrganizationPackage.Literals.CUSTOM_USER_INFO_DEFINITIONS__CUSTOM_USER_INFO_DEFINITION)
.observe(organization.getCustomUserInfoDefinitions());
customUserInfoTable.setInput(customUserInfoObservableList);
customUserInfoObservableList.addListChangeListener(new IListChangeListener() {
......@@ -289,7 +290,8 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
final Composite detailsComposite = new Composite(group, SWT.NONE);
detailsComposite.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).span(2, 1).create());
detailsComposite.setLayout(GridLayoutFactory.fillDefaults().numColumns(2).spacing(0, 2).margins(15, 5).equalWidth(false).create());
detailsComposite.setLayout(
GridLayoutFactory.fillDefaults().numColumns(2).spacing(0, 2).margins(15, 5).equalWidth(false).create());
createUserNameField(detailsComposite);
......@@ -393,7 +395,8 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
managerName.setText(Messages.manager);
managerNameComboViewer = new ComboViewer(rightColumnComposite, SWT.BORDER | SWT.READ_ONLY);
managerNameComboViewer.getControl().setLayoutData(GridDataFactory.fillDefaults().grab(true, false).minSize(100, SWT.DEFAULT).indent(5, 0).create());
managerNameComboViewer.getControl().setLayoutData(
GridDataFactory.fillDefaults().grab(true, false).minSize(100, SWT.DEFAULT).indent(5, 0).create());
managerNameComboViewer.setLabelProvider(new LabelProvider());
managerNameComboViewer.setContentProvider(new ObservableListContentProvider());
......@@ -447,12 +450,15 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
passwordText.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).indent(5, 0).create());
final UpdateValueStrategy mandatoryStrategy = new UpdateValueStrategy();
mandatoryStrategy.setAfterGetValidator(new UserEmptyInputValidator(Messages.password, userSingleSelectionObservable));
mandatoryStrategy
.setAfterGetValidator(new UserEmptyInputValidator(Messages.password, userSingleSelectionObservable));
final IObservableValue userPasswordObservableValue = EMFObservables.observeDetailValue(Realm.getDefault(), userSingleSelectionObservable,
final IObservableValue userPasswordObservableValue = EMFObservables.observeDetailValue(Realm.getDefault(),
userSingleSelectionObservable,
OrganizationPackage.Literals.USER__PASSWORD);
final IObservableValue passwordValueObservableValue = EMFObservables.observeDetailValue(Realm.getDefault(), userPasswordObservableValue,
final IObservableValue passwordValueObservableValue = EMFObservables.observeDetailValue(Realm.getDefault(),
userPasswordObservableValue,
OrganizationPackage.Literals.PASSWORD_TYPE__VALUE);
passwordValueObservableValue.addValueChangeListener(new IValueChangeListener() {
......@@ -466,7 +472,8 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
}
});
final Binding binding = context.bindValue(SWTObservables.observeText(passwordText, SWT.Modify), passwordValueObservableValue, mandatoryStrategy, null);
final Binding binding = context.bindValue(SWTObservables.observeText(passwordText, SWT.Modify),
passwordValueObservableValue, mandatoryStrategy, null);
ControlDecorationSupport.create(binding, SWT.LEFT, rightColumnComposite, new ControlDecorationUpdater() {
@Override
......@@ -493,7 +500,8 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
@Override
public Object convert(final Object from) {
if (userSingleSelectionObservable != null && userSingleSelectionObservable.getValue() != null) {
if (from != null && userSingleSelectionObservable != null
&& userSingleSelectionObservable.getValue() != null) {
final User user = (User) userSingleSelectionObservable.getValue();
updateDelegueeMembership(user.getUserName(), from.toString());
}
......@@ -529,9 +537,11 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
}
});
final IObservableValue userNameValue = EMFObservables.observeDetailValue(Realm.getDefault(), userSingleSelectionObservable,
final IObservableValue userNameValue = EMFObservables.observeDetailValue(Realm.getDefault(),
userSingleSelectionObservable,
OrganizationPackage.Literals.USER__USER_NAME);
final Binding binding = context.bindValue(SWTObservables.observeText(usernameText, SWT.Modify), userNameValue, stategy, null);
final Binding binding = context.bindValue(SWTObservables.observeText(usernameText, SWT.Modify), userNameValue,
stategy, null);
ControlDecorationSupport.create(binding, SWT.LEFT, rightColumnComposite, new ControlDecorationUpdater() {
@Override
......@@ -619,8 +629,10 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
protected Control createCustomControl(final Composite parent) {
final Composite otherInfoComposite = new Composite(parent, SWT.NONE);
otherInfoComposite.setLayout(GridLayoutFactory.fillDefaults().numColumns(2).margins(5, 5).equalWidth(false).create());
otherInfoComposite.setLayoutData(GridDataFactory.fillDefaults().grab(true, true).hint(SWT.DEFAULT, SWT.DEFAULT).create());
otherInfoComposite
.setLayout(GridLayoutFactory.fillDefaults().numColumns(2).margins(5, 5).equalWidth(false).create());
otherInfoComposite
.setLayoutData(GridDataFactory.fillDefaults().grab(true, true).hint(SWT.DEFAULT, SWT.DEFAULT).create());
final User selectedUser = (User) userSingleSelectionObservable.getValue();
if (selectedUser != null) {
......@@ -629,10 +641,12 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
selectedUser.setCustomUserInfoValues(OrganizationFactory.eINSTANCE.createCustomUserInfoValuesType());
}
final IObservableValue customUserInfoValuesValue = EMFObservables.observeDetailValue(Realm.getDefault(), userSingleSelectionObservable,
final IObservableValue customUserInfoValuesValue = EMFObservables.observeDetailValue(Realm.getDefault(),
userSingleSelectionObservable,
OrganizationPackage.Literals.USER__CUSTOM_USER_INFO_VALUES);
final IObservableList customUserInfoListValue = EMFObservables.observeDetailList(Realm.getDefault(), customUserInfoValuesValue,
final IObservableList customUserInfoListValue = EMFObservables.observeDetailList(Realm.getDefault(),
customUserInfoValuesValue,
OrganizationPackage.Literals.CUSTOM_USER_INFO_VALUES_TYPE__CUSTOM_USER_INFO_VALUE);
final EList<CustomUserInfoValue> customUserInfoValueList = sortCustomUserInfoValues(selectedUser);
......@@ -659,7 +673,8 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
textValue.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).create());
context.bindValue(SWTObservables.observeText(textValue, SWT.Modify),
EMFObservables.observeValue(infoValue, OrganizationPackage.Literals.CUSTOM_USER_INFO_VALUE__VALUE), strategy, null);
EMFObservables.observeValue(infoValue, OrganizationPackage.Literals.CUSTOM_USER_INFO_VALUE__VALUE),
strategy, null);
}
}
......@@ -682,7 +697,8 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
}
private EList<CustomUserInfoValue> sortCustomUserInfoValues(final User selectedUser) {
final EList<CustomUserInfoValue> customUserInfoValueList = selectedUser.getCustomUserInfoValues().getCustomUserInfoValue();
final EList<CustomUserInfoValue> customUserInfoValueList = selectedUser.getCustomUserInfoValues()
.getCustomUserInfoValue();
ECollections.sort(customUserInfoValueList, new Comparator<CustomUserInfoValue>() {
@Override
......@@ -697,7 +713,8 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
final Composite detailsInfoComposite = new Composite(parent, SWT.NONE);
detailsInfoComposite.setLayoutData(GridDataFactory.fillDefaults().grab(true, true).create());
detailsInfoComposite.setLayout(GridLayoutFactory.fillDefaults().numColumns(5).margins(5, 5).equalWidth(false).create());
detailsInfoComposite
.setLayout(GridLayoutFactory.fillDefaults().numColumns(5).margins(5, 5).equalWidth(false).create());
final User selectedUser = (User) userSingleSelectionObservable.getValue();
if (selectedUser != null) {
......@@ -729,7 +746,8 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
}
final Button addMembershipButton = new Button(detailsInfoComposite, SWT.PUSH);
addMembershipButton.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).span(5, 1).align(SWT.END, SWT.CENTER).create());
addMembershipButton.setLayoutData(
GridDataFactory.fillDefaults().grab(true, false).span(5, 1).align(SWT.END, SWT.CENTER).create());
addMembershipButton.setText(Messages.addMembership);
addMembershipButton.addSelectionListener(new SelectionAdapter() {
......@@ -753,7 +771,8 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
}
private void removeMembershipAction(final Membership membership) {
if (MessageDialog.openQuestion(Display.getDefault().getActiveShell(), Messages.deleteMembershipTitle, Messages.deleteMembershipMsg)) {
if (MessageDialog.openQuestion(Display.getDefault().getActiveShell(), Messages.deleteMembershipTitle,
Messages.deleteMembershipMsg)) {
membershipList.remove(membership);
final Event ev = new Event();
ev.item = tab.getSelection()[0];
......@@ -777,8 +796,10 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
final UpdateValueStrategy targetStrategy = new UpdateValueStrategy();
targetStrategy.setAfterGetValidator(new EmptyInputValidator(Messages.emtpyMembershipValue));
final IObservableValue membershipRoleValue = EMFObservables.observeValue(membership, OrganizationPackage.Literals.MEMBERSHIP__ROLE_NAME);
final Binding binding = context.bindValue(SWTObservables.observeText(roleNameCombo), membershipRoleValue, targetStrategy, null);
final IObservableValue membershipRoleValue = EMFObservables.observeValue(membership,
OrganizationPackage.Literals.MEMBERSHIP__ROLE_NAME);
final Binding binding = context.bindValue(SWTObservables.observeText(roleNameCombo), membershipRoleValue,
targetStrategy, null);
ControlDecorationSupport.create(binding, SWT.LEFT, detailsInfoComposite);
}
......@@ -790,34 +811,37 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
groupName.setText(Messages.groupName);
final ComboViewer groupNameCombo = new ComboViewer(detailsInfoComposite, SWT.BORDER | SWT.READ_ONLY);
groupNameCombo.getCombo().setLayoutData(GridDataFactory.fillDefaults().grab(true, false).minSize(100, SWT.DEFAULT).create());
groupNameCombo.getCombo()
.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).minSize(100, SWT.DEFAULT).create());
groupNameCombo.setContentProvider(new ObservableListContentProvider());
groupNameCombo.setLabelProvider(new OrganizationGroupLabelProvider());
// for(final org.bonitasoft.studio.actors.model.organization.Group g : groupList){
// groupNameCombo.add(GroupContentProvider.getGroupPath(g)) ;
// }
final IObservableList observeGroupList = EMFObservables.observeList(organization.getGroups(), OrganizationPackage.Literals.GROUPS__GROUP);
final IObservableList observeGroupList = EMFObservables.observeList(organization.getGroups(),
OrganizationPackage.Literals.GROUPS__GROUP);
final UpdateValueStrategy targetStrategy = new UpdateValueStrategy();
targetStrategy.setAfterGetValidator(new EmptyInputValidator(Messages.emtpyMembershipValue));
targetStrategy.setConverter(new Converter(org.bonitasoft.studio.actors.model.organization.Group.class, String.class) {
targetStrategy
.setConverter(new Converter(org.bonitasoft.studio.actors.model.organization.Group.class, String.class) {
@Override
public Object convert(final Object from) {
final org.bonitasoft.studio.actors.model.organization.Group group = (org.bonitasoft.studio.actors.model.organization.Group) from;
if (group != null) {
if (group.getParentPath() == null || group.getParentPath().isEmpty()) {
membership.setGroupParentPath(null);
} else {
membership.setGroupParentPath(group.getParentPath());
@Override
public Object convert(final Object from) {
final org.bonitasoft.studio.actors.model.organization.Group group = (org.bonitasoft.studio.actors.model.organization.Group) from;
if (group != null) {
if (group.getParentPath() == null || group.getParentPath().isEmpty()) {
membership.setGroupParentPath(null);
} else {
membership.setGroupParentPath(group.getParentPath());
}
return group.getName();
} else {
return "";
}
}
return group.getName();
} else {
return "";
}
}
});
});
final UpdateValueStrategy modelStrategy = new UpdateValueStrategy();
modelStrategy.setConverter(new Converter(String.class, org.bonitasoft.studio.actors.model.organization.Group.class) {
......@@ -843,8 +867,10 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
});
groupNameCombo.setInput(observeGroupList);
final IObservableValue membershipValue = EMFObservables.observeValue(membership, OrganizationPackage.Literals.MEMBERSHIP__GROUP_NAME);
final Binding binding = context.bindValue(ViewersObservables.observeSingleSelection(groupNameCombo), membershipValue, targetStrategy, modelStrategy);
final IObservableValue membershipValue = EMFObservables.observeValue(membership,
OrganizationPackage.Literals.MEMBERSHIP__GROUP_NAME);
final Binding binding = context.bindValue(ViewersObservables.observeSingleSelection(groupNameCombo), membershipValue,
targetStrategy, modelStrategy);
ControlDecorationSupport.create(binding, SWT.LEFT, detailsInfoComposite);
}
......@@ -876,8 +902,9 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
final Text faxText = new Text(detailsInfoComposite, SWT.BORDER);
faxText.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).create());
faxText.setMessage(Messages.faxHint);
bindTextToUserAttribute(faxText, reference, OrganizationPackage.Literals.CONTACT_DATA__FAX_NUMBER, updateValueStrategy()
.withValidator(maxLengthValidator(Messages.faxLabel, SHORT_FIELD_MAX_LENGTH)).create());
bindTextToUserAttribute(faxText, reference, OrganizationPackage.Literals.CONTACT_DATA__FAX_NUMBER,
updateValueStrategy()
.withValidator(maxLengthValidator(Messages.faxLabel, SHORT_FIELD_MAX_LENGTH)).create());
}
private void createMobileField(final Composite detailsInfoComposite, final EReference reference) {
......@@ -888,8 +915,9 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
final Text mobileText = new Text(detailsInfoComposite, SWT.BORDER);
mobileText.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).create());
mobileText.setMessage(Messages.mobileHint);
bindTextToUserAttribute(mobileText, reference, OrganizationPackage.Literals.CONTACT_DATA__MOBILE_NUMBER, updateValueStrategy()
.withValidator(maxLengthValidator(Messages.mobileLabel, SHORT_FIELD_MAX_LENGTH)).create());
bindTextToUserAttribute(mobileText, reference, OrganizationPackage.Literals.CONTACT_DATA__MOBILE_NUMBER,
updateValueStrategy()
.withValidator(maxLengthValidator(Messages.mobileLabel, SHORT_FIELD_MAX_LENGTH)).create());
}
private void createPhoneField(final Composite detailsInfoComposite, final EReference reference) {
......@@ -900,8 +928,9 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
final Text phoneText = new Text(detailsInfoComposite, SWT.BORDER);
phoneText.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).create());
phoneText.setMessage(Messages.phoneHint);
bindTextToUserAttribute(phoneText, reference, OrganizationPackage.Literals.CONTACT_DATA__PHONE_NUMBER, updateValueStrategy()
.withValidator(maxLengthValidator(Messages.phoneLabel, SHORT_FIELD_MAX_LENGTH)).create());
bindTextToUserAttribute(phoneText, reference, OrganizationPackage.Literals.CONTACT_DATA__PHONE_NUMBER,
updateValueStrategy()
.withValidator(maxLengthValidator(Messages.phoneLabel, SHORT_FIELD_MAX_LENGTH)).create());
}
private void createWebSiteField(final Composite detailsInfoComposite, final EReference reference) {
......@@ -912,8 +941,9 @@ public class UsersWizardPage extends AbstractOrganizationWizardPage {
final Text websiteText = new Text(detailsInfoComposite, SWT.BORDER);
websiteText.setLayoutData(GridDataFactory.fillDefaults().grab(true, false).create());
websiteText.setMessage(Messages.websiteHint);
bindTextToUserAttribute(websiteText, reference, OrganizationPackage.Literals.CONTACT_DATA__WEBSITE, updateValueStrategy()
.withValidator(maxLengthValidator(Messages.websiteLabel, LONG_FIELD_MAX_LENGTH)).create());
bindTextToUserAttribute(websiteText, reference, OrganizationPackage.Literals.CONTACT_DATA__WEBSITE,
updateValueStrategy()
.withValidator(maxLengthValidator(Messages.websiteLabel, LONG_FIELD_MAX_LENGTH)).create());
}