Rename a few variables #2193

Author: travkin79

bundles/org.eclipse.ui.ide/src/org/eclipse/ui/views/markers/internal/ContentGeneratorDescriptor.java

@@ -45,7 +45,8 @@ public class ContentGeneratorDescriptor {
 	private static final String MARKER_FIELD_REFERENCE = "markerFieldReference"; //$NON-NLS-1$
 
 	private IConfigurationElement configurationElement;
-	private MarkerField[] initialVisible;
+	private MarkerField[] allFieldsWithoutExtensions;
+	private MarkerField[] initialVisibleWithoutExtensions;
 	private Collection<IConfigurationElement> generatorExtensions = new ArrayList<>();
 
 	/**
@@ -58,13 +59,13 @@ public ContentGeneratorDescriptor(IConfigurationElement element) {
 	/**
 	 * Add the groups defined in the receiver to the collection of groups.
 	 */
-	private void addDefinedGroups(Collection<MarkerGroup> groupss) {
+	private void addDefinedGroups(Collection<MarkerGroup> groups) {
 		// Add the ones in the receiver.
-		addGroupsFrom(configurationElement, groupss);
+		addGroupsFrom(configurationElement, groups);
 		// Add the extensions
 		Iterator<IConfigurationElement> extensions = generatorExtensions.iterator();
 		while (extensions.hasNext()) {
-			addGroupsFrom(extensions.next(), groupss);
+			addGroupsFrom(extensions.next(), groups);
 		}
 	}
 
@@ -103,7 +104,7 @@ public boolean allTypesSelected(Collection<MarkerType> selectedTypes) {
 	 * @return {@link MarkerField}[]
 	 */
 	public MarkerField[] getAllFields() {
-		List<MarkerField> allFieldsList = new ArrayList<>(Arrays.asList(allFields));
+		List<MarkerField> allFieldsList = new ArrayList<>(Arrays.asList(allFieldsWithoutExtensions));
 
 		Iterator<IConfigurationElement> extensions = generatorExtensions.iterator();
 		while (extensions.hasNext()) {
@@ -173,7 +174,7 @@ public String getId() {
 	 * @return {@link MarkerField}[]
 	 */
 	public MarkerField[] getInitialVisible() {
-		return initialVisible;
+		return initialVisibleWithoutExtensions;
 	}
 
 	/**
@@ -296,11 +297,11 @@ public void initializeFromConfigurationElement(
 			}
 		}
 
-		allFields = new MarkerField[allFieldList.size()];
-		allFieldList.toArray(allFields);
+		allFieldsWithoutExtensions = new MarkerField[allFieldList.size()];
+		allFieldList.toArray(allFieldsWithoutExtensions);
 
-		initialVisible = new MarkerField[initialVisibleList.size()];
-		initialVisibleList.toArray(initialVisible);
+		initialVisibleWithoutExtensions = new MarkerField[initialVisibleList.size()];
+		initialVisibleList.toArray(initialVisibleWithoutExtensions);
 
 	}