Changeset 868

Timestamp:

May 3, 2010, 7:12:46 PM (14 years ago)

Author:

tobias

Message:

configurationView moved to new DataTree class.
implemented selectOneMenu on DataTree

Location:

vanHelsing/trunk/gui

Files:

• WebContent/menu.jspx (modified) (5 diffs)
• src/de/dass_it/vanhelsing/gui/BeanUtil.java (modified) (2 diffs)
• src/de/dass_it/vanhelsing/gui/Client.java (modified) (1 diff)
• src/de/dass_it/vanhelsing/gui/ConfigurationBean.java (modified) (21 diffs)
• src/de/dass_it/vanhelsing/gui/DataTree.java (modified) (9 diffs)
• src/de/dass_it/vanhelsing/gui/JobScheduleBean.java (modified) (5 diffs)
• src/de/dass_it/vanhelsing/gui/UserObjectItemFactory.java (modified) (1 diff)
• src/de/dass_it/vanhelsing/gui/ViewBean.java (added)
• src/de/dass_it/vanhelsing/gui/messages_en.properties (modified) (1 diff)

vanHelsing/trunk/gui/WebContent/menu.jspx

@@ -21 +21 @@
         <ice:panelTabSet>
                 <ice:panelTab  label="Configuration">
-                            <ice:panelGroup style="float:top">
-                                <ice:commandButton id="newClient"
-                                        value="create client"
-                                        actionListener="#{configurationBean.newClientButtonListener}" />
-                                        
-                                <ice:commandButton id="newRes" 
-                                    value="create resource" 
-                                    actionListener="#{configurationBean.newResourceButtonListener}">
-                                    </ice:commandButton>
-                                    
-                                        <ice:commandButton id="reloadRes"
-                                                value="reload Tree"
-                                                actionListener="#{configurationBean.reloadResourceButtonListener}" />
-                                        
-                                        <ice:commandButton id="saveRes"
-                                        value="update resource"
-                                        actionListener="#{configurationBean.saveButtonListener}"/>
-                                        
-                                        <ice:commandButton id="deleteRes"
-                                                value="delete resource"
-                                                actionListener="#{configurationBean.deleteResourceButtonListener}" />
-                                </ice:panelGroup>
                 
-                        <ice:panelDivider style="height:600px;width:85%" dividerPosition="30">
+                        <ice:panelDivider style="height:600px;width:95%" dividerPosition="30">
                         <f:facet name="first">
                         <ice:tree id="baum"     
-                                        value="#{configurationBean.tree}" 
+                                        value="#{configurationBean.dataTree.tree}" 
                                         var="item"
                                         hideRootNode = "false"
@@ -61 +39 @@
                                         </f:facet>
                                         <f:facet name="content">
-                                        <ice:panelGroup  styleClass="selectedNode#{item.userObject.userObject.resId eq configurationBean.selectedId} selectedComponent#{item.userObject.selected}"
-                                                        style="display:inline" > 
+                                        <!--<ice:panelGroup  styleClass="selectedNode#{item.userObject.userObject.resId eq configurationBean.selectedId} selectedComponent#{item.userObject.selected}"
+                                                        style="display:inline" > --> 
 
-                                                <ice:commandLink actionListener="#{configurationBean.userObjectItemNodeSelected}">
+                                                <ice:commandLink actionListener="#{configurationBean.renderResource}">
                                                 <f:param name="userObject.resId" value="#{item.userObject.userObject.resId}"/>
-                                                <f:param name="userObject.resName" value="#{item.userObject.userObject.value}" />
-                                                <ice:outputText id="knoten" value="#{item.userObject.userObject.value}"/>
+                                                <f:param name="userObject.resName" value="#{item.userObject.userObject.resName}" />
+                                                <ice:outputText id="knoten" value="#{item.userObject.userObject.resName}"/>
                                                 </ice:commandLink>
-                                        </ice:panelGroup> 
+                                        <!--</ice:panelGroup> -->
                                         </f:facet>
                                 </ice:treeNode>
@@ -76 +54 @@
                         <f:facet name="second">
                         <ice:panelGrid cellpadding="0" cellspacing="3" 
-                                columns="2" rendered="#{configurationBean.selectedObject != null}">
+                                columns="2" rendered="#{configurationBean.selectedObject.viewItemList != null}">
                                 <ice:dataTable
                                         var="item"
-                                         value="#{configurationBean.selectedObject}"
+                                         value="#{configurationBean.selectedObject.viewItemList}"
                                          style="float:left,bottom; width:90%"
                                          >
@@ -86 +64 @@
                                                          <ice:outputText value="Key" />
                                                  </f:facet>
-                                                <ice:outputText style="color:red" rendered="#{item.required eq true}" value="#{item.key}" />
-                                                <ice:outputText style="color:green" rendered="#{item.required eq false}" value="#{item.key}" />
+                                                <ice:outputText rendered="#{item.required eq true}" value="#{item.key}" />
+                                                <ice:outputText style="color:grey" rendered="#{item.required eq false}" value="#{item.key}" />
                                         </ice:column>
                                         <ice:column>
@@ -117 +95 @@
                         </f:facet>
                         </ice:panelDivider>
+                            <ice:panelGroup style="float:top">
+                                <ice:commandButton id="newClient"
+                                        value="create client"
+                                        actionListener="#{configurationBean.newClientButtonListener}" />
+                                        
+                                <ice:commandButton id="newRes" 
+                                    value="create resource" 
+                                    actionListener="#{configurationBean.newResourceButtonListener}">
+                                    </ice:commandButton>
+                                    
+                                        <ice:commandButton id="reloadRes"
+                                                value="reload Tree"
+                                                actionListener="#{configurationBean.reloadResourceButtonListener}" />
+                                        
+                                        <ice:commandButton id="saveRes"
+                                        value="update resource"
+                                        actionListener="#{configurationBean.saveButtonListener}"/>
+                                        
+                                        <ice:commandButton id="deleteRes"
+                                                value="delete resource"
+                                                actionListener="#{configurationBean.deleteResourceButtonListener}" />
+                                </ice:panelGroup>
+                        
                 </ice:panelTab>
          

vanHelsing/trunk/gui/src/de/dass_it/vanhelsing/gui/BeanUtil.java

@@ -58 +58 @@
         public static boolean getRequired(String type, String key) {
                 String s = getFieldProperty(type, key, 2);
+                if (s == null) return false;
                 if (s.equals("true"))
                         return true;
@@ -104 +105 @@
                 key = key.replaceAll(" ", "");
                 String result[] = getProperties((daemon + "." + type + "." + key));
+                if (result[0] == null) return null;
                 if (i == 0) {
                         if (result[1].equals("boolean")) {

vanHelsing/trunk/gui/src/de/dass_it/vanhelsing/gui/Client.java

@@ -88 +88 @@
                         System.err.println("getSR: " + grt.getResId() + " : " + e.toString());
                 }
-                return new SimpleResource(new ResourceInfo(), new ResourceAttributeType[0]);
+                return null;
         }
         /**

vanHelsing/trunk/gui/src/de/dass_it/vanhelsing/gui/ConfigurationBean.java

@@ -4 +4 @@
 import java.util.ArrayList;
 
+import javax.faces.context.FacesContext;
 import javax.faces.event.ActionEvent;
 import javax.faces.event.ValueChangeEvent;
@@ -17 +18 @@
  * List all Bacula configuration components by name.
  */
-public class ConfigurationBean extends TreeNavigation {
-
-        private DefaultTreeModel tree;
-        private ArrayList<ViewItem> selectedObject;
+public class ConfigurationBean implements ViewBean{
+        
+        
+        private DataTree dataTree;
+        private ConcreteUserObjectItem selectedObject;
+        private boolean createResource;
         private String selectedId;
-        private String selectedName;
-        private boolean createResource = false;
 
         public ConfigurationBean() {
@@ -34 +35 @@
          */
         private void init(){
-                DefaultMutableTreeNode root = new DefaultMutableTreeNode();
-                DefaultMutableTreeNode header;
-                DefaultMutableTreeNode leaf;
-                String type;
-                ListResourcesType lrt;
-                GetResourceType grt;
-                DefaultMutableTreeNode myNode;
-                ResourceInfo[] ri;
+                DefaultMutableTreeNode parent;
+                ResourceInfo resItems[];
                 SimpleResource sr;
-
                 Client c = new Client();
-                setTree(super.createTree(root, BeanUtil.getProperty("nodes").split(","), "Configuration"));
-
-                
-                for (int i = 0; i < tree.getChildCount(root); i++) {
-                        header = (DefaultMutableTreeNode) tree.getChild(root, i);
-                        type = ((UserObjectItemType) header.getUserObject())
-                                        .getUserObject().getResType();
-                        lrt = new ListResourcesType();
-                        lrt.setDirector("bacula-dir");
-                        lrt.setResourceType(type);
-                        ri = c.getListResources(lrt);
-                        if (ri == null || ri.length == 0)
-                                continue;
-                        for (int j = 0; j < ri.length; j++) {
-                                myNode = addNode(header, type, ri[j]);
-                                grt = new GetResourceType();
-                                grt.setDirector(lrt.getDirector());
-                                grt.setResId(ri[j].getResId());
-                                sr = c.getSimpleResource(grt);
-                                myNode = addNode(myNode, type, sr.getResourceAttributeType());
-                                if (myNode != null) {
-                                        header.add(myNode);
+                UserObjectItemFactory UOFactory = new UserObjectItemFactory();
+                setDataTree(new DataTree());
+                dataTree.setTree("Configuration");
+                for (String name : BeanUtil.getProperty("nodes").split(",")){
+                        parent = dataTree.createNode(dataTree.getRoot(), 
+                                        UOFactory.createUserObjectItem(
+                                                        c.makeResourceInfo(BeanUtil.getProperty("defaultdirector"), -1, name, name)
+                                        )
+                        );
+                        resItems = c.getListResources(BeanUtil.getProperty("defaultdirector"), name);
+                        if (resItems != null){
+                                for (ResourceInfo rinfo : resItems){
+                                        sr = c.getSimpleResource(rinfo.getDirector(), rinfo.getResId());
+                                        if (sr != null){
+                                                //TODO: discard the SimpleResource ResInfo return value and work with the query object
+                                                dataTree.createNode(parent, 
+                                                                UOFactory.createUserObjectItem(
+                                                                                sr.getResourceAttributeType(), rinfo));
+                                        }
                                 }
                         }
-                } 
-        }
-
+                }
+                dataTree.createKeyValueLists();
+                dataTree.updateUserObjects();
+        }
+        
         /**
          * transfers the selected (by attribute resId) dataobject (resource) into an ArrayList of ViewItems.<br/>
@@ -79 +72 @@
          * @param ae    ActionEvent which contains relevant information about the component tree. the variable is not used.
          */
-        public void userObjectItemNodeSelected(ActionEvent ae) {
+        public void renderResource(ActionEvent ae){
+                DefaultMutableTreeNode node;
+                String id = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("userObject.resId");
+                int numId = new Integer(id);
+                String name = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("userObject.resName");
+                if (numId > 0){
+                        node = dataTree.getNodeById(numId);
+                        selectedObject = (ConcreteUserObjectItem)((UserObjectItemType)(node.getUserObject())).getUserObject();
+                } else {
+                        node = dataTree.getNodeByName(name);
+                        selectedObject = (ConcreteUserObjectItem)((UserObjectItemType)(node.getUserObject())).getUserObject();
+                }
+        }
+        /*public void userObjectItemNodeSelected(ActionEvent ae) {
                 DefaultMutableTreeNode node;
                 UserObjectItem userObject;
-                selectedObject = new ArrayList<ViewItem>();
+                selectedObject.setViewItemList(viewItemList) = new ArrayList<ViewItem>();
                 String Id = BeanUtil.getRequestParameter("userObject.resId");
                 String name = BeanUtil.getRequestParameter("userObject.resName");
@@ -147 +153 @@
                         e.printStackTrace();
                 }
-        }
+        }*/
         /**
          * return an array of nodes of a given resource type
@@ -156 +162 @@
          * @return null         null object there are no nodes of the requested type
          */
-        private DefaultMutableTreeNode[] getChildNodes(DefaultTreeModel tree2, String key) {
+        /*private DefaultMutableTreeNode[] getChildNodes(DefaultTreeModel tree2, String key) {
                 DefaultMutableTreeNode[] dmtn;
                 DefaultMutableTreeNode root = (DefaultMutableTreeNode)tree2.getRoot();
@@ -171 +177 @@
                 }
                 return null;
-        }
+        }*/
         
         /**
@@ -177 +183 @@
          * @param ae
          */
-        public void newClientButtonListener(ActionEvent ae){
+        /*public void newClientButtonListener(ActionEvent ae){
                 String type = "client";
                 ArrayList newResource = new ArrayList<ViewItem>();
@@ -211 +217 @@
                 
                 
-        }
-        
-        public void newResourceButtonListener(ActionEvent ae){
+        }*/
+        
+        /*public void newResourceButtonListener(ActionEvent ae){
                 DefaultMutableTreeNode node;
                 UserObjectItem userObject;
@@ -267 +273 @@
                 }
                 
-        }
+        }*/
         /**
          * **EXPERIMENTAL** returns type of the selected resource.
@@ -274 +280 @@
          * @return viewName     name of the resource type of the selected data tree node        
          */
-        public String newResourceListener(ActionEvent ae){
+        /*public String newResourceListener(ActionEvent ae){
                 if (selectedObject != null && selectedObject.size() > 0){
                         String resType = selectedObject.get(0).getResType();
@@ -281 +287 @@
                 }
                 return "";
-        }
+        }*/
         
         public void userObjectItemOptionSelected(ValueChangeEvent vce){
@@ -296 +302 @@
                 BeanUtil.setInfoMessage(null, "Diese Methode ist noch nicht implementiert.");
         }
-        public void saveClientButtonListener(ActionEvent ae){
+        /*public void saveClientButtonListener(ActionEvent ae){
                 Client c = new Client();
                 String name = "";
@@ -315 +321 @@
                                 );
                 System.err.println(newResId);
-        }
+        }*/
         /**
          * **EXPERIMENTAL** writes the selected resource to the data tree of the web service.
@@ -321 +327 @@
          * @param ae    ActionEvent contains relevant information 
          */
-        public void saveButtonListener(ActionEvent ae) {
+        /*public void saveButtonListener(ActionEvent ae) {
                 if (selectedObject == null){
                         BeanUtil.setInfoMessage(null, "bitte eine Resource zum Ändern auswählen");
@@ -353 +359 @@
                         if (selectedObject.get(0) != null){
                                 selectedObject.get(0).setResId(s2r2.getResId());
-                        }*/
+                        }
                         // TODO: write ResId to selectedObject
                         // selectedObject.get(0).setResId(grt.getResId());
                         // valueChangeEffect.setFired(false);
                 }
-        }
+        }*/
         /**
          * Setter method for the tree attribute
          * @param tree  tree contains the DefaultTreeModel for the data tree
          */
-        public void setTree(DefaultTreeModel tree) {
-                this.tree = tree;
+        public void setDataTree(DataTree dataTree) {
+                this.dataTree = dataTree;
         }
         /**
@@ -370 +376 @@
          * @return tree         tree contains the DefaultTreeModel for the data tree
          */
-        public DefaultTreeModel getTree() {
-                return tree;
+        public DataTree getDataTree() {
+                return dataTree;
+        }
+
+        public void createNodeButtonListener(ActionEvent ae) {
+                // TODO Auto-generated method stub
+                
+        }
+
+        public void deleteNodeButtonListener(ActionEvent ae) {
+                // TODO Auto-generated method stub
+                
+        }
+
+
+        public void readNodeButtonListener(ActionEvent ae) {
+                // TODO Auto-generated method stub
+                
+        }
+
+        public void selectNode(ActionEvent ae) {
+                // TODO Auto-generated method stub
+                
+        }
+
+        public void updateNodeButtonListener(ActionEvent ae) {
+                // TODO Auto-generated method stub
+                
         }
         
@@ -378 +410 @@
          * @return selectedObject       selectedObject contains the data object of the selected leaf node.
          */
-        public ArrayList<ViewItem> getSelectedObject() {
+        public ConcreteUserObjectItem getSelectedObject() {
                 return selectedObject;
         }
@@ -386 +418 @@
          * @param selectedObject        selectedObject contains the data object of the selected leaf node
          */
-        public void setSelectedObject(ArrayList<ViewItem> selectedObject) {
+        public void setSelectedObject(ConcreteUserObjectItem selectedObject) {
                 this.selectedObject = selectedObject;
         }
@@ -396 +428 @@
         public int getSelectedId(){
                 if (selectedObject != null){
-                        if (selectedObject.size() > 0){
-                                return selectedObject.get(0).getResId();
-                        }
-                }
+                                return selectedObject.getResId();
+                        }
                 return -1;
         }
-        public String getSelectedName(){
+        /*public String getSelectedName(){
                 if (selectedObject != null){
                         if (selectedObject.size() > 0){
@@ -409 +439 @@
                 }
                 return "";
-        }
+        }*/
         public void setCreateResource(boolean b){
                 this.createResource = b;

vanHelsing/trunk/gui/src/de/dass_it/vanhelsing/gui/DataTree.java

@@ -1 +1 @@
 package de.dass_it.vanhelsing.gui;
 
+import java.util.ArrayList;
 import java.util.Enumeration;
+import java.util.HashMap;
+
+import javax.faces.model.SelectItem;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
@@ -15 +19 @@
         private DefaultTreeModel tree;
         private DefaultMutableTreeNode root;
+        private HashMap<String, SelectItem[]> keyValueList;
         
         public DataTree() {}
@@ -31 +36 @@
                 obj.setResName(name);
         }
+
         /**
          * creates a tree node as a child to the parent node containing the given UserObectItem
@@ -46 +52 @@
                 return node;
         }
+
         /**
          * replace a tree nodes UserObject
@@ -54 +61 @@
                 ((UserObjectItemType)node.getUserObject()).setUserObject(userObject);
         }
+
         /**
          * retrieves a node by the value of the UserObjects resId
@@ -73 +81 @@
                 return null;
         }
+
         /**
          * retrieves a node by the value of the UserObjects resName
@@ -91 +100 @@
                 return null;
         }
+        
         /**
          * deletes the given node from the data tree
@@ -104 +114 @@
         }
         
+        public void createKeyValueLists(){
+                DefaultMutableTreeNode parent;
+                DefaultMutableTreeNode node;
+                ConcreteUserObjectItem userObject;
+                SelectItem[] selItems;
+                String key;
+                parent = (DefaultMutableTreeNode)tree.getRoot();
+                for (int i = 0; i < parent.getChildCount(); i++){
+                        node = (DefaultMutableTreeNode)parent.getChildAt(i);
+                        selItems = new SelectItem[node.getChildCount()];
+                        for (int j = 0; j < node.getChildCount(); j++){
+                                userObject = (ConcreteUserObjectItem)((DefaultMutableTreeNode)node.getChildAt(j)).getUserObject();
+                                selItems[j] = new SelectItem(userObject.getResName(), userObject.getResName());
+                        }
+                        key = ((ConcreteUserObjectItem)((DefaultMutableTreeNode)node.getChildAt(i)).getUserObject()).getResType();
+                        keyValueList.put(key, selItems);
+                } 
+        }
+        public SelectItem[] getSelectItem(String type){
+                return keyValueList.get(type);
+        }
         public DefaultMutableTreeNode getRoot(){
                 return root;
@@ -116 +147 @@
                 this.tree = tree;
         }
+        public void updateUserObjects(){
+                DefaultMutableTreeNode parent;
+                DefaultMutableTreeNode node;
+                parent = (DefaultMutableTreeNode)tree.getRoot();
+                ArrayList<ViewItem> viList;
+                for(int i = 0; i < parent.getChildCount(); i++){
+                        node = (DefaultMutableTreeNode)parent.getChildAt(i);
+                        for (int j = 0; j < node.getChildCount(); j++){
+                                viList = ((ConcreteUserObjectItem)((UserObjectItemType)node.getUserObject()).getUserObject()).getViewItemList();
+                                for (ViewItem vi : viList){
+                                        if (vi.getRenderer().equals("selectOneMenu")){
+                                                vi.setKeyValueList(keyValueList.get(vi.getResType()));
+                                        }
+                                }
+                        }
+                }
+        }
+
+        
 }

vanHelsing/trunk/gui/src/de/dass_it/vanhelsing/gui/JobScheduleBean.java

@@ -12 +12 @@
  * with a given schedule.
  */
-public class JobScheduleBean  {
+public class JobScheduleBean implements ViewBean {
         private DataTree dataTree;
         private ConcreteUserObjectItem selectedObject;
@@ -52 +52 @@
          * @param ae    ActionEvent parameter as required by JSF. Not used by this method
          */
-        public void createNodeListener(ActionEvent ae){
+        public void createNodeButtonListener(ActionEvent ae){
                 //Methode kann nur mit ausgewählten ParentNode ausgeführt werden
                 DefaultMutableTreeNode parent = dataTree.getNodeByName("horst");
@@ -62 +62 @@
          * @param ae    ActionEvent parameter as required by JSF. Not used by this method
          */
-        public void updateNodeListener(ActionEvent ae){
+        public void updateNodeButtonListener(ActionEvent ae){
                 BeanUtil.setInfoMessage(null, "Die Methode ist noch nicht implementiert");
                 
@@ -70 +70 @@
          * @param ae
          */
-        public void deleteNodeListener(ActionEvent ae){
+        public void deleteNodeButtonListener(ActionEvent ae){
                 DefaultMutableTreeNode node;
                 ae.getComponent().getAttributes();
@@ -100 +100 @@
          * @param ae    ActionEvent parameter as required by JSF. Not used by this method
          */
-        public void reloadTreeListener(ActionEvent ae){
+        public void readNodeButtonListener(ActionEvent ae){
                 init();
         }
         public void selectNode(ActionEvent ae){
                 //BeanUtil.setInfoMessage(null, "Die Methode ist noch nicht implementiert");
+                String id = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("userObject.resId");
+                String name = FacesContext.getCurrentInstance().getExternalContext().getRequestParameterMap().get("userObject.resName");
+                BeanUtil.setInfoMessage(null, ("id: "+id+" name: "+name) );
+                
                 
         }

vanHelsing/trunk/gui/src/de/dass_it/vanhelsing/gui/UserObjectItemFactory.java

@@ -36 +36 @@
                 ArrayList<ViewItem> viewItemList = new ArrayList<ViewItem>();
                 ViewItem vi;
+                String s;
+                boolean b;
                 for (ResourceAttributeType attr : ra){
                         vi = new ViewItem();
-                        vi.setDataType(BeanUtil.getDataType(obj.getResType(), attr.getKey()));
-                        vi.setRendererFlag(BeanUtil.getRenderer(obj.getResType(), attr.getKey()));
-                        vi.setRequired(BeanUtil.getRequired(obj.getResType(), attr.getKey()));
+                        
+                        s = BeanUtil.getDataType(BeanUtil.getAccessType(obj.getResType().toLowerCase()), attr.getKey());
+                        if (s == null){
+                                s = "String";
+                        }
+                        vi.setDataType(s);
+                        
+                        s = BeanUtil.getRenderer(BeanUtil.getAccessType(obj.getResType().toLowerCase()), attr.getKey());
+                        if (s == null){
+                                s = "inputType";
+                        }
+                        vi.setRendererFlag(s);
+                        
+                        b = false;
+                        b = BeanUtil.getRequired(BeanUtil.getAccessType(obj.getResType().toLowerCase()), attr.getKey());
+                        vi.setRequired(b);
+                        
                         vi.setKey(attr.getKey());
                         vi.setKeyValue(attr.getValue());

vanHelsing/trunk/gui/src/de/dass_it/vanhelsing/gui/messages_en.properties

@@ -1 +1 @@
 defaultdirector = bacula-dir
-nodes = Director,Storage,Autochanger,Client,FileSet,FDClient,Schedule,SDStorage,Console,Catalog,SDDevice,Job,JobDefs,Messages,Pool
+nodes = Director,Storage,Client,FileSet,Schedule,Console,Catalog,Job,JobDefs,Messages,Pool
 director.director.name.ref =  0
 director.director.name.type = String