Changeset 32468 in osm for applications/editors/josm/plugins/indoorhelper
- Timestamp:
- 2016-06-30T20:10:45+02:00 (8 years ago)
- Location:
- applications/editors/josm/plugins/indoorhelper
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/indoorhelper/build.xml
r32134 r32468 5 5 <property name="commit.message" value="Inital commit"/> 6 6 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 7 <property name="plugin.main.version" value=" 9759"/>7 <property name="plugin.main.version" value="10279"/> 8 8 9 9 <!-- Configure these properties (replace "..." accordingly). -
applications/editors/josm/plugins/indoorhelper/src/controller/IndoorHelperController.java
r32137 r32468 23 23 import java.awt.event.ItemEvent; 24 24 import java.awt.event.ItemListener; 25 import java.io.IOException;26 25 import java.util.ArrayList; 27 26 import java.util.Collections; … … 31 30 32 31 import javax.swing.JOptionPane; 33 import javax.xml.stream.XMLStreamException;34 32 35 33 import org.openstreetmap.josm.Main; 36 34 import org.openstreetmap.josm.actions.ValidateAction; 35 import org.openstreetmap.josm.data.osm.Tag; 37 36 import org.openstreetmap.josm.data.preferences.MapListSetting; 38 37 import org.openstreetmap.josm.data.preferences.Setting; 39 import org.openstreetmap.josm.data.osm.Tag;40 38 import org.openstreetmap.josm.data.validation.OsmValidator; 41 39 import org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker; … … 43 41 import org.openstreetmap.josm.gui.dialogs.FilterTableModel; 44 42 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles; 45 import org.xml.sax.SAXException;46 43 47 44 import model.IndoorHelperModel; … … 59 56 * 60 57 */ 61 62 58 public class IndoorHelperController { 63 59 -
applications/editors/josm/plugins/indoorhelper/src/model/IndoorHelperModel.java
r32122 r32468 39 39 * @author egru 40 40 */ 41 42 41 public class IndoorHelperModel{ 43 42 … … 261 260 */ 262 261 public void addTagsToOSM(IndoorObject object, List<Tag> userTags){ 263 if(!Main. main.getCurrentDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()){262 if(!Main.getLayerManager().getEditDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()){ 264 263 265 264 List<Tag> tags = this.getObjectTags(object); … … 279 278 } 280 279 281 } else if(Main. main.getCurrentDataSet().selectionEmpty()){280 } else if(Main.getLayerManager().getEditDataSet().selectionEmpty()){ 282 281 283 282 JOptionPane.showMessageDialog(null, "No data selected.", "Error", JOptionPane.ERROR_MESSAGE); 284 285 } 286 283 } 287 284 } 288 285 … … 295 292 public void addTagsToOSM(IndoorObject object){ 296 293 297 if(!Main. main.getCurrentDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()){294 if(!Main.getLayerManager().getEditDataSet().selectionEmpty() && !Main.main.getInProgressSelection().isEmpty()){ 298 295 List<Tag> tags = this.getObjectTags(object); 299 296 tags.add(new Tag("indoor:level", Integer.toString(workingLevel))); … … 306 303 Main.main.undoRedo.add(new ChangePropertyCommand(Main.main.getInProgressSelection(), t.getKey(), t.getValue())); 307 304 } 308 } else if(Main. main.getCurrentDataSet().selectionEmpty()){305 } else if(Main.getLayerManager().getEditDataSet().selectionEmpty()){ 309 306 JOptionPane.showMessageDialog(null, "No data selected.", "Error", JOptionPane.ERROR_MESSAGE); 310 307 } 311 312 313 308 } 314 309 … … 321 316 return counter.getRanking(); 322 317 } 323 324 325 326 318 }
Note:
See TracChangeset
for help on using the changeset viewer.