Revision 5074

View differences:

org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.api/src/main/java/org/gvsig/vcsgis/swing/VCSGisSwingServices.java
62 62
    public Icon getFeatureStoresTreeModelIcon(TreeModel model, Object obj);
63 63
    
64 64
    public void connectedToModel(VCSGisWorkspace workspace, String model);
65
    
66
    public Geometry getExtentOfCurrentDocument();
65 67

  
66 68
}
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/test/java/org/gvsig/vcsgis/swing/impl/managehistory/Test01BackupHistory.java
1 1
package org.gvsig.vcsgis.swing.impl.managehistory;
2 2

  
3 3
import java.io.File;
4
import java.net.URL;
5 4
import java.sql.Timestamp;
6 5
import java.util.List;
7 6
import java.util.Locale;
......
13 12
import org.gvsig.fmap.dal.feature.EditableFeature;
14 13
import org.gvsig.fmap.dal.feature.Feature;
15 14
import org.gvsig.fmap.dal.feature.FeatureStore;
16
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters;
17 15
import org.gvsig.fmap.dal.store.jdbc2.JDBCServerExplorer;
18 16
import org.gvsig.tools.dispose.DisposeUtils;
19 17
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer;
......
206 204
            assertEquals("ws1.commit-1 status", ERR_NO_ERROR, r);
207 205

  
208 206
            //Export enero
209
            r = ws1.export("test", "exp_enero", null, Timestamp.valueOf("2021-01-15 00:00:00.000"), null);
207
            r = ws1.export("test", "exp_enero", null, Timestamp.valueOf("2021-01-15 00:00:00.000"), null, null);
210 208
            assertEquals("ws1.export-1 status", 0, r);
211 209
            store2 = ws1.openFeatureStore("exp_enero", false);
212 210
            features = store2.getFeatures((Expression) null, "id", true);
......
221 219
            DisposeUtils.disposeQuietly(store2);
222 220

  
223 221
            //Export febrero
224
            r = ws1.export("test", "exp_febrero", null, Timestamp.valueOf("2021-02-15 00:00:00.000"), null);
222
            r = ws1.export("test", "exp_febrero", null, Timestamp.valueOf("2021-02-15 00:00:00.000"), null, null);
225 223
            assertEquals("ws1.export-1 status", 0, r);
226 224
            store2 = ws1.openFeatureStore("exp_febrero", false);
227 225
            features = store2.getFeatures((Expression) null, "id", true);
......
240 238
            DisposeUtils.disposeQuietly(store2);
241 239

  
242 240
            //Export marzo
243
            r = ws1.export("test", "exp_marzo", null, Timestamp.valueOf("2021-03-15 00:00:00.000"), null);
241
            r = ws1.export("test", "exp_marzo", null, Timestamp.valueOf("2021-03-15 00:00:00.000"), null, null);
244 242
            assertEquals("ws1.export-1 status", 0, r);
245 243
            store2 = ws1.openFeatureStore("exp_marzo", false);
246 244
            features = store2.getFeatures((Expression) null, "id", true);
......
260 258
            DisposeUtils.disposeQuietly(store2);
261 259

  
262 260
            //Export abril
263
            r = ws1.export("test", "exp_abril", null, Timestamp.valueOf("2021-04-15 00:00:00.000"), null);
261
            r = ws1.export("test", "exp_abril", null, Timestamp.valueOf("2021-04-15 00:00:00.000"), null, null);
264 262
            assertEquals("ws1.export-1 status", 0, r);
265 263
            store2 = ws1.openFeatureStore("exp_abril", false);
266 264
            features = store2.getFeatures((Expression) null, "id", true);
......
282 280
            DisposeUtils.disposeQuietly(store2);
283 281

  
284 282
            //Export mayo
285
            r = ws1.export("test", "exp_mayo", null, Timestamp.valueOf("2021-05-15 00:00:00.000"), null);
283
            r = ws1.export("test", "exp_mayo", null, Timestamp.valueOf("2021-05-15 00:00:00.000"), null, null);
286 284
            assertEquals("ws1.export-1 status", 0, r);
287 285
            store2 = ws1.openFeatureStore("exp_mayo", false);
288 286
            features = store2.getFeatures((Expression) null, "id", true);
......
306 304
            DisposeUtils.disposeQuietly(store2);
307 305

  
308 306
            //Export junio
309
            r = ws1.export("test", "exp_junio", null, Timestamp.valueOf("2021-06-15 00:00:00.000"), null);
307
            r = ws1.export("test", "exp_junio", null, Timestamp.valueOf("2021-06-15 00:00:00.000"), null, null);
310 308
            assertEquals("ws1.export-2 status", 0, r);
311 309
            store2 = ws1.openFeatureStore("exp_junio", false);
312 310
            features = store2.getFeatures((Expression) null, "id", true);
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/managehistory/RestoreHistory.java
9 9
import java.util.concurrent.Callable;
10 10
import javax.json.JsonObject;
11 11
import org.apache.commons.io.FilenameUtils;
12
import org.gvsig.expressionevaluator.spi.JsonUtils;
13 12
import org.gvsig.fmap.dal.DALLocator;
14 13
import org.gvsig.fmap.dal.DataManager;
15 14
import org.gvsig.fmap.dal.DataStore;
......
24 23
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters;
25 24
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParameters;
26 25
import org.gvsig.fmap.dal.store.jdbc2.JDBCServerExplorer;
26
import org.gvsig.json.Json;
27 27
import org.gvsig.tools.ToolsLocator;
28 28
import org.gvsig.tools.dispose.DisposeUtils;
29 29
import org.gvsig.tools.task.SimpleTaskStatus;
30
import org.gvsig.vcsgis.lib.VCSGisManager;
31 30
import static org.gvsig.vcsgis.lib.VCSGisManager.ERR_EXCEPTION;
32 31
import static org.gvsig.vcsgis.lib.VCSGisManager.ERR_OK;
33 32
import org.slf4j.Logger;
......
56 55
    public Integer call() {
57 56

  
58 57
        if( this.status == null ) {
59
            this.status = ToolsLocator.getTaskStatusManager().createDefaultSimpleTaskStatus("vcsgis init");
58
            this.status = ToolsLocator.getTaskStatusManager().createDefaultSimpleTaskStatus("Restore");
60 59
            this.status.setAutoremove(true);
61 60
            this.status.add();
62 61
        } else {
......
159 158
                if(data != null){
160 159
                    JsonObject x = null;
161 160
                    try {
162
                        x = JsonUtils.toJsonObject(data);
161
                        x = Json.createObject(data);
163 162
                    } catch (Exception ex) {
164 163
                        throw new RuntimeException("DAT_DATA incorrect value at line "+line, ex);
165 164
                    }
......
180 179
            status.terminate();
181 180
            return ERR_OK;
182 181
        } catch (Exception ex) {
183
            LOGGER.warn("Can't export history.", ex);
182
            LOGGER.warn("Can't restore backup.", ex);
184 183
            DataTransaction.rollbackQuietly(trans);
185 184
            status.abort();
186 185
            return ERR_EXCEPTION;
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/export/VCSGisJExportImpl.java
27 27
import java.util.Date;
28 28
import javax.swing.ComboBoxModel;
29 29
import javax.swing.JComponent;
30
import javax.swing.JOptionPane;
30 31
import javax.swing.SwingUtilities;
31 32
import javax.swing.event.ChangeEvent;
32 33
import javax.swing.event.DocumentEvent;
......
34 35
import org.apache.commons.lang3.StringUtils;
35 36
import org.gvsig.fmap.dal.feature.FeatureStore;
36 37
import org.gvsig.fmap.dal.feature.FeatureType;
38
import org.gvsig.fmap.geom.Geometry;
37 39
import org.gvsig.tools.ToolsLocator;
38 40
import org.gvsig.tools.dataTypes.DataTypeUtils;
39 41
import org.gvsig.tools.dispose.DisposeUtils;
......
46 48
import org.gvsig.tools.swing.api.pickercontroller.PickerController;
47 49
import org.gvsig.tools.swing.api.task.TaskStatusController;
48 50
import org.gvsig.tools.swing.api.task.TaskStatusSwingManager;
51
import org.gvsig.tools.swing.api.threadsafedialogs.ThreadSafeDialogsManager;
49 52
import org.gvsig.tools.swing.api.windowmanager.Dialog;
50 53
import org.gvsig.tools.swing.api.windowmanager.WindowManager_v2;
51 54
import org.gvsig.tools.util.LabeledValue;
52 55
import org.gvsig.vcsgis.lib.VCSGisEntity;
53
import static org.gvsig.vcsgis.lib.VCSGisManager.ERR_CANT_CHECKOUT;
56
import static org.gvsig.vcsgis.lib.VCSGisManager.ERR_CANT_EXPORT;
54 57
import static org.gvsig.vcsgis.lib.VCSGisManager.ERR_OK;
55 58
import org.gvsig.vcsgis.lib.VCSGisRevision;
56 59
import org.gvsig.vcsgis.lib.VCSGisRuntimeException;
57 60
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspace;
58
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspaceEntity;
59 61
import org.gvsig.vcsgis.swing.VCSGisEntitySelectorController;
60 62
import static org.gvsig.vcsgis.swing.VCSGisEntitySelectorController.ACTION_BEGIN_PROCESSING_ID;
61 63
import static org.gvsig.vcsgis.swing.VCSGisEntitySelectorController.ACTION_END_PROCESSING_ID;
......
100 102

  
101 103
    private void initComponents() {
102 104
        //TODO: remove next line in next build (>3208)
103
        this.btnEffectiveDate.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
105
//        this.btnEffectiveDate.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
104 106

  
105 107
        TaskStatusSwingManager taskStatusManager = ToolsSwingLocator.getTaskStatusSwingManager();
106 108
        ToolsSwingManager toolsSwingManager = ToolsSwingLocator.getToolsSwingManager();
......
203 205
                doUpdateComponents();
204 206
            }
205 207
        });
208
        this.chkExportOnlyExtentOfCurrentView.setSelected(false);
206 209

  
207
        ToolsSwingUtils.ensureRowsCols(this, 25, 70);
210
        ToolsSwingUtils.ensureRowsCols(this, 25, 80);
208 211
        doUpdateComponents();
209 212

  
210 213
    }
......
466 469
    public int export() {
467 470
        I18nManager i18n = ToolsLocator.getI18nManager();
468 471

  
472
        Geometry roi = null;
473
        boolean exportOnlyExtentOfCurrentView = this.chkExportOnlyExtentOfCurrentView.isSelected();
474
        if( exportOnlyExtentOfCurrentView ) {
475
            VCSGisSwingManager swingManager = VCSGisSwingLocator.getVCSGisSwingManager();
476
            VCSGisSwingServices services = swingManager.getDefaultServices();
477
            roi = services.getExtentOfCurrentDocument();
478
            if( roi == null ) {
479
                ThreadSafeDialogsManager dialogs = ToolsSwingLocator.getThreadSafeDialogsManager();
480
                dialogs.messageDialog(
481
                        i18n.getTranslation("_Cant_retrieve_extent_of_active_document"), 
482
                        i18n.getTranslation("_VCS_Export"), 
483
                        JOptionPane.INFORMATION_MESSAGE
484
                );
485
                return ERR_CANT_EXPORT;
486
            }
487
        }
469 488
        VCSGisEntity entity = entitySelector.getSelectedEntity();
470 489
        final VCSGisWorkspace workspace = this.getWorkspace();
471

  
490
        
472 491
        VCSGisRevision revision = this.revisionPicker.get();
473 492
        if (workspace != null && entity != null) {
474 493
            try {
......
483 502
                        tableName,
484 503
                        (revision == null) ? null : revision.getRevisionCode(),
485 504
                        DataTypeUtils.toTimestamp(efectivePicker.get()),
505
                        roi,
486 506
                        null
487 507
                );
488 508
                postExport(res, tableName);
......
493 513
                doUpdateComponents();
494 514
            }
495 515
        }
496
        return ERR_CANT_CHECKOUT;
516
        return ERR_CANT_EXPORT;
497 517
    }
498 518

  
499 519
    private void translate() {
......
507 527
        swingManager.translate(this.rdbAddTableToProject);
508 528
        swingManager.translate(this.lblTableName);
509 529
        swingManager.translate(this.lblAddTableToProject);
530
        swingManager.translate(this.chkExportOnlyExtentOfCurrentView);
510 531
    }
511 532

  
512 533
    @Override
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/export/VCSGisJExportView.xml
24 24
    </at>
25 25
    <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
26 26
   </super>
27
   <at name="id">/home/fdiaz/projects/gvSIG/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/export/VCSGisJExportView.xml</at>
28
   <at name="path">src/main/java/org/gvsig/vcsgis/swing/impl/export/VCSGisJExportView.xml</at>
29
   <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:MIN(16PX;DEFAULT):NONE,CENTER:MIN(16PX;DEFAULT):NONE,CENTER:MIN(16PX;DEFAULT):NONE,CENTER:2DLU:NONE</at>
27
   <at name="id">/home/jjdelcerro/datos/devel/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/export/VCSGisJExportView.xml</at>
28
   <at name="path">datos/devel/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/export/VCSGisJExportView.xml</at>
29
   <at name="rowspecs">CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:MIN(16PX;DEFAULT):NONE,CENTER:MIN(16PX;DEFAULT):NONE,CENTER:MIN(16PX;DEFAULT):NONE,CENTER:2DLU:NONE</at>
30 30
   <at name="colspecs">FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE</at>
31 31
   <at name="components">
32 32
    <object classname="java.util.LinkedList">
......
75 75
             </object>
76 76
            </at>
77 77
            <at name="name">lblWorkspace</at>
78
            <at name="width">67</at>
78
            <at name="width">75</at>
79 79
            <at name="text">_Workingcopy</at>
80 80
            <at name="fill">
81 81
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
82 82
              <at name="name">fill</at>
83 83
             </object>
84 84
            </at>
85
            <at name="height">14</at>
85
            <at name="height">16</at>
86 86
           </object>
87 87
          </at>
88 88
         </object>
......
135 135
             </object>
136 136
            </at>
137 137
            <at name="name">cboWorkspaces</at>
138
            <at name="width">1178</at>
138
            <at name="width">517</at>
139 139
            <at name="items">
140 140
             <object classname="com.jeta.forms.store.properties.ItemsProperty">
141 141
              <at name="name">items</at>
142 142
             </object>
143 143
            </at>
144
            <at name="height">20</at>
144
            <at name="height">22</at>
145 145
           </object>
146 146
          </at>
147 147
         </object>
......
200 200
            <at name="actionCommand">...</at>
201 201
            <at name="opaque">false</at>
202 202
            <at name="name">btnInitWorkspace</at>
203
            <at name="width">16</at>
203
            <at name="width">13</at>
204 204
            <at name="text">...</at>
205
            <at name="height">18</at>
205
            <at name="height">20</at>
206 206
           </object>
207 207
          </at>
208 208
         </object>
......
255 255
             </object>
256 256
            </at>
257 257
            <at name="name">lblTable</at>
258
            <at name="width">67</at>
258
            <at name="width">75</at>
259 259
            <at name="text">_Table</at>
260 260
            <at name="fill">
261 261
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
262 262
              <at name="name">fill</at>
263 263
             </object>
264 264
            </at>
265
            <at name="height">14</at>
265
            <at name="height">16</at>
266 266
           </object>
267 267
          </at>
268 268
         </object>
......
315 315
             </object>
316 316
            </at>
317 317
            <at name="name">txtFilter</at>
318
            <at name="width">1256</at>
319
            <at name="height">20</at>
318
            <at name="width">602</at>
319
            <at name="height">22</at>
320 320
           </object>
321 321
          </at>
322 322
         </object>
......
371 371
            <at name="scrollableTracksViewportHeight">true</at>
372 372
            <at name="scrollableTracksViewportWidth">true</at>
373 373
            <at name="name">lstTables</at>
374
            <at name="width">1281</at>
374
            <at name="width">623</at>
375 375
            <at name="items">
376 376
             <object classname="com.jeta.forms.store.properties.ItemsProperty">
377 377
              <at name="name">items</at>
......
404 404
              </at>
405 405
             </object>
406 406
            </at>
407
            <at name="height">258</at>
407
            <at name="height">109</at>
408 408
           </object>
409 409
          </at>
410 410
         </object>
......
464 464
             </object>
465 465
            </at>
466 466
            <at name="name">rdbEffectiveDate</at>
467
            <at name="width">1283</at>
467
            <at name="width">625</at>
468 468
            <at name="text">_Effective_date</at>
469
            <at name="height">16</at>
469
            <at name="height">18</at>
470 470
           </object>
471 471
          </at>
472 472
         </object>
......
526 526
             </object>
527 527
            </at>
528 528
            <at name="name">rdbRevision</at>
529
            <at name="width">1283</at>
529
            <at name="width">625</at>
530 530
            <at name="text">_Revision</at>
531
            <at name="height">16</at>
531
            <at name="height">18</at>
532 532
           </object>
533 533
          </at>
534 534
         </object>
......
587 587
            <at name="actionCommand">...</at>
588 588
            <at name="opaque">false</at>
589 589
            <at name="name">btnTable</at>
590
            <at name="width">16</at>
590
            <at name="width">13</at>
591 591
            <at name="text">...</at>
592
            <at name="height">18</at>
592
            <at name="height">20</at>
593 593
           </object>
594 594
          </at>
595 595
         </object>
......
604 604
         <at name="cellconstraints">
605 605
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
606 606
           <at name="column">2</at>
607
           <at name="row">18</at>
607
           <at name="row">20</at>
608 608
           <at name="colspan">5</at>
609 609
           <at name="rowspan">1</at>
610 610
           <at name="halign">default</at>
......
642 642
             </object>
643 643
            </at>
644 644
            <at name="name">lblAddTableToProject</at>
645
            <at name="width">1283</at>
645
            <at name="width">625</at>
646 646
            <at name="text">_Add_the_table_to_the_project</at>
647 647
            <at name="fill">
648 648
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
649 649
              <at name="name">fill</at>
650 650
             </object>
651 651
            </at>
652
            <at name="height">14</at>
652
            <at name="height">16</at>
653 653
           </object>
654 654
          </at>
655 655
         </object>
......
664 664
         <at name="cellconstraints">
665 665
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
666 666
           <at name="column">2</at>
667
           <at name="row">21</at>
667
           <at name="row">23</at>
668 668
           <at name="colspan">4</at>
669 669
           <at name="rowspan">1</at>
670 670
           <at name="halign">default</at>
......
702 702
             </object>
703 703
            </at>
704 704
            <at name="name">lblStatusTitle</at>
705
            <at name="width">1263</at>
705
            <at name="width">608</at>
706 706
            <at name="fill">
707 707
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
708 708
              <at name="name">fill</at>
......
723 723
         <at name="cellconstraints">
724 724
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
725 725
           <at name="column">2</at>
726
           <at name="row">22</at>
726
           <at name="row">24</at>
727 727
           <at name="colspan">4</at>
728 728
           <at name="rowspan">1</at>
729 729
           <at name="halign">default</at>
......
761 761
             </object>
762 762
            </at>
763 763
            <at name="name">pbStatus</at>
764
            <at name="width">1263</at>
764
            <at name="width">608</at>
765 765
            <at name="percentComplete">0.25</at>
766 766
            <at name="value">25</at>
767 767
            <at name="height">12</at>
......
779 779
         <at name="cellconstraints">
780 780
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
781 781
           <at name="column">2</at>
782
           <at name="row">23</at>
782
           <at name="row">25</at>
783 783
           <at name="colspan">4</at>
784 784
           <at name="rowspan">1</at>
785 785
           <at name="halign">default</at>
......
817 817
             </object>
818 818
            </at>
819 819
            <at name="name">lblStatusMessages</at>
820
            <at name="width">1263</at>
820
            <at name="width">608</at>
821 821
            <at name="fill">
822 822
             <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
823 823
              <at name="name">fill</at>
......
848 848
         </at>
849 849
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
850 850
        </super>
851
        <at name="id">embedded.1021904144</at>
851
        <at name="id">embedded.918453058</at>
852 852
        <at name="rowspecs">CENTER:DEFAULT:NONE</at>
853 853
        <at name="colspecs">FILL:22PX:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
854 854
        <at name="components">
......
898 898
                  </object>
899 899
                 </at>
900 900
                 <at name="name">txtEffectiveDate</at>
901
                 <at name="width">1229</at>
901
                 <at name="width">575</at>
902 902
                 <at name="enabled">false</at>
903
                 <at name="height">20</at>
903
                 <at name="height">22</at>
904 904
                </object>
905 905
               </at>
906 906
              </object>
......
959 959
                 <at name="actionCommand">...</at>
960 960
                 <at name="opaque">false</at>
961 961
                 <at name="name">btnEffectiveDate</at>
962
                 <at name="width">16</at>
962
                 <at name="width">13</at>
963 963
                 <at name="text">...</at>
964 964
                 <at name="enabled">false</at>
965
                 <at name="height">18</at>
965
                 <at name="height">20</at>
966 966
                </object>
967 967
               </at>
968 968
              </object>
......
1069 1069
         </at>
1070 1070
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1071 1071
        </super>
1072
        <at name="id">embedded.2075886119</at>
1072
        <at name="id">embedded.1817131647</at>
1073 1073
        <at name="rowspecs">CENTER:DEFAULT:NONE</at>
1074 1074
        <at name="colspecs">FILL:22PX:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE</at>
1075 1075
        <at name="components">
......
1119 1119
                  </object>
1120 1120
                 </at>
1121 1121
                 <at name="name">txtRevision</at>
1122
                 <at name="width">1229</at>
1122
                 <at name="width">575</at>
1123 1123
                 <at name="enabled">false</at>
1124
                 <at name="height">20</at>
1124
                 <at name="height">22</at>
1125 1125
                </object>
1126 1126
               </at>
1127 1127
              </object>
......
1180 1180
                 <at name="actionCommand">...</at>
1181 1181
                 <at name="opaque">false</at>
1182 1182
                 <at name="name">btnRevision</at>
1183
                 <at name="width">16</at>
1183
                 <at name="width">13</at>
1184 1184
                 <at name="text">...</at>
1185 1185
                 <at name="enabled">false</at>
1186
                 <at name="height">18</at>
1186
                 <at name="height">20</at>
1187 1187
                </object>
1188 1188
               </at>
1189 1189
              </object>
......
1280 1280
         <at name="cellconstraints">
1281 1281
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1282 1282
           <at name="column">2</at>
1283
           <at name="row">20</at>
1283
           <at name="row">22</at>
1284 1284
           <at name="colspan">5</at>
1285 1285
           <at name="rowspan">1</at>
1286 1286
           <at name="halign">default</at>
......
1290 1290
         </at>
1291 1291
         <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1292 1292
        </super>
1293
        <at name="id">embedded.1835273475</at>
1293
        <at name="id">embedded.1164421047</at>
1294 1294
        <at name="rowspecs">CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE</at>
1295 1295
        <at name="colspecs">FILL:22PX:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0)</at>
1296 1296
        <at name="components">
......
1347 1347
                  </object>
1348 1348
                 </at>
1349 1349
                 <at name="name">rdbDontAddToProject</at>
1350
                 <at name="width">1256</at>
1350
                 <at name="width">598</at>
1351 1351
                 <at name="text">_Dont_add_the_table_or_layer_to_the_project</at>
1352
                 <at name="height">16</at>
1352
                 <at name="height">18</at>
1353 1353
                </object>
1354 1354
               </at>
1355 1355
              </object>
......
1409 1409
                  </object>
1410 1410
                 </at>
1411 1411
                 <at name="name">rdbAddLayerToView</at>
1412
                 <at name="width">1256</at>
1412
                 <at name="width">598</at>
1413 1413
                 <at name="text">_Add_layer_to_view</at>
1414
                 <at name="height">16</at>
1414
                 <at name="height">18</at>
1415 1415
                </object>
1416 1416
               </at>
1417 1417
              </object>
......
1471 1471
                  </object>
1472 1472
                 </at>
1473 1473
                 <at name="name">rdbAddTableToProject</at>
1474
                 <at name="width">1256</at>
1474
                 <at name="width">598</at>
1475 1475
                 <at name="text">_Add_table_to_project</at>
1476
                 <at name="height">16</at>
1476
                 <at name="height">18</at>
1477 1477
                </object>
1478 1478
               </at>
1479 1479
              </object>
......
1526 1526
                  </object>
1527 1527
                 </at>
1528 1528
                 <at name="name">lblTableName</at>
1529
                 <at name="width">75</at>
1529
                 <at name="width">67</at>
1530 1530
                 <at name="text">_Table_name</at>
1531 1531
                 <at name="fill">
1532 1532
                  <object classname="com.jeta.forms.store.properties.effects.PaintProperty">
1533 1533
                   <at name="name">fill</at>
1534 1534
                  </object>
1535 1535
                 </at>
1536
                 <at name="height">14</at>
1536
                 <at name="height">16</at>
1537 1537
                </object>
1538 1538
               </at>
1539 1539
              </object>
......
1586 1586
                  </object>
1587 1587
                 </at>
1588 1588
                 <at name="name">txtTableName</at>
1589
                 <at name="width">1170</at>
1590
                 <at name="height">20</at>
1589
                 <at name="width">521</at>
1590
                 <at name="height">22</at>
1591 1591
                </object>
1592 1592
               </at>
1593 1593
              </object>
......
1612 1612
              </at>
1613 1613
              <at name="componentclass">com.jeta.forms.gui.form.FormComponent</at>
1614 1614
             </super>
1615
             <at name="id">embedded.758232470</at>
1615
             <at name="id">embedded.1853547825</at>
1616 1616
             <at name="rowspecs">CENTER:DEFAULT:NONE</at>
1617 1617
             <at name="colspecs">FILL:22PX:NONE,FILL:DEFAULT:GROW(1.0)</at>
1618 1618
             <at name="components">
......
1662 1662
                       </object>
1663 1663
                      </at>
1664 1664
                      <at name="name">cboView</at>
1665
                      <at name="width">1229</at>
1665
                      <at name="width">571</at>
1666 1666
                      <at name="items">
1667 1667
                       <object classname="com.jeta.forms.store.properties.ItemsProperty">
1668 1668
                        <at name="name">items</at>
1669 1669
                       </object>
1670 1670
                      </at>
1671
                      <at name="height">20</at>
1671
                      <at name="height">22</at>
1672 1672
                     </object>
1673 1673
                    </at>
1674 1674
                   </object>
......
1867 1867
       </object>
1868 1868
      </at>
1869 1869
     </item>
1870
     <item >
1871
      <at name="value">
1872
       <object classname="com.jeta.forms.store.memento.BeanMemento">
1873
        <super classname="com.jeta.forms.store.memento.ComponentMemento">
1874
         <at name="cellconstraints">
1875
          <object classname="com.jeta.forms.store.memento.CellConstraintsMemento">
1876
           <at name="column">2</at>
1877
           <at name="row">18</at>
1878
           <at name="colspan">5</at>
1879
           <at name="rowspan">1</at>
1880
           <at name="halign">default</at>
1881
           <at name="valign">default</at>
1882
           <at name="insets" object="insets">0,0,0,0</at>
1883
          </object>
1884
         </at>
1885
         <at name="componentclass">com.jeta.forms.gui.form.StandardComponent</at>
1886
        </super>
1887
        <at name="jetabeanclass">com.jeta.forms.gui.beans.JETABean</at>
1888
        <at name="beanclass">javax.swing.JCheckBox</at>
1889
        <at name="beanproperties">
1890
         <object classname="com.jeta.forms.store.memento.PropertiesMemento">
1891
          <at name="classname">javax.swing.JCheckBox</at>
1892
          <at name="properties">
1893
           <object classname="com.jeta.forms.store.support.PropertyMap">
1894
            <at name="border">
1895
             <object classname="com.jeta.forms.store.properties.CompoundBorderProperty">
1896
              <super classname="com.jeta.forms.store.properties.BorderProperty">
1897
               <at name="name">border</at>
1898
              </super>
1899
              <at name="borders">
1900
               <object classname="java.util.LinkedList">
1901
                <item >
1902
                 <at name="value">
1903
                  <object classname="com.jeta.forms.store.properties.DefaultBorderProperty">
1904
                   <super classname="com.jeta.forms.store.properties.BorderProperty">
1905
                    <at name="name">border</at>
1906
                   </super>
1907
                  </object>
1908
                 </at>
1909
                </item>
1910
               </object>
1911
              </at>
1912
             </object>
1913
            </at>
1914
            <at name="actionCommand">_Export_only_extent_of_current_view</at>
1915
            <at name="name">chkExportOnlyExtentOfCurrentView</at>
1916
            <at name="width">625</at>
1917
            <at name="text">_Export_only_extent_of_current_view</at>
1918
            <at name="height">18</at>
1919
           </object>
1920
          </at>
1921
         </object>
1922
        </at>
1923
       </object>
1924
      </at>
1925
     </item>
1870 1926
    </object>
1871 1927
   </at>
1872 1928
   <at name="properties">
......
1924 1980
   <at name="cellpainters">
1925 1981
    <object classname="com.jeta.forms.store.support.Matrix">
1926 1982
     <at name="rows">
1927
      <object classname="[Ljava.lang.Object;" size="24">
1983
      <object classname="[Ljava.lang.Object;" size="26">
1928 1984
       <at name="item" index="0">
1929 1985
        <object classname="[Ljava.lang.Object;" size="7"/>
1930 1986
       </at>
......
1997 2053
       <at name="item" index="23">
1998 2054
        <object classname="[Ljava.lang.Object;" size="7"/>
1999 2055
       </at>
2056
       <at name="item" index="24">
2057
        <object classname="[Ljava.lang.Object;" size="7"/>
2058
       </at>
2059
       <at name="item" index="25">
2060
        <object classname="[Ljava.lang.Object;" size="7"/>
2061
       </at>
2000 2062
      </object>
2001 2063
     </at>
2002 2064
    </object>
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/export/VCSGisJExportView.java
11 11
import javax.swing.ButtonGroup;
12 12
import javax.swing.ImageIcon;
13 13
import javax.swing.JButton;
14
import javax.swing.JCheckBox;
14 15
import javax.swing.JComboBox;
15 16
import javax.swing.JFrame;
16 17
import javax.swing.JLabel;
......
50 51
   JLabel lblTableName = new JLabel();
51 52
   JTextField txtTableName = new JTextField();
52 53
   JComboBox cboView = new JComboBox();
54
   JCheckBox chkExportOnlyExtentOfCurrentView = new JCheckBox();
53 55

  
54 56
   /**
55 57
    * Default constructor
......
141 143
   public JPanel createPanel()
142 144
   {
143 145
      JPanel jpanel1 = new JPanel();
144
      FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE","CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:MIN(16PX;DEFAULT):NONE,CENTER:MIN(16PX;DEFAULT):NONE,CENTER:MIN(16PX;DEFAULT):NONE,CENTER:2DLU:NONE");
146
      FormLayout formlayout1 = new FormLayout("FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE,FILL:DEFAULT:GROW(1.0),FILL:4DLU:NONE,FILL:DEFAULT:NONE,FILL:4DLU:NONE","CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,FILL:DEFAULT:GROW(1.0),CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:2DLU:NONE,CENTER:DEFAULT:NONE,CENTER:MIN(16PX;DEFAULT):NONE,CENTER:MIN(16PX;DEFAULT):NONE,CENTER:MIN(16PX;DEFAULT):NONE,CENTER:2DLU:NONE");
145 147
      CellConstraints cc = new CellConstraints();
146 148
      jpanel1.setLayout(formlayout1);
147 149

  
......
196 198

  
197 199
      lblAddTableToProject.setName("lblAddTableToProject");
198 200
      lblAddTableToProject.setText("_Add_the_table_to_the_project");
199
      jpanel1.add(lblAddTableToProject,cc.xywh(2,18,5,1));
201
      jpanel1.add(lblAddTableToProject,cc.xywh(2,20,5,1));
200 202

  
201 203
      lblStatusTitle.setName("lblStatusTitle");
202
      jpanel1.add(lblStatusTitle,cc.xywh(2,21,4,1));
204
      jpanel1.add(lblStatusTitle,cc.xywh(2,23,4,1));
203 205

  
204 206
      pbStatus.setName("pbStatus");
205 207
      pbStatus.setValue(25);
206
      jpanel1.add(pbStatus,cc.xywh(2,22,4,1));
208
      jpanel1.add(pbStatus,cc.xywh(2,24,4,1));
207 209

  
208 210
      lblStatusMessages.setName("lblStatusMessages");
209
      jpanel1.add(lblStatusMessages,cc.xywh(2,23,4,1));
211
      jpanel1.add(lblStatusMessages,cc.xywh(2,25,4,1));
210 212

  
211 213
      jpanel1.add(createPanel1(),cc.xywh(2,12,5,1));
212 214
      jpanel1.add(createPanel2(),cc.xywh(2,16,5,1));
213
      jpanel1.add(createPanel3(),cc.xywh(2,20,5,1));
214
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6,7 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24 });
215
      jpanel1.add(createPanel3(),cc.xywh(2,22,5,1));
216
      chkExportOnlyExtentOfCurrentView.setActionCommand("_Export_only_extent_of_current_view");
217
      chkExportOnlyExtentOfCurrentView.setName("chkExportOnlyExtentOfCurrentView");
218
      chkExportOnlyExtentOfCurrentView.setText("_Export_only_extent_of_current_view");
219
      jpanel1.add(chkExportOnlyExtentOfCurrentView,cc.xywh(2,18,5,1));
220

  
221
      addFillComponents(jpanel1,new int[]{ 1,2,3,4,5,6,7 },new int[]{ 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26 });
215 222
      return jpanel1;
216 223
   }
217 224

  
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.app/org.gvsig.vcsgis.app.mainplugin/src/main/java/org/gvsig/vcsgis/app/VCSGisSwingServicesImpl.java
572 572
            }
573 573
        }
574 574
    }
575

  
576
    @Override
577
    public Geometry getExtentOfCurrentDocument() {
578
        ApplicationManager application = ApplicationLocator.getApplicationManager();
579
        Project project = application.getCurrentProject();
580
        
581
        ViewDocument view = (ViewDocument) project.getActiveDocument(ViewDocument.class);
582
        if( view == null ) {
583
            return null;
584
        }
585
        return view.getMapContext().getViewPort().getEnvelope().getBox2D();
586
    }
575 587
    
576 588
}
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.app/org.gvsig.vcsgis.app.mainplugin/src/main/resources-plugin/i18n/text.properties
259 259
_Restore_history=Restaura una copia de seguridad en csv del historial de una entidad
260 260
_Entity_history_backup_files=Archivos de copia de seguridad del historial de entidades
261 261
_EntitiesFile=Archivo de entidades
262
_Replace_layer_if_exists=Reemplazar la capa si existe
262
_Replace_layer_if_exists=Reemplazar la capa si existe
263
_Export_only_extent_of_current_view=Exportar solo la extensi\u00f3n de la vista actual.
264
_Cant_retrieve_extent_of_active_document=No se puede recuperar la extensi\u00f3n del documento activo.
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.app/org.gvsig.vcsgis.app.mainplugin/src/main/resources-plugin/i18n/text_en.properties
246 246
_Entity_history_backup_files=Entity history backup files
247 247
_EntitiesFile=Archivo de entidades
248 248
_Replace_layer_if_exists=Replace layer if exists
249
_Export_only_extent_of_current_view=Export only the extent of the current view.
250
_Cant_retrieve_extent_of_active_document=Unable to retrieve the extent of the active document.
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/test/java/org/gvsig/vcsgis/lib/impl/AbstractTest02Initws.java
5 5
import java.util.Comparator;
6 6
import java.util.HashSet;
7 7
import java.util.List;
8
import java.util.Locale;
9 8
import java.util.Map;
10 9
import java.util.Set;
11
import junit.framework.TestCase;
12 10
import static junit.framework.TestCase.assertEquals;
13 11
import org.apache.commons.io.FileUtils;
14 12
import org.apache.commons.lang3.StringUtils;
......
24 22
import org.gvsig.fmap.dal.store.jdbc.JDBCServerExplorerParameters;
25 23
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParameters;
26 24
import org.gvsig.fmap.dal.store.jdbc2.JDBCServerExplorer;
27
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer;
28 25
import org.gvsig.tools.util.MapBuilder;
29 26
import org.gvsig.vcsgis.lib.VCSGisLocator;
30 27
import org.gvsig.vcsgis.lib.VCSGisManager;
......
37 34
import org.gvsig.vcsgis.lib.workspace.tables.UsersTable;
38 35
import org.gvsig.vcsgis.lib.workspace.tables.VarsTable;
39 36
import org.gvsig.vcsgis.lib.workspace.tables.WorkspaceChangesTable;
40
import org.slf4j.Logger;
41
import org.slf4j.LoggerFactory;
42 37

  
43
public abstract class AbstractTest02Initws extends TestCase {
38
public abstract class AbstractTest02Initws extends AbstractTestVCSGIS {
44 39

  
45
    protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractTest02Initws.class);
46

  
47
    static{
48
            Locale.setDefault(Locale.forLanguageTag("es-ES"));
49
    }
50

  
51 40
    public AbstractTest02Initws(String testName) {
52 41
        super(testName);
53 42
    }
......
55 44
    @Override
56 45
    protected void setUp() throws Exception {
57 46
        super.setUp();
58
        new DefaultLibrariesInitializer().fullInitialize();
59 47
    }
60 48

  
61 49
    @Override
......
63 51
        super.tearDown();
64 52
    }
65 53

  
66
    protected abstract AbstractTestUtils utils();
67

  
68 54
    // TODO add test methods here. The name must begin with 'test'. For example:
69 55
    // public void testHello() {}
70 56

  
71 57
    protected void testCreateWS() throws Exception {
72
        utils().disposablesCheck_init();
73
        
74 58
        utils().cleanRepositoryDatabase();
75 59
        
76 60
        String testid = "initws";
......
163 147
        workspace.dispose();
164 148
        wsexplorer.dispose();
165 149
        vcsgismanager.clean();
166
        utils().disposablesCheck_test();
167 150
    }
168 151
}
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/test/java/org/gvsig/vcsgis/lib/impl/AbstractTest18Revert.java
1 1
package org.gvsig.vcsgis.lib.impl;
2 2

  
3 3
import java.io.File;
4
import java.util.Locale;
5
import junit.framework.TestCase;
6 4
import static junit.framework.TestCase.assertEquals;
7 5
import org.apache.commons.io.FileUtils;
8 6
import org.gvsig.fmap.dal.feature.EditableFeature;
9 7
import org.gvsig.fmap.dal.feature.Feature;
10 8
import org.gvsig.fmap.dal.feature.FeatureStore;
11 9
import org.gvsig.fmap.dal.store.jdbc2.JDBCServerExplorer;
12
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer;
13 10
import org.gvsig.vcsgis.lib.SequentialCodeGenerator;
14 11
import org.gvsig.vcsgis.lib.VCSGisLocator;
15 12
import org.gvsig.vcsgis.lib.VCSGisManager;
......
22 19
import org.gvsig.vcsgis.lib.repository.VCSGisRepository;
23 20
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspace;
24 21
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspaceEntity;
25
import org.slf4j.Logger;
26
import org.slf4j.LoggerFactory;
27 22

  
28
public abstract class AbstractTest18Revert extends TestCase {
23
public abstract class AbstractTest18Revert extends AbstractTestVCSGIS {
29 24

  
30
    protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractTest18Revert.class);
31

  
32
    static{
33
            Locale.setDefault(Locale.forLanguageTag("es-ES"));
34
    }
35

  
36 25
    public AbstractTest18Revert(String testName) {
37 26
        super(testName);
38 27
    }
......
40 29
    @Override
41 30
    protected void setUp() throws Exception {
42 31
        super.setUp();
43
        new DefaultLibrariesInitializer().fullInitialize();
44 32
    }
45 33

  
46 34
    @Override
......
48 36
        super.tearDown();
49 37
    }
50 38

  
51
    protected abstract AbstractTestUtils utils();
52

  
53 39
    private void check(FeatureStore store2, String relatedFeatureCode, int id, String text) throws Exception {
54 40
        Feature f = store2.findFirst("VCSGISCODE = '"+relatedFeatureCode+"'");
55 41
        assertEquals(id, f.getInt("id"));
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/test/java/org/gvsig/vcsgis/lib/impl/AbstractTest17Geom1.java
2 2

  
3 3
import java.io.File;
4 4
import java.util.List;
5
import java.util.Locale;
6
import junit.framework.TestCase;
7 5
import static junit.framework.TestCase.assertEquals;
8 6
import org.apache.commons.io.FileUtils;
9
import org.apache.commons.lang3.StringUtils;
10 7
import org.gvsig.fmap.dal.feature.Feature;
11 8
import org.gvsig.fmap.dal.feature.FeatureStore;
12 9
import org.gvsig.fmap.dal.store.jdbc2.JDBCServerExplorer;
13 10
import org.gvsig.fmap.geom.Geometry;
14 11
import org.gvsig.tools.dispose.DisposeUtils;
15
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer;
16 12
import org.gvsig.vcsgis.lib.SequentialCodeGenerator;
17 13
import org.gvsig.vcsgis.lib.VCSGisLocator;
18 14
import org.gvsig.vcsgis.lib.VCSGisManager;
......
23 19
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspaceEntity;
24 20
import org.gvsig.vcsgis.lib.workspace.tables.EntitiesTable;
25 21
import org.gvsig.vcsgis.lib.workspace.tables.WorkspaceChangesTable;
26
import org.slf4j.Logger;
27
import org.slf4j.LoggerFactory;
28 22
import static org.gvsig.vcsgis.lib.VCSGisManager.STATE_LOCAL_UNMODIFIED;
29 23

  
30 24
@SuppressWarnings("UseSpecificCatch")
31
public abstract class AbstractTest17Geom1 extends TestCase {
25
public abstract class AbstractTest17Geom1 extends AbstractTestVCSGIS {
32 26

  
33
    protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractTest17Geom1.class);
34

  
35
    static {
36
        Locale.setDefault(Locale.forLanguageTag("es-ES"));
37
    }
38

  
39 27
    public AbstractTest17Geom1(String testName) {
40 28
        super(testName);
41 29
    }
......
43 31
    @Override
44 32
    protected void setUp() throws Exception {
45 33
        super.setUp();
46
        new DefaultLibrariesInitializer().fullInitialize();
47 34
    }
48 35

  
49 36
    @Override
......
51 38
        super.tearDown();
52 39
    }
53 40

  
54
    protected abstract AbstractTestUtils utils();
55

  
56 41
    // TODO add test methods here. The name must begin with 'test'. For example:
57 42
    // public void testHello() {}
58 43
    protected void testGeom1() throws Exception {
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/test/java/org/gvsig/vcsgis/lib/impl/AbstractTest03GetWorkspaces.java
1 1
package org.gvsig.vcsgis.lib.impl;
2 2

  
3 3
import java.io.File;
4
import java.util.Locale;
5 4
import java.util.Map;
6
import junit.framework.TestCase;
7 5
import static junit.framework.TestCase.assertEquals;
8 6
import org.apache.commons.io.FileUtils;
9 7
import org.gvsig.fmap.dal.store.jdbc2.JDBCServerExplorer;
10 8
import org.gvsig.tools.dispose.DisposeUtils;
11
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer;
12 9
import org.gvsig.vcsgis.lib.VCSGisLocator;
13 10
import org.gvsig.vcsgis.lib.VCSGisManager;
14 11
import org.gvsig.vcsgis.lib.repository.VCSGisRepository;
15 12
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspace;
16 13
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspaceDescriptor;
17 14
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspaceDescriptorImpl;
18
import org.slf4j.Logger;
19
import org.slf4j.LoggerFactory;
20 15

  
21
public abstract class AbstractTest03GetWorkspaces extends TestCase {
16
public abstract class AbstractTest03GetWorkspaces extends AbstractTestVCSGIS {
22 17

  
23
    protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractTest03GetWorkspaces.class);
24

  
25
    static {
26
        Locale.setDefault(Locale.forLanguageTag("es-ES"));
27
    }
28

  
29 18
    public AbstractTest03GetWorkspaces(String testName) {
30 19
        super(testName);
31 20
    }
......
33 22
    @Override
34 23
    protected void setUp() throws Exception {
35 24
        super.setUp();
36
        new DefaultLibrariesInitializer().fullInitialize();
37 25
    }
38 26

  
39 27
    @Override
......
41 29
        super.tearDown();
42 30
    }
43 31

  
44
    protected abstract AbstractTestUtils utils();
45

  
46 32
    // TODO add test methods here. The name must begin with 'test'. For example:
47 33
    // public void testHello() {}
48 34
    protected void testGetWorkspaces() throws Exception {
49 35
        try {
50
            utils().disposablesCheck_init();
51
            
52 36
            utils().cleanRepositoryDatabase();
53 37

  
54 38
            VCSGisManager manager = VCSGisLocator.getVCSGisManager();
......
84 68
            repo.dispose();
85 69
            server.dispose();
86 70
            manager.clean();
87
            utils().disposablesCheck_test();
88 71
        } catch (Throwable th) {
89 72
            LOGGER.warn("", th);
90 73
            throw th;
......
93 76

  
94 77
    protected void testGetWorkspaces2() throws Exception {
95 78
        try {
96
            utils().disposablesCheck_init();
97
            
98 79
            utils().cleanRepositoryDatabase();
99 80

  
100 81
            VCSGisManager manager = VCSGisLocator.getVCSGisManager();
......
127 108
            repo.dispose();
128 109
            server.dispose();
129 110
            manager.clean();
130
            utils().disposablesCheck_test();
131 111
        } catch (Throwable th) {
132 112
            LOGGER.warn("", th);
133 113
            throw th;
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/test/java/org/gvsig/vcsgis/lib/impl/AbstractTest11GetLocalChanges.java
2 2

  
3 3
import java.io.File;
4 4
import java.util.List;
5
import java.util.Locale;
6
import junit.framework.TestCase;
7 5
import static junit.framework.TestCase.assertEquals;
8 6
import org.apache.commons.io.FileUtils;
9 7
import org.gvsig.fmap.dal.feature.EditableFeature;
......
11 9
import org.gvsig.fmap.dal.feature.FeatureStore;
12 10
import org.gvsig.fmap.dal.store.jdbc2.JDBCServerExplorer;
13 11
import org.gvsig.tools.dispose.DisposeUtils;
14
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer;
15 12
import org.gvsig.tools.util.GetItemWithSize64;
16 13
import org.gvsig.vcsgis.lib.VCSGisLocator;
17 14
import org.gvsig.vcsgis.lib.VCSGisManager;
......
23 20
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspace;
24 21
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspaceChange;
25 22
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspaceEntity;
26
import org.slf4j.Logger;
27
import org.slf4j.LoggerFactory;
28 23

  
29
public abstract class AbstractTest11GetLocalChanges extends TestCase {
24
public abstract class AbstractTest11GetLocalChanges extends AbstractTestVCSGIS {
30 25

  
31
    protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractTest11GetLocalChanges.class);
32

  
33
    static{
34
            Locale.setDefault(Locale.forLanguageTag("es-ES"));
35
    }
36

  
37 26
    public AbstractTest11GetLocalChanges(String testName) {
38 27
        super(testName);
39 28
    }
......
41 30
    @Override
42 31
    protected void setUp() throws Exception {
43 32
        super.setUp();
44
        new DefaultLibrariesInitializer().fullInitialize();
45 33
    }
46 34

  
47 35
    @Override
......
49 37
        super.tearDown();
50 38
    }
51 39

  
52
    protected abstract AbstractTestUtils utils();
53

  
54 40
    // TODO add test methods here. The name must begin with 'test'. For example:
55 41
    // public void testHello() {}
56 42

  
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/test/java/org/gvsig/vcsgis/lib/impl/AbstractTest04AddEntity.java
1 1
package org.gvsig.vcsgis.lib.impl;
2 2

  
3 3
import java.io.File;
4
import java.util.Locale;
5
import junit.framework.TestCase;
6 4
import static junit.framework.TestCase.assertEquals;
7 5
import org.apache.commons.io.FileUtils;
8 6
import org.gvsig.fmap.dal.feature.FeatureStore;
9 7
import org.gvsig.fmap.dal.store.jdbc2.JDBCServerExplorer;
10
import org.gvsig.tools.dispose.DisposeUtils;
11
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer;
12 8
import org.gvsig.vcsgis.lib.VCSGisLocator;
13 9
import org.gvsig.vcsgis.lib.VCSGisManager;
14 10
import static org.gvsig.vcsgis.lib.VCSGisManager.STATE_LOCAL_NEW;
......
16 12
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspace;
17 13
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspaceEntity;
18 14
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspaceImpl;
19
import org.slf4j.Logger;
20
import org.slf4j.LoggerFactory;
21 15

  
22
public abstract class AbstractTest04AddEntity extends TestCase {
16
public abstract class AbstractTest04AddEntity extends AbstractTestVCSGIS {
23 17

  
24
    protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractTest04AddEntity.class);
25

  
26
    static{
27
            Locale.setDefault(Locale.forLanguageTag("es-ES"));
28
    }
29

  
30 18
    public AbstractTest04AddEntity(String testName) {
31 19
        super(testName);
32 20
    }
......
34 22
    @Override
35 23
    protected void setUp() throws Exception {
36 24
        super.setUp();
37
        new DefaultLibrariesInitializer().fullInitialize();
38 25
    }
39 26

  
40 27
    @Override
......
42 29
        super.tearDown();
43 30
    }
44 31

  
45
    protected abstract AbstractTestUtils utils();
46
    
47 32
    // TODO add test methods here. The name must begin with 'test'. For example:
48 33
    // public void testHello() {}
49 34
    
50 35
    protected void testAdd_entity1() throws Exception {
51
        utils().disposablesCheck_init();
52
         
53 36
        utils().cleanRepositoryDatabase();
54 37
        
55 38
        VCSGisManager manager = VCSGisLocator.getVCSGisManager();
......
89 72
        repo.dispose();
90 73
        server.dispose();
91 74
        manager.clean();
92
        utils().disposablesCheck_test();
93 75
    }
94 76
}
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/test/java/org/gvsig/vcsgis/lib/impl/AbstractTest01InitRepo.java
1 1
package org.gvsig.vcsgis.lib.impl;
2 2

  
3
import java.util.ArrayList;
4 3
import java.util.Collections;
5 4
import java.util.HashSet;
6 5
import java.util.List;
7
import java.util.Locale;
8 6
import java.util.Map;
9 7
import java.util.Set;
10
import junit.framework.TestCase;
11 8
import static junit.framework.TestCase.assertEquals;
12 9
import org.apache.commons.lang3.StringUtils;
13 10
import org.gvsig.fmap.dal.DALLocator;
......
21 18
import org.gvsig.fmap.dal.feature.FeatureType;
22 19
import org.gvsig.fmap.dal.store.jdbc.JDBCStoreParameters;
23 20
import org.gvsig.fmap.dal.store.jdbc2.JDBCServerExplorer;
24
import org.gvsig.tools.ToolsLocator;
25
import org.gvsig.tools.dispose.DisposableInfo;
26
import org.gvsig.tools.dispose.DisposableManager;
27
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer;
28 21
import org.gvsig.tools.util.MapBuilder;
29 22
import org.gvsig.vcsgis.lib.VCSGisLocator;
30 23
import org.gvsig.vcsgis.lib.VCSGisManager;
......
35 28
import org.gvsig.vcsgis.lib.repository.localdb.tables.RevisionsRepoTable;
36 29
import org.gvsig.vcsgis.lib.repository.localdb.tables.TopologyplanRepoTable;
37 30
import org.gvsig.vcsgis.lib.repository.localdb.tables.UsersRepoTable;
38
import org.slf4j.Logger;
39
import org.slf4j.LoggerFactory;
40 31

  
41
public abstract class AbstractTest01InitRepo extends TestCase {
32
public abstract class AbstractTest01InitRepo extends AbstractTestVCSGIS {
42 33

  
43
    protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractTest01InitRepo.class);
44

  
45
    static {
46
        Locale.setDefault(Locale.forLanguageTag("es-ES"));
47
    }
48

  
49 34
    public AbstractTest01InitRepo(String testName) {
50 35
        super(testName);
51 36
    }
......
53 38
    @Override
54 39
    protected void setUp() throws Exception {
55 40
        super.setUp();
56
        new DefaultLibrariesInitializer().fullInitialize();
57 41
    }
58 42

  
59 43
    @Override
......
61 45
        super.tearDown();
62 46
    }
63 47

  
64
    protected abstract AbstractTestUtils utils();
65

  
66 48
    private static class ExpectedValue implements Comparable<ExpectedValue> {
67 49

  
68 50
        private final String tableName;
......
83 65
    // public void testHello() {}
84 66
    protected void testInit1() throws Exception {
85 67
        try {
86
            utils().disposablesCheck_init();
87
            
88 68
            utils().cleanRepositoryDatabase();
89 69

  
90 70
            final String testid = "initrepo";
......
155 135
                store.dispose();
156 136
            }          
157 137
            server.dispose();
158
            utils().disposablesCheck_test();
159 138
        } catch (Throwable th) {
160 139
            LOGGER.warn("testInit1", th);
161 140
            throw th;
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/test/java/org/gvsig/vcsgis/lib/impl/AbstractTest08Update.java
2 2

  
3 3
import java.io.File;
4 4
import java.util.List;
5
import java.util.Locale;
6
import static junit.framework.Assert.assertNotNull;
7
import static junit.framework.Assert.assertTrue;
8
import junit.framework.TestCase;
9 5
import static junit.framework.TestCase.assertEquals;
10 6
import org.apache.commons.io.FileUtils;
11 7
import org.codehaus.plexus.util.StringUtils;
......
16 12
import org.gvsig.fmap.dal.feature.FeatureStore;
17 13
import org.gvsig.fmap.dal.store.jdbc2.JDBCServerExplorer;
18 14
import org.gvsig.tools.dispose.DisposeUtils;
19
import org.gvsig.tools.junit.AbstractCheckDisposablesTestCase;
20
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer;
21 15
import org.gvsig.vcsgis.lib.SequentialCodeGenerator;
22 16
import org.gvsig.vcsgis.lib.VCSGisLocator;
23 17
import org.gvsig.vcsgis.lib.VCSGisManager;
......
30 24
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspace;
31 25
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspaceChanges;
32 26
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspaceEntity;
33
import org.slf4j.Logger;
34
import org.slf4j.LoggerFactory;
35 27

  
36
public abstract class AbstractTest08Update extends AbstractCheckDisposablesTestCase {
28
public abstract class AbstractTest08Update extends AbstractTestVCSGIS {
37 29

  
38
    protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractTest08Update.class);
39

  
40
    static{
41
            Locale.setDefault(Locale.forLanguageTag("es-ES"));
42
    }
43

  
44 30
    public AbstractTest08Update(String testName) {
45 31
        super(testName);
46 32
    }
......
55 41
        super.tearDown();
56 42
    }
57 43

  
58
    protected abstract AbstractTestUtils utils();
59

  
60 44
    // TODO add test methods here. The name must begin with 'test'. For example:
61 45
    // public void testHello() {}
62 46

  
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/test/java/org/gvsig/vcsgis/lib/impl/AbstractTest09CommitOutdated.java
2 2

  
3 3
import java.io.File;
4 4
import java.util.List;
5
import java.util.Locale;
6
import junit.framework.TestCase;
7 5
import static junit.framework.TestCase.assertEquals;
8 6
import org.apache.commons.io.FileUtils;
9 7
import org.gvsig.expressionevaluator.Expression;
......
12 10
import org.gvsig.fmap.dal.feature.FeatureStore;
13 11
import org.gvsig.fmap.dal.store.jdbc2.JDBCServerExplorer;
14 12
import org.gvsig.tools.dispose.DisposeUtils;
15
import org.gvsig.tools.junit.AbstractCheckDisposablesTestCase;
16
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer;
17 13
import org.gvsig.vcsgis.lib.SequentialCodeGenerator;
18 14
import org.gvsig.vcsgis.lib.VCSGisLocator;
19 15
import org.gvsig.vcsgis.lib.VCSGisManager;
......
24 20
import org.gvsig.vcsgis.lib.repository.VCSGisRepository;
25 21
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspace;
26 22
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspaceEntity;
27
import org.slf4j.Logger;
28
import org.slf4j.LoggerFactory;
29 23

  
30
public abstract class AbstractTest09CommitOutdated extends AbstractCheckDisposablesTestCase {
24
public abstract class AbstractTest09CommitOutdated extends AbstractTestVCSGIS {
31 25

  
32
    protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractTest09CommitOutdated.class);
33

  
34
    static{
35
            Locale.setDefault(Locale.forLanguageTag("es-ES"));
36
    }
37

  
38 26
    public AbstractTest09CommitOutdated(String testName) {
39 27
        super(testName);
40
        showDisposablesAtFinish = true;
41 28
    }
42 29

  
43 30
    @Override
......
50 37
        super.tearDown();
51 38
    }
52 39

  
53
    protected abstract AbstractTestUtils utils();
54

  
55 40
    // TODO add test methods here. The name must begin with 'test'. For example:
56 41
    // public void testHello() {}
57 42

  
......
184 169

  
185 170
        
186 171
    }
187

  
188
    @Override
189
    protected void disposablesCheck_init() {
190
//        super.disposablesCheck_init(); //To change body of generated methods, choose Tools | Templates.
191
    }
192

  
193
    @Override
194
    protected void disposablesCheck_test() {
195
//        super.disposablesCheck_test(); //To change body of generated methods, choose Tools | Templates.
196
    }
197 172
    
198
    
199 173
}
org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.lib/org.gvsig.vcsgis.lib.impl/src/test/java/org/gvsig/vcsgis/lib/impl/AbstractTest12Commit.java
2 2

  
3 3
import java.io.File;
4 4
import java.util.List;
5
import java.util.Locale;
6
import junit.framework.TestCase;
7 5
import static junit.framework.TestCase.assertEquals;
8 6
import org.apache.commons.io.FileUtils;
9 7
import org.gvsig.fmap.dal.feature.EditableFeature;
......
11 9
import org.gvsig.fmap.dal.feature.FeatureStore;
12 10
import org.gvsig.fmap.dal.store.jdbc2.JDBCServerExplorer;
13 11
import org.gvsig.tools.dispose.DisposeUtils;
14
import org.gvsig.tools.library.impl.DefaultLibrariesInitializer;
15 12
import org.gvsig.tools.util.GetItemWithSize64;
16 13
import org.gvsig.vcsgis.lib.VCSGisLocator;
17 14
import org.gvsig.vcsgis.lib.VCSGisManager;
......
19 16
import org.gvsig.vcsgis.lib.repository.VCSGisRepository;
20 17
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspace;
21 18
import org.gvsig.vcsgis.lib.workspace.VCSGisWorkspaceChange;
22
import org.slf4j.Logger;
23
import org.slf4j.LoggerFactory;
24 19

  
25
public abstract class AbstractTest12Commit extends TestCase {
20
public abstract class AbstractTest12Commit extends AbstractTestVCSGIS {
26 21

  
27
    protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractTest12Commit.class);
28

  
29
    static{
30
            Locale.setDefault(Locale.forLanguageTag("es-ES"));
31
    }
32

  
33 22
    public AbstractTest12Commit(String testName) {
34 23
        super(testName);
35 24
    }
......
37 26
    @Override
38 27
    protected void setUp() throws Exception {
39 28
        super.setUp();
40
        new DefaultLibrariesInitializer().fullInitialize();
41 29
    }
42 30

  
43 31
    @Override
......
45 33
        super.tearDown();
46 34
    }
47 35

  
48
    protected abstract AbstractTestUtils utils();
49

  
50 36
    // TODO add test methods here. The name must begin with 'test'. For example:
51 37
    // public void testHello() {}
52 38

  
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff