Changeset 847

Timestamp:

Mar 19, 2010, 5:51:31 PM (14 years ago)

Author:

tobias

Message:

displays key value pairs as part of the tree

Location:

vanHelsing/trunk/gui/src/de/dass_it/vanhelsing/gui

Files:

• Client.java (modified) (1 diff)
• ConfigurationBean.java (modified) (3 diffs)
• TreeNavigation.java (modified) (2 diffs)
• items/ClientItem.java (modified) (2 diffs)
• items/DirectorItem.java (modified) (1 diff)
• items/JobItem.java (modified) (2 diffs)

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

@@ -42 +42 @@
                         
                 } catch(Exception e){
-                        System.err.println("getSimpleResource: " + e.toString());
+                        System.err.println("getSR:" + grt.getResId() + ":" + e.toString());
                 }
                 return new SimpleResource(new ResourceInfo(), new ResourceAttributeType[0]);

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

@@ -20 +20 @@
                 DefaultMutableTreeNode root = new DefaultMutableTreeNode();
                 DefaultMutableTreeNode header;
+                DefaultMutableTreeNode leaf;
                 String type;
                 ListResourcesType lrt;
+                GetResourceType grt;
                 DefaultMutableTreeNode myNode;
                 ResourceInfo[] ri;
+                SimpleResource sr;
+                
                 Client c = new Client();
-                String[] nodes = {"Director", "Storage", "Catalog", "Autochanger", "Client", "FileSet", "FDClient", "Schedule",
-                                        "SDStorage", "Console", "Catalog", "SDDevice", "Job", "JobDefs", "Messages", "Pool"};
+                //String[] nodes = {"Director", "Storage", "Catalog", "Autochanger", "Client", "FileSet", "FDClient", "Schedule", "SDStorage", "Console", "Catalog", "SDDevice", "Job", "JobDefs", "Messages", "Pool"};
+                String[] nodes = {"Client"};
                 setTree(super.createTree(root, nodes, "Configuration"));
 
@@ -39 +43 @@
                         if (ri == null || ri.length == 0) continue;
                         for (int j = 0; j < ri.length; j++){
-                                myNode = null;
+                                //myNode = null;
                                 myNode = addNode(header, type, ri[j]);
                                 if (myNode != null){
@@ -46 +50 @@
                         }
                 }
+                for (int i = 0; i < tree.getChildCount(root); i++){
+                        header = (DefaultMutableTreeNode)tree.getChild(root, i);
+                        
+                        for (int j = 0; j < tree.getChildCount(header); j++){
+                                leaf = (DefaultMutableTreeNode)tree.getChild(header, j);
+                                type = ((UserObjectItemType)leaf.getUserObject()).getUserObject().getResType();
+                                grt = new GetResourceType();
+                                grt.setDirector("bacula-dir");
+                                grt.setResId(((ItemType)(((UserObjectItemType)leaf.getUserObject()).getUserObject())).getResId());
+                                sr = c.getSimpleResource(grt);
+                                sr.getResourceAttributeType();
+                                for (ResourceAttributeType ra : sr.getResourceAttributeType()){
+                                        myNode = addNode(leaf, type, ra);
+                                        if (myNode != null){
+                                                leaf.add(myNode);
+                                        }
+                                }
+                        }
+                }
+                
+
         }
         

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

@@ -75 +75 @@
                         System.err.println("Class " + type2 + " lacks a no-argument constructor");
                 } catch (Exception e){
-                        System.err.println(e.toString());
+                        System.err.println("addHeader: " + e.toString());
                 }
                 
@@ -133 +133 @@
                         System.err.println("Class " + type2 + " lacks a no-argument constructor");
                 } catch (Exception e){
-                        System.err.println(e.toString());
+                        System.err.println("RI: " + e.toString());
                 }
                 
                 return null;
         }
-        
+        public DefaultMutableTreeNode addNode(DefaultMutableTreeNode parent, String type, ResourceAttributeType ra){
+                DefaultMutableTreeNode node = new DefaultMutableTreeNode();
+                Class subClass;
+                Class myClass;
+                Method[] raMethods;
+                Method[] methods;
+                Object o;
+                UserObjectItemType userObject = new UserObjectItemType(node);
+                String type2 = "de.dass_it.vanhelsing.gui.items." + type + "Item";
+                String key = null, value = null;
+                try {
+                        subClass = Class.forName(type2);
+                        o = subClass.newInstance();
+                        UserObjectItem item = (UserObjectItem) o;
+                        item.setResType(type);
+                        myClass = item.getClass().asSubclass(subClass);         
+                        methods = myClass.getMethods();
+                        Method m;
+                        Class[] args = new Class[1];
+                        args[0] = String.class;
+                        /*for (Method m : methods){
+                                if(m.getName().contains("set" + p)){
+                                        m.invoke(item, title);
+                                }
+                        }*/
+                        for (Method n : ra.getClass().getDeclaredMethods()){
+                                if (n.getName().equals("getKey")) {
+                                        key = (String)(n.invoke(ra, (Object[])null));
+                                }
+                                if (n.getName().equals("getValue")){
+                                        value = (String)(n.invoke(ra, (Object[])null));
+                                        
+                                }
+
+                        }
+                        if(!(key.isEmpty() && value.isEmpty())){
+                                key = key.replaceAll(" ", "");
+                                key = key.replaceFirst(new Character(key.charAt(0)).toString(),
+                                                new Character(Character.toUpperCase(key.charAt(0))).toString());
+                                m = myClass.getMethod(("set"+key), args);
+                                m.invoke(item, value);
+                                ((ItemType)o).setValue(key + ": " + value);
+
+                        }
+                                        
+                                
+                        
+                                
+                        
+                        //Value-Wert aus Key: Value zusammenbauen 
+                        
+                        //ItemObjekt erzeugen und an das UserObjekt referenzieren
+                        userObject.setUserObjectItem((UserObjectItem)o);
+                        //Eine Referenz auf das UserObjekt wird an das Nodeobjekt übergeben
+                        node.setUserObject(userObject);
+                        //System.out.println(((ItemType)((UserObjectItem)(node.getUserObject()))).getResId());
+                        return node;
+                } catch (ClassNotFoundException e1){
+                        System.err.println("Itemclass "+ type2 +" must be in the classpath");
+                } catch (InstantiationException e2){
+                        System.err.println("Class "+type2+" must be a concrete class, not an interface or an abstract class");
+                } catch (IllegalAccessException e3){
+                        System.err.println("Class " + type2 + " lacks a no-argument constructor");
+                } catch (Exception e){
+                        System.err.println("Leaf: " + e.toString());
+                }
+                
+                return null;
+        }       
 }

vanHelsing/trunk/gui/src/de/dass_it/vanhelsing/gui/items/ClientItem.java

@@ -4 +4 @@
         private String name;
         private String address;
-        private String fdPort;
+        private String FDPort;
         private String catalog;
         private String password;
@@ -31 +31 @@
         }
 
-        public String getFdPort() {
-                return fdPort;
+        public String getFDPort() {
+                return FDPort;
         }
 
-        public void setFdPort(String fdPort) {
-                this.fdPort = fdPort;
+        public void setFDPort(String fdPort) {
+                this.FDPort = fdPort;
         }
 

vanHelsing/trunk/gui/src/de/dass_it/vanhelsing/gui/items/DirectorItem.java

@@ -38 +38 @@
                 return name;
         }
-         public String getDescription() {
+        public String getDescription() {
                         return description;
                 }
 
-                public void setDescription(String description) {
+        public void setDescription(String description) {
                         this.description = description;
-                }
+        }
 
                 public String getPassword() {

vanHelsing/trunk/gui/src/de/dass_it/vanhelsing/gui/items/JobItem.java

@@ -3 +3 @@
         private String name;
         private String enabled;
+        private String description;
         private String type;
         private String level;
@@ -79 +80 @@
                 this.enabled = enabled;
         }
+        public void setDescription(String description) {
+                this.description = description;
+        }
+        public String getDescription() {
+                return description;
+        }
         public String getType() {
                 return type;