Index: applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/ToulouseDataSetHandler.java
===================================================================
--- applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/ToulouseDataSetHandler.java	(revision 32931)
+++ applications/editors/josm/plugins/opendata/modules/fr.toulouse/src/org/openstreetmap/josm/plugins/opendata/modules/fr/toulouse/datasets/ToulouseDataSetHandler.java	(revision 32932)
@@ -45,5 +45,6 @@
     public static final DataSetCategory CAT_CULTURE = new DataSetCategory("Culture", "presets/arts_centre.png");
     public static final DataSetCategory CAT_ENFANCE = new DataSetCategory("Enfance", "presets/kindergarten.png");
-    public static final DataSetCategory CAT_ENVIRONNEMENT = new DataSetCategory("Environnement", "styles/standard/service/recycling/recycling_container.svg");
+    public static final DataSetCategory CAT_ENVIRONNEMENT = new DataSetCategory("Environnement",
+            "styles/standard/service/recycling/recycling_container.svg");
     public static final DataSetCategory CAT_PATRIMOINE = new DataSetCategory("Patrimoine", "presets/ruins.png");
     public static final DataSetCategory CAT_SERVICES = new DataSetCategory("Services", "styles/standard/vehicle/services.png");
@@ -85,5 +86,5 @@
     }*/
 
-    private final void init(int portalId) {
+    private void init(int portalId) {
         try {
             setLicense(new ToulouseLicense());
@@ -141,14 +142,14 @@
         public void actionPerformed(ActionEvent e) {
             final String baseName = OdPlugin.getInstance().getDialog().getDataLayer().getName();
-            final DataSet baseDs = getCurrentDataSet();
+            final DataSet baseDs = Main.getLayerManager().getEditDataSet();
             for (OsmPrimitive boundary : getBoundaries()) {
                 DataSet data = new DataSet();
                 for (OsmPrimitive p : NodeWayUtils.selectAllInside(Collections.singleton(boundary), baseDs)) {
                     if (p instanceof Node) {
-                        data.addPrimitive(new Node((Node)p));
+                        data.addPrimitive(new Node((Node) p));
                     } else if (p instanceof Way) {
-                        data.addPrimitive(new Way((Way)p));
+                        data.addPrimitive(new Way((Way) p));
                     } else if (p instanceof Relation) {
-                        data.addPrimitive(new Relation((Relation)p));
+                        data.addPrimitive(new Relation((Relation) p));
                     }
                 }
@@ -165,26 +166,34 @@
             }
         }
+
         @Override
         public void dataChanged(DataChangedEvent event) {
             setEnabled(!getBoundaries().isEmpty());
         }
+
         @Override
         public void primitivesAdded(PrimitivesAddedEvent event) {
         }
+
         @Override
         public void primitivesRemoved(PrimitivesRemovedEvent event) {
         }
+
         @Override
         public void tagsChanged(TagsChangedEvent event) {
         }
+
         @Override
         public void nodeMoved(NodeMovedEvent event) {
         }
+
         @Override
         public void wayNodesChanged(WayNodesChangedEvent event) {
         }
+
         @Override
         public void relationMembersChanged(RelationMembersChangedEvent event) {
         }
+
         @Override
         public void otherDatasetChange(AbstractDatasetChangedEvent event) {
@@ -196,4 +205,5 @@
             super(marktr("Split by municipality"), tr("Split this data by municipality (admin_level=8)."));
         }
+
         @Override
         protected Collection<Relation> getBoundaries() {
@@ -206,4 +216,5 @@
             super(marktr("Split by sector"), tr("Split this data by sector (admin_level=10)."));
         }
+
         @Override
         protected Collection<Relation> getBoundaries() {
@@ -216,4 +227,5 @@
             super(marktr("Split by neighbourhood"), tr("Split this data by neighbourhood (admin_level=11)."));
         }
+
         @Override
         protected Collection<Relation> getBoundaries() {