diff --git a/src/org/gcube/vremanagement/vremodeler/db/IStoDBUtil.java b/src/org/gcube/vremanagement/vremodeler/db/IStoDBUtil.java index cfa6a40..d3245ec 100644 --- a/src/org/gcube/vremanagement/vremodeler/db/IStoDBUtil.java +++ b/src/org/gcube/vremanagement/vremodeler/db/IStoDBUtil.java @@ -131,6 +131,7 @@ public class IStoDBUtil { row= new ArrayList(2); row.add(gen.getID()); row.add(gen.getType()); + values.add(row); } try{ diff --git a/src/org/gcube/vremanagement/vremodeler/impl/thread/DeployVRE.java b/src/org/gcube/vremanagement/vremodeler/impl/thread/DeployVRE.java index bd5ed10..4290070 100644 --- a/src/org/gcube/vremanagement/vremodeler/impl/thread/DeployVRE.java +++ b/src/org/gcube/vremanagement/vremodeler/impl/thread/DeployVRE.java @@ -306,6 +306,7 @@ public class DeployVRE extends Thread{ resItem= new ResourceItem(); resItem.setID(neededRes.getString(1)); resItem.setType(neededRes.getString(2)); + logger.debug("Needed GenericResources:"+ resItem.getID()); resItemList.add(resItem); } }catch(SQLException sqle){ diff --git a/src/org/gcube/vremanagement/vremodeler/portallayout/LayoutCreation.java b/src/org/gcube/vremanagement/vremodeler/portallayout/LayoutCreation.java index 0f2d818..2dca0ab 100644 --- a/src/org/gcube/vremanagement/vremodeler/portallayout/LayoutCreation.java +++ b/src/org/gcube/vremanagement/vremodeler/portallayout/LayoutCreation.java @@ -66,7 +66,9 @@ public class LayoutCreation { Element layoutCreationTab= XMLUtil.createTextElement(doc, "tab", null, new Couple("align", "left"), new Couple("can-modify", "false"), new Couple("label", ""), new Couple("order", "50"), new Couple("outline", "true"), new Couple("required-role", "VRE-Manager"), new Couple("style", ""), new Couple("visible", "true"), new Couple("width", "")); Element layoutCreationTitle= XMLUtil.createTextElement(doc, "title", "Layout Creator", new Couple("lang", "en")); - + + Element layoutCreationTable= XMLUtil.createTextElement(doc, "table", null,new Couple("can-modify", "false"), new Couple("label", ""), new Couple("required-role", "") ,new Couple("style", ""),new Couple("visible", "true"),new Couple("width", "") ); + Element layoutCreationRow =XMLUtil.createTextElement(doc, "row", null,new Couple("can-modify", "false"), new Couple("label", ""), new Couple("required-role", "") ,new Couple("style", ""),new Couple("visible", "true"),new Couple("width", "") ); Element layoutCreationColumn =XMLUtil.createTextElement(doc, "column", null,new Couple("can-modify", "false"), new Couple("label", ""), new Couple("required-role", "") ,new Couple("style", ""),new Couple("visible", "true"),new Couple("width", "") ); @@ -78,14 +80,17 @@ public class LayoutCreation { layoutCreationframe.appendChild(layoutCreationPortlet); layoutCreationColumn.appendChild(layoutCreationframe); layoutCreationRow.appendChild(layoutCreationColumn); - layoutCreationTitle.appendChild(layoutCreationRow); layoutCreationTab.appendChild(layoutCreationTitle); + layoutCreationTable.appendChild(layoutCreationRow); + layoutCreationTab.appendChild(layoutCreationTable); //InformationSpaceEditorPortlet Element informationSpaceTab= XMLUtil.createTextElement(doc, "tab", null, new Couple("align", "left"), new Couple("can-modify", "false"), new Couple("label", ""), new Couple("order", "50"), new Couple("outline", "true"), new Couple("required-role", "VRE-Manager"), new Couple("style", ""), new Couple("visible", "true"), new Couple("width", "")); - Element informationSpaceTitle= XMLUtil.createTextElement(doc, "title", "Layout Creator", new Couple("lang", "en")); - + Element informationSpaceTitle= XMLUtil.createTextElement(doc, "title", "VRE InformationSpace", new Couple("lang", "en")); + + Element informationSpaceTable= XMLUtil.createTextElement(doc, "table", null,new Couple("can-modify", "false"), new Couple("label", ""), new Couple("required-role", "") ,new Couple("style", ""),new Couple("visible", "true"),new Couple("width", "") ); + Element informationSpaceRow =XMLUtil.createTextElement(doc, "row", null,new Couple("can-modify", "false"), new Couple("label", ""), new Couple("required-role", "") ,new Couple("style", ""),new Couple("visible", "true"),new Couple("width", "") ); Element informationSpaceColumn =XMLUtil.createTextElement(doc, "column", null,new Couple("can-modify", "false"), new Couple("label", ""), new Couple("required-role", "") ,new Couple("style", ""),new Couple("visible", "true"),new Couple("width", "") ); @@ -97,16 +102,16 @@ public class LayoutCreation { informationSpaceFrame.appendChild(informationSpacePortlet); informationSpaceColumn.appendChild(informationSpaceFrame); informationSpaceRow.appendChild(informationSpaceColumn); - informationSpaceTitle.appendChild(informationSpaceRow); informationSpaceTab.appendChild(informationSpaceTitle); - + informationSpaceTable.appendChild(informationSpaceRow); + informationSpaceTab.appendChild(informationSpaceTable); subRoot.appendChild(layoutCreationTab); subRoot.appendChild(informationSpaceTab); - - title.appendChild(subRoot); + tab.appendChild(title); + tab.appendChild(subRoot); root.appendChild(tab); return root; } catch (Exception e) { diff --git a/src/org/gcube/vremanagement/vremodeler/portallayout/util/AbstractTree.java b/src/org/gcube/vremanagement/vremodeler/portallayout/util/AbstractTree.java deleted file mode 100644 index afac80e..0000000 --- a/src/org/gcube/vremanagement/vremodeler/portallayout/util/AbstractTree.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.gcube.vremanagement.vremodeler.portallayout.util; - -import java.util.List; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -public abstract class AbstractTree { - - protected List childs; - - protected String nodeName; - - protected String portletClass; - - public abstract boolean isLeaf(); - - public abstract void addPathNode(AbstractTree node); - - public abstract String getPortletClass(); - - public boolean equals(Object o){ - AbstractTree n= (AbstractTree) o; - return (this.nodeName.compareTo(n.getNodeName())==0); - } - - public String getNodeName() { - return this.nodeName; - } - - public abstract Element createElement(Document doc); - -} diff --git a/src/org/gcube/vremanagement/vremodeler/portallayout/util/TreeLeaf.java b/src/org/gcube/vremanagement/vremodeler/portallayout/util/TreeLeaf.java deleted file mode 100644 index 67675a7..0000000 --- a/src/org/gcube/vremanagement/vremodeler/portallayout/util/TreeLeaf.java +++ /dev/null @@ -1,64 +0,0 @@ -package org.gcube.vremanagement.vremodeler.portallayout.util; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -public class TreeLeaf extends AbstractTree{ - - @SuppressWarnings("unused") - private String nodeName; - private String portletClass; - public TreeLeaf(String name, String portletClass){ - this.nodeName= name; - this.portletClass= portletClass; - } - - - public String getPortletClass(){ - return this.portletClass; - } - - public boolean isLeaf(){ - return true; - } - - @Override - public void addPathNode(AbstractTree node) {} - - - public Element createElement(Document doc){ - Element row =doc.createElement("row"); - row.setAttribute("can-modify", "false"); - row.setAttribute("label", ""); - row.setAttribute("required-role", ""); - row.setAttribute("style", ""); - row.setAttribute("visible", "true"); - row.setAttribute("width", ""); - - Element column =doc.createElement("column"); - column.setAttribute("can-modify", "false"); - column.setAttribute("label", ""); - column.setAttribute("required-role", ""); - column.setAttribute("style", ""); - column.setAttribute("visible", "true"); - column.setAttribute("width", ""); - - Element frame = doc.createElement("frame"); - frame.setAttribute("can-modify", "false"); - frame.setAttribute("inner-padding", ""); - frame.setAttribute("label", ""); - frame.setAttribute("outer-padding", ""); - frame.setAttribute("required-role", ""); - frame.setAttribute("style", ""); - frame.setAttribute("transparent", "true"); - frame.setAttribute("visible", "true"); - frame.setAttribute("width", ""); - Element portlet= doc.createElement("portlet-class"); - portlet.setTextContent(this.getPortletClass()); - frame.appendChild(portlet); - column.appendChild(frame); - row.appendChild(column); - return row; - } - -} diff --git a/src/org/gcube/vremanagement/vremodeler/portallayout/util/TreeNode.java b/src/org/gcube/vremanagement/vremodeler/portallayout/util/TreeNode.java deleted file mode 100644 index b06abb6..0000000 --- a/src/org/gcube/vremanagement/vremodeler/portallayout/util/TreeNode.java +++ /dev/null @@ -1,103 +0,0 @@ -package org.gcube.vremanagement.vremodeler.portallayout.util; - -import java.util.ArrayList; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -public class TreeNode extends AbstractTree{ - - - public TreeNode(String name){ - this.nodeName= name; - this.childs= new ArrayList(); - } - - @Override - public void addPathNode(AbstractTree node){ - if (node.isLeaf()){ - this.childs.add(node); - } else { - if (!this.childs.contains(node)) this.childs.add(node); - else this.childs.get((this.childs.indexOf(node))).addPathNode(node.childs.get(0)); - } - } - - @Override - public String getPortletClass() { - return null; - } - - @Override - public boolean isLeaf() { - return false; - } - - @Override - public Element createElement(Document doc) { - if (this.getNodeName().compareTo("Root")!=0){ - Element tab= doc.createElement("tab"); - tab.setAttribute("align", "left"); - tab.setAttribute("can-modify", "false"); - tab.setAttribute("label", ""); - tab.setAttribute("order", "50"); - tab.setAttribute("outline", "true"); - tab.setAttribute("required-role", ""); - tab.setAttribute("style", ""); - tab.setAttribute("visible", "true"); - tab.setAttribute("width", ""); - - Element title= doc.createElement("title"); - title.setAttribute("lang", "en"); - title.setTextContent(this.getNodeName()); - tab.appendChild(title); - - - Element subRoot; - if(this.childs.get(0).isLeaf()){ - subRoot= doc.createElement("table"); - subRoot.setAttribute("can-modify", "false"); - subRoot.setAttribute("label", ""); - subRoot.setAttribute("required-role", ""); - subRoot.setAttribute("style", ""); - subRoot.setAttribute("visible", "true"); - subRoot.setAttribute("width", ""); - for (AbstractTree t:this.childs){ - subRoot.appendChild(t.createElement(doc)); - } - tab.appendChild(subRoot); - }else{ - subRoot= doc.createElement("tabbed-pane"); - subRoot.setAttribute("can-modify", "false"); - subRoot.setAttribute("label", ""); - subRoot.setAttribute("required-role", ""); - subRoot.setAttribute("style", "sub-menu"); - subRoot.setAttribute("visible", "true"); - subRoot.setAttribute("width", ""); - - for (AbstractTree t:this.childs){ - subRoot.appendChild(t.createElement(doc)); - } - tab.appendChild(subRoot);} - return tab; - }else{ - Element root; - root= doc.createElement("tabbed-pane"); - root.setAttribute("can-modify", "false"); - root.setAttribute("label", ""); - root.setAttribute("required-role", ""); - root.setAttribute("style", "menu"); - root.setAttribute("visible", "true"); - root.setAttribute("width", ""); - - for (AbstractTree t:this.childs){ - root.appendChild(t.createElement(doc));} - - return root; - } - - - } - - -}