LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ADT: Fix some potential NPE in the configuration composite.

Browse Source 
This is just based on Eclipse static analysis of potential null pointers.
It doesn't mean we were ever going to have any NPE there.

Change-Id: I2a326048d2eb6afff7598f9300f48e35495ff3c2
This commit is contained in:
Raphael
2009-08-25 16:14:14 -07:00
parent 5837c3cc34
commit b8a74f4551
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tools/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/configuration/ConfigurationComposite.java
View File

@@ -57,6 +57,9 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.SortedSet; import java.util.SortedSet;
/**
* A composite that displays the current configuration displayed in a Graphical Layout Editor.
*/
public class ConfigurationComposite extends Composite { public class ConfigurationComposite extends Composite {
private final static String THEME_SEPARATOR = "----------"; //$NON-NLS-1$ private final static String THEME_SEPARATOR = "----------"; //$NON-NLS-1$
@@ -90,6 +93,12 @@ public class ConfigurationComposite extends Composite {
private final IConfigListener mListener; private final IConfigListener mListener;
/**
* Interface implemented by the part which owns a {@link ConfigurationComposite}.
* This notifies the owners when the configuration change.
* The owner must also provide methods to provide the configuration that will
* be displayed.
*/
public interface IConfigListener { public interface IConfigListener {
void onConfigurationChange(); void onConfigurationChange();
void onThemeChange(); void onThemeChange();
@@ -386,7 +395,7 @@ public class ConfigurationComposite extends Composite {
mLocale.add("Default"); mLocale.add("Default");
mLocaleList.add(new ResourceQualifier[] { null, null }); mLocaleList.add(new ResourceQualifier[] { null, null });
if (languages != null && languages.size() > 0) { if (project != null && languages != null && languages.size() > 0) {
for (String language : languages) { for (String language : languages) {
// first the language alone // first the language alone
mLocale.add(language); mLocale.add(language);
@@ -402,7 +411,6 @@ public class ConfigurationComposite extends Composite {
} }
} }
} else {
} }
mDisableUpdates = false; mDisableUpdates = false;
@@ -701,14 +709,16 @@ public class ConfigurationComposite extends Composite {
} }
} }
if (frameworkStyle) { if (parentStyle != null) {
// if the parent is a framework style, it has to be 'Theme' or 'Theme.*' if (frameworkStyle) {
return parentStyle.equals("Theme") || parentStyle.startsWith("Theme."); // if the parent is a framework style, it has to be 'Theme' or 'Theme.*'
} else { return parentStyle.equals("Theme") || parentStyle.startsWith("Theme.");
// if it's a project style, we check this is a theme. } else {
value = styleMap.get(parentStyle); // if it's a project style, we check this is a theme.
if (value != null) { value = styleMap.get(parentStyle);
return isTheme(value, styleMap); if (value != null) {
return isTheme(value, styleMap);
}
} }
} }
} }