Changeset 6070 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

Timestamp:

2013-07-17T00:01:49+02:00 (11 years ago)

Author:

stoecker

Message:

see #8853 remove tabs, trailing spaces, windows line ends, strange characters

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (26 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -152 +152 @@
      */
     private final TagEditHelper editHelper = new TagEditHelper(propertyData, valueCount);
-    
+
     private final DataSetListenerAdapter dataChangedAdapter = new DataSetListenerAdapter(this);
     private final HelpAction helpAction = new HelpAction();
@@ -170 +170 @@
     private final SelectRelationAction selectRelationAction = new SelectRelationAction(false);
     private final SelectRelationAction addRelationToSelectionAction = new SelectRelationAction(true);
-    
+
     private final DownloadMembersAction downloadMembersAction = new DownloadMembersAction();
     private final DownloadSelectedIncompleteMembersAction downloadSelectedIncompleteMembersAction = new DownloadSelectedIncompleteMembersAction();
-    
+
     private final SelectMembersAction selectMembersAction = new SelectMembersAction(false);
     private final SelectMembersAction addMembersToSelectionAction = new SelectMembersAction(true);
-    
+
     private final HighlightHelper highlightHelper= new HighlightHelper();
-    
+
     /**
      * The Add button (needed to be able to disable it)
@@ -195 +195 @@
      */
     private final PresetListPanel presets = new PresetListPanel();
-    
+
     /**
      * Text to display when nothing selected.
@@ -214 +214 @@
         }
     };
-    
+
     // <editor-fold defaultstate="collapsed" desc="Dialog construction and helper methods">
-    
+
     /**
      * Create a new PropertiesDialog
@@ -231 +231 @@
         setupMembershipMenu();
         buildMembershipTable();
-        
+
         // combine both tables and wrap them in a scrollPane
         JPanel bothTables = new JPanel();
@@ -249 +249 @@
             bothTables.add(presets, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 2, 5, 2));
         }
-        
+
         setupKeyboardShortcuts();
 
@@ -257 +257 @@
         propertyTable.getSelectionModel().addListSelectionListener(deleteAction);
         membershipTable.getSelectionModel().addListSelectionListener(deleteAction);
-        
-        
+
+
         JScrollPane scrollPane = (JScrollPane) createLayout(bothTables, true, Arrays.asList(new SideButton[] {
                 this.btnAdd, this.btnEdit, this.btnDel
@@ -273 +273 @@
         editHelper.loadTagsIfNeeded();
     }
-        
+
     private void buildPropertiesTable() {
         // setting up the properties table
@@ -280 +280 @@
         propertyTable.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         propertyTable.getTableHeader().setReorderingAllowed(false);
-        
+
         propertyTable.getColumnModel().getColumn(1).setCellRenderer(new DefaultTableCellRenderer(){
             @Override public Component getTableCellRendererComponent(JTable table, Object value,
@@ -383 +383 @@
         mod.getColumn(0).setPreferredWidth(200);
     }
-    
+
     /**
      * creates the popup menu @field membershipMenu and its launcher on membership table
@@ -432 +432 @@
         });
     }
-    
-    /**
-     * creates the popup menu @field propertyMenu and its launcher on property table 
+
+    /**
+     * creates the popup menu @field propertyMenu and its launcher on property table
      */
     private void setupPropertiesMenu() {
@@ -448 +448 @@
         propertyTable.addMouseListener(new PopupMenuLauncher(propertyMenu));
     }
-    
+
     /**
      * Assignas all needed keys like Enter and Spacebar to most important actions
      */
     private void setupKeyboardShortcuts() {
-        
+
         // ENTER = editAction, open "edit" dialog
         propertyTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
@@ -461 +461 @@
                 .put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0),"onTableEnter");
         membershipTable.getActionMap().put("onTableEnter",editAction);
-        
-        // INSERT button = addAction, open "add property" dialog 
+
+        // INSERT button = addAction, open "add property" dialog
         propertyTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
                 .put(KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, 0),"onTableInsert");
         propertyTable.getActionMap().put("onTableInsert",addAction);
-        
+
         // unassign some standard shortcuts for JTable to allow upload / download
         InputMapUtils.unassignCtrlShiftUpDown(propertyTable, JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT);
-        
+
         // unassign some standard shortcuts for correct copy-pasting, fix #8508
         propertyTable.setTransferHandler(null);
-  
+
         propertyTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
                 .put(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK),"onCopy");
@@ -479 +479 @@
         // allow using enter to add tags for all look&feel configurations
         InputMapUtils.enableEnter(this.btnAdd);
-        
+
         // DEL button = deleteAction
         getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
@@ -485 +485 @@
                 );
         getActionMap().put("delete", deleteAction);
-        
+
         // F1 button = custom help action
         getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
@@ -491 +491 @@
         getActionMap().put("onHelp", helpAction);
     }
-    
+
          /**
      * This simply fires up an {@link RelationEditor} for the relation shown; everything else
@@ -506 +506 @@
                 ((MemberInfo) membershipData.getValueAt(row, 1)).role).setVisible(true);
     }
-    
+
     private int findRow(TableModel model, Object value) {
         for (int i=0; i<model.getRowCount(); i++) {
@@ -514 +514 @@
         return -1;
     }
-    
+
     /**
      * Update selection status, call @{link #selectionChanged} function.
@@ -525 +525 @@
         }
     }
-    
+
    // </editor-fold>
 
     // <editor-fold defaultstate="collapsed" desc="Event listeners methods">
-    
+
     @Override
     public void showNotify() {
@@ -558 +558 @@
         }
     }
-    
+
     @Override
     public void destroy() {
@@ -625 +625 @@
                     ? e.getValue().keySet().iterator().next() : tr("<different>"));
         }
-        
+
         membershipData.setRowCount(0);
 
@@ -698 +698 @@
         }
     }
-    
+
     /* ---------------------------------------------------------------------------------- */
     /* EditLayerChangeListener                                                            */
@@ -721 +721 @@
 
     // <editor-fold defaultstate="collapsed" desc="Methods that are called by plugins to extend fuctionality ">
-    
+
     /**
      * Replies the property popup menu handler.
@@ -752 +752 @@
         return row > -1 ? (IRelation) membershipData.getValueAt(row, 0) : null;
     }
-        
+
     // </editor-fold>
-    
+
      /**
      * Class that watches for mouse clicks
@@ -852 +852 @@
         }
     };
-    
+
     /**
      * Action handling delete button press in properties dialog.
@@ -940 +940 @@
             } else if (membershipTable.getSelectedRowCount() > 0) {
                 int[] rows = membershipTable.getSelectedRows();
-                // delete from last relation to convserve row numbers in the table 
+                // delete from last relation to convserve row numbers in the table
                 for (int i=rows.length-1; i>=0; i--) {
                     deleteFromRelation(rows[i]);