Removed unnecessary settings. Code clean-up.

Author: halirutan

src/de/halirutan/mathematica/settings/MathematicaSettings.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Patrick Scheibe
+ * Copyright (c) 2017 Patrick Scheibe
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
@@ -60,8 +60,7 @@ public enum SmartEnterResult {
     INSERT_TEMPLATE
   }
 
-  public SmartEnterResult smartEnterResult = SmartEnterResult.INSERT_TEMPLATE;
-  public boolean sortCompletionEntriesLexicographically = false;
+  public SmartEnterResult smartEnterResult = SmartEnterResult.INSERT_BRACES;
 
   public static MathematicaSettings getInstance() {
     return ServiceManager.getService(MathematicaSettings.class);
@@ -88,15 +87,12 @@ public boolean equals(Object obj) {
     }
 
     final MathematicaSettings settings = (MathematicaSettings) obj;
-    if(smartEnterResult != settings.smartEnterResult) return false;
-    return sortCompletionEntriesLexicographically == settings.sortCompletionEntriesLexicographically;
+    return smartEnterResult == settings.smartEnterResult;
   }
 
   @Override
   public int hashCode() {
-    int result = (smartEnterResult.ordinal());
-    result = 29 * result + (sortCompletionEntriesLexicographically ? 1 : 0);
-    return result;
+    return (smartEnterResult.ordinal());
   }
 
   public SmartEnterResult getSmartEnterResult() {
@@ -107,11 +103,4 @@ public void setSmartEnterResult(SmartEnterResult result) {
     this.smartEnterResult = result;
   }
 
-  public boolean isSortCompletionEntriesLexicographically() {
-    return sortCompletionEntriesLexicographically;
-  }
-
-  public void setSortCompletionEntriesLexicographically(boolean shouldSort) {
-    this.sortCompletionEntriesLexicographically = shouldSort;
-  }
 }

src/de/halirutan/mathematica/settings/MathematicaSettingsConfigurable.java

@@ -33,7 +33,7 @@
  */
 public class MathematicaSettingsConfigurable extends BaseConfigurable {
 
-  private SettingsUI settingsUI;
+  private SettingsUI mySettingsUI = null;
 
   @Nls
   @Override
@@ -44,37 +44,37 @@ public String getDisplayName() {
   @Nullable
   @Override
   public String getHelpTopic() {
-    return "xpath.settings";
+    return null;
   }
 
   @Nullable
   @Override
   public JComponent createComponent() {
-    settingsUI = new SettingsUI();
-    settingsUI.setSettings(MathematicaSettings.getInstance());
-    return settingsUI;
+    mySettingsUI = new SettingsUI();
+    mySettingsUI.setSettings(MathematicaSettings.getInstance());
+    return mySettingsUI;
   }
 
   @Override
   public void apply() throws ConfigurationException {
-    if (settingsUI != null) {
+    if (mySettingsUI != null) {
       final MathematicaSettings instance = MathematicaSettings.getInstance();
-      instance.loadState(settingsUI.getSettings());
+      instance.loadState(mySettingsUI.getSettings());
     }
 
   }
 
   @Override
   public void reset() {
-    if (settingsUI != null) {
-      settingsUI.setSettings(MathematicaSettings.getInstance());
+    if (mySettingsUI != null) {
+      mySettingsUI.setSettings(MathematicaSettings.getInstance());
     }
   }
 
   @Override
   public boolean isModified() {
-    if (settingsUI != null) {
-      return !settingsUI.getSettings().equals(MathematicaSettings.getInstance());
+    if (mySettingsUI != null) {
+      return !mySettingsUI.getSettings().equals(MathematicaSettings.getInstance());
     }
     return false;
   }