Ignore:
Timestamp:
2016-06-18T00:06:41+02:00 (8 years ago)
Author:
Don-vip
Message:

fix #12983 - replace calls to Main.main.get[Active|Edit]Layer() by Main.getLayerManager().get[Active|Edit]Layer() - gsoc-core

Location:
trunk/src/org/openstreetmap/josm/gui
Files:
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java

    r10369 r10413  
    196196    public void prepareForEditing() {
    197197        AutoCompletionList acList = new AutoCompletionList();
    198         Main.main.getEditLayer().data.getAutoCompletionManager().populateWithMemberRoles(acList);
     198        Main.getLayerManager().getEditLayer().data.getAutoCompletionManager().populateWithMemberRoles(acList);
    199199        tfRole.setAutoCompletionList(acList);
    200200        AutoCompletingTextField editor = (AutoCompletingTextField) tblResolver.getColumnModel().getColumn(2).getCellEditor();
    … …  
    203203        }
    204204        AutoCompletionList acList2 = new AutoCompletionList();
    205         Main.main.getEditLayer().data.getAutoCompletionManager().populateWithKeys(acList2);
     205        Main.getLayerManager().getEditLayer().data.getAutoCompletionManager().populateWithKeys(acList2);
    206206        tfKey.setAutoCompletionList(acList2);
    207207    }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java

    r10332 r10413  
    121121        ChangesetCache.getInstance().addChangesetCacheListener(inActiveDataLayerModel);
    122122        Main.getLayerManager().addActiveLayerChangeListener(inActiveDataLayerModel);
    123         OsmDataLayer editLayer = Main.main.getEditLayer();
     123        OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
    124124        if (editLayer != null) {
    125125            editLayer.data.addDataSetListener(inActiveDataLayerModel);
    … …  
    134134        ChangesetCache.getInstance().removeChangesetCacheListener(inActiveDataLayerModel);
    135135        Main.getLayerManager().removeActiveLayerChangeListener(inActiveDataLayerModel);
    136         OsmDataLayer editLayer = Main.main.getEditLayer();
     136        OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
    137137        if (editLayer != null) {
    138138            editLayer.data.removeDataSetListener(inActiveDataLayerModel);
    … …  
    237237
    238238    protected void initWithCurrentData() {
    239         OsmDataLayer editLayer = Main.main.getEditLayer();
     239        OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
    240240        if (editLayer != null) {
    241241            inSelectionModel.initFromPrimitives(editLayer.data.getAllSelected());
    … …  
    323323                return;
    324324
    325             DataSet ds = Main.main.getEditLayer().data;
     325            DataSet ds = Main.getLayerManager().getEditLayer().data;
    326326            selectObjectsByChangesetIds(ds, sel);
    327327        }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

    r10369 r10413  
    345345    protected static FilteredCollection<? extends OsmPrimitive> getAffectedPrimitives(TreePath path) {
    346346        PseudoCommand c = ((CommandListMutableTreeNode) path.getLastPathComponent()).getCommand();
    347         final OsmDataLayer currentLayer = Main.main.getEditLayer();
     347        final OsmDataLayer currentLayer = Main.getLayerManager().getEditLayer();
    348348        return new FilteredCollection<>(
    349349                c.getParticipatingPrimitives(),
    … …  
    389389                throw new IllegalStateException();
    390390
    391             OsmDataLayer editLayer = Main.main.getEditLayer();
     391            OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
    392392            if (editLayer == null) return;
    393393            editLayer.data.setSelected(getAffectedPrimitives(path));

  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

    r10378 r10413  
    234234     */
    235235    public void refreshView() {
    236         OsmDataLayer editLayer = Main.main.getEditLayer();
     236        OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
    237237        conflicts = editLayer == null ? new ConflictCollection() : editLayer.getConflicts();
    238238        GuiHelper.runInEDT(new Runnable() {

  • trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

    r10386 r10413  
    362362
    363363        public void run() {
    364             RelationEditor.getEditor(Main.main.getEditLayer(), null, null).setVisible(true);
     364            RelationEditor.getEditor(Main.getLayerManager().getEditLayer(), null, null).setVisible(true);
    365365        }
    366366
    … …  
    694694    @Override
    695695    public void dataChanged(DataChangedEvent event) {
    696         initFromLayer(Main.main.getEditLayer());
     696        initFromLayer(Main.getLayerManager().getEditLayer());
    697697    }
    698698

  • trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

    r10383 r10413  
    212212            if (idx < 0) return;
    213213            if (isDoubleClick(e)) {
    214                 OsmDataLayer layer = Main.main.getEditLayer();
     214                OsmDataLayer layer = Main.getLayerManager().getEditLayer();
    215215                if (layer == null) return;
    216216                OsmPrimitive osm = model.getElementAt(idx);
    … …  
    335335            Collection<OsmPrimitive> sel = model.getSelected();
    336336            if (sel.isEmpty()) return;
    337             OsmDataLayer editLayer = Main.main.getEditLayer();
     337            OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
    338338            if (editLayer == null) return;
    339339            editLayer.data.setSelected(sel);

  • trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

    r10378 r10413  
    144144    public void showDialog() {
    145145        super.showDialog();
    146         Layer layer = Main.main.getActiveLayer();
     146        Layer layer = Main.getLayerManager().getActiveLayer();
    147147        if (layer instanceof OsmDataLayer) {
    148148            refresh(((OsmDataLayer) layer).data.getAllSelected());

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java

    r10332 r10413  
    198198                        + "edit layer ''{0}''.</html>",
    199199                        primitives.size(),
    200                         Main.main.getEditLayer().getName()
     200                        Main.getLayerManager().getEditLayer().getName()
    201201                ),
    202202                title, JOptionPane.WARNING_MESSAGE, helpTopic
    … …  
    336336                return null;
    337337            }
    338             OsmDataLayer layer = Main.main.getEditLayer();
     338            OsmDataLayer layer = Main.getLayerManager().getEditLayer();
    339339            Set<OsmPrimitive> target = new HashSet<>();
    340340            for (HistoryOsmPrimitive p : model.getSelectedPrimitives()) {
    … …  
    386386                return;
    387387            }
    388             Main.main.getEditLayer().data.setSelected(target);
     388            Main.getLayerManager().getEditLayer().data.setSelected(target);
    389389        }
    390390    }
    … …  
    409409                return;
    410410            }
    411             Main.main.getEditLayer().data.setSelected(target);
     411            Main.getLayerManager().getEditLayer().data.setSelected(target);
    412412            AutoScaleAction.zoomToSelection();
    413413        }

  • trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java

    r10378 r10413  
    335335                            + "edit layer ''{1}''.</html>",
    336336                            currentChangeset.getId(),
    337                             Main.main.getEditLayer().getName()
     337                            Main.getLayerManager().getEditLayer().getName()
    338338                    ),
    339339                    tr("Nothing to select"),
    … …  
    348348                return;
    349349            if (Main.main == null || !Main.main.hasEditLayer()) return;
    350             OsmDataLayer layer = Main.main.getEditLayer();
     350            OsmDataLayer layer = Main.getLayerManager().getEditLayer();
    351351            Set<OsmPrimitive> target = new HashSet<>();
    352352            for (OsmPrimitive p: layer.data.allPrimitives()) {
    … …  
    396396                            + "edit layer ''{1}''.</html>",
    397397                            currentChangeset.getId(),
    398                             Main.main.getEditLayer().getName()
     398                            Main.getLayerManager().getEditLayer().getName()
    399399                    ),
    400400                    tr("Nothing to zoom to"),
    … …  
    409409                return;
    410410            if (Main.main == null || !Main.main.hasEditLayer()) return;
    411             OsmDataLayer layer = Main.main.getEditLayer();
     411            OsmDataLayer layer = Main.getLayerManager().getEditLayer();
    412412            Set<OsmPrimitive> target = new HashSet<>();
    413413            for (OsmPrimitive p: layer.data.allPrimitives()) {

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

    r10345 r10413  
    563563        Main.map.relationListDialog.selectRelation(relation);
    564564        RelationEditor.getEditor(
    565                 Main.main.getEditLayer(),
     565                Main.getLayerManager().getEditLayer(),
    566566                relation,
    567567                ((MemberInfo) membershipData.getValueAt(row, 1)).role

  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

    r10378 r10413  
    419419            mainPanel.add(p, BorderLayout.CENTER);
    420420
    421             AutoCompletionManager autocomplete = Main.main.getEditLayer().data.getAutoCompletionManager();
     421            AutoCompletionManager autocomplete = Main.getLayerManager().getEditLayer().data.getAutoCompletionManager();
    422422            List<AutoCompletionListItem> keyList = autocomplete.getKeys();
    423423            Collections.sort(keyList, defaultACItemComparator);
    … …  
    676676                +"<br><br>"+tr("Please select a key")), GBC.eol().fill(GBC.HORIZONTAL));
    677677
    678             AutoCompletionManager autocomplete = Main.main.getEditLayer().data.getAutoCompletionManager();
     678            AutoCompletionManager autocomplete = Main.getLayerManager().getEditLayer().data.getAutoCompletionManager();
    679679            List<AutoCompletionListItem> keyList = autocomplete.getKeys();
    680680

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java

    r10386 r10413  
    235235        private void updateEnabledState() {
    236236            setEnabled(Main.main != null
    237                     && Main.main.getEditLayer() == getLayer()
     237                    && Main.getLayerManager().getEditLayer() == getLayer()
    238238                    && getSelectedRowCount() == 1
    239239                    && hasGap());

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

    r10089 r10413  
    108108    @Override
    109109    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
    110         if (Main.main.getEditLayer() != this.layer) return;
     110        if (Main.getLayerManager().getEditLayer() != this.layer) return;
    111111        // just trigger a repaint
    112112        Collection<RelationMember> sel = getSelectedMembers();

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java

    r10212 r10413  
    3131 *  final ParentRelationLoadingTask task = new ParentRelationLoadingTask(
    3232 *                   child,   // the child relation
    33  *                   Main.main.getEditLayer(), // the edit layer
     33 *                   Main.getLayerManager().getEditLayer(), // the edit layer
    3434 *                   true,  // load fully
    3535 *                   new PleaseWaitProgressMonitor()  // a progress monitor

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java

    r10378 r10413  
    135135                return;
    136136            }
    137             DataSetMerger visitor = new DataSetMerger(Main.main.getEditLayer().data, ds);
     137            DataSetMerger visitor = new DataSetMerger(Main.getLayerManager().getEditLayer().data, ds);
    138138            visitor.merge();
    139139            if (!visitor.getConflicts().isEmpty()) {
    140                 Main.main.getEditLayer().getConflicts().add(visitor.getConflicts());
     140                Main.getLayerManager().getEditLayer().getConflicts().add(visitor.getConflicts());
    141141            }
    142142            final RelationTreeModel model = (RelationTreeModel) getModel();

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java

    r10378 r10413  
    6262    @Override
    6363    public int getRowCount() {
    64         if (Main.main.getEditLayer() != layer)
     64        if (Main.getLayerManager().getEditLayer() != layer)
    6565            return 0;
    6666        return cache.size();
    … …  
    104104    @Override
    105105    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
    106         if (layer == Main.main.getEditLayer()) {
     106        if (layer == Main.getLayerManager().getEditLayer()) {
    107107            cache.clear();
    108108            cache.addAll(newSelection);

  • trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

    r10378 r10413  
    106106
    107107        if (Main.main != null) {
    108             OsmDataLayer editLayer = Main.main.getEditLayer();
     108            OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
    109109            if (editLayer != null) {
    110110                editLayer.data.addDataSetListener(this);
    … …  
    174174        if (history.getNumVersions() > 0) {
    175175            HistoryOsmPrimitive newLatest = null;
    176             OsmDataLayer editLayer = Main.main.getEditLayer();
     176            OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
    177177            if (editLayer != null) {
    178178                OsmPrimitive p = editLayer.data.getPrimitiveById(history.getId(), history.getType());
    … …  
    532532            if (latest == null)
    533533                return null;
    534             OsmDataLayer editLayer = Main.main.getEditLayer();
     534            OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
    535535            if (editLayer == null)
    536536                return null;
    … …  
    666666     */
    667667    public void unlinkAsListener() {
    668         OsmDataLayer editLayer = Main.main.getEditLayer();
     668        OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
    669669        if (editLayer != null) {
    670670            editLayer.data.removeDataSetListener(this);

  • trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java

    r10210 r10413  
    243243            OsmPrimitive p = getPrimitiveToZoom();
    244244            if (p != null) {
    245                 OsmDataLayer editLayer = Main.main.getEditLayer();
     245                OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
    246246                if (editLayer != null) {
    247247                    editLayer.data.setSelected(p.getPrimitiveId());
    … …  
    259259            if (primitiveId == null)
    260260                return null;
    261             OsmDataLayer editLayer = Main.main.getEditLayer();
     261            OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
    262262            if (editLayer == null)
    263263                return null;

  • trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

    r10378 r10413  
    149149        String text;
    150150        if (isLatest) {
    151             OsmDataLayer editLayer = Main.main.getEditLayer();
     151            OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
    152152            text = tr("<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>",
    153153                    Long.toString(version),

  • trunk/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java

    r10378 r10413  
    7979        // FIXME: should now about the layer this task is running for. might
    8080        // be different from the current edit layer
    81         OsmDataLayer layer = Main.main.getEditLayer();
     81        OsmDataLayer layer = Main.getLayerManager().getEditLayer();
    8282        if (layer == null)
    8383            throw new IllegalStateException(tr("Failed to update primitive with id {0} because current edit layer is null", id));
    … …  
    268268        );
    269269        if (ret == 0) {
    270             DownloadReferrersAction.downloadReferrers(Main.main.getEditLayer(), Arrays.asList(conflict.a));
     270            DownloadReferrersAction.downloadReferrers(Main.getLayerManager().getEditLayer(), Arrays.asList(conflict.a));
    271271        }
    272272    }

  • trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesWithReferrersTask.java

    r8840 r10413  
    129129
    130130        // Append downloaded data to JOSM
    131         OsmDataLayer layer = Main.main.getEditLayer();
     131        OsmDataLayer layer = Main.getLayerManager().getEditLayer();
    132132        if (layer == null || this.newLayer)
    133133            Main.main.addLayer(tmpLayer);

  • trunk/src/org/openstreetmap/josm/gui/io/TagSettingsPanel.java

    r10210 r10413  
    9797     */
    9898    public void startUserInput() {
    99         pnlTagEditor.initAutoCompletion(Main.main.getEditLayer());
     99        pnlTagEditor.initAutoCompletion(Main.getLayerManager().getEditLayer());
    100100    }
    101101

  • trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPreset.java

    r10369 r10413  
    389389                @Override
    390390                public void run() {
    391                     RelationEditor.getEditor(Main.main.getEditLayer(), r, members).setVisible(true);
     391                    RelationEditor.getEditor(Main.getLayerManager().getEditLayer(), r, members).setVisible(true);
    392392                }
    393393            });

  • trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetItem.java

    r10212 r10413  
    4141    protected void initAutoCompletionField(AutoCompletingTextField field, List<String> keys) {
    4242        if (Main.main == null) return;
    43         OsmDataLayer layer = Main.main.getEditLayer();
     43        OsmDataLayer layer = Main.getLayerManager().getEditLayer();
    4444        if (layer == null) {
    4545            return;
Note: See TracChangeset for help on using the changeset viewer.