Don't require a folder for a agent. Allow agents to be added at the root

level in the Deploy View. Fixed #384
JumpMind · Jul 26, 2016 · 7e8a2d2 · 7e8a2d2
1 parent 25a4aea
commit 7e8a2d2
Showing 1 changed file with 15 additions and 18 deletions.
diff --git a/metl-ui/src/main/java/org/jumpmind/metl/ui/views/DeployNavigator.java b/metl-ui/src/main/java/org/jumpmind/metl/ui/views/DeployNavigator.java
@@ -148,7 +148,8 @@ public void refresh() {
         }
 
         treeTable.removeAllItems();
-        List<Folder> folders = context.getConfigurationService().findFolders(null, FolderType.AGENT);
+        List<Folder> folders = context.getConfigurationService().findFolders(null,
+                FolderType.AGENT);
         for (Folder folder : folders) {
             addChildren(folder);
         }
@@ -465,7 +466,7 @@ protected void selectionChanged(ValueChangeEvent event) {
         boolean showNewFolder = itemBeingEdited == null
                 && (selected == null || selectedFolder != null);
         newFolder.setEnabled(showNewFolder);
-        newAgent.setEnabled(selectedFolder != null && !selectedFolder.getName().startsWith("<"));
+        newAgent.setEnabled(selectedFolder == null || !selectedFolder.getName().startsWith("<"));
 
         delete.setEnabled(isDeleteButtonEnabled(selected));
     }
@@ -493,9 +494,8 @@ public boolean onOk() {
                                     context.getConfigurationService().delete(folder);
                                 } catch (Exception ex) {
                                     log.error("", ex);
-                                    CommonUiUtils.notify(
-                                            "Could not delete the \"" + folder.getName()
-                                                    + "\" folder", Type.WARNING_MESSAGE);
+                                    CommonUiUtils.notify("Could not delete the \""
+                                            + folder.getName() + "\" folder", Type.WARNING_MESSAGE);
                                 }
                             }
                             refresh();
@@ -530,19 +530,16 @@ protected void addFolder() {
 
     protected void addAgent() {
         Folder folder = getSelectedFolder();
-        if (folder != null) {
-            Agent agent = new Agent();
-            agent.setName("New Agent");
-            agent.setFolder(folder);
-            agent.setHost(AppUtils.getHostName());
-            context.getConfigurationService().save(agent);
-            context.getAgentManager().refresh(agent);
-            AgentName name = new AgentName(agent);
-            addAgent(folder, name);
-            expand(folder, name);
-            startEditingItem(name);
-        }
-
+        Agent agent = new Agent();
+        agent.setName("New Agent");
+        agent.setFolder(folder);
+        agent.setHost(AppUtils.getHostName());
+        context.getConfigurationService().save(agent);
+        context.getAgentManager().refresh(agent);
+        AgentName name = new AgentName(agent);
+        addAgent(folder, name);
+        expand(folder, name);
+        startEditingItem(name);
     }
 
     protected void addAgent(Folder folder, AgentName agent) {