commit ea7717ed1e31f5c0115872780c131313c16561da
author Andre Weinand <aweinand> Tue Jan 14 09:50:22 2003 +0000
committer Andre Weinand <aweinand> Tue Jan 14 09:50:22 2003 +0000
tree 60bd9de0e07ebd5db6074f7bc641c3aab59b0598
parent 98bb6f59b0e319c9ed2c46c06c07c3e0b8835082

fixed issue with resolve indicator

bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java

diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index 39178f7..dfb3b51 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -2548,19 +2548,20 @@
 					Diff d= (Diff) e.next();
 					if (d.isIncoming()) {
 						hasIncoming= true;
-						if (!d.fResolved)
+						if (!d.fResolved) {
 							unresolved= true;
-						break;
+							break;
+						}
 					}
 				}
 			}
-			//if (hasIncoming) {
+			if (hasIncoming) {
 				Display d= fSummaryLabel.getDisplay();
 				if (unresolved)
 					c= d.getSystemColor(SWT.COLOR_RED);
 				else
 					c= d.getSystemColor(SWT.COLOR_GREEN);
-			//}
+			}
 		}
 		fSummaryLabel.setBackground(c);
 	}

bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java

diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index 39178f7..dfb3b51 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -2548,19 +2548,20 @@
 					Diff d= (Diff) e.next();
 					if (d.isIncoming()) {
 						hasIncoming= true;
-						if (!d.fResolved)
+						if (!d.fResolved) {
 							unresolved= true;
-						break;
+							break;
+						}
 					}
 				}
 			}
-			//if (hasIncoming) {
+			if (hasIncoming) {
 				Display d= fSummaryLabel.getDisplay();
 				if (unresolved)
 					c= d.getSystemColor(SWT.COLOR_RED);
 				else
 					c= d.getSystemColor(SWT.COLOR_GREEN);
-			//}
+			}
 		}
 		fSummaryLabel.setBackground(c);
 	}