r3260 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check - Isis-fish-commits

18 Apr 2011

Author: chatellier
Date: 2011-04-18 14:18:23 +0000 (Mon, 18 Apr 2011)
New Revision: 3260

Log:
Improve code

Modified:
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java
===================================================================

--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java	2011-04-18 14:08:16 UTC (rev 3259)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java	2011-04-18 14:18:23 UTC (rev 3260)
@@ -5,7 +5,7 @@
  * $Id$
  * $HeadURL$
  * %%
- * Copyright (C) 2002 - 2010 Ifremer, CodeLutin
+ * Copyright (C) 2002 - 2011 Ifremer, CodeLutin, Chatellier Eric
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -25,10 +25,13 @@
 
 package fr.ifremer.isisfish.ui.input.check;
 
+import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedHashSet;
-import java.util.Iterator;
-import java.util.HashMap;
 import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Classe permettant de créer le résultat d'une vérification de la bonne saisie des objets.
@@ -44,60 +47,62 @@
  */
 public class CheckResult { // CheckResult
 
-    LinkedHashSet order = new LinkedHashSet();
+    protected Set<Object> order = new LinkedHashSet<Object>();
 
-    HashMap info = new HashMap();
-    HashMap warning = new HashMap();
-    HashMap error = new HashMap();
+    protected Map<Object, List<String>> info = new HashMap<Object, List<String>>();
+    protected Map<Object, List<String>> warning = new HashMap<Object, List<String>>();
+    protected Map<Object, List<String>> error = new HashMap<Object, List<String>>();
 
     public StringBuffer getInfo() {
         StringBuffer result = new StringBuffer();
-        for(Iterator i=order.iterator(); i.hasNext();){
+        for (Iterator i = order.iterator(); i.hasNext();) {
             Object o = i.next();
             StringBuffer tmp = getInfo(o);
-            if(tmp.length() != 0){
+            if (tmp.length() != 0) {
                 String title = o.toString();
                 tmp.insert(0, "\n");
-                for(int e=0; e<title.length(); e++){
+                for (int e = 0; e < title.length(); e++) {
                     tmp.insert(0, "=");
                 }
-                tmp.insert(0, title+"\n");
+                tmp.insert(0, title + "\n");
                 tmp.append("\n");
                 result.append(tmp.toString());
             }
         }
         return result;
     }
+
     public StringBuffer getWarning() {
         StringBuffer result = new StringBuffer();
-        for(Iterator i=order.iterator(); i.hasNext();){
+        for (Iterator i = order.iterator(); i.hasNext();) {
             Object o = i.next();
             StringBuffer tmp = getWarning(o);
-            if(tmp.length() != 0){
+            if (tmp.length() != 0) {
                 String title = o.toString();
                 tmp.insert(0, "\n");
-                for(int e=0; e<title.length(); e++){
+                for (int e = 0; e < title.length(); e++) {
                     tmp.insert(0, "=");
                 }
-                tmp.insert(0, title+"\n");
+                tmp.insert(0, title + "\n");
                 tmp.append("\n");
                 result.append(tmp.toString());
             }
         }
         return result;
     }
+
     public StringBuffer getError() {
         StringBuffer result = new StringBuffer();
-        for(Iterator i=order.iterator(); i.hasNext();){
+        for (Iterator i = order.iterator(); i.hasNext();) {
             Object o = i.next();
             StringBuffer tmp = getError(o);
-            if(tmp.length() != 0){
+            if (tmp.length() != 0) {
                 String title = o.toString();
                 tmp.insert(0, "\n");
-                for(int e=0; e<title.length(); e++){
+                for (int e = 0; e < title.length(); e++) {
                     tmp.insert(0, "=");
                 }
-                tmp.insert(0, title+"\n");
+                tmp.insert(0, title + "\n");
                 tmp.append("\n");
                 result.append(tmp.toString());
             }
@@ -107,37 +112,39 @@
 
     public StringBuffer getInfo(Object o) {
         StringBuffer result = new StringBuffer();
-        LinkedList list = (LinkedList)info.get(o);
-        if(list != null && list.size() != 0){
+        List list = info.get(o);
+        if (list != null && list.size() != 0) {
             result.append("Info\n");
             result.append("----\n");
-            for(Iterator i=list.iterator(); i.hasNext();){
+            for (Iterator i = list.iterator(); i.hasNext();) {
                 result.append(i.next().toString());
                 result.append("\n");
             }
         }
         return result;
     }
+
     public StringBuffer getWarning(Object o) {
         StringBuffer result = new StringBuffer();
-        LinkedList list = (LinkedList)warning.get(o);
-        if(list != null && list.size() != 0){
+        List list = warning.get(o);
+        if (list != null && list.size() != 0) {
             result.append("Problème\n");
             result.append("--------\n");
-            for(Iterator i=list.iterator(); i.hasNext();){
+            for (Iterator i = list.iterator(); i.hasNext();) {
                 result.append(i.next().toString());
                 result.append("\n");
             }
         }
         return result;
     }
+
     public StringBuffer getError(Object o) {
         StringBuffer result = new StringBuffer();
-        LinkedList list = (LinkedList)error.get(o);
-        if(list != null && list.size() != 0){
+        List list = error.get(o);
+        if (list != null && list.size() != 0) {
             result.append("Erreur\n");
             result.append("------\n");
-            for(Iterator i=list.iterator(); i.hasNext();){
+            for (Iterator i = list.iterator(); i.hasNext();) {
                 result.append(i.next().toString());
                 result.append("\n");
             }
@@ -145,27 +152,27 @@
         return result;
     }
 
-    public StringBuffer getAll(Object o){
+    public StringBuffer getAll(Object o) {
         StringBuffer result = new StringBuffer();
         result.append(getError(o).toString());
         result.append(getWarning(o).toString());
         result.append(getInfo(o).toString());
 
-        if (result.length() != 0){
+        if (result.length() != 0) {
             String title = o.toString();
             result.insert(0, "\n");
-            for(int i=0; i<title.length(); i++){
+            for (int i = 0; i < title.length(); i++) {
                 result.insert(0, "=");
             }
-            result.insert(0, title+"\n");
+            result.insert(0, title + "\n");
         }
         result.append("\n");
         return result;
     }
 
-    public StringBuffer getAll(){
+    public StringBuffer getAll() {
         StringBuffer result = new StringBuffer();
-        for(Iterator i=order.iterator(); i.hasNext();){
+        for (Iterator i = order.iterator(); i.hasNext();) {
             result.append(getAll(i.next()));
         }
         return result;
@@ -176,11 +183,11 @@
     * @param o l'objet sur lequel le message porte, surment un descendant d'un DBobjet
     * @param message le message à ajouter
     */
-    public void addInfo(Object o, String message){
+    public void addInfo(Object o, String message) {
         order.add(o);
-        LinkedList list = (LinkedList)info.get(o);
-        if(list == null){
-            info.put(o, list = new LinkedList());
+        List<String> list = info.get(o);
+        if (list == null) {
+            info.put(o, list = new LinkedList<String>());
         }
         list.add(message);
     }
@@ -190,11 +197,11 @@
     * @param o l'objet sur lequel le message porte, surment un descendant d'un DBobjet
     * @param message le message à ajouter
     */
-    public void addWarning(Object o, String message){
+    public void addWarning(Object o, String message) {
         order.add(o);
-        LinkedList list = (LinkedList)warning.get(o);
-        if(list == null){
-            warning.put(o, list = new LinkedList());
+        List<String> list = warning.get(o);
+        if (list == null) {
+            warning.put(o, list = new LinkedList<String>());
         }
         list.add(message);
     }
@@ -204,14 +211,13 @@
     * @param o l'objet sur lequel le message porte, surment un descendant d'un DBobjet
     * @param message le message à ajouter
     */
-    public void addError(Object o, String message){
+    public void addError(Object o, String message) {
         order.add(o);
-        LinkedList list = (LinkedList)error.get(o);
-        if(list == null){
-            error.put(o, list = new LinkedList());
+        List<String> list = error.get(o);
+        if (list == null) {
+            error.put(o, list = new LinkedList<String>());
         }
         list.add(message);
     }
 
 } // CheckResult
-

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java	2011-04-18 14:08:16 UTC (rev 3259)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java	2011-04-18 14:18:23 UTC (rev 3260)
@@ -5,7 +5,7 @@
  * $Id$
  * $HeadURL$
  * %%
- * Copyright (C) 2002 - 2010 Ifremer, CodeLutin
+ * Copyright (C) 2002 - 2011 Ifremer, CodeLutin, Chatellier Eric
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -74,4 +74,3 @@
     }
 
 } // CheckResultFrame
-

    

r3260 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/check

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)