Index: trunk/src/org/openstreetmap/josm/gui/JMultilineLabel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/JMultilineLabel.java (revision 1405)
+++ trunk/src/org/openstreetmap/josm/gui/JMultilineLabel.java (revision 1407)
@@ -93,8 +93,7 @@
float w = insets.left + insets.right;
float x = insets.left, y=insets.top;
-
-
+
if (width > 0 && text != null && text.length() > 0) {
- String[] lines = getText().split("\n");
+ String[] lines = getText().split("\n");
for(String line : lines) {
// Insert a space so new lines get rendered
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 1405)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java (revision 1407)
@@ -24,4 +24,5 @@
import java.util.HashMap;
import java.util.HashSet;
+import java.util.LinkedList;
import java.util.Map;
import java.util.TreeMap;
@@ -53,11 +54,16 @@
import org.openstreetmap.josm.data.SelectionChangedListener;
import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.JMultilineLabel;
import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.preferences.TaggingPresetPreference;
+import org.openstreetmap.josm.gui.tagging.TaggingPreset;
import org.openstreetmap.josm.tools.AutoCompleteComboBox;
import org.openstreetmap.josm.tools.GBC;
@@ -438,4 +444,5 @@
private final SideButton btnEdit;
private final SideButton btnDel;
+ private final JMultilineLabel presets = new JMultilineLabel("");
private final JLabel selectSth = new JLabel("" + tr("Please select the objects you want to change properties for.") + "
");
@@ -525,4 +532,5 @@
bothTables.add(membershipTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL));
bothTables.add(membershipTable, GBC.eol().fill(GBC.BOTH));
+ bothTables.add(presets, GBC.eol().fill().insets(10, 10, 10, 10));
DblClickWatch dblClickWatch = new DblClickWatch();
@@ -532,6 +540,7 @@
scrollPane.addMouseListener(dblClickWatch);
add(scrollPane, BorderLayout.CENTER);
-
+
selectSth.setPreferredSize(scrollPane.getSize());
+ presets.setPreferredSize(scrollPane.getSize());
JPanel buttonPanel = new JPanel(new GridLayout(1,3));
@@ -549,11 +558,11 @@
NameVisitor n = new NameVisitor();
cur.visit(n);
-
- int result = new ExtendedDialog(Main.parent,
- tr("Change relation"),
+
+ int result = new ExtendedDialog(Main.parent,
+ tr("Change relation"),
tr("Really delete selection from relation {0}?", n.name),
- new String[] {tr("Delete from relation"), tr("Cancel")},
- new String[] {"dialogs/delete.png", "cancel.png"}).getValue();
-
+ new String[] {tr("Delete from relation"), tr("Cancel")},
+ new String[] {"dialogs/delete.png", "cancel.png"}).getValue();
+
if(result == 1)
{
@@ -620,4 +629,52 @@
}
+ private void checkPresets(int nodes, int ways, int relations, int closedways)
+ {
+ LinkedList p = new LinkedList();
+ int total = nodes+ways+relations+closedways;
+ if(total != 0)
+ {
+ for(TaggingPreset t : TaggingPresetPreference.taggingPresets)
+ {
+ if(!( (relations > 0 && !t.types.contains("relation")) &&
+ (nodes > 0 && !t.types.contains("node")) &&
+ (ways+closedways > 0 && !t.types.contains("way")) &&
+ (closedways > 0 && !t.types.contains("closedway"))))
+ {
+ int found = 0;
+ for(TaggingPreset.Item i : t.data)
+ {
+ if(i instanceof TaggingPreset.Key)
+ {
+ String val = ((TaggingPreset.Key)i).value;
+ String key = ((TaggingPreset.Key)i).key;
+ // we subtract 100 if not found and add 1 if found
+ found -= 100;
+ if(valueCount.containsKey(key))
+ {
+ Map v = valueCount.get(key);
+ if(v.size() == 1 && v.containsKey(val) && v.get(val) == total)
+ {
+ found += 101;
+ }
+ }
+ }
+ }
+ if(found > 0)
+ p.add(t);
+ }
+ }
+ }
+ String t = "";
+ for(TaggingPreset tp : p)
+ {
+ if(t.length() > 0)
+ t += "\n";
+ t += tp.getName();
+ }
+ presets.setText(t);
+ presets.setVisible(t.length() > 0);
+ }
+
public void selectionChanged(Collection newSelection) {
if (!isVisible())
@@ -630,8 +687,16 @@
// re-load property data
propertyData.setRowCount(0);
+ int nodes = 0;
+ int ways = 0;
+ int relations = 0;
+ int closedways = 0;
Map keyCount = new HashMap();
valueCount.clear();
for (OsmPrimitive osm : newSelection) {
+ if(osm instanceof Node) ++nodes;
+ else if(osm instanceof Relation) ++relations;
+ else if(((Way)osm).isClosed()) ++closedways;
+ else ++ways;
for (Entry e : osm.entrySet()) {
keyCount.put(e.getKey(), keyCount.containsKey(e.getKey()) ? keyCount.get(e.getKey())+1 : 1);
@@ -666,4 +731,6 @@
selectSth.setVisible(!hasSelection);
if(hasTags) propertyTable.changeSelection(0, 0, false, false);
+
+ checkPresets(nodes, ways, relations, closedways);
// re-load membership data