Changeset 6070 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair

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

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/pair

Files:

• ConflictResolver.java (modified) (1 diff)
• ListMergeModel.java (modified) (3 diffs)
• ListMerger.java (modified) (2 diffs)
• nodes/NodeListMerger.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

@@ -258 +258 @@
         selectFirstTabWithConflicts();
     }
-    
+
     public void selectFirstTabWithConflicts() {
         for (int i = 0; i < tabbedPane.getTabCount(); i++) {

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

@@ -87 +87 @@
     private boolean isFrozen = false;
     private final ComparePairListModel comparePairListModel;
-    
+
     private DataSet myDataset;
     private Map<PrimitiveId, PrimitiveId> mergedMap;
@@ -130 +130 @@
         return getMyPrimitiveById(entry);
     }
-    
+
     public final OsmPrimitive getMyPrimitiveById(PrimitiveId entry) {
         OsmPrimitive result = myDataset.getPrimitiveById(entry);
@@ -336 +336 @@
         fireModelDataChanged();
     }
-    
+
     protected final void initPopulate(OsmPrimitive my, OsmPrimitive their, Map<PrimitiveId, PrimitiveId> mergedMap) {
         CheckParameterUtil.ensureParameterNotNull(my, "my");

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

@@ -888 +888 @@
         );
     }
-    
+
     public void unlinkAsListener() {
         myEntriesTable.unlinkAsListener();
@@ -1031 +1031 @@
         }
     }
-    
+
     protected final <P extends OsmPrimitive> OsmDataLayer findLayerFor(P primitive) {
         if (primitive != null) {

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java

@@ -60 +60 @@
         theirEntriesTable.setLayer(findLayerFor(theirWay));
     }
-    
+
     public void deletePrimitive(boolean deleted) {
         if (deleted) {