diff options
Diffstat (limited to 'eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout')
3 files changed, 8 insertions, 7 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LinearLayoutRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LinearLayoutRule.java index 77cd7fe..ac4b6ff 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LinearLayoutRule.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/LinearLayoutRule.java @@ -38,14 +38,14 @@ import com.android.ide.common.api.IMenuCallback; import com.android.ide.common.api.INode; import com.android.ide.common.api.INodeHandler; import com.android.ide.common.api.IViewMetadata; +import com.android.ide.common.api.IViewMetadata.FillPreference; import com.android.ide.common.api.IViewRule; import com.android.ide.common.api.InsertType; import com.android.ide.common.api.MenuAction; +import com.android.ide.common.api.MenuAction.OrderedChoices; import com.android.ide.common.api.Point; import com.android.ide.common.api.Rect; import com.android.ide.common.api.SegmentType; -import com.android.ide.common.api.IViewMetadata.FillPreference; -import com.android.ide.common.api.MenuAction.OrderedChoices; import com.android.ide.eclipse.adt.AdtPlugin; import com.android.sdklib.SdkConstants; @@ -544,7 +544,7 @@ public class LinearLayoutRule extends BaseLayoutRule { } /** A possible match position */ - private class MatchPos { + private static class MatchPos { /** The pixel distance */ private int mDistance; /** The position among siblings */ @@ -571,7 +571,7 @@ public class LinearLayoutRule extends BaseLayoutRule { } } - private class LinearDropData { + private static class LinearDropData { /** Vertical layout? */ private final boolean mVertical; diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/PropertyCallback.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/PropertyCallback.java index 4024d5a..559aac8 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/PropertyCallback.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/PropertyCallback.java @@ -44,7 +44,7 @@ public class PropertyCallback implements IMenuCallback { // ---- Implements IMenuCallback ---- public void action(MenuAction action, final String valueId, final Boolean newValue) { - if (mTargetNodes != null && mTargetNodes.size() == 0) { + if (mTargetNodes == null || mTargetNodes.size() == 0) { return; } mTargetNodes.get(0).editXml(mUndoLabel, new INodeHandler() { diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/ConstraintType.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/ConstraintType.java index 8488760..7c6fae8 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/ConstraintType.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/relative/ConstraintType.java @@ -141,10 +141,11 @@ enum ConstraintType { public static ConstraintType fromAttribute(String attribute) { if (sNameToType == null) { ConstraintType[] types = ConstraintType.values(); - sNameToType = new HashMap<String, ConstraintType>(types.length); + Map<String, ConstraintType> map = new HashMap<String, ConstraintType>(types.length); for (ConstraintType type : types) { - sNameToType.put(type.name, type); + map.put(type.name, type); } + sNameToType = map; } return sNameToType.get(attribute); } |