CVS update of src/org/objectweb/clif/scenario/isac/egui/plugins/gui (1 file)

[Bruno Dillenseger <dillense@xxxxxxxxxxxxxxxxxxxxxxxxx>]

    Date: Friday, February 23, 2007 @ 14:21:49
  Author: dillense
    Path: /cvsroot/clif/src/org/objectweb/clif/scenario/isac/egui/plugins/gui

Modified: ParameterPanel.java

changed from Hashtable/HashMap/Map raw type to Map/HashMap generic types


---------------------+
 ParameterPanel.java |   61 ++++++++++++++++++++++++++------------------------
 1 files changed, 32 insertions(+), 29 deletions(-)


Index: 
src/org/objectweb/clif/scenario/isac/egui/plugins/gui/ParameterPanel.java
diff -u 
src/org/objectweb/clif/scenario/isac/egui/plugins/gui/ParameterPanel.java:1.4 
src/org/objectweb/clif/scenario/isac/egui/plugins/gui/ParameterPanel.java:1.5
--- 
src/org/objectweb/clif/scenario/isac/egui/plugins/gui/ParameterPanel.java:1.4 
      Wed Mar 29 17:28:43 2006
+++ src/org/objectweb/clif/scenario/isac/egui/plugins/gui/ParameterPanel.java 
  Fri Feb 23 14:21:48 2007
@@ -53,7 +53,7 @@
 public class ParameterPanel extends Composite {
     static Logger cat = 
Monolog.getMonologFactory().getLogger(ParameterPanel.class.getName());
     
-    private Hashtable params;
+    private Map<String,ParameterWidget> params;
     
     /**
      * Build a new parameter panel
@@ -65,7 +65,7 @@
         
this.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WHITE));
         this.setLayout(new GridLayout());
         this.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-        this.params = new Hashtable();
+        this.params = new HashMap<String,ParameterWidget>();
     }
     
     /**
@@ -98,10 +98,10 @@
      */
     public Map getParametersValues() {
         cat.log(BasicLevel.DEBUG, "-> getParametersValues");
-        Map values = new HashMap();
-        Enumeration e = this.params.elements();
-        while (e.hasMoreElements()) {
-            ParameterWidget temp = (ParameterWidget) e.nextElement();
+        Map<String,String> values = new HashMap<String,String>();
+        Iterator iter = this.params.values().iterator();
+        while (iter.hasNext()) {
+            ParameterWidget temp = (ParameterWidget) iter.next();
             if (temp.getStyle() != WidgetDescription.GROUP) {
                 if (temp.getValue() != null) {
                     values.put(temp.getName(), temp.getValue());
@@ -123,7 +123,7 @@
      * @param panels The table where the panels must be stored
      */
     public static void createNewPanelsFromXML(Vector ids, PluginDescription 
plugin,
-            String fileName, Hashtable panels) {
+            String fileName, Map<String,ParametersWidgetsNode> panels) {
         
         cat.log(BasicLevel.DEBUG, "-> createNewPanelsFromXML");
         /* if the file does not exist, create the default panels */
@@ -143,7 +143,7 @@
      * @param panels The table of widgets tree, to be completed
      */
     private static void createNewDefaultsPanels(
-            Vector ids, PluginDescription plugin, Hashtable panels) {
+            Vector ids, PluginDescription plugin, 
Map<String,ParametersWidgetsNode> panels) {
         cat.log(BasicLevel.DEBUG, "-> createNewDefaultsPanels");
         /* load the object description */
         ObjectDescription obj = plugin.getObject();
@@ -317,21 +317,24 @@
      * method which set the values of the differents parameters
      * @param values The parameters values
      */
-    public void setParametersValues(Map values) {
+    public void setParametersValues(Map<String,String> values) {
         cat.log(BasicLevel.DEBUG, "-> set ParametersValues");
         if (values == null) {
             return;
         }
         // get the parameters name
-        Iterator keys = values.keySet().iterator();
-        while (keys.hasNext()) {
-            String name = (String) keys.next();
-            if (this.params.containsKey(name)) {
-                ((ParameterWidget) this.params.get(name))
-                .setValue((String) values.get(name));
+        Iterator iter = values.entrySet().iterator();
+        while (iter.hasNext())
+        {
+               Map.Entry entry = (Map.Entry)iter.next();
+            String name = (String)entry.getKey();
+            if (this.params.containsKey(name))
+            {
+                this.params.get(name).setValue((String)entry.getValue());
             } 
-            else {
-                cat.log(BasicLevel.WARN, name + " can't be found");
+            else
+            {
+                throw new Error("unknown parameter name \"" + name + "\"");
             }
         }
     }
@@ -341,9 +344,9 @@
      * @return boolean
      */
     public boolean addButtonSelected(Object source) {
-        Enumeration elements = params.elements();
-        while (elements.hasMoreElements()) {
-            ParameterWidget pw = (ParameterWidget) elements.nextElement();
+        Iterator elements = params.values().iterator();
+        while (elements.hasNext()) {
+            ParameterWidget pw = (ParameterWidget) elements.next();
             if (pw.getStyle() == WidgetDescription.NFIELD) {
                 if (pw.addEmptyFieldForNField(source))
                     return true;
@@ -362,9 +365,9 @@
      * @return boolean
      */
     public boolean removeButtonSelected(Object source) {
-        Enumeration elements = params.elements();
-        while (elements.hasMoreElements()) {
-            ParameterWidget pw = (ParameterWidget) elements.nextElement();
+        Iterator elements = params.values().iterator();
+        while (elements.hasNext()) {
+            ParameterWidget pw = (ParameterWidget) elements.next();
             if (pw.getStyle() == WidgetDescription.NFIELD) {
                 if (pw.removeLastFieldForNField(source)) {
                     return true;
@@ -384,9 +387,9 @@
      * @return boolean
      */
     public boolean modifySomething(Object source) {
-        Enumeration elements = params.elements();
-        while (elements.hasMoreElements()) {
-            ParameterWidget pw = (ParameterWidget) elements.nextElement();
+        Iterator elements = params.values().iterator();
+        while (elements.hasNext()) {
+            ParameterWidget pw = (ParameterWidget) elements.next();
             if (pw.getStyle() == WidgetDescription.TABLE) {
                 if (pw.modifyText(source)) {
                     return true;
@@ -407,9 +410,9 @@
     public void dispose() {
         cat.log(BasicLevel.DEBUG, "-> dispose");
         if (params != null) {
-            Enumeration elements = params.elements();
-            while (elements.hasMoreElements()) {
-                ParameterWidget pw = (ParameterWidget) 
elements.nextElement();
+            Iterator elements = params.values().iterator();
+            while (elements.hasNext()) {
+                ParameterWidget pw = (ParameterWidget) elements.next();
                 pw.dispose();
             }
         }