diff --git a/org.eclipse.scout.sdk.ui/resources/sdkPropertyViewConfig.xml b/org.eclipse.scout.sdk.ui/resources/sdkPropertyViewConfig.xml
index 67598ef..b94b2d9 100644
--- a/org.eclipse.scout.sdk.ui/resources/sdkPropertyViewConfig.xml
+++ b/org.eclipse.scout.sdk.ui/resources/sdkPropertyViewConfig.xml
@@ -546,7 +546,8 @@
</type>
<type name="org.eclipse.scout.rt.server.services.lookup.AbstractSqlLookupService">
<config name="getConfiguredSqlSelect" type="Normal" category="Data" />
- <config name="getConfiguredSortColumn" type="Advanced" category="Data" />
+ <config name="getConfiguredSortColumn" type="Normal" category="Data" />
+ <config name="execLoadLookupRows" type="Normal" category="BusinessLogic" />
</type>
<type name="org.eclipse.scout.rt.server.services.common.jdbc.AbstractSqlService">
<config name="getConfiguredDirectJdbcConnection" type="Normal" category="Data" />
diff --git a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/internal/view/properties/presenter/single/MultiLineStringPresenter.java b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/internal/view/properties/presenter/single/MultiLineStringPresenter.java
index 6cff9d8..e76da43 100644
--- a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/internal/view/properties/presenter/single/MultiLineStringPresenter.java
+++ b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/internal/view/properties/presenter/single/MultiLineStringPresenter.java
@@ -25,11 +25,6 @@
}
@Override
- protected String formatSourceValue(String value) throws CoreException {
- return "\"" + value + "\"";
- }
-
- @Override
protected String formatDisplayValue(String value) throws CoreException {
return value;
}
diff --git a/org.eclipse.scout.sdk.util/src/org/eclipse/scout/sdk/util/jdt/JdtUtility.java b/org.eclipse.scout.sdk.util/src/org/eclipse/scout/sdk/util/jdt/JdtUtility.java
index 29de46b..fdeabbe 100644
--- a/org.eclipse.scout.sdk.util/src/org/eclipse/scout/sdk/util/jdt/JdtUtility.java
+++ b/org.eclipse.scout.sdk.util/src/org/eclipse/scout/sdk/util/jdt/JdtUtility.java
@@ -103,7 +103,7 @@
*/
public static String escapeStringJava(String s) {
if (s == null) return null;
- return s.replace("\\", "\\\\").replace("\"", "\\\"");
+ return s.replace("\\", "\\\\").replace("\"", "\\\"").replace("\n", "\\n").replace("\r", "");
}
/**
diff --git a/org.eclipse.scout.sdk.ws.jaxws/src/org/eclipse/scout/sdk/ws/jaxws/operation/WsConsumerImplNewOperation.java b/org.eclipse.scout.sdk.ws.jaxws/src/org/eclipse/scout/sdk/ws/jaxws/operation/WsConsumerImplNewOperation.java
index 0ac1b26..211fb4a 100644
--- a/org.eclipse.scout.sdk.ws.jaxws/src/org/eclipse/scout/sdk/ws/jaxws/operation/WsConsumerImplNewOperation.java
+++ b/org.eclipse.scout.sdk.ws.jaxws/src/org/eclipse/scout/sdk/ws/jaxws/operation/WsConsumerImplNewOperation.java
@@ -48,18 +48,18 @@
IType jaxWsPortType = null;
if (TypeUtility.exists(getJaxWsPortType())) {
jaxWsPortType = getJaxWsPortType();
- JaxWsSdk.logError("Could not link webservice consumer to port type as port type could not be found");
}
else {
jaxWsPortType = TypeUtility.getType(Object.class.getName());
+ JaxWsSdk.logError("Could not link webservice consumer to port type as port type could not be found");
}
IType jaxWsServiceType = null;
if (TypeUtility.exists(getJaxWsServiceType())) {
jaxWsServiceType = getJaxWsServiceType();
- JaxWsSdk.logError("Could not link webservice consumer to service as service could not be found");
}
else {
jaxWsServiceType = TypeUtility.getType(Service.class.getName());
+ JaxWsSdk.logError("Could not link webservice consumer to service as service could not be found");
}
String superTypeSignature = "<";
diff --git a/org.eclipse.scout.sdk.ws.jaxws/src/org/eclipse/scout/sdk/ws/jaxws/util/JaxWsSdkUtility.java b/org.eclipse.scout.sdk.ws.jaxws/src/org/eclipse/scout/sdk/ws/jaxws/util/JaxWsSdkUtility.java
index 9f67779..9c16b7f 100644
--- a/org.eclipse.scout.sdk.ws.jaxws/src/org/eclipse/scout/sdk/ws/jaxws/util/JaxWsSdkUtility.java
+++ b/org.eclipse.scout.sdk.ws.jaxws/src/org/eclipse/scout/sdk/ws/jaxws/util/JaxWsSdkUtility.java
@@ -548,7 +548,7 @@
final Set<IType> types = new HashSet<IType>();
try {
new SearchEngine().search(
- SearchPattern.createPattern("*", IJavaSearchConstants.INTERFACE, IJavaSearchConstants.DECLARATIONS, SearchPattern.R_REGEXP_MATCH),
+ SearchPattern.createPattern("*", IJavaSearchConstants.INTERFACE, IJavaSearchConstants.DECLARATIONS, SearchPattern.R_PATTERN_MATCH),
new SearchParticipant[]{SearchEngine.getDefaultSearchParticipant()},
new JarFileSearchScope(jarFile), //SearchEngine.createWorkspaceScope(),
new SearchRequestor() {
@@ -625,7 +625,7 @@
final Set<IType> types = new HashSet<IType>();
try {
new SearchEngine().search(
- SearchPattern.createPattern("*", IJavaSearchConstants.TYPE, IJavaSearchConstants.DECLARATIONS, SearchPattern.R_REGEXP_MATCH),
+ SearchPattern.createPattern("*", IJavaSearchConstants.TYPE, IJavaSearchConstants.DECLARATIONS, SearchPattern.R_PATTERN_MATCH),
new SearchParticipant[]{SearchEngine.getDefaultSearchParticipant()},
new JarFileSearchScope(jarFile), //SearchEngine.createWorkspaceScope(),
new SearchRequestor() {
@@ -710,6 +710,9 @@
public static IType extractGenericSuperType(IType type, int index) {
try {
+ if (!TypeUtility.exists(type)) {
+ return null;
+ }
String superTypeSignature = type.getSuperclassTypeSignature();
if (superTypeSignature == null) {
return null;
