Skip to content

Commit

Permalink
Merge pull request #5932 from scottslewis/issue-5632b
Browse files Browse the repository at this point in the history
Fix for workspace error/refresh issue in Java OSGi Service wizard
  • Loading branch information
pkriens authored Dec 21, 2023
2 parents 19adf42 + 8e91a10 commit 689630e
Show file tree
Hide file tree
Showing 27 changed files with 14 additions and 497 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,11 @@ protected IEditorPart configureConsumerProject(IJavaProject consumerJavaProject,
.getConsumerClassName(templateParams.get(ServiceProjectTemplateParam.SERVICE_NAME.getString())));
}

@Override
protected boolean canRunForked() {
return false;
}

@Override
public boolean performFinish() {
boolean result = super.performFinish();
Expand Down Expand Up @@ -297,10 +302,10 @@ public boolean performFinish() {
.getActivePage()
.activate(serviceApiEditor);
}
// Finally refresh all projects
// refresh whole workspace to update the inter-project relationships
try {
Central.getWorkspace()
.refreshProjects();
.forceRefresh();
} catch (Exception e) {}
}
return result;
Expand Down
4 changes: 0 additions & 4 deletions bndtools.test/workspace-comms/.gitignore

This file was deleted.

34 changes: 0 additions & 34 deletions bndtools.test/workspace-comms/build.gradle

This file was deleted.

6 changes: 0 additions & 6 deletions bndtools.test/workspace-comms/cnf/.classpath

This file was deleted.

3 changes: 0 additions & 3 deletions bndtools.test/workspace-comms/cnf/.gitignore

This file was deleted.

17 changes: 0 additions & 17 deletions bndtools.test/workspace-comms/cnf/.project

This file was deleted.

1 change: 0 additions & 1 deletion bndtools.test/workspace-comms/cnf/build.bnd

This file was deleted.

34 changes: 0 additions & 34 deletions bndtools.test/workspace-comms/cnf/build.gradle

This file was deleted.

5 changes: 0 additions & 5 deletions bndtools.test/workspace-comms/cnf/ext/junit.bnd

This file was deleted.

14 changes: 0 additions & 14 deletions bndtools.test/workspace-comms/cnf/ext/repositories.bnd

This file was deleted.

11 changes: 0 additions & 11 deletions bndtools.test/workspace-comms/cnf/gradle.properties

This file was deleted.

2 changes: 0 additions & 2 deletions bndtools.test/workspace-comms/cnf/localrepo/index.xml

This file was deleted.

6 changes: 0 additions & 6 deletions bndtools.test/workspace-comms/cnf/nonosgi-repo/README.txt

This file was deleted.

Binary file not shown.
Binary file not shown.
2 changes: 0 additions & 2 deletions bndtools.test/workspace-comms/cnf/releaserepo/index.xml

This file was deleted.

111 changes: 0 additions & 111 deletions bndtools.test/workspace-comms/cnf/settings.gradle

This file was deleted.

27 changes: 0 additions & 27 deletions bndtools.test/workspace-comms/cnf/settings.xml

This file was deleted.

Empty file.
11 changes: 0 additions & 11 deletions bndtools.test/workspace-comms/gradle.properties

This file was deleted.

Loading

0 comments on commit 689630e

Please sign in to comment.