You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oodt.apache.org by ma...@apache.org on 2015/10/25 23:54:49 UTC
[09/12] oodt git commit: OODT-907 remove collection never queried
OODT-907 remove collection never queried
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/7ebb59a7
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/7ebb59a7
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/7ebb59a7
Branch: refs/heads/master
Commit: 7ebb59a771e18ccea26602cb6788c4bc5b670503
Parents: 0096545
Author: Tom Barber <to...@analytical-labs.com>
Authored: Sun Oct 25 22:37:42 2015 +0000
Committer: Tom Barber <to...@analytical-labs.com>
Committed: Sun Oct 25 22:37:42 2015 +0000
----------------------------------------------------------------------
.../org/apache/oodt/cas/filemgr/browser/model/CasDB.java | 9 ---------
.../cas/workflow/gui/perspective/view/impl/GraphView.java | 4 +---
.../workflow/event/EventToWorkflowViewer.java | 10 +++-------
.../workflow/repository/PackagedWorkflowRepository.java | 3 ---
4 files changed, 4 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oodt/blob/7ebb59a7/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
----------------------------------------------------------------------
diff --git a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
index eb04d97..5d185c0 100644
--- a/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
+++ b/app/fmbrowser/src/main/java/org/apache/oodt/cas/filemgr/browser/model/CasDB.java
@@ -26,7 +26,6 @@ import org.apache.oodt.cas.filemgr.system.XmlRpcFileManagerClient;
import org.apache.oodt.cas.metadata.Metadata;
import java.net.URL;
-import java.util.Collections;
import java.util.Hashtable;
import java.util.Vector;
@@ -88,16 +87,8 @@ public class CasDB {
ProductType pt = client.getProductTypeByName(productTypeName);
Vector<Element> v = (Vector<Element>) client
.getElementsByProductType(pt);
- Vector<String> names = new Vector<String>();
elements = new String[v.size()];
- for (Element aV : v) {
- names.add(aV.getElementName());
- }
-
- Collections.sort(names);
- names.toArray(elements);
-
} catch (Exception e) {
e.printStackTrace();
}
http://git-wip-us.apache.org/repos/asf/oodt/blob/7ebb59a7/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
----------------------------------------------------------------------
diff --git a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
index e576112..210dee3 100644
--- a/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
+++ b/app/weditor/src/main/java/org/apache/oodt/cas/workflow/gui/perspective/view/impl/GraphView.java
@@ -701,14 +701,12 @@ public class GraphView extends DefaultTreeView {
this.directedGraph.addVertex(modelGraph.getModel());
DefaultGraphCell modelCell = this.m_jgAdapter.getVertexCell(modelGraph
.getModel());
- Vector<DefaultGraphCell> group = new Vector<DefaultGraphCell>();
- group.add(modelCell);
+
HashMap<Object, Object> map = new HashMap<Object, Object>();
for (int i = 0; i < modelGraph.getChildren().size(); i++) {
ModelGraph child = modelGraph.getChildren().get(i);
DefaultGraphCell curCell = addGroups(child, nested, state);
- group.add(curCell);
Rectangle2D bounds = (Rectangle2D) ((Map<Object, Object>) nested
.get(curCell)).get("bounds");
if (bounds.getX() < top_x)
http://git-wip-us.apache.org/repos/asf/oodt/blob/7ebb59a7/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/event/EventToWorkflowViewer.java
----------------------------------------------------------------------
diff --git a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/event/EventToWorkflowViewer.java b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/event/EventToWorkflowViewer.java
index 0d917a8..e3203c3 100644
--- a/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/event/EventToWorkflowViewer.java
+++ b/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/workflow/event/EventToWorkflowViewer.java
@@ -18,9 +18,6 @@
package org.apache.oodt.cas.webcomponents.workflow.event;
-import java.util.List;
-import java.util.Vector;
-
import org.apache.oodt.cas.webcomponents.workflow.WorkflowMgrConn;
import org.apache.oodt.cas.workflow.structs.Workflow;
import org.apache.wicket.PageParameters;
@@ -37,6 +34,8 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
+import java.util.List;
+
/**
*
* Describe your class here.
@@ -50,13 +49,10 @@ public class EventToWorkflowViewer extends Panel {
private static final long serialVersionUID = -5120511045763328237L;
private final WorkflowMgrConn wm;
-
- private final List<Workflow> workflows;
-
+
public EventToWorkflowViewer(String id, String workflowUrlStr, final Class<? extends WebPage> viewerPage) {
super(id);
this.wm = new WorkflowMgrConn(workflowUrlStr);
- this.workflows = new Vector<Workflow>();
WebMarkupContainer wTable = new WebMarkupContainer("wtable");
wTable.setVisible(false);
PropertyModel<List<Workflow>> workflowsModel = new PropertyModel<List<Workflow>>(this, "workflows");
http://git-wip-us.apache.org/repos/asf/oodt/blob/7ebb59a7/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
----------------------------------------------------------------------
diff --git a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
index ea6db55..50ed8b5 100644
--- a/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
+++ b/workflow/src/main/java/org/apache/oodt/cas/workflow/repository/PackagedWorkflowRepository.java
@@ -50,8 +50,6 @@ public class PackagedWorkflowRepository implements WorkflowRepository {
private Map<String, ParentChildWorkflow> workflows;
- private List<Graph> graphs;
-
private Map<String, WorkflowCondition> conditions;
private Map<String, WorkflowTask> tasks;
@@ -367,7 +365,6 @@ public class PackagedWorkflowRepository implements WorkflowRepository {
this.conditions = new HashMap<String, WorkflowCondition>();
this.eventWorkflowMap = new HashMap<String, List<ParentChildWorkflow>>();
this.globalConfGroups = new HashMap<String, Metadata>();
- this.graphs = new Vector<Graph>();
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
DocumentBuilder parser;