devonfw#1509 further processing of the testAdaptMonolithicTemplatesA…

…ndGenerate
cedricarnauld123 · Feb 14, 2023 · c998068 · c998068
1 parent 801773d
commit c998068
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/...test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/EclipseCobiGenUtils.java b/...test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/EclipseCobiGenUtils.java
@@ -3,6 +3,7 @@
 import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellIsActive;
 import static org.eclipse.swtbot.swt.finder.waits.Conditions.widgetIsEnabled;
 
+import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -359,7 +360,8 @@ private static void captureAdvancedHealthCheck(SWTWorkbenchBot bot) {
    */
   public static void runAndCaptureUpdateTemplates(SWTWorkbenchBot bot) throws Exception {
 
-    ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
+    IWorkspace workspace = ResourcesPlugin.getWorkspace();
+    workspace.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
     bot.waitUntil(new AllJobsAreFinished(), DEFAULT_TIMEOUT); // build might take some time
 
     SWTBotView view = bot.viewById(JavaUI.ID_PACKAGES);

diff --git a/...pse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/tools/ResourcesPluginUtil.java b/...pse/cobigen-eclipse/src/com/devonfw/cobigen/eclipse/common/tools/ResourcesPluginUtil.java
@@ -212,7 +212,7 @@ public static String getJarPath(boolean isSource) {
    *
    * @return the templateDirectory
    */
-  private static File getTemplatesDirectory() {
+  public static File getTemplatesDirectory() {
 
     return CobiGenPaths.getTemplatesFolderPath().toFile();
   }
@@ -239,6 +239,7 @@ public static void processJar(String fileName) throws MalformedURLException, IOE
 
     String pathForCobigenTemplates = "";
     IPath ws = ResourcesPluginUtil.getWorkspaceLocation();
+    Path templateDirectory = ResourcesPluginUtil.getTemplatesDirectory().toPath();
 
     try {
       pathForCobigenTemplates = ws.toPortableString()
@@ -264,8 +265,8 @@ public static void processJar(String fileName) throws MalformedURLException, IOE
     }
 
     try {
-      TemplateAdapter templateAdapter = new TemplateAdapterImpl(cobigenFolderPath);
-      templateAdapter.adaptMonolithicTemplates(cobigenFolderPath.resolve(ConfigurationConstants.COBIGEN_TEMPLATES),
+      TemplateAdapter templateAdapter = new TemplateAdapterImpl(templateDirectory);
+      templateAdapter.adaptMonolithicTemplates(templateDirectory.resolve(ConfigurationConstants.COBIGEN_TEMPLATES),
           false);
     } catch (Exception e) {
       LOG.error("An exception occurred while processing Jar files to create CobiGen_Templates folder", e);

diff --git a/...lipse/src/com/devonfw/cobigen/eclipse/workbenchcontrol/handler/AdaptTemplatesHandler.java b/...lipse/src/com/devonfw/cobigen/eclipse/workbenchcontrol/handler/AdaptTemplatesHandler.java
@@ -108,7 +108,8 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
             }
             ResourcesPluginUtil.processJar(fileName);
 
-            importProjectIntoWorkspace(ResourceConstants.CONFIG_PROJECT_NAME, null);
+            importProjectIntoWorkspace(ResourceConstants.CONFIG_PROJECT_NAME,
+                ResourcesPluginUtil.getTemplatesDirectory().toPath());
             dialog = new MessageDialog(Display.getDefault().getActiveShell(), "Information", null,
                 "CobiGen_Templates folder is imported sucessfully", MessageDialog.INFORMATION, new String[] { "Ok" },
                 1);