Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 3288) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (revision 3289) @@ -310,4 +310,5 @@ } ); + tfRole.setText(Main.pref.get("relation.editor.generic.lastrole", "")); p3.add(tfRole); SetRoleAction setRoleAction = new SetRoleAction(); @@ -1167,4 +1168,5 @@ public void run() { + Main.pref.put("relation.editor.generic.lastrole", tfRole.getText()); if (getRelation() == null) { applyNewRelation(); Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 3288) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (revision 3289) @@ -486,4 +486,90 @@ } + public static class Role { + public List types; + public String key; + public String text; + public String text_context; + public String locale_text; + + public boolean required=false; + public long count = 0; + + public void setType(String types) throws SAXException { + this.types = TaggingPreset.getType(types); + } + + public void setRequisite(String str) throws SAXException { + if("required".equals(str)) + required = true; + else if(!"optional".equals(str)) + throw new SAXException(tr("Unknown requisite: {0}", str)); + } + + /* return either argument, the highest possible value or the lowest + allowed value */ + public long getValidCount(long c) + { + if(count > 0 && !required) + return c != 0 ? count : 0; + else if(count > 0) + return count; + else if(!required) + return c != 0 ? c : 0; + else + return c != 0 ? c : 1; + } + public boolean addToPanel(JPanel p, Collection sel) { + String cstring; + if(count > 0 && !required) + cstring = "0,"+String.valueOf(count); + else if(count > 0) + cstring = String.valueOf(count); + else if(!required) + cstring = "0-..."; + else + cstring = "1-..."; + if(locale_text == null) { + if (text != null) { + if(text_context != null) { + locale_text = trc(text_context, text); + } else { + locale_text = tr(text); + } + } + } + p.add(new JLabel(locale_text+":"), GBC.std().insets(0,0,10,0)); + p.add(new JLabel(key), GBC.std().insets(0,0,10,0)); + p.add(new JLabel(cstring), types == null ? GBC.eol() : GBC.std().insets(0,0,10,0)); + if(types != null){ + JPanel pp = new JPanel(); + for(String t : types) + pp.add(new JLabel(ImageProvider.get("Mf_" + t))); + p.add(pp, GBC.eol()); + } + return true; + } + } + + public static class Roles extends Item { + public List roles = new LinkedList(); + @Override public boolean addToPanel(JPanel p, Collection sel) { + p.add(new JLabel(" "), GBC.eol()); // space + if(roles.size() > 0) + { + JPanel proles = new JPanel(new GridBagLayout()); + proles.add(new JLabel(tr("Available roles")), GBC.std().insets(0,0,10,0)); + proles.add(new JLabel(tr("role")), GBC.std().insets(0,0,10,0)); + proles.add(new JLabel(tr("count")), GBC.std().insets(0,0,10,0)); + proles.add(new JLabel(tr("elements")), GBC.eol()); + for (Role i : roles) + i.addToPanel(proles, sel); + p.add(proles, GBC.eol()); + } + return false; + } + @Override public void addCommands(Collection sel, List cmds) {} + } + public static class Optional extends Item { // TODO: Draw a box around optional stuff @@ -581,11 +667,17 @@ */ private static Collection allowedtypes = Arrays.asList(new String[] - {marktr("way"), marktr("node"), marktr("relation"), marktr("closedway")}); - public void setType(String types) throws SAXException { - this.types = Arrays.asList(types.split(",")); - for (String type : this.types) { + {marktr("way"), marktr("node"), marktr("relation"), marktr("closedway")}); + + static public List getType(String types) throws SAXException { + List t = Arrays.asList(types.split(",")); + for (String type : t) { if(!allowedtypes.contains(type)) throw new SAXException(tr("Unknown type: {0}", type)); } + return t; + } + + public void setType(String types) throws SAXException { + this.types = getType(types); } @@ -598,4 +690,6 @@ parser.map("link", Link.class); parser.mapOnStart("optional", Optional.class); + parser.mapOnStart("roles", Roles.class); + parser.map("role", Role.class); parser.map("check", Check.class); parser.map("combo", Combo.class); @@ -605,4 +699,5 @@ LinkedList all = new LinkedList(); TaggingPresetMenu lastmenu = null; + Roles lastrole = null; parser.start(in); while(parser.hasNext()) { @@ -621,8 +716,10 @@ } + lastrole = null; } else if (o instanceof TaggingPresetSeparator) { TaggingPresetSeparator tp = (TaggingPresetSeparator) o; tp.group = lastmenu; all.add(tp); + lastrole = null; } else if (o instanceof TaggingPreset) { TaggingPreset tp = (TaggingPreset) o; @@ -631,7 +728,21 @@ all.add(tp); Main.toolbar.register(tp); + lastrole = null; } else { - if(all.size() != 0) - all.getLast().data.add((Item)o); + if(all.size() != 0) { + if(o instanceof Roles) { + all.getLast().data.add((Item)o); + lastrole = (Roles) o; + } + else if(o instanceof Role) { + if(lastrole == null) + throw new SAXException(tr("Preset role element without parent")); + lastrole.roles.add((Role) o); + } + else { + all.getLast().data.add((Item)o); + lastrole = null; + } + } else throw new SAXException(tr("Preset sub element without parent")); Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java (revision 3288) +++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java (revision 3289) @@ -75,5 +75,10 @@ * use getRoleCache() accessor */ - protected Set roleCache; + protected Set roleCache; + /** + * the same as roleCache but for the preset roles + * can be accessed directly + */ + protected static Set presetRoleCache = new HashSet(); public AutoCompletionManager(DataSet ds) { @@ -179,4 +184,10 @@ presetTagCache.put(tt.key, tt.default_); } + } else if (item instanceof TaggingPreset.Roles) { + TaggingPreset.Roles r = (TaggingPreset.Roles) item; + for (TaggingPreset.Role i : r.roles) { + if (i.key != null) + presetRoleCache.add(i.key); + } } } @@ -228,4 +239,5 @@ */ public void populateWithMemberRoles(AutoCompletionList list) { + list.add(presetRoleCache, AutoCompletionItemPritority.IS_IN_STANDARD); list.add(getRoleCache(), AutoCompletionItemPritority.IS_IN_DATASET); }