diff options
5 files changed, 15 insertions, 10 deletions
diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/WorkingSetManagerData.java b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/WorkingSetManagerData.java index 8a9b1efba..febc4764c 100644 --- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/WorkingSetManagerData.java +++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/data/WorkingSetManagerData.java @@ -262,8 +262,9 @@ public class WorkingSetManagerData extends RequestData { List<CriterionResource> resources = new ArrayList<>(); - for (String key : selectedElements.keySet()) { - Set<String> values = selectedElements.get(key); + for (Map.Entry<String, Set<String>> entry : selectedElements.entrySet()) { + String key = entry.getKey(); + Set<String> values = entry.getValue(); CriterionResource resource = new CriterionResource(key, new ArrayList<>(values)); resources.add(resource); } diff --git a/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipsPreferences.java b/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipsPreferences.java index 8f5508d38..f97a5a701 100644 --- a/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipsPreferences.java +++ b/org.eclipse.tips.ide/src/org/eclipse/tips/ide/internal/TipsPreferences.java @@ -132,10 +132,11 @@ public class TipsPreferences extends AbstractPreferenceInitializer { public static IStatus saveReadState(Map<String, List<Integer>> pReadTips) { try { File stateLocation = getStateLocation(); - for (String child : pReadTips.keySet()) { + for (Map.Entry<String, List<Integer>> entry : pReadTips.entrySet()) { + String child = entry.getKey(); PreferenceStore store = new PreferenceStore( new File(stateLocation, child.trim() + ".state").getAbsolutePath()); //$NON-NLS-1$ - pReadTips.get(child).forEach(value -> store.setValue(value.toString(), value.intValue())); + entry.getValue().forEach(value -> store.setValue(value.toString(), value.intValue())); store.setValue("provider", child); //$NON-NLS-1$ store.save(); } diff --git a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckLinkAction.java b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckLinkAction.java index 7605b5f36..edaeb182e 100644 --- a/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckLinkAction.java +++ b/org.eclipse.ua.tests.doc/src/org/eclipse/ua/tests/doc/internal/actions/CheckLinkAction.java @@ -57,7 +57,8 @@ public class CheckLinkAction implements ILiveHelpAction { setPageNotFoundPreference(""); System.out.println("Start checking " + links.size() + " links"); int count = 0; - for (String next : links.keySet()) { + for (Map.Entry<String, String> entry : links.entrySet()) { + String next = entry.getKey(); count++; if (count % 1000 == 0) { System.out.println("Checked " + count + " links"); @@ -82,7 +83,7 @@ public class CheckLinkAction implements ILiveHelpAction { opened = false; } if (!opened) { - String containingPage = links.get(next); + String containingPage = entry.getValue(); System.out.println("Cannot open link from " + trimPath(containingPage) + " to " + trimPath(next)); } diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/CompositeCheatSheetSaveHelper.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/CompositeCheatSheetSaveHelper.java index 7fbf20807..f677a8903 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/CompositeCheatSheetSaveHelper.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/model/CompositeCheatSheetSaveHelper.java @@ -147,8 +147,9 @@ public class CompositeCheatSheetSaveHelper { } private void saveMap(XMLMemento writeMemento, Map<String, String> data, String tag) { - for (String key : data.keySet()) { - String value = data.get(key); + for (Map.Entry<String, String> entry : data.entrySet()) { + String key = entry.getKey(); + String value = entry.getValue(); IMemento childMemento = writeMemento.createChild(tag); childMemento.putString(ICompositeCheatsheetTags.KEY, key); childMemento.putString(ICompositeCheatsheetTags.VALUE, value); diff --git a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetSaveHelper.java b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetSaveHelper.java index 11bb4bfea..911912f04 100644 --- a/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetSaveHelper.java +++ b/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/data/CheatSheetSaveHelper.java @@ -298,10 +298,11 @@ public class CheatSheetSaveHelper { if (map == null) { return; } - for (String itemKey : map.keySet()) { + for (Map.Entry<String, String> entry : map.entrySet()) { + String itemKey = entry.getKey(); IMemento childMemento = memento.createChild(mapName); childMemento.putString(IParserTags.MANAGERDATAKEY,(itemKey)); - childMemento.putString(IParserTags.MANAGERDATAVALUE, map.get(itemKey)); + childMemento.putString(IParserTags.MANAGERDATAVALUE, entry.getValue()); } } |