Changeset 857 for vanHelsing/trunk/gui/src/de/dass_it

Timestamp:

Apr 1, 2010, 7:02:55 PM (15 years ago)

Author:

tobias

Message:

type dependent rendering added

Location:

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

Files:

• BeanUtil.java (modified) (2 diffs)
• ConfigurationBean.java (modified) (4 diffs)
• PropertyBundle.java (added)
• Validation.java (deleted)
• ValidationItem.java (deleted)
• ViewItem.java (modified) (3 diffs)
• messages_en.properties (added)

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

@@ -8 +8 @@
 import javax.faces.model.SelectItem;
 import java.util.ResourceBundle;
+import java.util.Locale;
 
 
@@ -24 +25 @@
     
         //Messagebundles
+        public static String getProperty(String key){
+                String s = PropertyBundle.getProperty(key);
+                return s;
+        }
         
-
+        public static String[] getProperties(String key){
+                String[] suffix = {"ref", "type", "required", "def"};
+                String[] bundle = new String[4];
+                for (int i = 0; i < 4; i++) {
+                        bundle[i] = BeanUtil.getProperty(key+"."+suffix[i]);
+                }
+                return bundle;
+        }
+        //getRenderer returns rendererType based on properties
+        public static String getRenderer(String type, String key){
+                String daemon = "director";
+                String res = "inputText";
+                if (type.startsWith("SD")){
+                        daemon = "storagedaemon";
+                }
+                if (type.startsWith("FD")){
+                        daemon = "filedaemon";
+                }
+                type = type.toLowerCase();
+                key = key.toLowerCase();
+                String result[] = getProperties((daemon+"."+type+"."+key));
+                if (result[1].equals("boolean")){
+                        return "radioGroup"; 
+                }
+                if (!(result[0].equals("0"))){
+                        return "selectOneMenu";
+                }
+                
+                return res;
+        }
     //Statusmeldungen an den Client
     public static void setInfoMessage(String client, String message){

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

@@ -5 +5 @@
 
 import javax.faces.event.ActionEvent;
+import javax.faces.event.ValueChangeEvent;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
@@ -96 +97 @@
                 String Id = BeanUtil.getRequestParameter("userObject.resId");
                 node = getNode(Id, tree);
-                Validation validation = new Validation();
                 String type = ((UserObjectItem) ((UserObjectItemType) node
                                 .getUserObject()).getUserObject()).getResType();
@@ -127 +127 @@
                                         vi.setResName(resName);
                                         vi.setDirector(director);
-                                        if (type.equals("Client") && 1 == 0){
-                                                
-                                                vi.setRendererFlag(validation.getRenderer(classType+":"+key));
-                                                vi.setNecessary(validation.getNecessary(classType+":"+key));
-                                        }
+                                        vi.setRendererFlag(BeanUtil.getRenderer(type, key));
+                                        System.err.println(vi.getRenderer());
+                                        System.err.println(vi.getInputText());
+                                        System.err.println(vi.getSelectOneMenu()+"\n\n");
                                         selectedObject.add(vi);
                                 }
@@ -141 +140 @@
         }
         public void newResourceButtonListener(ActionEvent ae){
+                
+        }
+        public void userObjectItemOptionSelected(ValueChangeEvent vce){
                 
         }

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

@@ -1 +1 @@
 package de.dass_it.vanhelsing.gui;
 
+import javax.faces.model.SelectItem;
 import de.dass_it.vanhelsing.gui.items.ItemType;
 import de.dass_it.vanhelsing.gui.items.UserObjectItem;
-import de.dass_it.vanhelsing.gui.ValidationItem.*;
 
 public class ViewItem extends ItemType implements UserObjectItem {
@@ -10 +10 @@
         private String inputText;
         private String selectOneMenu;
+        private String radioGroup;
         private boolean necessary;
         private String renderer;
         private String dataType;
+        private SelectItem[] keyValueList;
         
         public ViewItem(){
@@ -89 +91 @@
                 return selectOneMenu;
         }
+        
+        //TODO: RendererFlag überarbeiten
         public void setRendererFlag(String r){
                 if (r.equals("inputText")) {
                         this.inputText = new String("bernd");
                         this.selectOneMenu = null;
+                        this.radioGroup = null;
                 }
                 if (r.equals("selectOneMenu")){
-                        this.selectOneMenu = new String ("bernd");
+                        this.selectOneMenu = new String("bernd"); //null;
+                        this.inputText = null; //new String ("bernd");
+                        this.radioGroup = null;
+                        //KeyValuesList erzeugen
+                        keyValueList = new SelectItem[3];
+                        keyValueList[0] = new SelectItem("keyBernd","valueBernd");
+                        keyValueList[1] = new SelectItem("keyHorst","valueHorst");
+                        keyValueList[2] = new SelectItem("keyPeter","valuePeter");
+                                
+                        
+                }
+                if (r.equals("radioGroup")){
+                        this.radioGroup = new String("bernd");
+                        this.selectOneMenu = null;
                         this.inputText = null;
                 }
         }
+
+        public SelectItem[] getKeyValueList() {
+                return keyValueList;
+        }
+
+        public void setKeyValueList(SelectItem[] keyValueList) {
+                this.keyValueList = keyValueList;
+        }
 }