Merge pull request #721 from csmith/master

Minor style fixes

gradle/fatjar.gradle

@@ -47,7 +47,7 @@ task createFatVersionConfig {
 
         targetFile << "\nbundledplugins_versions:\n"
         configurations.plugin.each { p ->
-            targetFile << " " + p.name.replaceFirst('-', '=').replaceAll('.jar$', '\n');
+            targetFile << " " + p.name.replaceFirst('-', '=').replaceAll('.jar$', '\n')
         }
     }
 }

src/main/java/com/dmdirc/config/ConfigManager.java

@@ -28,20 +28,16 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.util.ClientInfo;
 import com.dmdirc.util.validators.Validator;
-
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
-
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -319,7 +315,7 @@ class ConfigManager implements ConfigChangeListener, ConfigProviderListener,
             synchronized (sources) {
                 sources.add(identity);
                 identity.addListener(this);
-                Collections.sort(sources, new ConfigProviderTargetComparator());
+                sources.sort(new ConfigProviderTargetComparator());
             }
 
             // Determine which settings will have changed

src/main/java/com/dmdirc/config/IdentityManager.java

@@ -442,7 +442,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
                     .collect(Collectors.toList()));
         }
 
-        Collections.sort(sources, new ConfigProviderTargetComparator());
+        sources.sort(new ConfigProviderTargetComparator());
 
         LOG.debug("Found {} source(s) for {}", sources.size(), manager);
 

src/main/java/com/dmdirc/config/prefs/reader/PreferencesReader.java

@@ -118,7 +118,7 @@ public class PreferencesReader {
         readCategoriesList(asList(value));
     }
 
-    private void readCategoriesList(final List<Object> list) throws PreferencesReaderException {
+    private void readCategoriesList(final List<Object> list) {
         for (Object category : list) {
             LOG.debug("Found category entry: {}", category.getClass().getName());
             final CategoryReader reader = new CategoryReader(asMap(category));

src/main/java/com/dmdirc/ui/core/profiles/CoreProfilesDialogModel.java

@@ -143,9 +143,7 @@ public class CoreProfilesDialogModel implements ProfilesDialogModel {
     @Override
     public void setSelectedProfile(final Optional<MutableProfile> profile) {
         checkNotNull(profile, "profile cannot be null");
-        if (profile.isPresent()) {
-            checkArgument(profiles.containsValue(profile.get()), "Profile must exist in list");
-        }
+        profile.ifPresent(mutableProfile -> checkArgument(profiles.containsValue(mutableProfile), "Profile must exist in list"));
         if (!selectedProfile.equals(profile)) {
             selectedProfile = profile;
             listeners.getCallable(ProfilesDialogModelListener.class).profileSelectionChanged(profile);
@@ -273,10 +271,8 @@ public class CoreProfilesDialogModel implements ProfilesDialogModel {
     public void setSelectedProfileSelectedNickname(final Optional<String> selectedNickname) {
         checkNotNull(selectedNickname, "Nickname cannot be null");
         selectedProfile.ifPresent(p -> {
-            if (selectedNickname.isPresent()) {
-                checkArgument(p.getNicknames().contains(selectedNickname.get()),
-                    "Nickname must exist in nicknames list");
-            }
+            selectedNickname.ifPresent(s -> checkArgument(p.getNicknames().contains(s),
+                    "Nickname must exist in nicknames list"));
             if (this.selectedNickname != selectedNickname) {
                 this.selectedNickname = selectedNickname;
                 listeners.getCallable(ProfilesDialogModelListener.class)
@@ -289,10 +285,8 @@ public class CoreProfilesDialogModel implements ProfilesDialogModel {
     public void setSelectedProfileSelectedHighlight(final Optional<String> selectedHighlight) {
         checkNotNull(selectedHighlight, "Highlight cannot be null");
         selectedProfile.ifPresent(p -> {
-            if (selectedHighlight.isPresent()) {
-                checkArgument(p.getHighlights().contains(selectedHighlight.get()),
-                        "Nickname must exist in nicknames list");
-            }
+            selectedHighlight.ifPresent(s -> checkArgument(p.getHighlights().contains(s),
+                    "Nickname must exist in nicknames list"));
             if (this.selectedHighlight != selectedHighlight) {
                 this.selectedHighlight = selectedHighlight;
                 listeners.getCallable(ProfilesDialogModelListener.class)

src/main/java/com/dmdirc/ui/messages/IRCLine.java

@@ -105,7 +105,7 @@ public class IRCLine implements Line {
     @Override
     public <T> T getStyled(final StyledMessageMaker<T> maker) {
         maker.setDefaultFont(fontName, fontSize);
-        styliser.addStyledString(maker, getLineParts());;
+        styliser.addStyledString(maker, getLineParts());
         final T styledString = maker.getStyledMessage();
         fontSize = maker.getMaximumFontSize();
         maker.clear();