You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2014/07/12 00:21:25 UTC

[12/20] updating xbaya gui to the new airavata

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterValueNode.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterValueNode.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterValueNode.java
deleted file mode 100644
index 38a7d16..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParameterValueNode.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.registrybrowser.nodes;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.swing.Icon;
-import javax.swing.JTree;
-import javax.swing.tree.TreeNode;
-
-import org.apache.airavata.schemas.gfac.Parameter;
-import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
-
-public class ParameterValueNode extends AbstractAiravataTreeNode {
-	private Parameter parameter;
-	
-	public ParameterValueNode(Parameter parameter, TreeNode parent) {
-		super(parent);
-		setParameter(parameter);
-	}
-
-	@Override
-	protected List<TreeNode> getChildren() {
-		return emptyList();
-	}
-
-	@Override
-	public String getCaption(boolean selected, boolean expanded, boolean leaf,
-			boolean hasFocus) {
-		return getParameter().getParameterName();
-	}
-
-	@Override
-	public Icon getIcon(boolean selected, boolean expanded, boolean leaf,
-			boolean hasFocus) {
-		return JCRBrowserIcons.PARAMETER_VALUE_ICON;
-	}
-
-	@Override
-	public List<String> getSupportedActions() {
-		return Arrays.asList();
-	}
-
-	public boolean triggerAction(JTree tree,String action) throws Exception{
-		return super.triggerAction(tree, action);
-	}
-
-	@Override
-	public String getActionCaption(AbstractBrowserActionItem action) {
-		return action.getDefaultCaption();
-	}
-
-	@Override
-	public Icon getActionIcon(AbstractBrowserActionItem action) {
-		return null;
-	}
-
-	@Override
-	public String getActionDescription(AbstractBrowserActionItem action) {
-		return null;
-	}
-
-	public Parameter getParameter() {
-		return parameter;
-	}
-
-	public void setParameter(Parameter parameter) {
-		this.parameter = parameter;
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParametersNode.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParametersNode.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParametersNode.java
deleted file mode 100644
index 33e409a..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ParametersNode.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.registrybrowser.nodes;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.swing.Icon;
-import javax.swing.JTree;
-import javax.swing.tree.TreeNode;
-
-import org.apache.airavata.xbaya.model.registrybrowser.ServiceParameters;
-import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
-
-public class ParametersNode extends AbstractAiravataTreeNode {
-	private ServiceParameters parametersList;
-	public ParametersNode(ServiceParameters parameters,TreeNode parent) {
-		super(parent);
-		setParametersList(parameters);
-	}
-
-	@Override
-	protected List<TreeNode> getChildren() {
-		return getTreeNodeList(getParametersList().getParameters().toArray(), this);
-	}
-
-	@Override
-	public String getCaption(boolean selected, boolean expanded, boolean leaf,
-			boolean hasFocus) {
-		return "Parameters";
-	}
-
-	@Override
-	public Icon getIcon(boolean selected, boolean expanded, boolean leaf,
-			boolean hasFocus) {
-		return JCRBrowserIcons.PARAMETERS_ICON;
-	}
-
-	@Override
-	public List<String> getSupportedActions() {
-		return Arrays.asList();
-	}
-	
-	public boolean triggerAction(JTree tree,String action) throws Exception{
-		return super.triggerAction(tree, action);
-	}
-
-	@Override
-	public String getActionCaption(AbstractBrowserActionItem action) {
-		return action.getDefaultCaption();
-	}
-
-	@Override
-	public Icon getActionIcon(AbstractBrowserActionItem action) {
-		return null;
-	}
-
-	@Override
-	public String getActionDescription(AbstractBrowserActionItem action) {
-		return null;
-	}
-
-	public ServiceParameters getParametersList() {
-		return parametersList;
-	}
-
-	public void setParametersList(ServiceParameters parametersList) {
-		this.parametersList = parametersList;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java
deleted file mode 100644
index 09af7c8..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryNode.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.registrybrowser.nodes;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.swing.Icon;
-import javax.swing.tree.TreeNode;
-
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.model.registrybrowser.AiravataConfigurations;
-import org.apache.airavata.xbaya.model.registrybrowser.HostDescriptions;
-import org.apache.airavata.xbaya.model.registrybrowser.ServiceDescriptions;
-import org.apache.airavata.xbaya.model.registrybrowser.XBayaWorkflowExperiments;
-import org.apache.airavata.xbaya.model.registrybrowser.XBayaWorkflowTemplates;
-import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
-import org.apache.airavata.xbaya.ui.actions.registry.browser.RefreshAction;
-
-public class RegistryNode extends AbstractAiravataTreeNode {
-    private AiravataAPI registry;
-    private XBayaEngine engine;
-
-    public RegistryNode(XBayaEngine engine, TreeNode parent) {
-        super(parent);
-        setRegistry(engine.getConfiguration().getAiravataAPI());
-        this.engine=engine;
-    }
-
-    protected List<TreeNode> getChildren() {
-        List<Object> children = new ArrayList<Object>();
-        AiravataConfigurations airavataConfigurations = new AiravataConfigurations(getRegistry());
-        children.add(airavataConfigurations);
-        HostDescriptions hostDescriptions = new HostDescriptions(getRegistry());
-        children.add(hostDescriptions);
-        ServiceDescriptions serviceDescriptions = new ServiceDescriptions(getRegistry());
-        children.add(serviceDescriptions);
-//        ApplicationDeploymentDescriptions applicationDeploymentDescriptions = new ApplicationDeploymentDescriptions(
-//                getRegistry());
-//        children.add(applicationDeploymentDescriptions);
-        XBayaWorkflowTemplates xBayaWorkflows = new XBayaWorkflowTemplates(getRegistry());
-        children.add(xBayaWorkflows);
-        XBayaWorkflowExperiments xBayaWorkflowExperiments = new XBayaWorkflowExperiments(getRegistry());
-        children.add(xBayaWorkflowExperiments);
-        return getTreeNodeList(children.toArray(), this);
-    }
-
-    public AiravataAPI getRegistry() {
-        return registry;
-    }
-
-    public void setRegistry(AiravataAPI registry) {
-        this.registry = registry;
-    }
-
-    @Override
-    public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-        try {
-            return getRegistry().getAiravataManager().getGateway().getGatewayName() + " - " + getRegistry().getAiravataManager().getUser().getUserName();
-        } catch (AiravataAPIInvocationException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-    @Override
-    public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-        return JCRBrowserIcons.REGISTRY_ICON;
-    }
-
-    // @Override
-    // public void refresh() {
-    // List<TreeNode> children = getChildren();
-    // for (TreeNode node : children) {
-    // if (node instanceof AbstractAiravataTreeNode){
-    // ((AbstractAiravataTreeNode)node).refresh();
-    // }
-    // }
-    // }
-    @Override
-    public List<String> getSupportedActions() {
-        return Arrays.asList(RefreshAction.ID);
-    }
-
-    @Override
-    public String getActionCaption(AbstractBrowserActionItem action) {
-        return action.getDefaultCaption();
-    }
-
-    @Override
-    public Icon getActionIcon(AbstractBrowserActionItem action) {
-        return null;
-    }
-
-    @Override
-    public String getActionDescription(AbstractBrowserActionItem action) {
-        return null;
-    }
-
-    public XBayaEngine getEngine() {
-        return engine;
-    }
-
-    public void setEngine(XBayaEngine engine) {
-        this.engine = engine;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryTreeCellRenderer.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryTreeCellRenderer.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryTreeCellRenderer.java
deleted file mode 100644
index fe3baac..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/RegistryTreeCellRenderer.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.registrybrowser.nodes;
-
-import java.awt.Component;
-
-import javax.swing.JTree;
-import javax.swing.tree.DefaultTreeCellRenderer;
-import javax.swing.tree.TreeCellRenderer;
-
-public class RegistryTreeCellRenderer implements TreeCellRenderer {
-
-    @Override
-    public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded,
-            boolean leaf, int row, boolean hasFocus) {
-        if (value instanceof AbstractAiravataTreeNode) {
-            AbstractAiravataTreeNode node = (AbstractAiravataTreeNode) value;
-            return node.getNodeComponent(tree, value, selected, expanded, leaf, row, hasFocus);
-        }
-        return new DefaultTreeCellRenderer().getTreeCellRendererComponent(tree, value, selected, expanded, leaf, row,
-                hasFocus);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java
deleted file mode 100644
index 81a5589..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionNode.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.registrybrowser.nodes;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.swing.Icon;
-import javax.swing.JTree;
-import javax.swing.tree.TreeNode;
-
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.commons.gfac.type.ServiceDescription;
-import org.apache.airavata.xbaya.model.registrybrowser.ApplicationDeploymentDescriptions;
-import org.apache.airavata.xbaya.model.registrybrowser.InputParameters;
-import org.apache.airavata.xbaya.model.registrybrowser.OutputParameters;
-import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
-import org.apache.airavata.xbaya.ui.actions.registry.browser.DeleteAction;
-import org.apache.airavata.xbaya.ui.actions.registry.browser.EditAction;
-import org.apache.airavata.xbaya.ui.dialogs.descriptors.DeploymentDescriptionDialog;
-
-public class ServiceDescriptionNode extends AbstractAiravataTreeNode {
-	private ServiceDescription serviceDescription;
-
-	public ServiceDescriptionNode(ServiceDescription serviceDescription, TreeNode parent) {
-		super(parent);
-		setServiceDescription(serviceDescription);
-	}
-
-	@Override
-	protected List<TreeNode> getChildren() {
-		List<Object> parameterTypeList=new ArrayList<Object>();
-		if (getServiceDescription().getType().getInputParametersArray().length>0){
-			parameterTypeList.add(new InputParameters(getServiceDescription().getType().getInputParametersArray()));
-		}
-		if (getServiceDescription().getType().getOutputParametersArray().length>0){
-			parameterTypeList.add(new OutputParameters(getServiceDescription().getType().getOutputParametersArray()));
-		}
-		parameterTypeList.add(new ApplicationDeploymentDescriptions(getRegistry(),getServiceDescription().getType().getName()));
-		return getTreeNodeList(parameterTypeList.toArray(), this);
-	}
-
-    @Override
-    public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-        return getServiceDescription().getType().getName();
-    }
-
-    @Override
-    public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-        return JCRBrowserIcons.SERVICE_ICON;
-    }
-
-    public ServiceDescription getServiceDescription() {
-        return serviceDescription;
-    }
-
-    public void setServiceDescription(ServiceDescription serviceDescription) {
-        this.serviceDescription = serviceDescription;
-    }
-
-    @Override
-    public List<String> getSupportedActions() {
-        return Arrays.asList(EditAction.ID, DeleteAction.ID);
-    }
-
-    public boolean triggerAction(JTree tree, String action) throws Exception {
-        if (action.equals(DeleteAction.ID)) {
-        	return deleteServiceDescription(tree);
-        } else if (action.equals(EditAction.ID)) {
-        	return editServiceDescription(tree);
-        }
-        return super.triggerAction(tree, action);
-    }
-
-	private boolean editServiceDescription(JTree tree) {
-		DeploymentDescriptionDialog serviceDescriptionDialog = new DeploymentDescriptionDialog(getRegistry(),false,getServiceDescription(), null);
-    	serviceDescriptionDialog.open();
-//		ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(getRegistry(),false,getServiceDescription());
-//		serviceDescriptionDialog.open();
-		if (serviceDescriptionDialog.isServiceCreated()) {
-		    refresh();
-		    reloadTreeNode(tree, this);
-		}
-		return true;
-	}
-
-    private boolean deleteServiceDescription(JTree tree) throws AiravataAPIInvocationException {
-        if (askQuestion("Application", "Are you sure that you want to remove the applications associated with \""
-                + getServiceDescription().getType().getName() + "\"?")) {
-            getRegistry().getApplicationManager().deleteServiceDescription(getServiceDescription().getType().getName());
-            ((AbstractAiravataTreeNode) getParent()).refresh();
-            reloadTreeNode(tree, getParent());
-        }
-        return true;
-    }
-
-    @Override
-    public String getActionCaption(AbstractBrowserActionItem action) {
-        if (action.getID().equals(DeleteAction.ID)) {
-            return "Remove";
-        } else if (action.getID().equals(EditAction.ID)) {
-            return "View/Edit";
-        }
-        return action.getDefaultCaption();
-    }
-
-    @Override
-    public Icon getActionIcon(AbstractBrowserActionItem action) {
-        return null;
-    }
-
-    @Override
-    public String getActionDescription(AbstractBrowserActionItem action) {
-        return null;
-    }
-
-	@Override
-	public String getDefaultAction() {
-		return EditAction.ID;
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java
deleted file mode 100644
index dbfce2e..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/ServiceDescriptionsNode.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.registrybrowser.nodes;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.swing.Icon;
-import javax.swing.JTree;
-import javax.swing.tree.TreeNode;
-
-import org.apache.airavata.client.api.AiravataAPI;
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.commons.gfac.type.ServiceDescription;
-//import org.apache.airavata.registry.api.AiravataRegistry2;
-import org.apache.airavata.xbaya.model.registrybrowser.ServiceDescriptions;
-import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
-import org.apache.airavata.xbaya.ui.actions.registry.browser.AddAction;
-import org.apache.airavata.xbaya.ui.actions.registry.browser.DeleteAction;
-import org.apache.airavata.xbaya.ui.actions.registry.browser.RefreshAction;
-import org.apache.airavata.xbaya.ui.dialogs.descriptors.DeploymentDescriptionDialog;
-
-public class ServiceDescriptionsNode extends AbstractAiravataTreeNode {
-    private ServiceDescriptions serviceDescriptions;
-
-    public ServiceDescriptionsNode(ServiceDescriptions serviceDescriptions, TreeNode parent) {
-        super(parent);
-        setServiceDescriptions(serviceDescriptions);
-    }
-
-    @Override
-    protected List<TreeNode> getChildren() {
-        try {
-            return getTreeNodeList(getServiceDescriptions().getDescriptions().toArray(), this);
-        } catch (AiravataAPIInvocationException e) {
-            e.printStackTrace();
-            return emptyList();
-        } catch (RegistryException e) {
-            e.printStackTrace();
-            return emptyList();
-        }
-    }
-
-    @Override
-    public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-        return "Applications";
-    }
-
-    @Override
-    public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-        return JCRBrowserIcons.SERVICES_ICON;
-    }
-
-    public ServiceDescriptions getServiceDescriptions() {
-        return serviceDescriptions;
-    }
-
-    public void setServiceDescriptions(ServiceDescriptions serviceDescriptions) {
-        this.serviceDescriptions = serviceDescriptions;
-    }
-
-    @Override
-    public List<String> getSupportedActions() {
-        return Arrays.asList(AddAction.ID, RefreshAction.ID, DeleteAction.ID);
-    }
-
-    public boolean triggerAction(JTree tree, String action) throws Exception {
-        if (action.equals(DeleteAction.ID)) {
-            deleteServiceDescription(tree);
-            return true;
-        } else if (action.equals(AddAction.ID)) {
-        	DeploymentDescriptionDialog serviceDescriptionDialog = new DeploymentDescriptionDialog(null, getRegistry());
-        	serviceDescriptionDialog.open();
-//            ServiceDescriptionDialog serviceDescriptionDialog = new ServiceDescriptionDialog(getRegistry());
-//            serviceDescriptionDialog.open();
-            if (serviceDescriptionDialog.isServiceCreated()) {
-                refresh();
-                reloadTreeNode(tree, this);
-            }
-            return true;
-        }
-        return super.triggerAction(tree, action);
-    }
-
-    private void deleteServiceDescription(JTree tree) throws Exception {
-        if (askQuestion("Applications",
-                "Are you sure that you want to remove all applications defined in this registry?")) {
-            AiravataAPI registry = getRegistry();
-            List<ServiceDescription> descriptions = getServiceDescriptions().getDescriptions();
-            for (ServiceDescription descriptionWrap : descriptions) {
-                registry.getApplicationManager().deleteServiceDescription(descriptionWrap.getType().getName());
-            }
-            refresh();
-            reloadTreeNode(tree, this);
-        }
-    }
-
-    @Override
-    public String getActionCaption(AbstractBrowserActionItem action) {
-        if (action.getID().equals(DeleteAction.ID)) {
-            return "Remove all Applicatons";
-        } else if (action.getID().equals(AddAction.ID)) {
-            return "Register Application...";
-        }
-        return action.getDefaultCaption();
-    }
-
-    @Override
-    public Icon getActionIcon(AbstractBrowserActionItem action) {
-        return null;
-    }
-
-    @Override
-    public String getActionDescription(AbstractBrowserActionItem action) {
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java
deleted file mode 100644
index d7294db..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentNode.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.registrybrowser.nodes;
-
-import java.awt.*;
-import java.awt.datatransfer.StringSelection;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.swing.Icon;
-import javax.swing.JTree;
-import javax.swing.tree.TreeNode;
-
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.workflow.ExperimentName;
-import org.apache.airavata.registry.api.workflow.WorkflowExecutionStatus;
-import org.apache.airavata.xbaya.model.registrybrowser.XBayaWorkflowExperiment;
-import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
-import org.apache.airavata.xbaya.ui.actions.registry.browser.CopyAction;
-import org.apache.airavata.xbaya.ui.actions.registry.browser.DeleteAction;
-
-public class XBayaWorkflowExperimentNode extends AbstractAiravataTreeNode {
-	private XBayaWorkflowExperiment experiment;
-	private String workflowExecutionName;
-	
-    public XBayaWorkflowExperimentNode(XBayaWorkflowExperiment experiment, TreeNode parent) {
-        super(parent);
-        setExperiment(experiment);
-    }
-
-    @Override
-    protected List<TreeNode> getChildren() {
-        return getTreeNodeList(getExperiment().getWorkflows().toArray(), this);
-    }
-
-    @Override
-    public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-    	if (workflowExecutionName==null) {
-			try {
-				workflowExecutionName = getRegistry().getProvenanceManager().getExperimentName(getExperiment().getExperimentId()).getInstanceName();
-			} catch (AiravataAPIInvocationException e) {
-				e.printStackTrace();
-			}
-			if (workflowExecutionName==null){
-				workflowExecutionName="["+getExperiment().getExperimentId()+"]";
-			}
-		}
-    	String caption=workflowExecutionName;
-    	try {
-			WorkflowExecutionStatus workflowExecutionStatus = getRegistry().getProvenanceManager().getWorkflowInstanceStatus(getExperiment().getExperimentId(), getExperiment().getExperimentId());
-			if (workflowExecutionStatus!=null && workflowExecutionStatus.getExecutionStatus()!=null){
-				caption += " - <i>" + workflowExecutionStatus.getExecutionStatus().toString()+"</i>";
-				if (workflowExecutionStatus.getStatusUpdateTime()!=null) {
-						caption += "<i> as of " + workflowExecutionStatus.getStatusUpdateTime().toString() + "</i>";
-				}
-			}
-		} catch (AiravataAPIInvocationException e) {
-			e.printStackTrace();
-		}
-		return wrapAsHtml(caption);
-    }
-
-    @Override
-    public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-        return JCRBrowserIcons.WORKFLOW_EXPERIMENT_ICON;
-    }
-
-    @Override
-    public List<String> getSupportedActions() {
-        return Arrays.asList(CopyAction.ID);
-    }
-
-    public boolean triggerAction(JTree tree, String action) throws Exception {
-        if (action.equals(CopyAction.ID)) {
-            Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(getExperimentInfo()), null);
-        }
-        return super.triggerAction(tree, action);
-    }
-
-    private String getExperimentName (){
-        String experimentId = getExperiment().getExperimentId();
-        try {
-            ExperimentName experimentName = getExperiment().getAiravataAPI().getProvenanceManager().getExperimentName(experimentId);
-            return experimentName.getInstanceName();
-        } catch (AiravataAPIInvocationException e) {
-            return null;
-        }
-    }
-
-    private String getExperimentInfo (){
-        String experimetName = getExperimentName();
-        String experimetID = getExperiment().getExperimentId();
-        return "[Experiment Name = " + experimetName + ", Experiment ID = " + experimetID + "]";
-    }
-
-    @Override
-    public String getActionCaption(AbstractBrowserActionItem action) {
-        if (action.getID().equals(CopyAction.ID)) {
-            return "Copy Experiment Info to clipboard";
-        }
-        return action.getDefaultCaption();
-    }
-
-    @Override
-    public Icon getActionIcon(AbstractBrowserActionItem action) {
-        return null;
-    }
-
-    @Override
-    public String getActionDescription(AbstractBrowserActionItem action) {
-        return null;
-    }
-
-	public XBayaWorkflowExperiment getExperiment() {
-		return experiment;
-	}
-
-	public void setExperiment(XBayaWorkflowExperiment experiment) {
-		this.experiment = experiment;
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentsNode.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentsNode.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentsNode.java
deleted file mode 100644
index 420dea3..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowExperimentsNode.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.registrybrowser.nodes;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.swing.Icon;
-import javax.swing.JTree;
-import javax.swing.tree.TreeNode;
-
-import org.apache.airavata.xbaya.model.registrybrowser.XBayaWorkflowExperiments;
-import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
-import org.apache.airavata.xbaya.ui.actions.registry.browser.RefreshAction;
-
-public class XBayaWorkflowExperimentsNode extends AbstractAiravataTreeNode {
-	private XBayaWorkflowExperiments experiments;
-	
-    public XBayaWorkflowExperimentsNode(XBayaWorkflowExperiments experiments, TreeNode parent) {
-        super(parent);
-        setExperiments(experiments);
-    }
-
-    @Override
-    protected List<TreeNode> getChildren() {
-        return getTreeNodeList(getExperiments().getAllExperiments().toArray(), this);
-    }
-
-    @Override
-    public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-        return "Experiments";
-    }
-
-    @Override
-    public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-        return JCRBrowserIcons.WORKFLOW_EXPERIMENTS_ICON;
-    }
-
-    @Override
-    public List<String> getSupportedActions() {
-        return Arrays.asList(RefreshAction.ID);
-    }
-
-    public boolean triggerAction(JTree tree, String action) throws Exception {
-        return super.triggerAction(tree, action);
-    }
-
-    @Override
-    public String getActionCaption(AbstractBrowserActionItem action) {
-        return action.getDefaultCaption();
-    }
-
-    @Override
-    public Icon getActionIcon(AbstractBrowserActionItem action) {
-        return null;
-    }
-
-    @Override
-    public String getActionDescription(AbstractBrowserActionItem action) {
-        return null;
-    }
-
-	public XBayaWorkflowExperiments getExperiments() {
-		return experiments;
-	}
-
-	public void setExperiments(XBayaWorkflowExperiments experiments) {
-		this.experiments = experiments;
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNode.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNode.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNode.java
deleted file mode 100644
index 1d38b80..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNode.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.registrybrowser.nodes;
-
-import java.awt.*;
-import java.awt.datatransfer.StringSelection;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.swing.Icon;
-import javax.swing.JTree;
-import javax.swing.tree.TreeNode;
-
-import org.apache.airavata.xbaya.model.registrybrowser.XBayaWorkflow;
-import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
-import org.apache.airavata.xbaya.ui.actions.registry.browser.CopyAction;
-
-public class XBayaWorkflowNode extends AbstractAiravataTreeNode {
-    private XBayaWorkflow xbayaWorkflow;
-
-    public XBayaWorkflowNode(XBayaWorkflow xbayaWorkflow, TreeNode parent) {
-        super(parent);
-        setXbayaWorkflow(xbayaWorkflow);
-    }
-
-    @Override
-    protected List<TreeNode> getChildren() {
-        return getTreeNodeList(getXbayaWorkflow().getWorkflowServices().toArray(),this);
-    }
-
-    @Override
-    public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-    	String caption=getXbayaWorkflow().getWorkflowId();
-    	if (getXbayaWorkflow().getWorkflowName()!=null){
-    		caption=getXbayaWorkflow().getWorkflowName()+" : "+caption;
-    	}
-        return caption;
-    }
-
-    @Override
-    public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-        return JCRBrowserIcons.WORKFLOW_ICON;
-    }
-
-    public XBayaWorkflow getXbayaWorkflow() {
-        return xbayaWorkflow;
-    }
-
-    public void setXbayaWorkflow(XBayaWorkflow xbayaWorkflow) {
-        this.xbayaWorkflow = xbayaWorkflow;
-    }
-
-    @Override
-    public List<String> getSupportedActions() {
-        return Arrays.asList(CopyAction.ID);
-    }
-
-    public boolean triggerAction(JTree tree, String action) throws Exception {
-        if (action.equals(CopyAction.ID)) {
-            Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(getWorkflowInfo()), null);
-        }
-        return super.triggerAction(tree, action);
-    }
-
-    private String getWorkflowInfo (){
-        String workflowName = getXbayaWorkflow().getWorkflowName();
-        String workflowId = getXbayaWorkflow().getWorkflowId();
-        return "[Worklfow Name = " + workflowName + ", Workflow Instance ID = " + workflowId + "]";
-    }
-
-    @Override
-    public String getActionCaption(AbstractBrowserActionItem action) {
-        if (action.getID().equals(CopyAction.ID)) {
-            return "Copy Workflow Info to clipboard";
-        }
-        return action.getDefaultCaption();
-    }
-
-    @Override
-    public Icon getActionIcon(AbstractBrowserActionItem action) {
-        return null;
-    }
-
-    @Override
-    public String getActionDescription(AbstractBrowserActionItem action) {
-        return null;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNodeElementNode.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNodeElementNode.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNodeElementNode.java
deleted file mode 100644
index 5cf32de..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowNodeElementNode.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.registrybrowser.nodes;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.swing.Icon;
-import javax.swing.JTree;
-import javax.swing.tree.TreeNode;
-
-import org.apache.airavata.xbaya.model.registrybrowser.ServiceParameters;
-import org.apache.airavata.xbaya.model.registrybrowser.XBayaWorkflowNodeElement;
-import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
-
-public class XBayaWorkflowNodeElementNode extends AbstractAiravataTreeNode {
-    private XBayaWorkflowNodeElement xbayaWorkflowService;
-
-    public XBayaWorkflowNodeElementNode(XBayaWorkflowNodeElement xbayaWorkflowNodeElement, TreeNode parent) {
-        super(parent);
-        setXbayaWorkflowNodeElement(xbayaWorkflowNodeElement);
-    }
-
-    @Override
-    protected List<TreeNode> getChildren() {
-		List<ServiceParameters> parameterTypeList=new ArrayList<ServiceParameters>();
-		if (getXbayaWorkflowNodeElement().getInputParameters()!=null && getXbayaWorkflowNodeElement().getInputParameters().getParameters().size()>0){
-			parameterTypeList.add(getXbayaWorkflowNodeElement().getInputParameters());
-		}
-		if (getXbayaWorkflowNodeElement().getOutputParameters()!=null && getXbayaWorkflowNodeElement().getOutputParameters().getParameters().size()>0){
-			parameterTypeList.add(getXbayaWorkflowNodeElement().getOutputParameters());
-		}
-		return getTreeNodeList(parameterTypeList.toArray(), this);
-    }
-
-    @Override
-    public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-        String type = getXbayaWorkflowNodeElement().getNodeData().getType().toString();
-//        if (selected) {
-//			type = " <font color=\"#D3D3D3\">Service call</font>";
-//		}
-		return wrapAsHtml(getXbayaWorkflowNodeElement().getNodeId()," [", type, "]");
-    }
-
-    @Override
-    public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-        return JCRBrowserIcons.WORKFLOW_SERVICE_ICON;
-    }
-
-    @Override
-    public List<String> getSupportedActions() {
-        return Arrays.asList();
-    }
-
-    public boolean triggerAction(JTree tree, String action) throws Exception {
-        return super.triggerAction(tree, action);
-    }
-
-    @Override
-    public String getActionCaption(AbstractBrowserActionItem action) {
-        return action.getDefaultCaption();
-    }
-
-    @Override
-    public Icon getActionIcon(AbstractBrowserActionItem action) {
-        return null;
-    }
-
-    @Override
-    public String getActionDescription(AbstractBrowserActionItem action) {
-        return null;
-    }
-
-	public XBayaWorkflowNodeElement getXbayaWorkflowNodeElement() {
-		return xbayaWorkflowService;
-	}
-
-	public void setXbayaWorkflowNodeElement(XBayaWorkflowNodeElement xbayaWorkflowNodeElement) {
-		this.xbayaWorkflowService = xbayaWorkflowNodeElement;
-	}
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplateNode.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplateNode.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplateNode.java
deleted file mode 100644
index 0edc847..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplateNode.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.registrybrowser.nodes;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.jcr.PathNotFoundException;
-import javax.swing.Icon;
-import javax.swing.JTree;
-import javax.swing.tree.TreeNode;
-
-import org.apache.airavata.client.api.exception.AiravataAPIInvocationException;
-import org.apache.airavata.registry.api.exception.RegistryException;
-import org.apache.airavata.registry.api.exception.ServiceDescriptionRetrieveException;
-import org.apache.airavata.workflow.model.wf.Workflow;
-import org.apache.airavata.xbaya.model.registrybrowser.XBayaWorkflowTemplate;
-import org.apache.airavata.xbaya.registry.RegistryAccesser;
-import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
-import org.apache.airavata.xbaya.ui.actions.registry.browser.DeleteAction;
-import org.apache.airavata.xbaya.ui.actions.registry.browser.ImportAction;
-import org.apache.airavata.xbaya.ui.graph.GraphCanvas;
-
-public class XBayaWorkflowTemplateNode extends AbstractAiravataTreeNode {
-    private XBayaWorkflowTemplate xbayaWorkflow;
-
-    public XBayaWorkflowTemplateNode(XBayaWorkflowTemplate xbayaWorkflow, TreeNode parent) {
-        super(parent);
-        setXbayaWorkflow(xbayaWorkflow);
-    }
-
-    @Override
-    protected List<TreeNode> getChildren() {
-        return emptyList();
-    }
-
-    @Override
-    public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-        return getXbayaWorkflow().getWorkflowName();
-    }
-
-    @Override
-    public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-        return JCRBrowserIcons.WORKFLOW_TEMPLATE_ICON;
-    }
-
-    public XBayaWorkflowTemplate getXbayaWorkflow() {
-        return xbayaWorkflow;
-    }
-
-    public void setXbayaWorkflow(XBayaWorkflowTemplate xbayaWorkflow) {
-        this.xbayaWorkflow = xbayaWorkflow;
-    }
-
-    @Override
-    public List<String> getSupportedActions() {
-        return Arrays.asList(ImportAction.ID,DeleteAction.ID);
-    }
-
-    public boolean triggerAction(JTree tree, String action) throws Exception {
-        if (action.equals(DeleteAction.ID)) {
-            deleteHostDescription(tree);
-            return true;
-        } else if (action.equals(ImportAction.ID)) {
-        	Workflow workflow = new RegistryAccesser(getXBayaEngine()).getWorkflow(getXbayaWorkflow().getWorkflowName());
-            GraphCanvas newGraphCanvas = getXBayaEngine().getGUI().newGraphCanvas(true);
-            newGraphCanvas.setWorkflow(workflow);
-            getXBayaEngine().getGUI().getGraphCanvas().setWorkflowFile(null);
-            return true;
-        }
-        return super.triggerAction(tree, action);
-    }
-
-    private void deleteHostDescription(JTree tree) throws PathNotFoundException, ServiceDescriptionRetrieveException {
-        if (askQuestion("XBaya Workflow", "Are you sure that you want to remove the workflow \""
-                + getXbayaWorkflow().getWorkflowName() + "\"?")) {
-            try {
-				getRegistry().getWorkflowManager().removeWorkflow(getXbayaWorkflow().getWorkflowName());
-				((AbstractAiravataTreeNode) getParent()).refresh();
-				reloadTreeNode(tree, getParent());
-			} catch (AiravataAPIInvocationException e) {
-				e.printStackTrace();
-			}
-        }
-    }
-
-    @Override
-    public String getActionCaption(AbstractBrowserActionItem action) {
-        if (action.getID().equals(DeleteAction.ID)) {
-            return "Remove";
-        } else if (action.getID().equals(ImportAction.ID)) {
-            return "Import";
-        }
-        return action.getDefaultCaption();
-    }
-
-    @Override
-    public Icon getActionIcon(AbstractBrowserActionItem action) {
-        return null;
-    }
-
-    @Override
-    public String getActionDescription(AbstractBrowserActionItem action) {
-        return null;
-    }
-    
-    @Override
-    public String getDefaultAction() {
-    	return ImportAction.ID;
-    }
-}

http://git-wip-us.apache.org/repos/asf/airavata/blob/3e6c815a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplatesNode.java
----------------------------------------------------------------------
diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplatesNode.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplatesNode.java
deleted file mode 100644
index f3b0c43..0000000
--- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/registrybrowser/nodes/XBayaWorkflowTemplatesNode.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-package org.apache.airavata.xbaya.registrybrowser.nodes;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.swing.Icon;
-import javax.swing.JOptionPane;
-import javax.swing.JTree;
-import javax.swing.tree.TreeNode;
-
-import org.apache.airavata.xbaya.model.registrybrowser.XBayaWorkflowTemplates;
-import org.apache.airavata.xbaya.ui.actions.AbstractBrowserActionItem;
-import org.apache.airavata.xbaya.ui.actions.registry.browser.AddAction;
-import org.apache.airavata.xbaya.ui.actions.registry.browser.RefreshAction;
-
-public class XBayaWorkflowTemplatesNode extends AbstractAiravataTreeNode {
-    private XBayaWorkflowTemplates xbayaWorkflows;
-
-    public XBayaWorkflowTemplatesNode(XBayaWorkflowTemplates xbayaWorkflows, TreeNode parent) {
-        super(parent);
-        setXbayaWorkflows(xbayaWorkflows);
-    }
-
-    @Override
-    protected List<TreeNode> getChildren() {
-        return getTreeNodeList(getXbayaWorkflows().getWorkflows().toArray(), this);
-    }
-
-    @Override
-    public String getCaption(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-        return "Workflow Templates";
-    }
-
-    @Override
-    public Icon getIcon(boolean selected, boolean expanded, boolean leaf, boolean hasFocus) {
-        return JCRBrowserIcons.WORKFLOW_TEMPLATES_ICON;
-    }
-
-    public XBayaWorkflowTemplates getXbayaWorkflows() {
-        return xbayaWorkflows;
-    }
-
-    public void setXbayaWorkflows(XBayaWorkflowTemplates xbayaWorkflows) {
-        this.xbayaWorkflows = xbayaWorkflows;
-    }
-
-    @Override
-    public List<String> getSupportedActions() {
-        return Arrays.asList(RefreshAction.ID);
-    }
-
-    public boolean triggerAction(JTree tree, String action) throws Exception {
-        if (action.equals(AddAction.ID)) {
-            JOptionPane.showMessageDialog(null, "TODO");
-            // TODO
-            return true;
-        }
-        return super.triggerAction(tree, action);
-    }
-
-    @Override
-    public String getActionCaption(AbstractBrowserActionItem action) {
-        if (action.getID().equals(AddAction.ID)) {
-            return "New workflow...";
-        }
-        return action.getDefaultCaption();
-    }
-
-    @Override
-    public Icon getActionIcon(AbstractBrowserActionItem action) {
-        return null;
-    }
-
-    @Override
-    public String getActionDescription(AbstractBrowserActionItem action) {
-        return null;
-    }
-}