MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

EA-35339 - NPE: PropertyParser.loadLayoutProperties

Browse Source
This commit is contained in:
Alexander Lobas
2012-04-04 12:33:26 +04:00
parent 5380731115
commit 3f1137e8ef
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-designer/src/com/intellij/android/designer/model/PropertyParser.java
+10 -10
View File
@@ -272,12 +272,12 @@ public class PropertyParser {
if (margin != null) {
List<Property> children = margin.getChildren(null);
children.add(PropertyTable.extractProperty(properties, "marginLeft"));
children.add(PropertyTable.extractProperty(properties, "marginTop"));
children.add(PropertyTable.extractProperty(properties, "marginRight"));
children.add(PropertyTable.extractProperty(properties, "marginBottom"));
children.add(PropertyTable.extractProperty(properties, "marginStart"));
children.add(PropertyTable.extractProperty(properties, "marginEnd"));
PropertyTable.moveProperty(properties, "marginLeft", children, -1);
PropertyTable.moveProperty(properties, "marginTop", children, -1);
PropertyTable.moveProperty(properties, "marginRight", children, -1);
PropertyTable.moveProperty(properties, "marginBottom", children, -1);
PropertyTable.moveProperty(properties, "marginStart", children, -1);
PropertyTable.moveProperty(properties, "marginEnd", children, -1);
if (model != null) {
for (Property child : children) {
@@ -303,10 +303,10 @@ public class PropertyParser {
}
});
PropertyTable.top(properties, "layout:margin");
PropertyTable.top(properties, "layout:gravity");
PropertyTable.top(properties, "layout:height");
PropertyTable.top(properties, "layout:width");
PropertyTable.moveProperty(properties, "layout:margin", properties, 0);
PropertyTable.moveProperty(properties, "layout:gravity", properties, 0);
PropertyTable.moveProperty(properties, "layout:height", properties, 0);
PropertyTable.moveProperty(properties, "layout:width", properties, 0);
}
}
plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/PropertyTable.java
+8 -3
View File
@@ -371,10 +371,15 @@ public final class PropertyTable extends JBTable implements ComponentSelectionLi
return -1;
}
public static void top(List<Property> properties, String name) {
Property property = extractProperty(properties, name);
public static void moveProperty(List<Property> source, String name, List<Property> destination, int index) {
Property property = extractProperty(source, name);
if (property != null) {
properties.add(0, property);
if (index == -1) {
destination.add(property);
}
else {
destination.add(index, property);
}
}
}