fix static access
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/82400c18 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/82400c18 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/82400c18 Branch: refs/heads/master Commit: 82400c18f2915a9c617544464825d835e15fe6cb Parents: f17f6a2 Author: Tom Barber <[email protected]> Authored: Sun Oct 25 15:42:46 2015 +0000 Committer: Tom Barber <[email protected]> Committed: Sun Oct 25 15:42:46 2015 +0000 ---------------------------------------------------------------------- .../cas/curation/service/CurationService.java | 2 +- .../cas/curation/service/MetadataResource.java | 2 +- .../filemgr/catalog/TestDataSourceCatalog.java | 2 +- .../preconditions/PreCondEvalUtils.java | 4 ++-- .../oodt/cas/product/rss/RSSProductServlet.java | 2 +- .../repository/XMLWorkflowRepository.java | 22 ++++++++++---------- 6 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/82400c18/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java ---------------------------------------------------------------------- diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java index 784078b..dc84ce8 100644 --- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java +++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/CurationService.java @@ -83,7 +83,7 @@ public class CurationService extends HttpServlet implements CuratorConfMetKeys { @Override public void init(ServletConfig conf) throws ServletException { super.init(conf); - this.config = CurationServiceConfig.getInstance(conf); + config = CurationServiceConfig.getInstance(conf); } /** http://git-wip-us.apache.org/repos/asf/oodt/blob/82400c18/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java ---------------------------------------------------------------------- diff --git a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java index a99bab1..7889906 100644 --- a/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java +++ b/curator/services/src/main/java/org/apache/oodt/cas/curation/service/MetadataResource.java @@ -159,7 +159,7 @@ public class MetadataResource extends CurationService { public String getMetExtractorConfigList( @DefaultValue("") @QueryParam("current") String current, @DefaultValue(FORMAT_HTML) @QueryParam("format") String format) { - String[] configIds = this.getFilesInDirectory(this.config + String[] configIds = this.getFilesInDirectory(config .getMetExtrConfUploadPath(), false); if (FORMAT_HTML.equals(format)) { http://git-wip-us.apache.org/repos/asf/oodt/blob/82400c18/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java ---------------------------------------------------------------------- diff --git a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java index a108853..04c5516 100644 --- a/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java +++ b/filemgr/src/test/java/org/apache/oodt/cas/filemgr/catalog/TestDataSourceCatalog.java @@ -264,7 +264,7 @@ public class TestDataSourceCatalog extends TestCase { Product testProd = getTestProduct(); Metadata met = getTestMetadata("test"); - for (int i = 0; i < this.catPageSize; i++) { + for (int i = 0; i < catPageSize; i++) { try { myCat.addProduct(testProd); myCat.addMetadata(met, testProd); http://git-wip-us.apache.org/repos/asf/oodt/blob/82400c18/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java ---------------------------------------------------------------------- diff --git a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java index 9d6ac12..fec6db5 100644 --- a/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java +++ b/metadata/src/main/java/org/apache/oodt/cas/metadata/preconditions/PreCondEvalUtils.java @@ -47,7 +47,7 @@ public class PreCondEvalUtils implements PreConditionOperatorMetKeys { private static ApplicationContext applicationContext; public PreCondEvalUtils(ApplicationContext applicationContext) { - this.applicationContext = applicationContext; + PreCondEvalUtils.applicationContext = applicationContext; } /** @@ -64,7 +64,7 @@ public class PreCondEvalUtils implements PreConditionOperatorMetKeys { */ public boolean eval(List<String> preCondComparatorIds, File product) { for (String preCondComparatorId : preCondComparatorIds) { - if (!((PreConditionComparator<?>) this.applicationContext.getBean( + if (!((PreConditionComparator<?>) applicationContext.getBean( preCondComparatorId, PreConditionComparator.class)) .passes(product)) { LOG.log(Level.INFO, "Failed precondition comparator id " http://git-wip-us.apache.org/repos/asf/oodt/blob/82400c18/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java ---------------------------------------------------------------------- diff --git a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java index 410b1c9..34b5f11 100644 --- a/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java +++ b/webapp/fmprod/src/main/java/org/apache/oodt/cas/product/rss/RSSProductServlet.java @@ -317,7 +317,7 @@ public class RSSProductServlet extends HttpServlet { private void getFileManager(String fileManagerUrl) { try { - this.fm = new XmlRpcFileManagerClient(new URL(fileManagerUrl)); + fm = new XmlRpcFileManagerClient(new URL(fileManagerUrl)); } catch (MalformedURLException e) { LOG.log(Level.SEVERE, "Unable to initialize file manager url in RSS Servlet: [url=" http://git-wip-us.apache.org/repos/asf/oodt/blob/82400c18/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java ---------------------------------------------------------------------- diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java index 8553ef2..7477b91 100644 --- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java +++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/XMLWorkflowRepository.java @@ -265,13 +265,13 @@ public class XMLWorkflowRepository implements WorkflowRepository { // check its conditions if(task.getPreConditions() != null && task.getPreConditions().size() > 0){ for(WorkflowCondition cond: task.getPreConditions()){ - if(!this.conditionMap.containsKey(cond.getConditionId())){ + if(!conditionMap.containsKey(cond.getConditionId())){ throw new RepositoryException("Reference in new task: ["+task.getTaskName()+"] to undefined pre condition ith id: ["+cond.getConditionId()+"]"); } } for(WorkflowCondition cond: task.getPostConditions()){ - if(!this.conditionMap.containsKey(cond.getConditionId())){ + if(!conditionMap.containsKey(cond.getConditionId())){ throw new RepositoryException("Reference in new task: ["+task.getTaskName()+"] to undefined post condition ith id: ["+cond.getConditionId()+"]"); } } @@ -279,7 +279,7 @@ public class XMLWorkflowRepository implements WorkflowRepository { String taskId = task.getTaskId() != null ? task.getTaskId():UUID.randomUUID().toString(); - this.taskMap.put(taskId, task); + taskMap.put(taskId, task); return taskId; } @@ -295,14 +295,14 @@ public class XMLWorkflowRepository implements WorkflowRepository { } for(WorkflowTask task: (List<WorkflowTask>)workflow.getTasks()){ - if(!this.taskMap.containsKey(task.getTaskId())){ + if(!taskMap.containsKey(task.getTaskId())){ throw new RepositoryException("Reference in new workflow: ["+workflow.getName()+"] to undefined task with id: ["+task.getTaskId()+"]"); } // check its conditions if(task.getConditions() != null && task.getConditions().size() > 0){ for(WorkflowCondition cond: (List<WorkflowCondition>)task.getConditions()){ - if(!this.conditionMap.containsKey(cond.getConditionId())){ + if(!conditionMap.containsKey(cond.getConditionId())){ throw new RepositoryException("Reference in new workflow: ["+workflow.getName()+"] to undefined condition ith id: ["+cond.getConditionId()+"]"); } } @@ -315,8 +315,8 @@ public class XMLWorkflowRepository implements WorkflowRepository { workflowId = UUID.randomUUID().toString(); workflow.setId(workflowId); } - this.workflowMap.put(workflowId, workflow); - this.eventMap.put(workflowId, Collections.singletonList(workflow)); + workflowMap.put(workflowId, workflow); + eventMap.put(workflowId, Collections.singletonList(workflow)); return workflowId; } @@ -327,11 +327,11 @@ public class XMLWorkflowRepository implements WorkflowRepository { @Override public List<WorkflowCondition> getConditionsByWorkflowId(String workflowId) throws RepositoryException { - if(!this.workflowMap.containsKey(workflowId)) throw new + if(!workflowMap.containsKey(workflowId)) throw new RepositoryException("Attempt to obtain conditions for a workflow: " + "["+workflowId+"] that does not exist!"); - return ((Workflow)this.workflowMap.get(workflowId)).getConditions(); + return ((Workflow) workflowMap.get(workflowId)).getConditions(); } @@ -340,7 +340,7 @@ public class XMLWorkflowRepository implements WorkflowRepository { */ @Override public WorkflowTask getTaskById(String taskId) throws RepositoryException { - return (WorkflowTask)this.taskMap.get(taskId); + return (WorkflowTask) taskMap.get(taskId); } /** @@ -694,7 +694,7 @@ public class XMLWorkflowRepository implements WorkflowRepository { task.setTaskId(workflowId+"-global-conditions-eval"); task.setTaskName(workflowName+"-global-conditions-eval"); task.setTaskInstanceClassName(NoOpTask.class.getName()); - this.taskMap.put(task.getTaskId(), task); + taskMap.put(task.getTaskId(), task); return task; }
