aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2018-06-27 13:34:30 -0400
committerThomas Wolf2018-06-30 15:43:37 -0400
commitbd36ad11ea5d55bacc2dba226bc2d81413affd07 (patch)
tree91f1104dbfb9af97383152c68d622687ffa13834
parent2124192716a59a22ba57466fa90ece3a715cab8e (diff)
downloadegit-bd36ad11ea5d55bacc2dba226bc2d81413affd07.tar.gz
egit-bd36ad11ea5d55bacc2dba226bc2d81413affd07.tar.xz
egit-bd36ad11ea5d55bacc2dba226bc2d81413affd07.zip
Sort decoration variables alphabetically
Change-Id: I6e07a299d4dcf683b92e74a397d1b3b713145265 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de> Bug:536360
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java
index d94403677..4ed5f68cf 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitDecoratorPreferencePage.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Observable;
import java.util.Observer;
+import java.util.TreeMap;
import org.eclipse.core.resources.IResource;
import org.eclipse.egit.ui.Activator;
@@ -30,9 +31,9 @@ import org.eclipse.egit.ui.internal.GitLabelProvider;
import org.eclipse.egit.ui.internal.PreferenceBasedDateFormatter;
import org.eclipse.egit.ui.internal.SWTUtils;
import org.eclipse.egit.ui.internal.UIText;
-import org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator.DecorationHelper;
import org.eclipse.egit.ui.internal.decorators.DecoratableResource;
import org.eclipse.egit.ui.internal.decorators.DecorationResult;
+import org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator.DecorationHelper;
import org.eclipse.egit.ui.internal.resources.IResourceState.StagingState;
import org.eclipse.egit.ui.internal.synchronize.mapping.GitChangeSetLabelProvider;
import org.eclipse.jface.dialogs.Dialog;
@@ -164,7 +165,7 @@ public class GitDecoratorPreferencePage extends PreferencePage implements
project.children = children;
PREVIEW_FILESYSTEM_ROOT = Collections.singleton(project);
- FILE_AND_FOLDER_BINDINGS = new HashMap<>();
+ FILE_AND_FOLDER_BINDINGS = new TreeMap<>();
FILE_AND_FOLDER_BINDINGS.put(DecorationHelper.BINDING_RESOURCE_NAME,
UIText.DecoratorPreferencesPage_bindingResourceName);
FILE_AND_FOLDER_BINDINGS.put(DecorationHelper.BINDING_DIRTY_FLAG,
@@ -172,7 +173,7 @@ public class GitDecoratorPreferencePage extends PreferencePage implements
FILE_AND_FOLDER_BINDINGS.put(DecorationHelper.BINDING_STAGED_FLAG,
UIText.DecoratorPreferencesPage_bindingStagedFlag);
- PROJECT_BINDINGS = new HashMap<>();
+ PROJECT_BINDINGS = new TreeMap<>();
PROJECT_BINDINGS.put(DecorationHelper.BINDING_RESOURCE_NAME,
UIText.DecoratorPreferencesPage_bindingResourceName);
PROJECT_BINDINGS.put(DecorationHelper.BINDING_DIRTY_FLAG,
@@ -189,7 +190,7 @@ public class GitDecoratorPreferencePage extends PreferencePage implements
UIText.DecoratorPreferencesPage_bindingCommitMessage);
- CHANGESET_LABEL_BINDINGS = new HashMap<>();
+ CHANGESET_LABEL_BINDINGS = new TreeMap<>();
CHANGESET_LABEL_BINDINGS.put(removeBraces(GitChangeSetLabelProvider.BINDING_CHANGESET_AUTHOR),
UIText.DecoratorPreferencesPage_bindingChangeSetAuthor);
CHANGESET_LABEL_BINDINGS.put(removeBraces(GitChangeSetLabelProvider.BINDING_CHANGESET_DATE),