Revision 3943

View differences:

org.gvsig.vcsgis/trunk/org.gvsig.vcsgis/org.gvsig.vcsgis.swing/org.gvsig.vcsgis.swing.impl/src/main/java/org/gvsig/vcsgis/swing/impl/checkout/VCSGisJCheckoutImpl.java
256 256
            if (canCheckout) {
257 257
                if (isLayer(selectedTable)) {
258 258
                    this.rdbAddLayerToView.setEnabled(canCheckout);
259
                    this.cboView.setEnabled(canCheckout);
259
                    this.cboView.setEnabled(canCheckout && this.rdbAddLayerToView.isSelected());
260 260
                } else {
261 261
                    this.rdbAddLayerToView.setEnabled(false);
262 262
                    this.cboView.setEnabled(false);
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
306 306
        this.revisionPicker.setEntity(selectedTable);
307 307
        this.efectivePicker.set(null);
308 308
        this.txtTableName.setText("");
309
        
310
        boolean isLayer = isLayer(selectedTable);
311
        this.rdbAddLayerToView.setSelected(isLayer && !this.rdbDontAddToProject.isSelected());
312
        this.rdbAddTableToProject.setSelected(!isLayer && !this.rdbDontAddToProject.isSelected());
313
        
314
        if(isLayer) {
315
            if (this.cboView.getModel().getSize() > 0) {
316
                this.cboView.setEnabled(true);
317
                if (this.cboView.getModel().getSize() == 2) {
318
                    this.cboView.setSelectedIndex(1);
319
                } else {
320
                    this.cboView.setSelectedIndex(0);
321
                }
322
            } else {
323
                this.cboView.setEnabled(false);
324
            }
325
        }
326
        doUpdateComponents();
309 327
    }
310 328

  
311 329
    private void doChangeTableName() {
......
377 395
                setVisibleStatus(true);
378 396
            }
379 397

  
380
            LOGGER.info("canExport = "+canExport+", processing = "+processing+", ws = "+workspace);
381

  
382 398
            this.entitySelector.setEnabled(!isProcessing && workspace != null);
383 399

  
384 400
            this.rdbRevision.setEnabled(isThereTableSelected);
......
392 408
            if (canExport) {
393 409
                if (isLayer(selectedTable)) {
394 410
                    this.rdbAddLayerToView.setEnabled(canExport);
395
//                    this.cboView.setEnabled(canExport && this.rdbAddLayerToView.isSelected());
396
                    
397
                    if (this.cboView.getModel().getSize() > 0) {
398
                        this.rdbAddLayerToView.setSelected(canExport && !this.rdbDontAddToProject.isSelected() && !this.rdbAddTableToProject.isSelected() );
399
                        this.cboView.setEnabled(canExport && this.rdbAddLayerToView.isSelected());
400
                        if (this.cboView.getModel().getSize() == 2) {
401
                            this.cboView.setSelectedIndex(1);
402
                        } else {
403
                            this.cboView.setSelectedIndex(0);
404
                        }
405
                    } else {
406
                        this.rdbAddLayerToView.setSelected(false);
407
                        this.cboView.setEnabled(false);
408
                        this.cboView.setSelectedIndex(0);
409
                    }
410
                    
411
                    this.cboView.setEnabled(canExport && this.rdbAddLayerToView.isSelected());
411 412
                } else {
412
                    if(!this.rdbDontAddToProject.isSelected()){
413
                        this.rdbAddTableToProject.setSelected(true);
414
                    }
415 413
                    this.rdbAddLayerToView.setEnabled(false);
416 414
                    this.cboView.setEnabled(false);
417
                    this.cboView.setSelectedIndex(0);
418 415
                }
419 416
            } else {
420 417
                this.rdbAddLayerToView.setEnabled(false);
421 418
                this.cboView.setEnabled(false);
422 419
            }
423 420

  
424
    //        this.workspacePicker.setEnabled(!isProcessing);
425 421
            this.entitySelector.setEnabled(!isProcessing && workspace != null);
426 422
            this.lblTableName.setEnabled(isThereTableSelected);
427 423
            this.txtTableName.setEnabled(isThereTableSelected);
428
            LOGGER.info("isProcessing = "+isProcessing+", processing = "+processing+", ws = "+workspace);
429 424

  
430 425
            this.pbStatus.setVisible(isProcessing);
431 426
            this.lblStatusTitle.setVisible(isProcessing);

Also available in: Unified diff