Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Keppler2019-11-17 01:48:47 -0500
committerMichael Keppler2019-11-17 11:25:51 -0500
commit6540493f4a86a19696eda84ce03826b62ce6dfee (patch)
tree4cbbb58c91122a48d45f2d1bc9c0b192eea91981
parentac1320338a87f1945a9d8fb97ecc8bbecef31a1e (diff)
downloadegit-6540493f4a86a19696eda84ce03826b62ce6dfee.tar.gz
egit-6540493f4a86a19696eda84ce03826b62ce6dfee.tar.xz
egit-6540493f4a86a19696eda84ce03826b62ce6dfee.zip
Fix typos and naming
Change-Id: Idcd45b3c9e379175af59589fb5c644ac79d17696 Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/RefFilterHelper.java52
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties6
2 files changed, 29 insertions, 29 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/RefFilterHelper.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/RefFilterHelper.java
index 3b0b2a019..26de601cf 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/RefFilterHelper.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/history/RefFilterHelper.java
@@ -42,16 +42,16 @@ public class RefFilterHelper {
private static final String ANY = "**"; //$NON-NLS-1$
- private static final String REF_SEPERATOR = ":"; //$NON-NLS-1$
+ private static final String REF_SEPARATOR = ":"; //$NON-NLS-1$
private static final String MACRO_CURRENT_BRANCH = "[CURRENT-BRANCH]"; //$NON-NLS-1$
private static final String DEFAULT_SELECTED_REFS = Constants.HEAD;
private static final String DEFAULT_SELECTED_REFS_ALL_BRANCHES =
- Constants.HEAD + REF_SEPERATOR
- + Constants.R_HEADS + ANY + REF_SEPERATOR
- + Constants.R_REMOTES + ANY + REF_SEPERATOR
+ Constants.HEAD + REF_SEPARATOR
+ + Constants.R_HEADS + ANY + REF_SEPARATOR
+ + Constants.R_REMOTES + ANY + REF_SEPARATOR
+ Constants.R_TAGS + ANY;
private final IPreferenceStore store;
@@ -99,7 +99,7 @@ public class RefFilterHelper {
@NonNull IPreferenceStore store) {
this.repository = repository;
this.store = store;
- setupPreconfigueredFilters();
+ setupPreconfiguredFilters();
setupMacros();
// Just always init the repo defaults as we don't know if this repo had
// a helper before.
@@ -114,7 +114,7 @@ public class RefFilterHelper {
return newPreConfFilter(prefix + "**"); //$NON-NLS-1$
}
- private void setupPreconfigueredFilters() {
+ private void setupPreconfiguredFilters() {
preconfiguredFilters = new ArrayList<>();
filtersForHEAD = new ArrayList<>();
filtersForCurrentBranch = new ArrayList<>();
@@ -125,10 +125,10 @@ public class RefFilterHelper {
filtersForHEAD.add(head);
filtersForAllBranchesAndTags.add(head);
- RefFilter current_branch = newPreConfFilter(
+ RefFilter currentBranch = newPreConfFilter(
Constants.R_REFS + "**/" + MACRO_CURRENT_BRANCH); //$NON-NLS-1$
- preconfiguredFilters.add(current_branch);
- filtersForCurrentBranch.add(current_branch);
+ preconfiguredFilters.add(currentBranch);
+ filtersForCurrentBranch.add(currentBranch);
RefFilter branches = newPreConfPrefixFilter(Constants.R_HEADS);
preconfiguredFilters.add(branches);
@@ -180,18 +180,18 @@ public class RefFilterHelper {
}
private void initDefaultForRepo(String preferenceName) {
- String repoSepcificPrefName = Activator.getDefault().getRepositoryUtil()
+ String repoSpecificPrefName = Activator.getDefault().getRepositoryUtil()
.getRepositorySpecificPreferenceKey(this.repository,
preferenceName);
- store.setDefault(repoSepcificPrefName,
+ store.setDefault(repoSpecificPrefName,
store.getDefaultString(preferenceName));
}
/**
* Init the default of the repo specific pref from global default. This
* needs to happen after each eclipse startup (as the default is not
- * persistet) for each repo.
+ * persisted) for each repo.
*/
private void initDefaultsForRepo() {
setDefaultSelectionBasedOnShowAllBranches();
@@ -210,16 +210,16 @@ public class RefFilterHelper {
* @return the string-valued preference
*/
protected String getPreferenceString(String preferenceName) {
- String repoSepcificPrefName = Activator.getDefault().getRepositoryUtil()
+ String repoSpecificPrefName = Activator.getDefault().getRepositoryUtil()
.getRepositorySpecificPreferenceKey(this.repository,
preferenceName);
- return store.getString(repoSepcificPrefName);
+ return store.getString(repoSpecificPrefName);
}
private List<String> getFiltersFromPref(String preferenceName) {
String refFiltersString = getPreferenceString(preferenceName);
- String[] filters = refFiltersString.split(REF_SEPERATOR);
+ String[] filters = refFiltersString.split(REF_SEPARATOR);
return Arrays.asList(filters);
}
@@ -237,11 +237,11 @@ public class RefFilterHelper {
private void setFiltersInPref(String preferenceName, List<String> filters,
boolean save) {
- String repoSepcificPrefName = Activator.getDefault().getRepositoryUtil()
+ String repoSpecificPrefName = Activator.getDefault().getRepositoryUtil()
.getRepositorySpecificPreferenceKey(this.repository,
preferenceName);
- String refFiltersString = String.join(REF_SEPERATOR, filters);
- store.setValue(repoSepcificPrefName, refFiltersString);
+ String refFiltersString = String.join(REF_SEPARATOR, filters);
+ store.setValue(repoSpecificPrefName, refFiltersString);
if (save) {
savePreferencStoreIfNeeded();
@@ -251,7 +251,7 @@ public class RefFilterHelper {
/**
* Get the configured ref filters from the preference store.
*
- * @return A list of all configuered ref filter strings
+ * @return A list of all configured ref filter strings
*/
public List<String> getConfiguredFilters() {
return getFiltersFromPref(UIPreferences.RESOURCEHISTORY_REF_FILTERS);
@@ -261,7 +261,7 @@ public class RefFilterHelper {
* Set the configured ref filters in the preference store.
*
* @param filters
- * The list of configuered ref filter strings to set
+ * The list of configured ref filter strings to set
* @param save
* Whether to save the preference store if necessary
*/
@@ -317,7 +317,7 @@ public class RefFilterHelper {
filters, save);
}
- private void addPreconfigueredFilters(Map<String, RefFilter> filters) {
+ private void addPreconfiguredFilters(Map<String, RefFilter> filters) {
for (RefFilter filter : preconfiguredFilters) {
// Don't use the existing object because selection states would be
// persisted immediately without calling setRefFilters.
@@ -330,7 +330,7 @@ public class RefFilterHelper {
*/
public Set<RefFilter> getRefFilters() {
Map<String, RefFilter> filters = new LinkedHashMap<>();
- addPreconfigueredFilters(filters);
+ addPreconfiguredFilters(filters);
for (String filter : getConfiguredFilters()) {
if (filter == null || filter.isEmpty()) {
@@ -367,7 +367,7 @@ public class RefFilterHelper {
/**
* Set the given rev filters in the preference store.
* <p>
- * This overrides the selected and the configuered filters in the preference
+ * This overrides the selected and the configured filters in the preference
* store.
* <p>
*
@@ -408,10 +408,10 @@ public class RefFilterHelper {
* Reset the last selection state to the default.
*/
public void resetLastSelectionStateToDefault() {
- String repoSepcificPrefName = Activator.getDefault().getRepositoryUtil()
+ String repoSpecificPrefName = Activator.getDefault().getRepositoryUtil()
.getRepositorySpecificPreferenceKey(this.repository,
UIPreferences.RESOURCEHISTORY_LAST_SELECTED_REF_FILTERS);
- store.setToDefault(repoSepcificPrefName);
+ store.setToDefault(repoSpecificPrefName);
savePreferencStoreIfNeeded();
}
@@ -624,7 +624,7 @@ public class RefFilterHelper {
* The filter string for the new ref filter; must not be
* null; must not be empty.
* @param isPreconfigured
- * Whether the new Filter is a preconfiguered one
+ * Whether the new Filter is a preconfigured one
*
* @throws IllegalArgumentException
* if the filter string is null or empty
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
index 00fa735d2..bce64edb4 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
@@ -187,8 +187,8 @@ GitHistoryPage_CreatePatchMenuLabel=Create P&atch...
GitHistoryPage_CreateTagMenuLabel=Create &Tag...
GitHistoryPage_cherryPickMenuItem=C&herry-Pick...
GitHistoryPage_compareMode=Compare Mode
-GitHistoryPage_showingHistoryOfHead=Change what commits to show. Current: Only HEAD and its parents
-GitHistoryPage_showingHistoryOfConfiguredFilters=Change what commits to show. Current: All branches matching the configured ref filters
+GitHistoryPage_showingHistoryOfHead=Change which commits to show. Current: Only HEAD and its parents
+GitHistoryPage_showingHistoryOfConfiguredFilters=Change which commits to show. Current: All branches matching the configured ref filters
GitHistoryPage_showFirstParentOnly=Show First Parent Only
GitHistoryPage_squashMenuItem=Squash
GitHistoryPage_errorLookingUpPath=IO error looking up path {0} in {1}.
@@ -1399,7 +1399,7 @@ DiffEditorPage_Title=Diff
DiffEditorPage_ToggleLineNumbers=Use Old/New &Line Numbers
DiffEditorPage_WarningNoDiffForMerge=Cannot compute diff for a merge commit.
DiscardChangesAction_confirmActionTitle=Discard Uncommitted Changes
-DiscardChangesAction_confirmActionMessage=Discard all uncommitted changes for the selected resources?\n\n Untracked files will be ignored.
+DiscardChangesAction_confirmActionMessage=Discard all uncommitted changes for the selected resources?\n\nUntracked files will be ignored.
DiscardChangesAction_discardChanges=Discard Changes
DiscardChangesAction_discardChangesButtonText=&Discard Changes
Disconnect_disconnect=Disconnect

Back to the top