Bug 456566 - Create LookupService - An internal error occurred during:

"proposal loader".

https://bugs.eclipse.org/bugs/show_bug.cgi?id=456566

1 files changed, 19 insertions, 13 deletions

diff --git a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/lookupcall/LookupCallNewWizardPage.java b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/lookupcall/LookupCallNewWizardPage.java
index 183f27b7e..c6cf56934 100644
--- a/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/lookupcall/LookupCallNewWizardPage.java
+++ b/org.eclipse.scout.sdk.ui/src/org/eclipse/scout/sdk/ui/wizard/lookupcall/LookupCallNewWizardPage.java
@@ -230,18 +230,7 @@ public class LookupCallNewWizardPage extends AbstractWorkspaceWizardPage {
       public void proposalAccepted(ContentProposalEvent event) {
         IType t = (IType) event.proposal;
         setServiceSuperTypeInternal(t);
-        m_genericTypeField.setEnabled(TypeUtility.isGenericType(t));
-        if (getGenericTypeSignature() == null && TypeUtility.exists(t)) {
-          try {
-            String lookupSvcKeyTypeSig = SignatureUtility.resolveTypeParameter(t, IRuntimeClasses.ILookupService, IRuntimeClasses.TYPE_PARAM_LOOKUPSERVICE__KEY_TYPE);
-            if (lookupSvcKeyTypeSig != null && Signature.getTypeSignatureKind(lookupSvcKeyTypeSig) != Signature.TYPE_VARIABLE_SIGNATURE) {
-              setGenericTypeSignature(lookupSvcKeyTypeSig);
-            }
-          }
-          catch (CoreException e) {
-            ScoutSdkUi.logError(e);
-          }
-        }
+        updateKeyTypeFor(t);
         pingStateChanging();
       }
     });
@@ -273,7 +262,9 @@ public class LookupCallNewWizardPage extends AbstractWorkspaceWizardPage {
     m_lookupServiceTypeField.addProposalAdapterListener(new IProposalAdapterListener() {
       @Override
       public void proposalAccepted(ContentProposalEvent event) {
-        setLookupServiceTypeInternal((IType) event.proposal);
+        IType t = (IType) event.proposal;
+        setLookupServiceTypeInternal(t);
+        updateKeyTypeFor(t);
         pingStateChanging();
       }
     });
@@ -295,6 +286,21 @@ public class LookupCallNewWizardPage extends AbstractWorkspaceWizardPage {
     return group;
   }
 
+  private void updateKeyTypeFor(IType t) {
+    m_genericTypeField.setEnabled(TypeUtility.isGenericType(t));
+    if (getGenericTypeSignature() == null && TypeUtility.exists(t)) {
+      try {
+        String lookupSvcKeyTypeSig = SignatureUtility.resolveTypeParameter(t, IRuntimeClasses.ILookupService, IRuntimeClasses.TYPE_PARAM_LOOKUPSERVICE__KEY_TYPE);
+        if (lookupSvcKeyTypeSig != null && Signature.getTypeSignatureKind(lookupSvcKeyTypeSig) != Signature.TYPE_VARIABLE_SIGNATURE) {
+          setGenericTypeSignature(lookupSvcKeyTypeSig);
+        }
+      }
+      catch (CoreException e) {
+        ScoutSdkUi.logError(e);
+      }
+    }
+  }
+
   @Override
   public LookupCallNewWizard getWizard() {
     return (LookupCallNewWizard) super.getWizard();