feat: Depend on Kubernetes extension for cluster managment (#320)

* feat: depends on Kubernetes Extension

Signed-off-by: Stephane Bouchet <[email protected]>

* feat: Depend on Kubernetes extension for cluster management

Signed-off-by: Stephane Bouchet <[email protected]>

* feat: Depend on Kubernetes extension for cluster management

Signed-off-by: Stephane Bouchet <[email protected]>

Author: sbouchet

build.gradle

@@ -20,7 +20,7 @@ targetCompatibility = '1.8'
 intellij {
     version ideaVersion //for a full list of IntelliJ IDEA releases please see https://www.jetbrains.com/intellij-repository/releases
     pluginName 'org.jboss.tools.intellij.openshift'
-    plugins 'java', 'terminal', 'JavaScriptDebugger', 'JavaScriptLanguage', 'CSS', 'yaml', 'com.redhat.devtools.intellij.telemetry:0.0.1.9'
+    plugins 'java', 'terminal', 'JavaScriptDebugger', 'JavaScriptLanguage', 'CSS', 'yaml', 'com.redhat.devtools.intellij.telemetry:0.0.1.9', 'com.redhat.devtools.intellij.kubernetes:0.1.6.32'
 	updateSinceUntilBuild false
 }
 

src/main/java/org/jboss/tools/intellij/openshift/WindowToolFactory.java

@@ -26,8 +26,6 @@
 import com.intellij.ui.treeStructure.Tree;
 import com.redhat.devtools.intellij.common.tree.MutableModelSynchronizer;
 import com.redhat.devtools.intellij.common.tree.TreeHelper;
-import org.jboss.tools.intellij.openshift.tree.ClustersTreeModel;
-import org.jboss.tools.intellij.openshift.tree.ClustersTreeNodeCellRenderer;
 import org.jboss.tools.intellij.openshift.tree.application.ApplicationsTreeStructure;
 import org.jetbrains.annotations.NotNull;
 
@@ -44,19 +42,14 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
 
             JBPanel<JBPanel> panel = new JBPanel<>();
             panel.setLayout(new BorderLayout());
-            Tree tree = new Tree(new ClustersTreeModel());
-            tree.setCellRenderer(new ClustersTreeNodeCellRenderer());
-            PopupHandler.installPopupHandler(tree, "org.jboss.tools.intellij.tree", ActionPlaces.UNKNOWN);
-            panel.add(new JBScrollPane(tree), BorderLayout.CENTER);
-
             ApplicationsTreeStructure structure = new ApplicationsTreeStructure(project);
             StructureTreeModel<ApplicationsTreeStructure> model = buildModel(structure, project);
             new MutableModelSynchronizer<>(model, structure, structure);
-            tree = new Tree(new AsyncTreeModel(model, project));
+            Tree tree = new Tree(new AsyncTreeModel(model, project));
             tree.putClientProperty(Constants.STRUCTURE_PROPERTY, structure);
             tree.setCellRenderer(new NodeRenderer());
             PopupHandler.installPopupHandler(tree, "org.jboss.tools.intellij.tree", ActionPlaces.UNKNOWN);
-            panel.add(new JBScrollPane(tree), BorderLayout.PAGE_START);
+            panel.add(new JBScrollPane(tree), BorderLayout.CENTER);
             toolWindow.getContentManager().addContent(contentFactory.createContent(panel, "", false));
             TreeHelper.addLinkSupport(tree);
         } catch (IllegalAccessException | InvocationTargetException | InstantiationException | NoSuchMethodException e) {

src/main/java/org/jboss/tools/intellij/openshift/actions/cluster/DeleteFromKubeConfigAction.java

@@ -76,11 +76,6 @@ public Odo getOdo() {
         return odo;
     }
 
-    public void load() {
-        OdoCliFactory.getInstance().resetOdo();
-        initializeOdo().thenAccept(odo -> structure.fireModified(this));
-    }
-
     public Project getProject() {
         return project;
     }
@@ -93,8 +88,6 @@ protected Config loadConfig() {
         return ConfigHelper.safeLoadKubeConfig();
     }
 
-
-
     public Map<String, ComponentDescriptor> getComponents() {
         return components;
     }
@@ -205,10 +198,8 @@ private boolean hasNewToken(NamedContext newContext, Config newConfig, NamedCont
     }
 
     public void refresh() {
-        try {
-            load();
-        } catch (Exception e) {
-        }
+        OdoCliFactory.getInstance().resetOdo();
+        initializeOdo().thenAccept(odo -> structure.fireModified(this));
     }
 
     public ApplicationsTreeStructure getStructure() {