diff options
author | Andi Bur | 2017-06-26 13:20:43 +0000 |
---|---|---|
committer | Andi Bur | 2017-06-29 12:49:42 +0000 |
commit | 1b8858653190a26c7d5a91bc7ba50061e87d3b16 (patch) | |
tree | bdfa93d6851fba5f21762c8558772f5fb41a1d1d | |
parent | 2c4abbf9a122cc75088c49d7ce83dbb7c1d939e2 (diff) | |
download | org.eclipse.scout.sdk-1b8858653190a26c7d5a91bc7ba50061e87d3b16.tar.gz org.eclipse.scout.sdk-1b8858653190a26c7d5a91bc7ba50061e87d3b16.tar.xz org.eclipse.scout.sdk-1b8858653190a26c7d5a91bc7ba50061e87d3b16.zip |
Replace ScoutTexts.get with TEXTS.get
Removed support for session scope specific `ScoutTexts` instances
because support of scoped services was removed in Scout without OSGi
(version >= 5.0). In consequence, ScoutTexts is not a thread-local
resource anymore but an application-scoped Scout bean.
178361
Change-Id: I7dab035108057828bf8bd363a795eee9df97960b
Reviewed-on: https://git.eclipse.org/r/100350
Tested-by: Hudson CI
Reviewed-by: Andi Bur <andi.bur@gmail.com>
2 files changed, 2 insertions, 3 deletions
diff --git a/org.eclipse.scout.sdk.core.s.test/src/main/client/formdata/client/ui/template/formfield/AbstractCompanyTableField.java b/org.eclipse.scout.sdk.core.s.test/src/main/client/formdata/client/ui/template/formfield/AbstractCompanyTableField.java index 0d3bd6d46..c654bc85f 100644 --- a/org.eclipse.scout.sdk.core.s.test/src/main/client/formdata/client/ui/template/formfield/AbstractCompanyTableField.java +++ b/org.eclipse.scout.sdk.core.s.test/src/main/client/formdata/client/ui/template/formfield/AbstractCompanyTableField.java @@ -16,7 +16,6 @@ import org.eclipse.scout.rt.client.ui.basic.table.AbstractTable; import org.eclipse.scout.rt.client.ui.basic.table.columns.AbstractStringColumn; import org.eclipse.scout.rt.client.ui.form.fields.tablefield.AbstractTableField; import org.eclipse.scout.rt.platform.Order; -import org.eclipse.scout.rt.shared.ScoutTexts; import org.eclipse.scout.rt.shared.TEXTS; import formdata.shared.services.process.AbstractCompanyTableFieldData; @@ -41,7 +40,7 @@ public abstract class AbstractCompanyTableField extends AbstractTableField<Abstr @Override protected String getConfiguredHeaderText() { - return ScoutTexts.get("Name"); + return TEXTS.get("Name"); } } } diff --git a/org.eclipse.scout.sdk.core.s.test/src/main/shared/formdata/shared/services/process/AbstractCompanyTableFieldData.java b/org.eclipse.scout.sdk.core.s.test/src/main/shared/formdata/shared/services/process/AbstractCompanyTableFieldData.java index 97f657c19..07db93490 100644 --- a/org.eclipse.scout.sdk.core.s.test/src/main/shared/formdata/shared/services/process/AbstractCompanyTableFieldData.java +++ b/org.eclipse.scout.sdk.core.s.test/src/main/shared/formdata/shared/services/process/AbstractCompanyTableFieldData.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2016 BSI Business Systems Integration AG. + * Copyright (c) 2017 BSI Business Systems Integration AG. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at |