Ignore:
Timestamp:
2010-09-15T18:59:53+02:00 (14 years ago)
Author:
stoecker
Message:

remove tabs

Location:
applications/editors/josm/plugins/reverter/src/reverter
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/reverter/src/reverter/ChangesetIdQuery.java

    r22533 r23192  
    3131        try {
    3232          return NumberFormat.getInstance().parse(tcid.getText()).intValue();
    33         } catch (ParseException e) {           
     33        } catch (ParseException e) {
    3434          return 0;
    3535        }
    … …  
    5050        panel.add(new JLabel(tr("Changeset id:")));
    5151        panel.add(tcid, GBC.eol().fill(GBC.HORIZONTAL));
    52        
     52
    5353        bgRevertType.add(rbFull);
    5454        bgRevertType.add(rbSelection);
    5555        bgRevertType.add(rbSelectionUndelete);
    56        
     56
    5757        rbFull.setSelected(true);
    5858        panel.add(rbFull, GBC.eol().insets(0,10,0,0).fill(GBC.HORIZONTAL));
    5959        panel.add(rbSelection, GBC.eol().fill(GBC.HORIZONTAL));
    6060        panel.add(rbSelectionUndelete, GBC.eol().fill(GBC.HORIZONTAL));
    61        
     61
    6262        setContent(panel);
    63         setupDialog();       
     63        setupDialog();
    6464    }
    6565}

  • applications/editors/josm/plugins/reverter/src/reverter/ChangesetReverter.java

    r21807 r23192  
    5454    public final RevertType revertType;
    5555
    56     private final OsmDataLayer layer; // data layer associated with reverter 
    57     private final DataSet ds; // DataSet associated with reverter 
    58     private final ChangesetDataSet cds; // Current changeset data 
     56    private final OsmDataLayer layer; // data layer associated with reverter
     57    private final DataSet ds; // DataSet associated with reverter
     58    private final ChangesetDataSet cds; // Current changeset data
    5959    private DataSet nds; // Dataset that contains new objects downloaded by reverter
    6060
    … …  
    6868    ////////////////////////////////////////
    6969    private void addIfMissing(PrimitiveId id) {
    70         OsmPrimitive p = ds.getPrimitiveById(id); 
     70        OsmPrimitive p = ds.getPrimitiveById(id);
    7171        if (p == null || p.isIncomplete()) {
    7272            missing.add(id);
    … …  
    9494        }
    9595    }
    96    
     96
    9797    /**
    9898     * Checks if {@see ChangesetDataSetEntry} conforms to current RevertType
    9999     * @param entry entry to be checked
    100      * @return <code>true</code> if {@see ChangesetDataSetEntry} conforms to current RevertType 
     100     * @return <code>true</code> if {@see ChangesetDataSetEntry} conforms to current RevertType
    101101     */
    102102    private boolean CheckOsmChangeEntry(ChangesetDataSetEntry entry) {
    … …  
    110110        return p.isSelected();
    111111    }
    112    
     112
    113113    /**
    114114     * creates a reverter for specific changeset and fetches initial data
    … …  
    132132            monitor.finishTask();
    133133        }
    134        
     134
    135135        // Build our own lists of created/updated/modified objects for better performance
    136136        for (Iterator<ChangesetDataSetEntry> it = cds.iterator();it.hasNext();) {
    … …  
    163163    public void downloadObjectsHistory(ProgressMonitor progressMonitor) throws OsmTransferException {
    164164        final OsmServerMultiObjectReader rdr = new OsmServerMultiObjectReader();
    165        
     165
    166166        progressMonitor.beginTask("Downloading objects history",updated.size()+deleted.size()+1);
    167167        try {
    … …  
    182182        }
    183183    }
    184    
     184
    185185    public void downloadMissingPrimitives(ProgressMonitor monitor) throws OsmTransferException {
    186186        if (!hasMissingObjects()) return;
    … …  
    200200            }
    201201        }
    202         DataSet source = rdr.parseOsm(monitor); 
     202        DataSet source = rdr.parseOsm(monitor);
    203203        for (OsmPrimitive p : source.allPrimitives()) {
    204204            if (!p.isVisible() && !p.isDeleted()) {
    … …  
    210210        missing.clear();
    211211    }
    212    
     212
    213213    private static Conflict<? extends OsmPrimitive> CreateConflict(OsmPrimitive p, boolean isMyDeleted) {
    214214        switch (p.getType()) {
    … …  
    222222        }
    223223    }
    224    
     224
    225225    private static boolean hasEqualSemanticAttributes(OsmPrimitive current,HistoryOsmPrimitive history) {
    226226        if (!current.getKeys().equals(history.getTags())) return false;
    … …  
    237237            return true;
    238238        case RELATION:
    239             List<org.openstreetmap.josm.data.osm.RelationMember> currentMembers = 
     239            List<org.openstreetmap.josm.data.osm.RelationMember> currentMembers =
    240240                ((Relation)current).getMembers();
    241241            List<RelationMember> historyMembers = ((HistoryRelation)history).getMembers();
    242242            if (currentMembers.size() != historyMembers.size()) return false;
    243243            for (int i = 0; i < currentMembers.size(); i++) {
    244                 org.openstreetmap.josm.data.osm.RelationMember currentMember = 
     244                org.openstreetmap.josm.data.osm.RelationMember currentMember =
    245245                    currentMembers.get(i);
    246246                RelationMember historyMember = historyMembers.get(i);
    … …  
    253253        }
    254254    }
    255    
     255
    256256    /**
    257257     * Builds a list of commands that will revert the changeset
    258      * 
     258     *
    259259     */
    260260    public List<Command> getCommands() {
    261261        if (this.nds == null) return null;
    262        
     262
    263263        //////////////////////////////////////////////////////////////////////////
    264264        // Create commands to restore/update all affected objects
    … …  
    282282            if (p != null) toDelete.add(p);
    283283        }
    284        
     284
    285285
    286286        //////////////////////////////////////////////////////////////////////////
    287287        // Check reversion against current dataset and create necessary conflicts
    288        
     288
    289289        HashSet<OsmPrimitive> conflicted = new HashSet<OsmPrimitive>();
    290        
     290
    291291        for (Conflict<? extends OsmPrimitive> conflict : merger.getConflicts()) {
    292292            cmds.add(new ConflictAddCommand(layer,conflict));
    293293        }
    294        
     294
    295295        // Check objects versions
    296296        for (Iterator<ChangesetDataSetEntry> it = cds.iterator();it.hasNext();) {
    … …  
    302302                throw new IllegalStateException(tr("Missing merge target for {0} with id {1}",
    303303                        hp.getType(), hp.getId()));
    304            
     304
    305305            if (hp.getVersion() != dp.getVersion()
    306306                    && (hp.isVisible() || dp.isVisible()) &&
    … …  
    309309                     */
    310310                    !hasEqualSemanticAttributes(dp,hp)) {
    311                
    312                
    313                 cmds.add(new ConflictAddCommand(layer,CreateConflict(dp, 
     311
     312
     313                cmds.add(new ConflictAddCommand(layer,CreateConflict(dp,
    314314                        entry.getModificationType() == ChangesetModificationType.CREATED)));
    315315                conflicted.add(dp);
    316316            }
    317317        }
    318        
     318
    319319        /* Check referrers for deleted objects: if object is referred by another object that
    320320         * isn't going to be deleted or modified, create a conflict.
    … …  
    340340            }
    341341        }
    342        
     342
    343343        // Create a Command to delete all marked objects
    344344        List<? extends OsmPrimitive> list;

  • applications/editors/josm/plugins/reverter/src/reverter/MultiOsmReader.java

    r21634 r23192  
    561561        processRelationsAfterParsing();
    562562    }
    563    
    564    
     563
     564
    565565}

  • applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryAction.java

    r21634 r23192  
    1616                Shortcut.registerShortcut("tool:history",
    1717                        "Tool: Display objects history dialog",
    18                         KeyEvent.VK_H, Shortcut.GROUP_EDIT, 
     18                        KeyEvent.VK_H, Shortcut.GROUP_EDIT,
    1919                        Shortcut.SHIFT_DEFAULT),
    2020                true);

  • applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryDialog.java

    r22533 r23192  
    1818        setButtonIcons(new String[] {"ok.png", "cancel.png" });
    1919        setContent(new JPanel(new GridBagLayout()));
    20         setupDialog();       
     20        setupDialog();
    2121    }
    2222}

  • applications/editors/josm/plugins/reverter/src/reverter/PrimitiveIdVersion.java

    r21700 r23192  
    2020        return version;
    2121    }
    22    
     22
    2323    @Override
    2424    public int hashCode() {

  • applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java

    r21726 r23192  
    2727                Shortcut.registerShortcut("tool:revert",
    2828                        tr("Tool: {0}", tr("Revert changeset")),
    29                         KeyEvent.VK_T, Shortcut.GROUP_EDIT, 
    30                         Shortcut.SHIFT_DEFAULT), 
     29                        KeyEvent.VK_T, Shortcut.GROUP_EDIT,
     30                        Shortcut.SHIFT_DEFAULT),
    3131                true);
    3232    }
    33    
     33
    3434    @Override
    3535    protected void updateEnabledState() {
    … …  
    4747        if (changesetId == 0) return;
    4848        if (revertType == null) return;
    49        
     49
    5050        Main.worker.submit(new PleaseWaitRunnable(tr("Reverting...")) {
    5151            private ChangesetReverter rev;
    5252            private boolean downloadConfirmed = false;
    53            
     53
    5454            private boolean checkAndDownloadMissing() throws OsmTransferException {
    5555                if (!rev.hasMissingObjects()) return true;
    5656                if (!downloadConfirmed) {
    5757                    downloadConfirmed = JOptionPane.showConfirmDialog(Main.parent,
    58                             tr("This changeset has objects that are not present in current dataset.\n" + 
     58                            tr("This changeset has objects that are not present in current dataset.\n" +
    5959                                    "It is needed to download them before reverting. Do you want to continue?"),
    6060                            tr("Confirm"), JOptionPane.YES_NO_OPTION) == JOptionPane.YES_OPTION;
    6161                    if (!downloadConfirmed) return false;
    6262                }
    63                 final PleaseWaitProgressMonitor monitor = 
     63                final PleaseWaitProgressMonitor monitor =
    6464                    new PleaseWaitProgressMonitor(tr("Fetching missing primitives"));
    6565                try {
    … …  
    7070                return !monitor.isCancelled();
    7171            }
    72            
     72
    7373            @Override
    7474            protected void realRun() throws OsmTransferException {
    … …  
    9090                    rev.downloadMissingPrimitives(progressMonitor.createSubTaskMonitor(0, false));
    9191                }
    92                
     92
    9393                if (progressMonitor.isCancelled()) return;
    9494                rev.downloadObjectsHistory(progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
    … …  
    9696                if (!checkAndDownloadMissing()) return;
    9797                List<Command> cmds = rev.getCommands();
    98                 Command cmd = new SequenceCommand(tr(revertType == RevertType.FULL ? "Revert changeset #{0}" : 
     98                Command cmd = new SequenceCommand(tr(revertType == RevertType.FULL ? "Revert changeset #{0}" :
    9999                        "Partially revert changeset #{0}",changesetId),cmds);
    100100                Main.main.undoRedo.add(cmd);

  • applications/editors/josm/plugins/reverter/src/reverter/ReverterPlugin.java

    r21807 r23192  
    1818        JMenu historyMenu = Main.main.menu.addMenu(marktr("History"), KeyEvent.VK_R,
    1919                Main.main.menu.defaultMenuPos,ht("/Plugin/Reverter"));
    20         //MainMenu.add(historyMenu, new ObjectsHistoryAction());       
     20        //MainMenu.add(historyMenu, new ObjectsHistoryAction());
    2121        MainMenu.add(historyMenu, new RevertChangesetAction());
    2222    }
Note: See TracChangeset for help on using the changeset viewer.