Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix exceptions

Browse source
This commit is contained in:
Victor Shcherb 2013-02-16 16:10:46 +01:00
parent d9e13f619c
commit 2b3230501c
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
View file

@ -7,6 +7,7 @@ import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set; import java.util.Set;
import net.osmand.access.AccessibleToast; import net.osmand.access.AccessibleToast;
@ -317,14 +318,18 @@ public class MapInfoLayer extends OsmandMapLayer {
} }
}); });
createCustomRenderingProperties(app.getRendererRegistry().getCurrentSelectedRenderer()); RenderingRulesStorage renderer = app.getRendererRegistry().getCurrentSelectedRenderer();
if(renderer != null) {
createCustomRenderingProperties(renderer);
}
} }
private void createCustomRenderingProperties(RenderingRulesStorage renderer) { private void createCustomRenderingProperties(RenderingRulesStorage renderer) {
String categoryName = ADDITIONAL_VECTOR_RENDERING_CATEGORY; String categoryName = ADDITIONAL_VECTOR_RENDERING_CATEGORY;
mapInfoControls.removeApperanceWidgets(categoryName); mapInfoControls.removeApperanceWidgets(categoryName);
final OsmandApplication app = view.getApplication(); final OsmandApplication app = view.getApplication();
for (final RenderingRuleProperty p : renderer.PROPS.getCustomRules()) { List<RenderingRuleProperty> customRules = renderer.PROPS.getCustomRules();
for (final RenderingRuleProperty p : customRules) {
String propertyName = SettingsActivity.getStringPropertyName(view.getContext(), p.getAttrName(), p.getName()); String propertyName = SettingsActivity.getStringPropertyName(view.getContext(), p.getAttrName(), p.getName());
//test old descr as title //test old descr as title
final String propertyDescr = SettingsActivity.getStringPropertyDescription(view.getContext(), p.getAttrName(), p.getName()); final String propertyDescr = SettingsActivity.getStringPropertyDescription(view.getContext(), p.getAttrName(), p.getName());