cleanup

Author: Michael5601

team/bundles/org.eclipse.compare/compare/org/eclipse/compare/EditionSelectionDialog.java

@@ -22,6 +22,7 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.ResourceBundle;
 
@@ -588,7 +589,9 @@ public ITypedElement getTarget() {
 	public ITypedElement[] getSelection() {
 		ArrayList<ITypedElement> result= new ArrayList<>();
 		if (fMemberSelection != null) {
-			for (Object edition : fArrayList) {
+			Iterator<Object> iter= fArrayList.iterator();
+			while (iter.hasNext()) {
+				Object edition= iter.next();
 				Object item= fMemberSelection.get(edition);
 				if (item != null)
 					result.add((ITypedElement) item);
@@ -724,7 +727,7 @@ protected Image getEditionImage(ITypedElement selectedEdition, ITypedElement ite
 			return selectedEdition.getImage();
 		if (selectedEdition instanceof HistoryItem) {
 			if (fTimeImage == null) {
-				String iconName = Utilities.getString(fBundle, "timeIcon", "obj16/resource_obj.svg"); //$NON-NLS-1$ //$NON-NLS-2$
+				String iconName= Utilities.getString(fBundle, "timeIcon", "obj16/resource_obj.svg"); //$NON-NLS-1$ //$NON-NLS-2$
 				ImageDescriptor id= CompareUIPlugin.getImageDescriptor(iconName);
 				if (id != null)
 					fTimeImage= id.createImage();
@@ -1028,7 +1031,7 @@ private void addEdition(Pair pair) {
 		if (lastDay == null || day != dayNumber(((Date)lastDay.getData()).getTime())) {
 			lastDay= new TreeItem(fEditionTree, SWT.NONE);
 			if (fDateImage == null) {
-				String iconName = Utilities.getString(fBundle, "dateIcon", "obj16/day_obj.svg"); //$NON-NLS-2$ //$NON-NLS-1$
+				String iconName= Utilities.getString(fBundle, "dateIcon", "obj16/day_obj.svg"); //$NON-NLS-2$ //$NON-NLS-1$
 				ImageDescriptor id= CompareUIPlugin.getImageDescriptor(iconName);
 				if (id != null)
 					fDateImage= id.createImage();
@@ -1099,8 +1102,9 @@ private void handleMemberSelect(Widget w) {
 				String pattern= Utilities.getString(fBundle, "treeTitleFormat"); //$NON-NLS-1$
 				String title= MessageFormat.format(pattern, ((Item)w).getText());
 				fEditionPane.setText(title);
-
-				for (Object item : editions) {
+				Iterator<Object> iter= editions.iterator();
+				while (iter.hasNext()) {
+					Object item= iter.next();
 					if (item instanceof Pair)
 						addEdition((Pair) item);
 				}

team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/AddFromHistoryDialog.java

@@ -164,11 +164,11 @@ boolean isSelected(int index) {
 	public AddFromHistoryDialog(Shell parent, ResourceBundle bundle) {
 		super(parent, bundle);
 
-		String iconName = Utilities.getString(fBundle, "dateIcon", "obj16/day_obj.svg"); //$NON-NLS-2$ //$NON-NLS-1$
+		String iconName= Utilities.getString(fBundle, "dateIcon", "obj16/day_obj.svg"); //$NON-NLS-2$ //$NON-NLS-1$
 		ImageDescriptor id= CompareUIPlugin.getImageDescriptor(iconName);
 		if (id != null)
 			fDateImage= id.createImage();
-		iconName = Utilities.getString(fBundle, "timeIcon", "obj16/resource_obj.svg"); //$NON-NLS-1$ //$NON-NLS-2$
+		iconName= Utilities.getString(fBundle, "timeIcon", "obj16/resource_obj.svg"); //$NON-NLS-1$ //$NON-NLS-2$
 		id= CompareUIPlugin.getImageDescriptor(iconName);
 		if (id != null)
 			fTimeImage= id.createImage();