diff options
| author | Mickael Istria | 2020-06-09 09:34:12 +0000 |
|---|---|---|
| committer | Nick Boldt | 2020-07-09 19:01:36 +0000 |
| commit | 9a02ed70b75c126655fe862230b13e518ce8ff36 (patch) | |
| tree | bd18e0f32eddbb2dd3137568bbe308e51ce84525 /jpa | |
| parent | 5cc0238b61bf690b3bb50ef50179797f5fd1cf54 (diff) | |
| download | webtools.dali-9a02ed70b75c126655fe862230b13e518ce8ff36.tar.gz webtools.dali-9a02ed70b75c126655fe862230b13e518ce8ff36.tar.xz webtools.dali-9a02ed70b75c126655fe862230b13e518ce8ff36.zip | |
Bug 563158 - JPA Proposal Computer requires UI Thread
Audited code and it seems like I Thread is not required.
Change-Id: Ib421c8e4143dc24822263306cadce88c92a807a1
Signed-off-by: Mickael Istria <mistria@redhat.com>
Diffstat (limited to 'jpa')
4 files changed, 13 insertions, 10 deletions
diff --git a/jpa/features/org.eclipse.jpt.jpa.feature/feature.xml b/jpa/features/org.eclipse.jpt.jpa.feature/feature.xml index 6f8eb07bef..fd18ea4519 100644 --- a/jpa/features/org.eclipse.jpt.jpa.feature/feature.xml +++ b/jpa/features/org.eclipse.jpt.jpa.feature/feature.xml @@ -14,7 +14,7 @@ <feature id="org.eclipse.jpt.jpa.feature" label="%featureName" - version="3.6.0.qualifier" + version="3.6.1.qualifier" provider-name="%providerName" plugin="org.eclipse.jpt.jpa.branding" license-feature="org.eclipse.license" diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.jpa.ui/META-INF/MANIFEST.MF index 8e46af5ada..5f7bf9ed69 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/META-INF/MANIFEST.MF +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.jpt.jpa.ui;singleton:=true -Bundle-Version: 3.6.0.qualifier +Bundle-Version: 3.6.1.qualifier Bundle-Activator: org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/plugin.xml b/jpa/plugins/org.eclipse.jpt.jpa.ui/plugin.xml index 2fcaa7573b..1b4df162ae 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/plugin.xml +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/plugin.xml @@ -152,10 +152,11 @@ id="JpaCompletionProposalComputer"> <!-- activate = "true", but our plug-in will only activate if the JpaProposalCategory is enabled (has JPA facet) bug 386358 --> - <javaCompletionProposalComputer - class="org.eclipse.jpt.jpa.ui.internal.JpaJavaCompletionProposalComputer" - activate="true" - categoryId="org.eclipse.jpt.jpa.ui.jpaProposalCategory"> + <javaCompletionProposalComputer + activate="true" + categoryId="org.eclipse.jpt.jpa.ui.jpaProposalCategory" + class="org.eclipse.jpt.jpa.ui.internal.JpaJavaCompletionProposalComputer" + requiresUIThread="false"> <partition type="__dftl_partition_content_type"/> <partition type="__java_string"/> </javaCompletionProposalComputer> @@ -168,9 +169,11 @@ <!-- activate = "true", but our plug-in will only activate if the JpaProposalCategory is enabled (has JPA facet) bug 386358 --> <javaCompletionProposalComputer - class="org.eclipse.jpt.jpa.ui.internal.jpql.JpaJpqlJavaCompletionProposalComputer" - activate="true" - categoryId="org.eclipse.jpt.jpa.ui.jpaProposalCategory"> + activate="true" + categoryId="org.eclipse.jpt.jpa.ui.jpaProposalCategory" + class="org.eclipse.jpt.jpa.ui.internal.jpql.JpaJpqlJavaCompletionProposalComputer" + requiresUIThread="true"> + <!-- requires UI Thread because it dereferences getViewer() to utlimately ask StyledText.getData() --> <partition type="__dftl_partition_content_type"/> <partition type="__java_string"/> </javaCompletionProposalComputer> diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/pom.xml b/jpa/plugins/org.eclipse.jpt.jpa.ui/pom.xml index c7f277da3f..ccf8c88cd7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/pom.xml +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/pom.xml @@ -22,6 +22,6 @@ <groupId>org.eclipse.webtools.dali</groupId> <artifactId>org.eclipse.jpt.jpa.ui</artifactId> - <version>3.6.0-SNAPSHOT</version> + <version>3.6.1-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> |