Changeset 5024 for branches/2.3/security/ExpressoCert/src/br/gov/serpro/ui/DialogBuilder.java

Timestamp:

09/02/11 13:40:07 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #2256 - Token iKey 2032 não consegue acessar certificado do usuário.

File:

• branches/2.3/security/ExpressoCert/src/br/gov/serpro/ui/DialogBuilder.java (modified) (4 diffs)

branches/2.3/security/ExpressoCert/src/br/gov/serpro/ui/DialogBuilder.java

@@ -3 +3 @@
 import br.gov.serpro.setup.Setup;
 import java.awt.BorderLayout;
-import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -18 +17 @@
 import java.lang.reflect.InvocationTargetException;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
@@ -332 +334 @@
     }
 
-    static public String showCertificateSelector(Frame parent, Setup setup, List<String> certificateList) {
+    static public String showCertificateSelector(Frame parent, Setup setup, Map<String, String> certificateMap) {
         DialogBuilder certificateSelectorDialog = new DialogBuilder(parent, setup);
+
+        Set<Map.Entry<String, String>> entries = certificateMap.entrySet();
+        List<String> certificateList = new ArrayList<String>();
+
+        if (setup.getParameter("debug").equalsIgnoreCase("true")) {
+            System.out.println("Entradas:");
+        }
+
+        for (Map.Entry<String, String> entry : entries){
+            if (setup.getParameter("debug").equalsIgnoreCase("true")) {
+                System.out.println("[" + entry.getKey() + " : " + entry.getValue() + "]");
+            }
+            certificateList.add(entry.getValue());
+        }
 
         try {
@@ -356 +372 @@
 
             String subject = certificateSelectorDialog.getCertificateSubject();
+            String label = "";
+
+            for (Map.Entry<String, String> entry : entries){
+                if (entry.getValue().equals(subject)){
+                    label = entry.getKey();
+                    break;
+                }
+            }
+
             certificateSelectorDialog.dispose();
             certificateSelectorDialog = null;
 
-            return subject;
+            return label;
         }
     }