Changeset 20724 in osm

Timestamp:

2010-03-28T22:07:43+02:00 (15 years ago)

Author:

guggis

Message:

Fixed drag-n-drop on empty relation member table
Few minor updates/fixes

Location:

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions

Files:

• TurnRestrictionBuilder.java (modified) (1 diff)
• dnd/PrimitiveIdListTransferHandler.java (modified) (1 diff)
• editor/RelationMemberColumnModel.java (modified) (3 diffs)
• editor/RelationMemberEditorModel.java (modified) (3 diffs)
• editor/RelationMemberRoleCellRenderer.java (added)
• editor/RelationMemberTargetCellRenderer.java (added)
• editor/TurnRestrictionEditorModel.java (modified) (1 diff)
• qa/IssuesModel.java (modified) (1 diff)

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/TurnRestrictionBuilder.java

@@ -13 +13 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
+/**
+ * TurnRestrictionBuilder creates a turn restriction and initializes it with
+ * objects from a selection of OSM primitives, i.e. the current selection
+ * in a {@see OsmDataLayer}.
+ *
+ */
 public class TurnRestrictionBuilder {
 

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/dnd/PrimitiveIdListTransferHandler.java

@@ -11 +11 @@
 
 /**
- * PrimitiveIdListTransferHandler is a transfer handler for component which 
+ * PrimitiveIdListTransferHandler is a transfer handler for components which 
  * provide and/or accept a list of {@see PrimitiveId} via copy/paste or
  * drag-and-drop.

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberColumnModel.java

@@ -7 +7 @@
 import javax.swing.table.TableColumn;
 
-import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -23 +22 @@
                  col.setPreferredWidth(100);    
                  col.setCellEditor(new MemberRoleCellEditor());
+                 col.setCellRenderer(new RelationMemberRoleCellRenderer());
                  addColumn(col);
                  
@@ -30 +30 @@
               col.setResizable(true);
               col.setPreferredWidth(300);
-              col.setCellRenderer(new OsmPrimitivRenderer());
+              col.setCellRenderer(new RelationMemberTargetCellRenderer());
               addColumn(col);         
         }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java

@@ -327 +327 @@
          */
         protected void removedSelectedMembers() {
-                int j = 0;
-                for(int i=0; i < getRowCount();i++){
+                for(int i=getRowCount()-1; i >= 0;i--){
                         if (rowSelectionModel.isSelectedIndex(i)) {
-                                members.remove(i - j);
-                                j++;
+                                members.remove(i);
                         }
                 }
@@ -448 +446 @@
 
         public int getRowCount() {
-                return members.size();
+                if (members.size() > 0) return members.size();
+                
+                // we display an empty row if the model is empty because otherwise
+                // we can't drag/drop into the empty table.
+                // FIXME: use JTable.setFillsViewportHeight(boolean) after the migration
+                // to Java 6.
+                return 1;
         }
 
         public Object getValueAt(int rowIndex, int columnIndex) {
+                if (members.size() == 0 && rowIndex == 0){
+                        // we display an empty row if the model is empty because otherwise
+                        // we can't drag/drop into the empty table.
+                        // FIXME: use JTable.setFillsViewportHeight(boolean) after the migration
+                        // to Java 6.
+                        return null;
+                }
                 switch(columnIndex){
                 case 0: return members.get(rowIndex).getRole();
@@ -461 +472 @@
         @Override
         public boolean isCellEditable(int rowIndex, int columnIndex) {
+                // we display an empty row if the model is empty because otherwise
+                // we can't drag/drop into the empty table. This row isn't editable
+                // FIXME: use JTable.setFillsViewportHeight(boolean) after the migration
+                // to Java 6.
+                if (members.size() == 0 && rowIndex == 0) return false;
+                
+                // otherwise only the column with the member roles is editable
                 return columnIndex == 0;
         }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditorModel.java

@@ -242 +242 @@
                                 tm.setValue(value);
                         } else {
-                                tagEditorModel.add(new TagModel("restriction", value.trim().toLowerCase()));
+                                tagEditorModel.prepend(new TagModel("restriction", value.trim().toLowerCase()));
                         }
                 }

applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IssuesModel.java

@@ -184 +184 @@
                 OsmPrimitive from = fromLegs.iterator().next();
                 OsmPrimitive to = toLegs.iterator().next();
+                
                 if (! (from instanceof Way)) return;
                 if (! (to instanceof Way)) return;
-                if (from.equals(to)){
+                if (from.equals(to) && ! "no_u_turn".equals(editorModel.getRestrictionTagValue())){
+                        // identical from and to allowed for "no_u_turn" only
+                        //
                         issues.add(new IdenticalTurnRestrictionLegsError(this, from));
                 }