Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Villiger2016-09-05 05:55:36 -0400
committerMatthias Villiger2016-09-09 06:42:49 -0400
commit0f6e970b287846982b35c718c66503e251a2b716 (patch)
tree087fb9f5bbf12752f5c3e80de6331c807740247e
parente6a3a866b1c0a3e6aca0e365e5c0f54c11eb733c (diff)
downloadorg.eclipse.scout.sdk-releases/5.2.x.tar.gz
org.eclipse.scout.sdk-releases/5.2.x.tar.xz
org.eclipse.scout.sdk-releases/5.2.x.zip
The method getDynamicNlsBaseName must not be protected.releases/5.2.x
Remove accessibility flag check for method because of change in Scout RT
-rw-r--r--org.eclipse.scout.sdk.s2e.nls/src/main/java/org/eclipse/scout/sdk/s2e/nls/internal/serviceproject/NlsServiceType.java25
1 files changed, 12 insertions, 13 deletions
diff --git a/org.eclipse.scout.sdk.s2e.nls/src/main/java/org/eclipse/scout/sdk/s2e/nls/internal/serviceproject/NlsServiceType.java b/org.eclipse.scout.sdk.s2e.nls/src/main/java/org/eclipse/scout/sdk/s2e/nls/internal/serviceproject/NlsServiceType.java
index ef21d3b2f..2602cc9bd 100644
--- a/org.eclipse.scout.sdk.s2e.nls/src/main/java/org/eclipse/scout/sdk/s2e/nls/internal/serviceproject/NlsServiceType.java
+++ b/org.eclipse.scout.sdk.s2e.nls/src/main/java/org/eclipse/scout/sdk/s2e/nls/internal/serviceproject/NlsServiceType.java
@@ -13,7 +13,6 @@ package org.eclipse.scout.sdk.s2e.nls.internal.serviceproject;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.eclipse.jdt.core.Flags;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
import org.eclipse.jdt.core.JavaModelException;
@@ -36,18 +35,18 @@ public class NlsServiceType extends NlsType {
@Override
protected String getBundleValue() throws JavaModelException {
IMethod getter = m_type.getMethod(DYNAMIC_NLS_BASE_NAME_GETTER, new String[]{});
- if (S2eUtils.exists(getter)) {
- int flags = getter.getFlags();
- int refFlags = Flags.AccProtected;
- if ((refFlags & flags) == refFlags) {
- String source = getter.getSource();
- if (source != null) {
- Matcher matcher = REGEX_RESOURCE_BUNDLE_GETTER.matcher(source);
- if (matcher.find()) {
- return matcher.group(1);
- }
- }
- }
+ if (!S2eUtils.exists(getter)) {
+ return null;
+ }
+
+ String source = getter.getSource();
+ if (source == null) {
+ return null;
+ }
+
+ Matcher matcher = REGEX_RESOURCE_BUNDLE_GETTER.matcher(source);
+ if (matcher.find()) {
+ return matcher.group(1);
}
return null;
}

Back to the top