1.1 --- a/openide.util/src/org/openide/ErrorManager.java Tue Apr 17 23:22:59 2007 +0000
1.2 +++ b/openide.util/src/org/openide/ErrorManager.java Wed Apr 18 22:12:27 2007 +0000
1.3 @@ -27,7 +27,7 @@
1.4 import java.util.Collection;
1.5 import java.util.Enumeration;
1.6 import java.util.HashSet;
1.7 -import java.util.Iterator;
1.8 +import java.util.LinkedHashSet;
1.9 import java.util.List;
1.10 import java.util.Map;
1.11 import java.util.ResourceBundle;
1.12 @@ -174,7 +174,7 @@
1.13 * <dd>
1.14 * <pre>
1.15 * IOException all = null;
1.16 - * for (int i = 0; i < things.length; i++) {
1.17 + * for (int i = 0; i < things.length; i++) {
1.18 * try {
1.19 * things[i].process();
1.20 * } catch (ThingProcessingException e) {
1.21 @@ -521,9 +521,9 @@
1.22 private String name = null;
1.23
1.24 /**
1.25 - * The set of instances we delegate to. Elements type is ErrorManager.
1.26 + * The set of instances we delegate to.
1.27 */
1.28 - private Set delegates = new HashSet();
1.29 + private Set<ErrorManager> delegates = new HashSet<ErrorManager>();
1.30
1.31 /** fallback logger to send messages to */
1.32 private Logger logger;
1.33 @@ -574,8 +574,7 @@
1.34
1.35 /** Calls all delegates. */
1.36 public Throwable attachAnnotations(Throwable t, Annotation[] arr) {
1.37 - for (Iterator i = delegates.iterator(); i.hasNext();) {
1.38 - ErrorManager em = (ErrorManager) i.next();
1.39 + for (ErrorManager em : delegates) {
1.40 em.attachAnnotations(t, arr);
1.41 }
1.42
1.43 @@ -584,8 +583,7 @@
1.44
1.45 /** Calls all delegates. */
1.46 public Annotation[] findAnnotations(Throwable t) {
1.47 - for (Iterator i = delegates.iterator(); i.hasNext();) {
1.48 - ErrorManager em = (ErrorManager) i.next();
1.49 + for (ErrorManager em : delegates) {
1.50 Annotation[] res = em.findAnnotations(t);
1.51
1.52 if ((res != null) && (res.length > 0)) {
1.53 @@ -633,8 +631,7 @@
1.54 return t;
1.55 }
1.56
1.57 - for (Iterator i = delegates.iterator(); i.hasNext();) {
1.58 - ErrorManager em = (ErrorManager) i.next();
1.59 + for (ErrorManager em : delegates) {
1.60 em.annotate(t, severity, message, localizedMessage, stackTrace, date);
1.61 }
1.62
1.63 @@ -658,8 +655,7 @@
1.64 }
1.65
1.66 try {
1.67 - for (Iterator i = delegates.iterator(); i.hasNext();) {
1.68 - ErrorManager em = (ErrorManager) i.next();
1.69 + for (ErrorManager em : delegates) {
1.70 em.notify(severity, t);
1.71 }
1.72 } catch (RuntimeException e) {
1.73 @@ -690,8 +686,7 @@
1.74 return;
1.75 }
1.76
1.77 - for (Iterator i = delegates.iterator(); i.hasNext();) {
1.78 - ErrorManager em = (ErrorManager) i.next();
1.79 + for (ErrorManager em : delegates) {
1.80 em.log(severity, s);
1.81 }
1.82 }
1.83 @@ -723,9 +718,7 @@
1.84 return logger().isLoggable(convertSeverity(severity, false, null));
1.85 }
1.86
1.87 - for (Iterator i = delegates.iterator(); i.hasNext();) {
1.88 - ErrorManager em = (ErrorManager) i.next();
1.89 -
1.90 + for (ErrorManager em : delegates) {
1.91 if (em.isLoggable(severity)) {
1.92 return true;
1.93 }
1.94 @@ -744,9 +737,7 @@
1.95 return logger().isLoggable(convertSeverity(severity, true, null));
1.96 }
1.97
1.98 - for (Iterator i = delegates.iterator(); i.hasNext();) {
1.99 - ErrorManager em = (ErrorManager) i.next();
1.100 -
1.101 + for (ErrorManager em : delegates) {
1.102 if (em.isNotifiable(severity)) {
1.103 return true;
1.104 }
1.105 @@ -760,12 +751,9 @@
1.106 * by ourselves.
1.107 */
1.108 public synchronized void setDelegates(Collection<? extends ErrorManager> newDelegates) {
1.109 - java.util.LinkedHashSet<ErrorManager> d;
1.110 - d = new java.util.LinkedHashSet<ErrorManager>(newDelegates);
1.111 - delegates = d;
1.112 + delegates = new LinkedHashSet<ErrorManager>(newDelegates);
1.113
1.114 - for (Iterator i = createdByMe.iterator(); i.hasNext();) {
1.115 - DelegatingErrorManager dem = (DelegatingErrorManager) i.next();
1.116 + for (DelegatingErrorManager dem : createdByMe) {
1.117 attachNewDelegates(dem, dem.getName());
1.118 }
1.119 }
1.120 @@ -783,8 +771,7 @@
1.121 private void attachNewDelegates(DelegatingErrorManager dem, String name) {
1.122 Set<ErrorManager> newDelegatesForDem = new HashSet<ErrorManager>();
1.123
1.124 - for (Iterator j = delegates.iterator(); j.hasNext();) {
1.125 - ErrorManager e = (ErrorManager) j.next();
1.126 + for (ErrorManager e : delegates) {
1.127 newDelegatesForDem.add(e.getInstance(name));
1.128 }
1.129
1.130 @@ -795,7 +782,7 @@
1.131 * delegates and adds a listener.
1.132 */
1.133 public void initialize() {
1.134 - r = Lookup.getDefault().lookup(new Lookup.Template<ErrorManager>(ErrorManager.class));
1.135 + r = Lookup.getDefault().lookupResult(ErrorManager.class);
1.136 setDelegates(r.allInstances());
1.137 }
1.138