Author: chathuri
Date: Tue Jan 29 22:21:25 2013
New Revision: 1440185
URL: http://svn.apache.org/viewvc?rev=1440185&view=rev
Log:
fixing AIRAVATA-750
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ExperimentDataList.java
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/RegistryWindow.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentSelector.java
Modified:
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java?rev=1440185&r1=1440184&r2=1440185&view=diff
==============================================================================
---
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
(original)
+++
airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/ProvenanceResourceClient.java
Tue Jan 29 22:21:25 2013
@@ -998,9 +998,9 @@ public class ProvenanceResourceClient {
}
ExperimentDataList experimentDataList =
response.getEntity(ExperimentDataList.class);
- List<ExperimentData> dataList =
experimentDataList.getExperimentDataList();
+ List<ExperimentDataImpl> dataList =
experimentDataList.getExperimentDataList();
- for (ExperimentData experimentData : dataList) {
+ for (ExperimentDataImpl experimentData : dataList) {
experimentDatas.add(experimentData);
}
return experimentDatas;
@@ -1052,9 +1052,9 @@ public class ProvenanceResourceClient {
}
ExperimentDataList experimentDataList =
response.getEntity(ExperimentDataList.class);
- List<ExperimentData> dataList =
experimentDataList.getExperimentDataList();
+ List<ExperimentDataImpl> dataList =
experimentDataList.getExperimentDataList();
- for (ExperimentData experimentData : dataList) {
+ for (ExperimentDataImpl experimentData : dataList) {
experimentDatas.add(experimentData);
}
return experimentDatas;
@@ -1153,9 +1153,9 @@ public class ProvenanceResourceClient {
}
ExperimentDataList experimentDataList =
response.getEntity(ExperimentDataList.class);
- List<ExperimentData> dataList =
experimentDataList.getExperimentDataList();
+ List<ExperimentDataImpl> dataList =
experimentDataList.getExperimentDataList();
- for (ExperimentData experimentData : dataList) {
+ for (ExperimentDataImpl experimentData : dataList) {
experimentDatas.add(experimentData);
}
return experimentDatas;
Modified:
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ExperimentDataList.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ExperimentDataList.java?rev=1440185&r1=1440184&r2=1440185&view=diff
==============================================================================
---
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ExperimentDataList.java
(original)
+++
airavata/trunk/modules/rest/mappings/src/main/java/org/apache/airavata/rest/mappings/resourcemappings/ExperimentDataList.java
Tue Jan 29 22:21:25 2013
@@ -22,7 +22,6 @@
package org.apache.airavata.rest.mappings.resourcemappings;
import org.apache.airavata.registry.api.impl.ExperimentDataImpl;
-import org.apache.airavata.registry.api.workflow.ExperimentData;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.ArrayList;
@@ -30,16 +29,16 @@ import java.util.List;
@XmlRootElement
public class ExperimentDataList {
- private List<ExperimentData> experimentDataList = new
ArrayList<ExperimentData>();
+ private List<ExperimentDataImpl> experimentDataList = new
ArrayList<ExperimentDataImpl>();
public ExperimentDataList() {
}
- public List<ExperimentData> getExperimentDataList() {
+ public List<ExperimentDataImpl> getExperimentDataList() {
return experimentDataList;
}
- public void setExperimentDataList(List<ExperimentData> experimentDataList)
{
+ public void setExperimentDataList(List<ExperimentDataImpl>
experimentDataList) {
this.experimentDataList = experimentDataList;
}
}
Modified:
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java?rev=1440185&r1=1440184&r2=1440185&view=diff
==============================================================================
---
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
(original)
+++
airavata/trunk/modules/rest/service/src/main/java/org/apache/airavata/services/registry/rest/resources/ProvenanceRegistryResource.java
Tue Jan 29 22:21:25 2013
@@ -22,6 +22,7 @@
package org.apache.airavata.services.registry.rest.resources;
import org.apache.airavata.registry.api.AiravataRegistry2;
+import org.apache.airavata.registry.api.impl.ExperimentDataImpl;
import org.apache.airavata.registry.api.impl.WorkflowExecutionDataImpl;
import org.apache.airavata.registry.api.workflow.*;
import org.apache.airavata.rest.mappings.resourcemappings.ExperimentDataList;
@@ -790,9 +791,9 @@ public class ProvenanceRegistryResource
try {
List<ExperimentData> experimentDataList =
airavataRegistry.getExperimentByUser(username);
ExperimentDataList experimentData = new ExperimentDataList();
- List<ExperimentData> experimentDatas = new
ArrayList<ExperimentData>();
+ List<ExperimentDataImpl> experimentDatas = new
ArrayList<ExperimentDataImpl>();
for (ExperimentData anExperimentDataList : experimentDataList) {
- experimentDatas.add(anExperimentDataList);
+ experimentDatas.add((ExperimentDataImpl)anExperimentDataList);
}
experimentData.setExperimentDataList(experimentDatas);
if (experimentDataList.size() != 0) {
@@ -1277,9 +1278,9 @@ public class ProvenanceRegistryResource
List<ExperimentData> allExperimentMetaInformation =
airavataRegistry.getAllExperimentMetaInformation(user);
ExperimentDataList experimentDataList = new ExperimentDataList();
- List<ExperimentData> experimentDatas = new
ArrayList<ExperimentData>();
+ List<ExperimentDataImpl> experimentDatas = new
ArrayList<ExperimentDataImpl>();
for (ExperimentData experimentData : allExperimentMetaInformation)
{
- experimentDatas.add(experimentData);
+ experimentDatas.add((ExperimentDataImpl)experimentData);
}
experimentDataList.setExperimentDataList(experimentDatas);
if (allExperimentMetaInformation.size() != 0) {
@@ -1317,9 +1318,9 @@ public class ProvenanceRegistryResource
List<ExperimentData> experimentDataList =
airavataRegistry.searchExperiments(user,
experimentNameRegex);
ExperimentDataList experimentData = new ExperimentDataList();
- List<ExperimentData> experimentDatas = new
ArrayList<ExperimentData>();
+ List<ExperimentDataImpl> experimentDatas = new
ArrayList<ExperimentDataImpl>();
for (ExperimentData experimentData1 : experimentDataList) {
- experimentDatas.add(experimentData1);
+ experimentDatas.add((ExperimentDataImpl)experimentData1);
}
experimentData.setExperimentDataList(experimentDatas);
if (experimentDataList.size() != 0) {
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java?rev=1440185&r1=1440184&r2=1440185&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
Tue Jan 29 22:21:25 2013
@@ -113,16 +113,17 @@ public class ComponentRegistryLoader imp
*/
private synchronized void runInThread(ComponentRegistry registry) {
try {
- if (getComponentTreeNodesMap().containsKey(registry.getName())){
-
this.getEngine().getGUI().getComponentSelector().removeComponentTree(getComponentTreeNodesMap().get(registry.getName()));
- getComponentTreeNodesMap().remove(registry.getName());
- }
+
this.getEngine().getGUI().getComponentSelector().removeComponentRegistry(registry.getName());
+// if (getComponentTreeNodesMap().containsKey(registry.getName())){
+//
this.getEngine().getGUI().getComponentSelector().removeComponentTree(getComponentTreeNodesMap().get(registry.getName()));
+// getComponentTreeNodesMap().remove(registry.getName());
+// }
componentTree = ComponentController.getComponentTree(registry);
if (this.canceled) {
return;
}
this.getEngine().getGUI().getComponentSelector().addComponentTree(componentTree);
- getComponentTreeNodesMap().put(registry.getName(),componentTree);
+// getComponentTreeNodesMap().put(registry.getName(),componentTree);
this.loadingDialog.hide();
} catch (ComponentRegistryException e) {
if (this.canceled) {
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/RegistryWindow.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/RegistryWindow.java?rev=1440185&r1=1440184&r2=1440185&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/RegistryWindow.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/RegistryWindow.java
Tue Jan 29 22:21:25 2013
@@ -133,7 +133,6 @@ public class RegistryWindow {
configuration.setRegigstryUserName(userName);
configuration.setRegistryPassphrase(password);
configuration.setRegistryURL(url);
- configuration.setAiravataAPI(airavataAPI);
configuration.setDefaultGateway(gateway);
engine.updateXBayaConfigurationServiceURLs();
hide();
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentSelector.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentSelector.java?rev=1440185&r1=1440184&r2=1440185&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentSelector.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/widgets/component/ComponentSelector.java
Tue Jan 29 22:21:25 2013
@@ -122,12 +122,24 @@ public class ComponentSelector implement
}
public void removeComponentTree(final ComponentTreeNode componentTree) {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
-
ComponentSelector.this.treeModel.removeNodeFromParent(componentTree);
- }
+ ComponentSelector.this.treeModel.removeNodeFromParent(componentTree);
+// SwingUtilities.invokeLater(new Runnable() {
+// public void run() {
+//
ComponentSelector.this.treeModel.removeNodeFromParent(componentTree);
+// }
+//
+// });
+ }
- });
+ public synchronized void removeComponentRegistry(final String
componentRegistryName) {
+ ComponentTreeNode root = ComponentSelector.this.treeModel.getRoot();
+ ComponentTreeNode[] treeNodes = root.getChildren().toArray(new
ComponentTreeNode[]{});
+ for(ComponentTreeNode treeNode:treeNodes){
+ if
(treeNode.getComponentRegistry().getName().equals(componentRegistryName)){
+ root.remove(treeNode);
+ }
+ }
+ treeModel.reload();
}
/**
