OODT-917 replace hashtable with its modern equivilant
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/fb45ef1d Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/fb45ef1d Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/fb45ef1d Branch: refs/heads/master Commit: fb45ef1d228de52d8d30c8f40f1532a498414672 Parents: e43e8f0 Author: Tom Barber <[email protected]> Authored: Tue Nov 3 00:23:00 2015 +0000 Committer: Tom Barber <[email protected]> Committed: Tue Nov 3 00:23:00 2015 +0000 ---------------------------------------------------------------------- .../filemgr/browser/view/panels/TablePane.java | 2 +- .../cas/filemgr/system/XmlRpcFileManager.java | 18 +++++++++--------- .../workflow/system/XmlRpcWorkflowManager.java | 10 +++++----- .../system/XmlRpcWorkflowManagerClient.java | 6 +++--- .../system/MockXmlRpcWorkflowManagerClient.java | 6 +++--- 5 files changed, 21 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/fb45ef1d/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/TablePane.java ---------------------------------------------------------------------- diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/TablePane.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/TablePane.java index 3c06a60..1624b42 100644 --- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/TablePane.java +++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/view/panels/TablePane.java @@ -28,7 +28,7 @@ import javax.swing.border.LineBorder; public class TablePane extends JPanel{ - public Vector<Integer> hiddenCols; + public List<Integer> hiddenCols; public HeaderRow header; private TableListener listener; http://git-wip-us.apache.org/repos/asf/oodt/blob/fb45ef1d/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java ---------------------------------------------------------------------- diff --git a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java index 992f420..41ebc25 100644 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java @@ -178,7 +178,7 @@ public class XmlRpcFileManager { } } - public Vector<Map<String, Object>> getCurrentFileTransfers() { + public List<Map<String, Object>> getCurrentFileTransfers() { List<FileTransferStatus> currentTransfers = transferStatusTracker.getCurrentFileTransfers(); if (currentTransfers != null && currentTransfers.size() > 0) { @@ -359,7 +359,7 @@ public class XmlRpcFileManager { return numProducts; } - public Vector<Map<String, Object>> getTopNProducts(int n) + public List<Map<String, Object>> getTopNProducts(int n) throws CatalogException { List<Product> topNProducts; @@ -375,7 +375,7 @@ public class XmlRpcFileManager { } } - public Vector<Map<String, Object>> getTopNProducts(int n, + public List<Map<String, Object>> getTopNProducts(int n, Map<String, Object> productTypeHash) throws CatalogException { ProductType type = XmlRpcStructFactory @@ -415,7 +415,7 @@ public class XmlRpcFileManager { return this.getReducedMetadata(product, elements).getMap(); } - public Vector<Map<String, Object>> getProductTypes() + public List<Map<String, Object>> getProductTypes() throws RepositoryManagerException { List<ProductType> productTypeList; @@ -432,7 +432,7 @@ public class XmlRpcFileManager { } } - public Vector<Map<String, Object>> getProductReferences( + public List<Map<String, Object>> getProductReferences( Map<String, Object> productHash) throws CatalogException { List<Reference> referenceList; @@ -508,7 +508,7 @@ public class XmlRpcFileManager { } } - public Vector<Map<String, Object>> getProductsByProductType( + public List<Map<String, Object>> getProductsByProductType( Map<String, Object> productTypeHash) throws CatalogException { ProductType type = XmlRpcStructFactory @@ -527,7 +527,7 @@ public class XmlRpcFileManager { } } - public Vector<Map<String, Object>> getElementsByProductType( + public List<Map<String, Object>> getElementsByProductType( Map<String, Object> productTypeHash) throws ValidationLayerException { ProductType type = XmlRpcStructFactory @@ -578,7 +578,7 @@ public class XmlRpcFileManager { } } - public Vector<Map<String, Object>> complexQuery( + public List<Map<String, Object>> complexQuery( Map<String, Object> complexQueryHash) throws CatalogException { try { ComplexQuery complexQuery = XmlRpcStructFactory @@ -639,7 +639,7 @@ public class XmlRpcFileManager { } } - public Vector<Map<String, Object>> query( + public List<Map<String, Object>> query( Map<String, Object> queryHash, Map<String, Object> productTypeHash) throws CatalogException { http://git-wip-us.apache.org/repos/asf/oodt/blob/fb45ef1d/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java index 913d49f..cfd6864 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManager.java @@ -136,7 +136,7 @@ public class XmlRpcWorkflowManager { return inst.getId(); } - public Vector getRegisteredEvents() throws RepositoryException { + public List getRegisteredEvents() throws RepositoryException { List events; Vector eventsVector = new Vector(); @@ -254,7 +254,7 @@ public class XmlRpcWorkflowManager { return met.getMap(); } - public Vector getWorkflowsByEvent(String eventName) + public List getWorkflowsByEvent(String eventName) throws RepositoryException { List workflows; Vector workflowList = new Vector(); @@ -371,7 +371,7 @@ public class XmlRpcWorkflowManager { return engine.getInstanceRepository().getNumWorkflowInstances(); } - public Vector getWorkflowInstancesByStatus(String status) + public List getWorkflowInstancesByStatus(String status) throws EngineException { List workflowInsts; @@ -424,7 +424,7 @@ public class XmlRpcWorkflowManager { return workflowInstances; } - public Vector getWorkflowInstances() throws EngineException { + public List getWorkflowInstances() throws EngineException { List workflowInsts; Vector workflowInstances = new Vector(); @@ -478,7 +478,7 @@ public class XmlRpcWorkflowManager { } } - public Vector getWorkflows() throws RepositoryException { + public List getWorkflows() throws RepositoryException { List workflowList = repo.getWorkflows(); Vector workflows = new Vector(); http://git-wip-us.apache.org/repos/asf/oodt/blob/fb45ef1d/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java index 388a572..20b9529 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/system/XmlRpcWorkflowManagerClient.java @@ -395,7 +395,7 @@ public class XmlRpcWorkflowManagerClient { } - public Vector getWorkflows() throws XmlRpcException, IOException, RepositoryException { + public List getWorkflows() throws XmlRpcException, IOException, RepositoryException { Vector argList = new Vector(); Vector works; Vector workflows; @@ -444,7 +444,7 @@ public class XmlRpcWorkflowManagerClient { return numInsts; } - public Vector getWorkflowInstancesByStatus(String status) throws XmlRpcException, IOException { + public List getWorkflowInstancesByStatus(String status) throws XmlRpcException, IOException { Vector argList = new Vector(); argList.add(status); Vector insts; @@ -468,7 +468,7 @@ public class XmlRpcWorkflowManagerClient { } - public Vector getWorkflowInstances() throws XmlRpcException, IOException { + public List getWorkflowInstances() throws XmlRpcException, IOException { Vector argList = new Vector(); Vector insts; Vector instsUnpacked; http://git-wip-us.apache.org/repos/asf/oodt/blob/fb45ef1d/workflow/src/test/java/org/apache/oodt/cas/workflow/system/MockXmlRpcWorkflowManagerClient.java ---------------------------------------------------------------------- diff --git a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/MockXmlRpcWorkflowManagerClient.java b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/MockXmlRpcWorkflowManagerClient.java index ca37774..ba4193d 100644 --- a/workflow/src/test/java/org/apache/oodt/cas/workflow/system/MockXmlRpcWorkflowManagerClient.java +++ b/workflow/src/test/java/org/apache/oodt/cas/workflow/system/MockXmlRpcWorkflowManagerClient.java @@ -272,7 +272,7 @@ public class MockXmlRpcWorkflowManagerClient extends return workflowRepo.getWorkflowById(workflowId); } - public Vector<Workflow> getWorkflows() throws RepositoryException { + public List<Workflow> getWorkflows() throws RepositoryException { lastMethodCallDetails = new MethodCallDetails( "getWorkflows", Lists.newArrayList()); @@ -293,14 +293,14 @@ public class MockXmlRpcWorkflowManagerClient extends return 1; } - public Vector<WorkflowInstance> getWorkflowInstancesByStatus(String status) { + public List<WorkflowInstance> getWorkflowInstancesByStatus(String status) { lastMethodCallDetails = new MethodCallDetails( "getWorkflowInstancesByStatus", Lists.newArrayList((Object) status)); return new Vector<WorkflowInstance>(); } - public Vector<WorkflowInstance> getWorkflowInstances() { + public List<WorkflowInstance> getWorkflowInstances() { lastMethodCallDetails = new MethodCallDetails( "getWorkflowInstances", Lists.newArrayList());
